[Digikam-devel] extragear/graphics/digikam/libs

[Gilles Caulier]

SVN commit 603237 by cgilles:

digikam from trunk : threadimageio and jpegutils use DDebug() class instead kdDebug(). See B.K.O file 133026 for details

CCBUGS: 133026
CCMAIL: digikam-devel at kde.org


 M  +1 -1      dimg/ddebug.h  
 M  +7 -7      jpegutils/jpegutils.cpp  
 M  +3 -3      threadimageio/Makefile.am  
 M  +3 -6      threadimageio/loadsavetask.cpp  
 M  +7 -11     threadimageio/managedloadsavethread.cpp  


--- trunk/extragear/graphics/digikam/libs/dimg/ddebug.h #603236:603237
@@ -50,5 +50,5 @@
 DIGIKAM_EXPORT Digikam::Ddbgstream DWarning(int area = 0);
 DIGIKAM_EXPORT Digikam::Ddbgstream DError(int area = 0);
 
-#endif //  DDEBUG_H
+#endif //  _DDEBUG_H_
 
--- trunk/extragear/graphics/digikam/libs/jpegutils/jpegutils.cpp #603236:603237
@@ -47,11 +47,11 @@
 
 // KDE includes.
 
-#include <kdebug.h>
 #include <kfilemetainfo.h>
 
 // Local includes.
 
+#include "ddebug.h"
 #include "dmetadata.h"
 #include "transupp.h"
 #include "jpegutils.h"
@@ -64,7 +64,7 @@
     QFileInfo fi(file);
     if (!fi.exists())
     {
-        kdDebug() << "ExifRotate: file do not exist: " << file << endl;
+        DDebug() << "ExifRotate: file do not exist: " << file << endl;
         return false;
     }
         
@@ -73,7 +73,7 @@
         DMetadata metaData;
         if (!metaData.load(file))
         {
-            kdDebug() << "ExifRotate: no Exif data found: " << file << endl;
+            DDebug() << "ExifRotate: no Exif data found: " << file << endl;
             return true;
         }
 
@@ -136,7 +136,7 @@
     
         if (transformoption.transform == JXFORM_NONE)
         {
-            kdDebug() << "ExifRotate: no rotation to perform: " << file << endl;
+            DDebug() << "ExifRotate: no rotation to perform: " << file << endl;
             return true;
         }
     
@@ -212,7 +212,7 @@
         // -- Metadata operations ------------------------------------------------------
 
         // Reset the Exif orientation tag of the temp image to normal
-        kdDebug() << "ExifRotate: set Orientation tag to normal: " << file << endl;
+        DDebug() << "ExifRotate: set Orientation tag to normal: " << file << endl;
 
         metaData.load(temp);
         metaData.setImageOrientation(DMetadata::ORIENTATION_NORMAL);
@@ -269,7 +269,7 @@
     }
     
     // Not a jpeg image.
-    kdDebug() << "ExifRotate: not a JPEG file: " << file << endl;
+    DDebug() << "ExifRotate: not a JPEG file: " << file << endl;
     return false;
 }
 
@@ -278,7 +278,7 @@
     QFileInfo fi(src);
     if (!fi.exists())
     {
-        kdDebug() << "JpegConvert: file do not exist: " << src << endl;
+        DDebug() << "JpegConvert: file do not exist: " << src << endl;
         return false;
     }
         
--- trunk/extragear/graphics/digikam/libs/threadimageio/Makefile.am #603236:603237
@@ -12,6 +12,6 @@
 libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	   -I$(top_srcdir)/digikam/libs/dimg/loaders \
-	   -I$(top_srcdir)/digikam/digikam \
-	   $(all_includes)
+	       -I$(top_srcdir)/digikam/libs/dimg/loaders \
+	       -I$(top_srcdir)/digikam/digikam \
+	       $(all_includes)
--- trunk/extragear/graphics/digikam/libs/threadimageio/loadsavetask.cpp #603236:603237
@@ -25,12 +25,9 @@
 
 #include <qapplication.h>
 
-// KDE includes
-
-#include <kdebug.h>
-
 // Locale includes.
 
+#include "ddebug.h"
 #include "loadsavethread.h"
 #include "managedloadsavethread.h"
 #include "sharedloadsavethread.h"
@@ -174,7 +171,7 @@
                 m_usedProcess->removeListener(this);
                 // wake up the process which is waiting until all listeners have removed themselves
                 lock.wakeAll();
-                //kdDebug() << "SharedLoadingTask " << this << ": waited" << endl;
+                //DDebug() << "SharedLoadingTask " << this << ": waited" << endl;
                 return;
             }
             else
@@ -211,7 +208,7 @@
 
     {
         LoadingCache::CacheLock lock(cache);
-        //kdDebug() << "SharedLoadingTask " << this << ": image loaded, " << img.isNull() << endl;
+        //DDebug() << "SharedLoadingTask " << this << ": image loaded, " << img.isNull() << endl;
         // indicate that loading has finished so that listeners can stop waiting
         m_completed = true;
 
--- trunk/extragear/graphics/digikam/libs/threadimageio/managedloadsavethread.cpp #603236:603237
@@ -19,13 +19,9 @@
  *
  * ============================================================ */
 
-
-// KDE includes
-
-#include <kdebug.h>
-
 // Local includes.
 
+#include "ddebug.h"
 #include "managedloadsavethread.h"
 #include "loadsavetask.h"
 
@@ -118,7 +114,7 @@
     LoadingTask *loadingTask = 0;
     LoadingTask *existingTask = findExistingTask(description);
 
-    //kdDebug() << "ManagedLoadSaveThread::load " << description.filePath << ", policy " << policy << endl;
+    //DDebug() << "ManagedLoadSaveThread::load " << description.filePath << ", policy " << policy << endl;
     switch(policy)
     {
         case LoadingPolicyFirstRemovePrevious:
@@ -133,14 +129,14 @@
                 if ( (loadingTask = checkLoadingTask(m_currentTask, LoadingTaskFilterAll)) )
                     loadingTask->setStatus(LoadingTask::LoadingTaskStatusStopping);
             }
-            //kdDebug() << "LoadingPolicyFirstRemovePrevious, Existing task " << existingTask <<
+            //DDebug() << "LoadingPolicyFirstRemovePrevious, Existing task " << existingTask <<
              //", m_currentTask " << m_currentTask << ", loadingTask " << loadingTask << endl;
             // remove all loading tasks
             for (LoadSaveTask *task = m_todo.first(); task; task = m_todo.next())
             {
                 if (task != existingTask && checkLoadingTask(task, LoadingTaskFilterAll))
                 {
-                    //kdDebug() << "Removing task " << task << " from list" << endl;
+                    //DDebug() << "Removing task " << task << " from list" << endl;
                     m_todo.remove();
                     m_todo.prev();
                 }
@@ -164,7 +160,7 @@
                     load(loadingTask->filePath(), LoadingPolicyPreload);
                 }
             }
-            //kdDebug() << "LoadingPolicyPrepend, Existing task " << existingTask << ", m_currentTask " << m_currentTask << endl;
+            //DDebug() << "LoadingPolicyPrepend, Existing task " << existingTask << ", m_currentTask " << m_currentTask << endl;
             // prepend new loading task
             if (existingTask)
                 break;
@@ -186,7 +182,7 @@
             }
             if (existingTask)
                 break;
-            //kdDebug() << "LoadingPolicyAppend, Existing task " << existingTask << ", m_currentTask " << m_currentTask << endl;
+            //DDebug() << "LoadingPolicyAppend, Existing task " << existingTask << ", m_currentTask " << m_currentTask << endl;
             // append new loading task, put it in front of preloading tasks
             for (uint i = 0; i<m_todo.count(); i++)
             {
@@ -200,7 +196,7 @@
             break;
         case LoadingPolicyPreload:
             // append to the very end of the list
-            //kdDebug() << "LoadingPolicyPreload, Existing task " << existingTask << endl;
+            //DDebug() << "LoadingPolicyPreload, Existing task " << existingTask << endl;
             if (existingTask)
                 break;
             m_todo.append(createLoadingTask(description, true, loadingMode, accessMode));