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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdeui
From:       Maks Orlovich <maksim () kde ! org>
Date:       2005-06-30 18:18:09
Message-ID: 1120155489.377950.11053.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 430271 by orlovich:

Q3PopupMenu is mostly headache, better use QMenu


 M  +3 -3      kpanelapplet.cpp  
 M  +4 -4      kpanelapplet.h  
 M  +4 -4      kpanelextension.cpp  
 M  +3 -3      kpanelextension.h  


--- branches/work/kde4/kdelibs/kdeui/kpanelapplet.cpp #430270:430271
@@ -37,7 +37,7 @@
       hasFocus(false)
       {}
 
-  const Q3PopupMenu* customMenu;
+  const QMenu* customMenu;
   KSharedConfig::Ptr sharedConfig;
   Q3PtrList<QObject> watchedForFocus;
   bool hasFocus;
@@ -128,12 +128,12 @@
     reportBug();
 }
 
-const Q3PopupMenu* KPanelApplet::customMenu() const
+const QMenu* KPanelApplet::customMenu() const
 {
     return d->customMenu;
 }
 
-void KPanelApplet::setCustomMenu(const Q3PopupMenu* menu)
+void KPanelApplet::setCustomMenu(const QMenu* menu)
 {
     d->customMenu = menu;
 }
--- branches/work/kde4/kdelibs/kdeui/kpanelapplet.h #430270:430271
@@ -25,7 +25,7 @@
 #define __kpanelapplet_h__
 
 class KConfig;
-class Q3PopupMenu;
+class QMenu;
 
 #include <q3frame.h>
 #include <kconfig.h>
@@ -213,9 +213,9 @@
 
     /**
      * @return the applet's custom menu, usually the same as the context menu, or 0 if none
-     * see setCustomMenu(QPopupMenu*)
+     * see setCustomMenu(QMenu*)
      */
-    const Q3PopupMenu* customMenu() const;
+    const QMenu* customMenu() const;
 
     /**
      * @internal
@@ -335,7 +335,7 @@
      * If the menu is deleted during the life of the applet, be sure to call this method again
      * with the new menu (or 0) to avoid crashes
      */
-    void setCustomMenu(const Q3PopupMenu*);
+    void setCustomMenu(const QMenu*);
 
     /**
      * Register widgets that can receive keyboard focus with this this method
--- branches/work/kde4/kdelibs/kdeui/kpanelextension.cpp #430270:430271
@@ -21,7 +21,7 @@
 
 ******************************************************************/
 
-#include <q3popupmenu.h>
+#include <QMenu>
 
 #include <kconfig.h>
 
@@ -39,7 +39,7 @@
     {}
 
     KPanelExtension::Size _size;
-    Q3PopupMenu* _customMenu;
+    QMenu* _customMenu;
     int _customSize;
     bool _reserveStrut;
 };
@@ -138,12 +138,12 @@
   return d->_customSize;
 }
 
-Q3PopupMenu* KPanelExtension::customMenu() const
+QMenu* KPanelExtension::customMenu() const
 {
     return d->_customMenu;
 }
 
-void KPanelExtension::setCustomMenu(Q3PopupMenu* menu)
+void KPanelExtension::setCustomMenu(QMenu* menu)
 {
     d->_customMenu = menu;
 }
--- branches/work/kde4/kdelibs/kdeui/kpanelextension.h #430270:430271
@@ -24,7 +24,7 @@
 #ifndef __kpanelextension_h__
 #define __kpanelextension_h__
 
-class Q3PopupMenu;
+class QMenu;
 class KConfig;
 class KPanelExtensionPrivate;
 
@@ -214,7 +214,7 @@
      * @see setCustomMenu(QPopupMenu*)
      * @since 3.4
      */
-    Q3PopupMenu* customMenu() const;
+    QMenu* customMenu() const;
 
     /**
      * @return whether or not to set a desktop geometry claiming strut for this panel
@@ -322,7 +322,7 @@
      * with the new menu (or 0) to avoid crashes
      * @since 3.4
      */
-    void setCustomMenu(Q3PopupMenu*);
+    void setCustomMenu(QMenu*);
 
     /**
      * Use this method to set the return value for reserveStrut
[prev in list] [next in list] [prev in thread] [next in thread]