[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-05-25 8:01:55
Message-ID: 1243238515.781363.16316.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 972521 by aseigo:

calling values() on a hash/map is EVIL


 M  +3 -3      abstracttaskitem.cpp  
 M  +11 -6     taskgroupitem.cpp  
 M  +2 -1      taskgroupitem.h  
 M  +2 -2      taskitemlayout.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp \
#972520:972521 @@ -608,10 +608,10 @@
 
             painter->setFont(font);
             rect.setTop(arrowRect.bottom());
-            painter->drawText(rect, Qt::AlignHCenter|Qt::AlignTop, \
QString::number(groupItem->memberList().count())); +            \
painter->drawText(rect, Qt::AlignHCenter|Qt::AlignTop, \
QString::number(groupItem->count()));  } else {
             painter->setFont(font);
-            painter->drawText(rect, Qt::AlignCenter, \
QString::number(groupItem->memberList().count())); +            \
painter->drawText(rect, Qt::AlignCenter, QString::number(groupItem->count()));  }
     }
 }
@@ -884,7 +884,7 @@
     QFontMetrics fm(KGlobalSettings::smallestReadableFont());
     Plasma::FrameSvg *itemBackground = m_applet->itemBackground();
 
-    QSize expanderSize(qMax(fm.width(QString::number(groupItem->memberList().count())),
 +    QSize expanderSize(qMax(fm.width(QString::number(groupItem->count())),
                        itemBackground ?  \
itemBackground->elementSize(expanderElement()).width() : 0),  size().height());
 
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.cpp #972520:972521
@@ -378,11 +378,16 @@
     menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size()));
 }
 
-QList<AbstractTaskItem*> TaskGroupItem::memberList() const
+QHash<AbstractItemPtr, AbstractTaskItem*> TaskGroupItem::members() const
 {
-    return m_groupMembers.values();
+    return m_groupMembers;
 }
 
+int TaskGroupItem::count() const
+{
+    return m_groupMembers.count();
+}
+
 AbstractTaskItem *TaskGroupItem::createAbstractItem(TaskManager::AbstractItemPtr \
groupableItem)  {
     //kDebug() << "item to create" << groupableItem << endl;
@@ -1043,7 +1048,7 @@
             if (groupItem) {
                 int subIndex = groupItem->indexOf(task);
                 if(subIndex == -1) {
-                    index += groupItem->memberList().count();
+                    index += groupItem->count();
                 } else {
                     return index+subIndex;
                 }
@@ -1081,7 +1086,7 @@
         if (taskItem) {
             TaskGroupItem *groupItem = qobject_cast<TaskGroupItem *>(taskItem);
             if (groupItem) {
-                count += groupItem->memberList().count();
+                count += groupItem->count();
             } else {
                 count++;
             }
@@ -1098,10 +1103,10 @@
         if (taskItem) {
             TaskGroupItem *groupItem = qobject_cast<TaskGroupItem *>(taskItem);
             if (groupItem) {
-                if (index < groupItem->memberList().count()) {
+                if (index < groupItem->count()) {
                    return \
groupItem->abstractTaskItem(groupItem->group()->members().at(index));  } else {
-                   index -= groupItem->memberList().count();
+                   index -= groupItem->count();
                 }
             } else if (index == 0) {
                 return taskItem;
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskgroupitem.h #972520:972521
@@ -64,7 +64,8 @@
 
     virtual void close();
 
-    QList<AbstractTaskItem*> memberList() const;
+    QHash<AbstractItemPtr, AbstractTaskItem*> members() const;
+    int count() const;
     AbstractTaskItem * activeSubTask();
 
     virtual bool isWindowItem() const;
--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/taskitemlayout.cpp \
#972520:972521 @@ -33,7 +33,7 @@
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
     setMaximumSize(INT_MAX,INT_MAX);
     //kDebug();
-    foreach(AbstractTaskItem *item, m_groupItem->memberList()) {
+    foreach (AbstractTaskItem *item, m_groupItem->members()) {
         addTaskItem(item);
     }
 }
@@ -143,7 +143,7 @@
 {
     int groupSize = 0;
 
-    foreach (AbstractTaskItem *item, m_groupItem->memberList()) {
+    foreach (AbstractTaskItem *item, m_groupItem->members()) {
         if (!item->abstractItem()) { //this item is a startup task
             kDebug() << "Error, invalid item in groupMembers";
             continue;


[prev in list] [next in list] [prev in thread] [next in thread]