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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-10-27 14:27:16
Message-ID: 20101027142716.3113EAC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190392 by ervin:

showMenuBar is deprecated, use showHideMenuBar instead.


 M  +2 -1      konqmainwindow.cpp  
 M  +2 -1      konqmainwindow.h  


--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.cpp #1190391:1190392
@@ -93,6 +93,7 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QLineEdit>
 
+#include <kdualaction.h>
 #include <kaboutdata.h>
 #include <ktoolbar.h>
 #include <konqbookmarkmenu.h>
@@ -3707,7 +3708,7 @@
      kDebug() << "Action add_bookmark not found!";
   }
 
-  m_paShowMenuBar = KStandardAction::showMenubar( this, SLOT( slotShowMenuBar() ), this );
+  m_paShowMenuBar = KStandardAction::showHideMenubar( this, SLOT( slotShowMenuBar() ), this );
   actionCollection()->addAction( KStandardAction::name(KStandardAction::ShowMenubar), m_paShowMenuBar );
 
   action = actionCollection()->addAction( "konqintro" );
--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.h #1190391:1190392
@@ -56,6 +56,7 @@
 class KBookmarkActionMenu;
 class KCMultiDialog;
 class KNewFileMenu;
+class KDualAction;
 class KToggleAction;
 class KonqBidiHistoryAction;
 class KBookmarkBar;
@@ -671,7 +672,7 @@
 #endif
   KToggleAction *m_ptaUseHTML;
 
-  KToggleAction *m_paShowMenuBar;
+  KDualAction *m_paShowMenuBar;
 
   KToggleFullScreenAction *m_ptaFullScreen;
 
[prev in list] [next in list] [prev in thread] [next in thread]