From 7ba5a5e30a85d92bd2d04b9e213d1a2f761508b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <agateau@kde.org>
Date: Sat, 13 Nov 2010 20:12:35 +0000
Subject: [PATCH] Revert "KStandardAction::showMenubar => showHideMenubar"

Shouldn't have pushed this, sorry.

svn path=/trunk/KDE/kdegraphics/okular/; revision=1196649
---
 shell/shell.cpp | 5 ++---
 shell/shell.h   | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/shell/shell.cpp b/shell/shell.cpp
index 317631182..1eb3e07e9 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -26,7 +26,6 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kdualaction.h>
 #include <kfiledialog.h>
 #include <kpluginloader.h>
 #include <kmessagebox.h>
@@ -188,7 +187,7 @@ void Shell::setupActions()
 
   setStandardToolBarMenuEnabled(true);
 
-  m_showMenuBarAction = KStandardAction::showHideMenubar( this, SLOT( slotShowMenubar() ), actionCollection());
+  m_showMenuBarAction = KStandardAction::showMenubar( this, SLOT( slotShowMenubar() ), actionCollection());
   m_fullScreenAction = KStandardAction::fullScreen( this, SLOT( slotUpdateFullScreen() ), this,actionCollection() );
 }
 
@@ -281,7 +280,7 @@ void Shell::setFullScreen( bool useFullScreen )
 
 void Shell::showEvent(QShowEvent *e)
 {
-    m_showMenuBarAction->setActive( menuBar()->isVisible() );
+    m_showMenuBarAction->setChecked( menuBar()->isVisible() );
 
     KParts::MainWindow::showEvent(e);
 }
diff --git a/shell/shell.h b/shell/shell.h
index f81ca96b8..850e7e37f 100644
--- a/shell/shell.h
+++ b/shell/shell.h
@@ -19,7 +19,6 @@
 #include <kparts/mainwindow.h>
 
 class KCmdLineArgs;
-class KDualAction;
 class KRecentFilesAction;
 class KToggleAction;
 
@@ -100,7 +99,7 @@ private:
   bool m_fileformatsscanned;
   KAction* m_printAction;
   KToggleAction* m_fullScreenAction;
-  KDualAction* m_showMenuBarAction;
+  KToggleAction* m_showMenuBarAction;
   bool m_menuBarWasShown, m_toolBarWasShown;
   KUrl m_openUrl;
 };