SVN commit 629343 by cgilles:

fix signal/slots naming

 M  +6 -6      digikamapp.cpp  
 M  +8 -8      digikamview.cpp  
 M  +9 -9      digikamview.h  


--- trunk/extragear/graphics/digikam/digikam/digikamapp.cpp #629342:629343
@@ -458,7 +458,7 @@
                                    "albumfolder-new",
                                    KStdAccel::shortcut(KStdAccel::New),
                                    d->view,
-                                   SLOT(slot_newAlbum()),
+                                   SLOT(slotNewAlbum()),
                                    actionCollection(),
                                    "album_new");
     d->newAction->setWhatsThis(i18n("This option creates a new empty Album in the database."));
@@ -470,7 +470,7 @@
                                     "album_sort");
 
     connect(d->albumSortAction, SIGNAL(activated(int)),
-            d->view, SLOT(slot_sortAlbums(int)));
+            d->view, SLOT(slotSortAlbums(int)));
 
     // Use same list order as in albumsettings enum
     QStringList sortActionList;
@@ -483,7 +483,7 @@
                                     "editdelete",
                                     0,
                                     d->view,
-                                    SLOT(slot_deleteAlbum()),
+                                    SLOT(slotDeleteAlbum()),
                                     actionCollection(),
                                     "album_delete");
 
@@ -735,7 +735,7 @@
                                    "viewmag+",
                                    CTRL+Key_Plus,
                                    d->view,
-                                   SLOT(slot_thumbSizePlus()),
+                                   SLOT(slotThumbSizePlus()),
                                    actionCollection(),
                                    "album_thumbSizeIncrease");
     d->thumbSizePlusAction->setWhatsThis(i18n("This option allows you to increase "
@@ -745,7 +745,7 @@
                                    "viewmag-",
                                    CTRL+Key_Minus,
                                    d->view,
-                                   SLOT(slot_thumbSizeMinus()),
+                                   SLOT(slotThumbSizeMinus()),
                                    actionCollection(),
                                    "album_thumbSizeDecrease");
     d->thumbSizeMinusAction->setWhatsThis(i18n("This option allows you to decrease "
@@ -1554,7 +1554,7 @@
     d->kipiInterface->slotCurrentAlbumChanged(d->albumManager->currentAlbum());
 
     // Setting the initial menu options after all plugins have been loaded
-    d->view->slot_albumSelected(d->albumManager->currentAlbum());
+    d->view->slotAlbumSelected(d->albumManager->currentAlbum());
 
     d->imagePluginsLoader = new ImagePluginLoader(this, d->splashScreen);
 }
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #629342:629343
@@ -213,7 +213,7 @@
     // -- AlbumManager connections --------------------------------
 
     connect(d->albumManager, SIGNAL(signalAlbumCurrentChanged(Album*)),
-            this, SLOT(slot_albumSelected(Album*)));
+            this, SLOT(slotAlbumSelected(Album*)));
 
     connect(d->albumManager, SIGNAL(signalAlbumsCleared()),
             this, SLOT(slotAlbumsCleared()));
@@ -401,10 +401,10 @@
     d->rightSideBar->loadViewState();
     d->rightSideBar->populateTags();
 
-    slot_albumSelected(album);
+    slotAlbumSelected(album);
 }
 
-void DigikamView::slot_sortAlbums(int order)
+void DigikamView::slotSortAlbums(int order)
 {
     AlbumSettings* settings = AlbumSettings::instance();
     if (!settings) return;
@@ -412,12 +412,12 @@
     d->folderView->resort();
 }
 
-void DigikamView::slot_newAlbum()
+void DigikamView::slotNewAlbum()
 {
     d->folderView->albumNew();
 }
 
-void DigikamView::slot_deleteAlbum()
+void DigikamView::slotDeleteAlbum()
 {
     d->folderView->albumDelete();
 }
@@ -563,7 +563,7 @@
 
 // ----------------------------------------------------------------
 
-void DigikamView::slot_albumSelected(Album* album)
+void DigikamView::slotAlbumSelected(Album* album)
 {
     //emit signalNoCurrentItem();
 
@@ -665,7 +665,7 @@
 
 // ----------------------------------------------------------------
 
-void DigikamView::slot_thumbSizePlus()
+void DigikamView::slotThumbSizePlus()
 {
     emit signalNoCurrentItem();
 
@@ -711,7 +711,7 @@
     settings->setDefaultIconSize( (int)thumbSize.size() );
 }
 
-void DigikamView::slot_thumbSizeMinus()
+void DigikamView::slotThumbSizeMinus()
 {
     emit signalNoCurrentItem();
 
--- trunk/extragear/graphics/digikam/digikam/digikamview.h #629342:629343
@@ -62,20 +62,22 @@
 
     void signalAlbumSelected(bool val);
     void signalTagSelected(bool val);
-    void signalImageSelected(const QPtrList<ImageInfo>& list, bool hasPrevious, bool hasNext);
+    void signalImageSelected(const QPtrList<ImageInfo>& list, bool, bool);
     void signalNoCurrentItem();
     void signalProgressBarMode(int, const QString&);
     void signalProgressValue(int);
 
 public slots:
 
-    void slot_newAlbum();
-    void slot_sortAlbums(int order);
-    void slot_deleteAlbum();
-    void slot_thumbSizePlus();
-    void slot_thumbSizeMinus();
+    // View Action slots
+    void slotThumbSizePlus();
+    void slotThumbSizeMinus();
 
     // Album action slots
+    void slotNewAlbum();
+    void slotSortAlbums(int order);
+    void slotDeleteAlbum();
+    void slotSelectAlbum(const KURL &url);
     void slotAlbumPropsEdit();
     void slotAlbumAddImages();
     void slotAlbumOpenInKonqui();
@@ -87,7 +89,7 @@
     void slotAlbumRenamed(Album *album);
     void slotAlbumSyncPicturesMetadata();
     void slotAlbumSyncPicturesMetadataDone();
-    void slotSelectAlbum(const KURL &url);
+    void slotAlbumSelected(Album* album);
 
     // Tag action slots
     void slotNewTag();
@@ -112,8 +114,6 @@
     void slotSelectInvert();
     void slotSortImages(int order);
 
-    void slot_albumSelected(Album* album);
-
     // Image Rating slots
     void slotAssignRating(int rating);
     void slotAssignRatingNoStar();