[Digikam-devel] extragear/graphics/digikam/utilities/cameragui

[Gilles Caulier]

SVN commit 967325 by cgilles:

very very nice. Broken signal/slot connection between cameragui and cameracontroller.
Typically, DB never recieve notification about new donloaded image from camera !
CCMAIL: digikam-devel at kde.org


 M  +3 -3      cameracontroller.h  
 M  +3 -3      cameraui.cpp  
 M  +3 -3      cameraui.h  


--- trunk/extragear/graphics/digikam/utilities/cameragui/cameracontroller.h #967324:967325
@@ -95,7 +95,7 @@
     void signalInfoMsg(const QString& msg);
     void signalErrorMsg(const QString& msg);
     void signalCameraInformation(const QString& summary, const QString& manual,
-                                  const QString& about);
+                                 const QString& about);
     void signalFreeSpace(unsigned long kBSize, unsigned long kBAvail);
     void signalPreview(const QImage& preview);
 
@@ -104,8 +104,8 @@
     void signalFileList(const GPItemInfoList& infoList);
     void signalUploaded(const GPItemInfo& itemInfo);
     void signalDownloaded(const QString& folder, const QString& file, int status);
-    void signalDownloadComplete(const QString &sourceFolder, const QString &sourceFile,
-                                const QString destFolder, const QString &destFile);
+    void signalDownloadComplete(const QString& sourceFolder, const QString& sourceFile,
+                                const QString& destFolder, const QString& destFile);
     void signalSkipped(const QString& folder, const QString& file);
     void signalDeleted(const QString& folder, const QString& file, bool status);
     void signalLocked(const QString& folder, const QString& file, bool status);
--- trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.cpp #967324:967325
@@ -670,7 +670,7 @@
     connect(d->controller, SIGNAL(signalDownloaded(const QString&, const QString&, int)),
             this, SLOT(slotDownloaded(const QString&, const QString&, int)));
 
-    connect(d->controller, SIGNAL(signalDownloadCompleted(const QString&, const QString&, const QString&, const QString&)),
+    connect(d->controller, SIGNAL(signalDownloadComplete(const QString&, const QString&, const QString&, const QString&)),
             this, SLOT(slotDownloadComplete(const QString&, const QString&, const QString&, const QString&)));
 
     connect(d->controller, SIGNAL(signalSkipped(const QString&, const QString&)),
@@ -1554,8 +1554,8 @@
     }
 }
 
-void CameraUI::slotDownloadCompleted(const QString &, const QString &,
-                                     const QString destFolder, const QString &)
+void CameraUI::slotDownloadComplete(const QString&, const QString&,
+                                     const QString& destFolder, const QString&)
 {
     ScanController::instance()->scheduleCollectionScanRelaxed(destFolder);
 }
--- trunk/extragear/graphics/digikam/utilities/cameragui/cameraui.h #967324:967325
@@ -127,7 +127,7 @@
     void slotCapture();
     void slotCameraInformation(const QString&, const QString&, const QString&);
     void slotCameraFreeSpaceInfo(unsigned long kBSize, unsigned long kBAvail);
-    void slotCollectionLocationStatusChanged(const CollectionLocation &location, int oldStatus);
+    void slotCollectionLocationStatusChanged(const CollectionLocation& location, int oldStatus);
 
     void slotFolderList(const QStringList& folderList);
     void slotFileList(const GPItemInfoList& fileList);
@@ -156,8 +156,8 @@
 
     void slotUploaded(const GPItemInfo&);
     void slotDownloaded(const QString&, const QString&, int);
-    void slotDownloadCompleted(const QString &sourceFolder, const QString &sourceFile,
-                               const QString destFolder, const QString &destFile);
+    void slotDownloadComplete(const QString& sourceFolder, const QString& sourceFile,
+                              const QString& destFolder, const QString& destFile);
     void slotSkipped(const QString&, const QString&);
     void slotDeleted(const QString&, const QString&, bool);
     void slotLocked(const QString&, const QString&, bool);