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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       Michael Jansen <kde () michael-jansen ! biz>
Date:       2008-11-23 19:43:46
Message-ID: 1227469426.217491.10830.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 888107 by mjansen:

Add unit tests for KActionCategory and fix a bug found while writing them
:-).

 M  +10 -6     actions/kactioncategory.cpp  
 M  +1 -0      tests/CMakeLists.txt  
 A             tests/kactioncategorytest.cpp   [License: UNKNOWN]
 A             tests/kactioncategorytest.h   [License: UNKNOWN]


--- trunk/KDE/kdelibs/kdeui/actions/kactioncategory.cpp #888106:888107
@@ -63,7 +63,7 @@
 QAction * KActionCategory::addAction(const QString &name, QAction *action)
     {
     collection()->addAction(name, action);
-    d->actions.append(action);
+    addAction(action);
     return action;
     }
 
@@ -71,7 +71,7 @@
 KAction * KActionCategory::addAction(const QString &name, KAction *action)
     {
     collection()->addAction(name, action);
-    d->actions.append(action);
+    addAction(action);
     return action;
     }
 
@@ -82,7 +82,7 @@
         const char *member)
     {
     KAction *action = collection()->addAction(actionType, receiver, member);
-    d->actions.append(action);
+    addAction(action);
     return action;
     }
 
@@ -94,7 +94,7 @@
         const char *member)
     {
     KAction *action = collection()->addAction(actionType, name, receiver, member);
-    d->actions.append(action);
+    addAction(action);
     return action;
     }
 
@@ -105,14 +105,18 @@
         const char *member)
     {
     KAction *action = collection()->addAction(name, receiver, member);
-    d->actions.append(action);
+    addAction(action);
     return action;
     }
 
 
 void KActionCategory::addAction(QAction *action)
     {
-    d->actions.append(action);
+    // Only add the action if wasn't added earlier.
+    if (d->actions.count(action) == 0)
+        {
+        d->actions.append(action);
+        }
     }
 
 
--- trunk/KDE/kdelibs/kdeui/tests/CMakeLists.txt #888106:888107
@@ -19,6 +19,7 @@
 
 KDEUI_UNIT_TESTS(
   kactioncollectiontest
+  kactioncategorytest
   kbuttongrouptest
   kcompletioncoretest
   kconfigguitest
[prev in list] [next in list] [prev in thread] [next in thread]