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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2010-11-09 0:15:12
Message-ID: 20101109001512.EF8ECAC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1194445 by gateau:

Revert "showMenuBar is deprecated, use showHideMenuBar instead."

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


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