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

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/imageeditor
From:       Andi Clemens <andi.clemens () gmx ! net>
Date:       2009-11-16 11:39:00
Message-ID: 1258371540.636983.32290.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1050012 by aclemens:

Better set a string to avoid an empty string object.
This ensures to always have some content returned from
ImagePlugin::actionCategory(), either __INVALID__ or an valid category name.
If this works for 64bit, it must be a Qt error, right?

 M  +1 -1      canvas/imageplugin.cpp  
 M  +4 -2      editor/editorwindow.cpp  


--- trunk/extragear/graphics/digikam/utilities/imageeditor/canvas/imageplugin.cpp \
#1050011:1050012 @@ -87,7 +87,7 @@
 
     if (!d || d->actionCategory.isNull() || d->actionCategory.isEmpty())
     {
-        return QString();
+        return QString("__INVALID__");
     }
     return d->actionCategory;
 }
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp \
#1050011:1050012 @@ -804,9 +804,11 @@
 
             // add actions to imagepluginsActionCollection
 #if KDE_IS_VERSION(4,1,68)
-            if (!plugin->actionCategory().isEmpty())
+            QString categoryStr = plugin->actionCategory();
+
+            if (categoryStr != QString("__INVALID__") && !categoryStr.isEmpty())
             {
-                KActionCategory *category = new \
KActionCategory(plugin->actionCategory(), d->imagepluginsActionCollection); +         \
KActionCategory *category = new KActionCategory(categoryStr, \
                d->imagepluginsActionCollection);
                 foreach (QAction* action, plugin->actionCollection()->actions())
                 {
                     category->addAction(action->objectName(), action);


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