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

List:       kde-commits
Subject:    [calligra] karbon/ui: rename slot to fix compiler warning about hidden symbol
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2012-07-25 22:05:14
Message-ID: 20120725220514.2611FA6094 () git ! kde ! org
[Download RAW message or body]

Git commit a7ab02540b6143d59a342b8a5a8ef150338a0bf9 by Jan Hambrecht.
Committed on 26/07/2012 at 00:08.
Pushed by jaham into branch 'master'.

rename slot to fix compiler warning about hidden symbol

M  +2    -2    karbon/ui/KarbonView.cpp
M  +1    -1    karbon/ui/KarbonView.h

http://commits.kde.org/calligra/a7ab02540b6143d59a342b8a5a8ef150338a0bf9

diff --git a/karbon/ui/KarbonView.cpp b/karbon/ui/KarbonView.cpp
index d82e637..8da216c 100644
--- a/karbon/ui/KarbonView.cpp
+++ b/karbon/ui/KarbonView.cpp
@@ -1201,7 +1201,7 @@ void KarbonView::initActions()
 
     KAction *actionPageLayout  = new KAction(i18n("Page &Layout..."), this);
     actionCollection()->addAction("page_layout", actionPageLayout);
-    connect(actionPageLayout, SIGNAL(triggered()), this, SLOT(pageLayout()));
+    connect(actionPageLayout, SIGNAL(triggered()), this, SLOT(configurePageLayout()));
 
     // view ---->
     KAction * zoomSelection = new KAction(KIcon("zoom-select"), i18n("Zoom to Selection"), this);
@@ -1325,7 +1325,7 @@ void KarbonView::configure()
     d->canvas->update();
 }
 
-void KarbonView::pageLayout()
+void KarbonView::configurePageLayout()
 {
     QPointer<KoPageLayoutDialog> dlg = new KoPageLayoutDialog(this, part()->pageLayout());
     dlg->showPageSpread(false);
diff --git a/karbon/ui/KarbonView.h b/karbon/ui/KarbonView.h
index b5b0b0e..80fb840 100644
--- a/karbon/ui/KarbonView.h
+++ b/karbon/ui/KarbonView.h
@@ -128,7 +128,7 @@ public slots:
 
     void configure();
 
-    void pageLayout();
+    void configurePageLayout();
 
     void selectionChanged();
 
[prev in list] [next in list] [prev in thread] [next in thread]