1 files changed, 10 insertions, 7 deletions

diff --git a/microkde/kdeui/ktoolbarbutton.h b/microkde/kdeui/ktoolbarbutton.h
index 9aaa13c..ad02e4e 100644
--- a/microkde/kdeui/ktoolbarbutton.h
+++ b/microkde/kdeui/ktoolbarbutton.h
@@ -27,6 +27,9 @@
 #include <qpixmap.h>
 #include <qtoolbutton.h>
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <Q3PopupMenu>
 #include <kglobal.h>
 
@@ -35,5 +38,5 @@ class KToolBarButtonPrivate;
 //USclass KInstance;
 class QEvent;
-class QPopupMenu;
+class Q3PopupMenu;
 class QPainter;
 
@@ -151,5 +154,5 @@ public:
    * @param iconset  The iconset to use
    */
-  virtual void setIconSet( const QIconSet &iconset );
+  virtual void setIconSet( const QIcon &iconset );
 
 #ifndef KDE_NO_COMPAT
@@ -210,5 +213,5 @@ public:
    * Return a pointer to this button's popup menu (if it exists)
    */
-  QPopupMenu *popup();
+  QMenu *popup();
 
   /**
@@ -225,5 +228,5 @@ public:
    * @param p The new popup menu
    */
-  void setPopup (QPopupMenu *p, bool unused = false);
+  void setPopup (Q3PopupMenu *p, bool unused = false);
 
   /**
@@ -236,5 +239,5 @@ public:
    * @param p the new popup menu
    */
-  void setDelayedPopup(QPopupMenu *p, bool unused = false);
+  void setDelayedPopup(Q3PopupMenu *p, bool unused = false);
 
   /**
@@ -304,5 +307,5 @@ private:
 * @version $Id$
 */
-class KToolBarButtonList : public QIntDict<KToolBarButton>
+class KToolBarButtonList : public Q3IntDict<KToolBarButton>
 {
 public: