Don't use a toggle action for "Split/Join" if the text and icon is changed dynamically.

svn path=/trunk/KDE/kdebase/apps/; revision=671043

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 88d05be6b798f07952b4ea8bf891406e2fe39535..536da2a472125b8e2298cf89ef2018910b0a1e72 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1158,7 +1158,7 @@ void DolphinMainWindow::setupActions()
     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
-    KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
+    QAction* split = actionCollection()->addAction("split_view");
     split->setShortcut(Qt::Key_F10);
     updateSplitAction(false);
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
@@ -1467,7 +1467,7 @@ void DolphinMainWindow::connectViewSignals(int viewIndex)
 
 void DolphinMainWindow::updateSplitAction(bool isSplit)
 {
-    KToggleAction* splitAction = static_cast<KToggleAction*>(actionCollection()->action("split_view"));
+    QAction* splitAction = actionCollection()->action("split_view");
     if (isSplit) {
         splitAction->setText(i18n("Join"));
         splitAction->setIcon(KIcon("fileview-join"));