From 2fc410709db1d9899d71b397d851356e7671ae0d Mon Sep 17 00:00:00 2001
From: Kevin Ottens <ervin@kde.org>
Date: Wed, 27 Oct 2010 14:25:11 +0000
Subject: [PATCH] showMenuBar is deprecated, use showHideMenuBar instead.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1190389
---
 src/MainWindow.cpp | 4 ++--
 src/MainWindow.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index d8c54dd92..36d8feb03 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -37,7 +37,7 @@
 #include <KMenuBar>
 #include <KMessageBox>
 #include <KService>
-#include <KToggleAction>
+#include <KDualAction>
 #include <KToggleFullScreenAction>
 #include <KToolInvocation>
 #include <KStandardAction>
@@ -274,7 +274,7 @@ void MainWindow::setupActions()
     //NOTE: This is currently handled by correctShortcuts()
 
     // View Menu
-    _toggleMenuBarAction = KStandardAction::showMenubar(menuBar(), SLOT(setVisible(bool)), collection);
+    _toggleMenuBarAction = KStandardAction::showHideMenubar(menuBar(), SLOT(setVisible(bool)), collection);
     _toggleMenuBarAction->setShortcut( QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_M) );
 
     // Hide the Show/Hide menubar item if the menu bar is a MacOS-style menu bar
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 98ca2a077..1a73ed3e1 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -32,7 +32,7 @@
 
 class KAction;
 class KActionMenu;
-class KToggleAction;
+class KDualAction;
 
 namespace Konsole
 {
@@ -190,7 +190,7 @@ class MainWindow : public KXmlGuiWindow
     private:
         ViewManager*  _viewManager;
         BookmarkHandler* _bookmarkHandler;
-        KToggleAction* _toggleMenuBarAction;
+        KDualAction* _toggleMenuBarAction;
         KActionMenu *_newTabMenuAction;
 
         QPointer<SessionController> _pluggedController;