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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/actions
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-09 14:53:23
Message-ID: 20101109145323.B3549AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1194704 by ervin:

Undeprecate properly. ;-)

CCMAIL: agateau@kde.org


 M  +0 -4      kstandardaction.cpp  
 M  +0 -2      kstandardaction.h  


--- trunk/KDE/kdelibs/kdeui/actions/kstandardaction.cpp #1194703:1194704
@@ -511,7 +511,6 @@
   return buildAutomaticAction( parent, SelectAll, SLOT( selectAll() ) );
 }
 
-#ifndef KDE_NO_DEPRECATED
 KToggleAction *showMenubar(const QObject *recvr, const char *slot, QObject *parent)
 {
   KToggleAction *ret = new KToggleAction(i18n( "Show &Menubar" ), parent);
@@ -534,7 +533,6 @@
 
   return ret;
 }
-#endif
 
 KDualAction *showHideMenubar(const QObject *recvr, const char *slot, QObject *parent)
 {
@@ -563,7 +561,6 @@
   return ret;
 }
 
-#ifndef KDE_NO_DEPRECATED
 KToggleAction *showStatusbar(const QObject *recvr, const char *slot, QObject *parent)
 {
   KToggleAction *ret = new KToggleAction(i18n( "Show St&atusbar" ), parent);
@@ -583,7 +580,6 @@
 
   return ret;
 }
-#endif
 
 KDualAction *showHideStatusbar(const QObject *recvr, const char *slot, QObject *parent)
 {
--- trunk/KDE/kdelibs/kdeui/actions/kstandardaction.h #1194703:1194704
@@ -518,7 +518,6 @@
 
   /**
    * Show/Hide the menubar.
-   * @deprecated use showHideMenubar instead.
    */
   KDEUI_EXPORT KToggleAction *showMenubar(const QObject *recvr, const char *slot, QObject *parent);
 
@@ -530,7 +529,6 @@
 
   /**
    * Show/Hide the statusbar.
-   * @deprecated use showHideStatusbar instead.
    */
   KDEUI_EXPORT KToggleAction *showStatusbar(const QObject *recvr, const char *slot, QObject *parent);
 
[prev in list] [next in list] [prev in thread] [next in thread]