[Cmake-commits] CMake branch, next, updated. v2.8.3-1515-ge5417a6

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e5417a66aeca7cbcebd80c0dcf2e4d381750a273 (commit)
       via  b1f52b1fd8dd13d22138b7b9c0701e699dbeb43c (commit)
      from  fa9d51912fb1184041c5dc2e90d46b04ce1ed4bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5417a66aeca7cbcebd80c0dcf2e4d381750a273
commit e5417a66aeca7cbcebd80c0dcf2e4d381750a273
Merge: fa9d519 b1f52b1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Jan 28 10:52:19 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 28 10:52:19 2011 -0500

    Merge topic 'qtdialog-groupingbug' into next
    
    b1f52b1 Fix grouping bug where "Ungrouped Entries" showed up as a child.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1f52b1fd8dd13d22138b7b9c0701e699dbeb43c
commit b1f52b1fd8dd13d22138b7b9c0701e699dbeb43c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Jan 28 08:50:56 2011 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Jan 28 08:50:56 2011 -0700

    Fix grouping bug where "Ungrouped Entries" showed up as a child.

diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index 562396d..72e9b24 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -293,6 +293,8 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
       parentItems.append(new QStandardItem());
       parentItems[0]->setData(QBrush(QColor(255,100,100)), Qt::BackgroundColorRole);
       parentItems[1]->setData(QBrush(QColor(255,100,100)), Qt::BackgroundColorRole);
+      parentItems[0]->setData(1, GroupRole);
+      parentItems[1]->setData(1, GroupRole);
       root->appendRow(parentItems);
 
       int num = props2.size();
@@ -314,6 +316,7 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props)
       QStandardItem* parentItem = 
         new QStandardItem(key.isEmpty() ? tr("Ungrouped Entries") : key);
       root->appendRow(parentItem);
+      parentItem->setData(1, GroupRole);
 
       int num = props2.size();
       for(int i=0; i<num; i++)
@@ -478,10 +481,13 @@ QCMakePropertyList QCMakeCacheModel::properties() const
     }
     else
     {
-      // get data
-      QCMakeProperty prop;
-      this->getPropertyData(idx, prop);
-      props.append(prop);
+      if(!data(idx, GroupRole).toInt())
+      {
+        // get data
+        QCMakeProperty prop;
+        this->getPropertyData(idx, prop);
+        props.append(prop);
+      }
       
       // go to the next in the tree
       while(!idxs.isEmpty() && !idxs.last().sibling(idxs.last().row()+1, 0).isValid())
diff --git a/Source/QtDialog/QCMakeCacheView.h b/Source/QtDialog/QCMakeCacheView.h
index 58bbd2d..0a628b9 100644
--- a/Source/QtDialog/QCMakeCacheView.h
+++ b/Source/QtDialog/QCMakeCacheView.h
@@ -67,7 +67,9 @@ public:
   enum { HelpRole = Qt::ToolTipRole,
          TypeRole = Qt::UserRole, 
          AdvancedRole,
-         StringsRole};
+         StringsRole,
+         GroupRole
+       };
 
   enum ViewType { FlatView, GroupView };
 

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/QCMakeCacheView.cxx |   14 ++++++++++----
 Source/QtDialog/QCMakeCacheView.h   |    4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake