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

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/advancedrename
From:       Andi Clemens <andi.clemens () gmx ! net>
Date:       2009-10-03 12:28:15
Message-ID: 1254572895.507384.28304.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1030884 by aclemens:

Move NewNamesList and NewNameInfo typedef out of the AdvancedRenameDialog class

 M  +4 -4      advancedrenamedialog.cpp  
 M  +3 -5      advancedrenamedialog.h  
 M  +6 -6      common/renamethread.cpp  
 M  +1 -1      common/renamethread.h  


--- trunk/extragear/graphics/digikam/utilities/advancedrename/advancedrenamedialog.cpp #1030883:1030884
@@ -127,9 +127,9 @@
         listView             = 0;
     }
 
-    QTreeWidget*                       listView;
-    AdvancedRenameWidget*              advancedRenameWidget;
-    AdvancedRenameDialog::NewNamesList newNamesList;
+    QTreeWidget*          listView;
+    AdvancedRenameWidget* advancedRenameWidget;
+    NewNamesList          newNamesList;
 };
 
 AdvancedRenameDialog::AdvancedRenameDialog(QWidget* parent)
@@ -246,7 +246,7 @@
     resize(minSize, (count > 1) ? minSize : 0);
 }
 
-AdvancedRenameDialog::NewNamesList AdvancedRenameDialog::newNames()
+NewNamesList AdvancedRenameDialog::newNames()
 {
     return d->newNamesList;
 }
--- trunk/extragear/graphics/digikam/utilities/advancedrename/advancedrenamedialog.h #1030883:1030884
@@ -73,6 +73,9 @@
 
 // --------------------------------------------------------
 
+typedef QPair<ImageInfo, QString> NewNameInfo;
+typedef QList<NewNameInfo>        NewNamesList;
+
 class AdvancedRenameDialogPriv;
 
 class AdvancedRenameDialog : public KDialog
@@ -81,11 +84,6 @@
 
 public:
 
-    typedef QPair<ImageInfo, QString> NewNameInfo;
-    typedef QList<NewNameInfo>        NewNamesList;
-
-public:
-
     AdvancedRenameDialog(QWidget* parent = 0);
     ~AdvancedRenameDialog();
 
--- trunk/extragear/graphics/digikam/utilities/advancedrename/common/renamethread.cpp #1030883:1030884
@@ -46,12 +46,12 @@
         running = false;
     }
 
-    bool                               running;
+    bool           running;
 
-    QMutex                             mutex;
-    QWaitCondition                     condVar;
+    QMutex         mutex;
+    QWaitCondition condVar;
 
-    AdvancedRenameDialog::NewNamesList todo;
+    NewNamesList   todo;
 };
 
 RenameThread::RenameThread(QObject* parent)
@@ -69,7 +69,7 @@
     delete d;
 }
 
-void RenameThread::addNewNames(const AdvancedRenameDialog::NewNamesList& newNames)
+void RenameThread::addNewNames(const NewNamesList& newNames)
 {
     QMutexLocker lock(&d->mutex);
     d->todo << newNames;
@@ -90,7 +90,7 @@
 
     while (d->running)
     {
-        AdvancedRenameDialog::NewNameInfo info;
+        NewNameInfo info;
         {
             QMutexLocker lock(&d->mutex);
             if (!d->todo.isEmpty())
--- trunk/extragear/graphics/digikam/utilities/advancedrename/common/renamethread.h #1030883:1030884
@@ -52,7 +52,7 @@
     RenameThread(QObject* parent);
     ~RenameThread();
 
-    void addNewNames(const AdvancedRenameDialog::NewNamesList& newNames);
+    void addNewNames(const NewNamesList& newNames);
     void cancel();
 
 Q_SIGNALS:
[prev in list] [next in list] [prev in thread] [next in thread]