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

List:       kde-commits
Subject:    [calligra/calligra/2.9] krita/ui: Remove superfluous creation of the keybindings standard action
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2014-12-28 12:15:09
Message-ID: E1Y5CkX-000626-6W () scm ! kde ! org
[Download RAW message or body]

Git commit 94d9381824e23761982093452365402f31a8211a by Boudewijn Rempt.
Committed on 24/12/2014 at 12:58.
Pushed by rempt into branch 'calligra/2.9'.

Remove superfluous creation of the keybindings standard action

M  +1    -3    krita/ui/KisViewManager.cpp

http://commits.kde.org/calligra/94d9381824e23761982093452365402f31a8211a

diff --git a/krita/ui/KisViewManager.cpp b/krita/ui/KisViewManager.cpp
index 9aaeec0..5e97602 100644
--- a/krita/ui/KisViewManager.cpp
+++ b/krita/ui/KisViewManager.cpp
@@ -288,9 +288,8 @@ KisViewManager::KisViewManager(QWidget * parent, \
KActionCollection *_actionColle  : d(new KisViewManagerPrivate())
 {
 
-    d->actionManager = new KisActionManager(this);
-
     d->actionCollection = _actionCollection;
+    d->actionManager = new KisActionManager(this);
     d->mainWindow = dynamic_cast<QMainWindow*>(parent);
 
     d->canvasResourceProvider = new KisCanvasResourceProvider(this);
@@ -313,7 +312,6 @@ KisViewManager::KisViewManager(QWidget * parent, \
KActionCollection *_actionColle  if (mainWindow()) {
 
         mainWindow()->setDockNestingEnabled(true);
-        actionCollection()->addAction(KStandardAction::KeyBindings, "keybindings", \
mainWindow()->guiFactory(), SLOT(configureShortcuts()));  
         connect(mainWindow(), SIGNAL(documentSaved()), this, \
SLOT(slotDocumentSaved()));  


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