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

List:       kde-commits
Subject:    extragear/graphics/digikam/digikam
From:       Gilles Caulier <caulier.gilles () kdemail ! net>
Date:       2007-02-02 12:39:22
Message-ID: 1170419962.018405.30481.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 629344 by cgilles:

fix signal/slots naming

 M  +8 -8      digikamapp.cpp  
 M  +13 -13    digikamview.cpp  
 M  +8 -8      digikamview.h  


--- trunk/extragear/graphics/digikam/digikam/digikamapp.cpp #629343:629344
@@ -561,7 +561,7 @@
                                       "viewimage",
                                       Key_F3,
                                       d->view,
-                                      SLOT(slot_imagePreview()),
+                                      SLOT(slotImagePreview()),
                                       actionCollection(),
                                       "image_view");
 
@@ -569,7 +569,7 @@
                                    "editimage",
                                    Key_F4,
                                    d->view,
-                                   SLOT(slot_imageEdit()),
+                                   SLOT(slotImageEdit()),
                                    actionCollection(),
                                    "image_edit");
     d->imageViewAction->setWhatsThis(i18n("This option allows you to open the editor with the "
@@ -579,7 +579,7 @@
                                     "pencil",
                                     Key_F2,
                                     d->view,
-                                    SLOT(slot_imageRename()),
+                                    SLOT(slotImageRename()),
                                     actionCollection(),
                                     "image_rename");
     d->imageRenameAction->setWhatsThis(i18n("This option allows you to rename the filename "
@@ -590,7 +590,7 @@
                                                 "edittrash",
                                                 Key_Delete,
                                                 d->view,
-                                                SLOT(slot_imageDelete()),
+                                                SLOT(slotImageDelete()),
                                                 actionCollection(),
                                                 "image_delete");
 
@@ -599,7 +599,7 @@
                                                 "editdelete",
                                                 SHIFT+Key_Delete,
                                                 d->view,
-                                                SLOT(slot_imageDeletePermanently()),
+                                                SLOT(slotImageDeletePermanently()),
                                                 actionCollection(),
                                                 "image_delete_permanently");
 
@@ -609,7 +609,7 @@
                                                         "editdelete",
                                                         0,
                                                         d->view,
-                                                        SLOT(slot_imageDeletePermanentlyDirectly()),
+                                                        SLOT(slotImageDeletePermanentlyDirectly()),
                                                         actionCollection(),
                                                         "image_delete_permanently_directly");
 
@@ -617,7 +617,7 @@
                                                         "edittrash",
                                                         0,
                                                         d->view,
-                                                        SLOT(slot_imageTrashDirectly()),
+                                                        SLOT(slotImageTrashDirectly()),
                                                         actionCollection(),
                                                         "image_trash_directly");
 
@@ -644,7 +644,7 @@
     QSignalMapper *exifOrientationMapper = new QSignalMapper( d->view );
     
     connect( exifOrientationMapper, SIGNAL( mapped( int ) ),
-             d->view, SLOT( slot_imageExifOrientation( int ) ) );
+             d->view, SLOT( slotImageExifOrientation( int ) ) );
 
     d->imageExifOrientationActionMenu = new KActionMenu(i18n("Correct Exif Orientation Tag"),
                                                       actionCollection(),
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #629343:629344
@@ -239,7 +239,7 @@
             this, SLOT(slotAlbumHighlight()));
 
     connect(d->iconView, SIGNAL(signalPreviewItem(AlbumIconItem*)),
-            this, SLOT(slot_imagePreview(AlbumIconItem*)));
+            this, SLOT(slotImagePreview(AlbumIconItem*)));
 
     //connect(d->iconView, SIGNAL(signalItemDeleted(AlbumIconItem*)),
       //      this, SIGNAL(signalNoCurrentItem()));
@@ -306,7 +306,7 @@
             this, SLOT(slotEditImage()));
 
     connect(d->albumWidgetStack, SIGNAL(signalDeleteItem()),
-            this, SLOT(slot_imageDelete()));
+            this, SLOT(slotImageDelete()));
 
     // -- Selection timer ---------------
 
@@ -865,9 +865,9 @@
 
     AlbumIconItem *currItem = dynamic_cast<AlbumIconItem*>(d->iconView->currentItem());
     if (currItem)
-        slot_imagePreview(currItem);
+        slotImagePreview(currItem);
     else
-        slot_imagePreview(0);
+        slotImagePreview();
     
     d->parent->escapePreview();
 }
@@ -876,10 +876,10 @@
 {
     AlbumIconItem *currItem = dynamic_cast<AlbumIconItem*>(d->iconView->currentItem());
     if (currItem)
-        slot_imageEdit(currItem);
+        slotImageEdit(currItem);
 }
 
-void DigikamView::slot_imagePreview(AlbumIconItem *iconItem)
+void DigikamView::slotImagePreview(AlbumIconItem *iconItem)
 {
     if (d->albumWidgetStack->previewMode() == AlbumWidgetStack::PreviewAlbumMode)
     {
@@ -909,7 +909,7 @@
     }
 }
 
-void DigikamView::slot_imageEdit(AlbumIconItem *iconItem)
+void DigikamView::slotImageEdit(AlbumIconItem *iconItem)
 {
     AlbumIconItem *item;
 
@@ -926,12 +926,12 @@
     d->iconView->slotDisplayItem(item);
 }
 
-void DigikamView::slot_imageExifOrientation(int orientation)
+void DigikamView::slotImageExifOrientation(int orientation)
 {
     d->iconView->slotSetExifOrientation(orientation);
 }
 
-void DigikamView::slot_imageRename(AlbumIconItem *iconItem)
+void DigikamView::slotImageRename(AlbumIconItem *iconItem)
 {
     AlbumIconItem *item;
 
@@ -948,22 +948,22 @@
     d->iconView->slotRename(item);
 }
 
-void DigikamView::slot_imageDelete()
+void DigikamView::slotImageDelete()
 {
     d->iconView->slotDeleteSelectedItems(false);
 }
 
-void DigikamView::slot_imageDeletePermanently()
+void DigikamView::slotImageDeletePermanently()
 {
     d->iconView->slotDeleteSelectedItems(true);
 }
 
-void DigikamView::slot_imageDeletePermanentlyDirectly()
+void DigikamView::slotImageDeletePermanentlyDirectly()
 {
     d->iconView->slotDeleteSelectedItemsDirectly(false);
 }
 
-void DigikamView::slot_imageTrashDirectly()
+void DigikamView::slotImageTrashDirectly()
 {
     d->iconView->slotDeleteSelectedItemsDirectly(true);
 }
--- trunk/extragear/graphics/digikam/digikam/digikamview.h #629343:629344
@@ -101,14 +101,14 @@
     void slotNewAdvancedSearch();
 
     // Image action slots
-    void slot_imagePreview(AlbumIconItem* iconItem=0);
-    void slot_imageEdit(AlbumIconItem* iconItem=0);
-    void slot_imageExifOrientation(int orientation);
-    void slot_imageRename(AlbumIconItem* iconItem=0);
-    void slot_imageDelete();
-    void slot_imageDeletePermanently();
-    void slot_imageDeletePermanentlyDirectly();
-    void slot_imageTrashDirectly();
+    void slotImagePreview(AlbumIconItem* iconItem=0);
+    void slotImageEdit(AlbumIconItem* iconItem=0);
+    void slotImageExifOrientation(int orientation);
+    void slotImageRename(AlbumIconItem* iconItem=0);
+    void slotImageDelete();
+    void slotImageDeletePermanently();
+    void slotImageDeletePermanentlyDirectly();
+    void slotImageTrashDirectly();
     void slotSelectAll();
     void slotSelectNone();
     void slotSelectInvert();
[prev in list] [next in list] [prev in thread] [next in thread]