1 files changed, 38 insertions, 30 deletions

diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 3319fa8..4e00abd 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -28,3 +28,3 @@
 #define private public
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #undef private
@@ -32,3 +32,3 @@
 #else
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #endif
@@ -36,10 +36,18 @@
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qcombobox.h>
 #include <qmap.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QShowEvent>
 #include <kglobal.h>
-#include <qguardedptr.h>
-#include <qframe.h>
-#include <qiconset.h>
+#include <qpointer.h>
+#include <q3frame.h>
+#include <qicon.h>
 
@@ -48,3 +56,3 @@ class QSize;
 class QPixmap;
-class QPopupMenu;
+class Q3PopupMenu;
 class QStringList;
@@ -65,3 +73,3 @@ class KToolBarPrivate;
 
-class KToolBarSeparator : public QFrame
+class KToolBarSeparator : public Q3Frame
 {
@@ -69,6 +77,6 @@ class KToolBarSeparator : public QFrame
 public:
-    KToolBarSeparator( Orientation, bool l, QToolBar *parent, const char* name=0 );
+    KToolBarSeparator( Qt::Orientation, bool l, Q3ToolBar *parent, const char* name=0 );
 
     QSize sizeHint() const;
-    Orientation orientation() const { return orient; }
+    Qt::Orientation orientation() const { return orient; }
     QSizePolicy sizePolicy() const;
@@ -76,3 +84,3 @@ public:
 public slots:
-   void setOrientation( Orientation );
+   void setOrientation( Qt::Orientation );
 protected:
@@ -80,3 +88,3 @@ protected:
 private:
-    Orientation orient;
+    Qt::Orientation orient;
     bool line;
@@ -113,6 +121,6 @@ private:
 #ifndef DESKTOP_VERSION
-#define QToolBar QPEToolBar
+#define Q3ToolBar QPEToolBar
 #endif
 
- class KToolBar : public QToolBar
+ class KToolBar : public Q3ToolBar
 {
@@ -129,3 +137,3 @@ private:
 #ifndef DESKTOP_VERSION
-#undef QToolBar
+#undef Q3ToolBar
 #endif    
@@ -177,3 +185,3 @@ public:
    */
-    KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false,
+    KToolBar( Q3MainWindow *parentWindow, Qt::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false,
               const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
@@ -195,3 +203,3 @@ public:
    */
-    KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine = false,
+    KToolBar( Q3MainWindow *parentWindow, QWidget *dock, bool newLine = false,
               const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
@@ -305,3 +313,3 @@ public:
    */
-    int insertButton(const QString& icon, int id, QPopupMenu *popup,
+    int insertButton(const QString& icon, int id, Q3PopupMenu *popup,
                      bool enabled, const QString&_text, int index=-1);
@@ -320,3 +328,3 @@ public:
    */
-    int insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup,
+    int insertButton(const QPixmap& pixmap, int id, Q3PopupMenu *popup,
                      bool enabled, const QString&_text, int index=-1);
@@ -361,3 +369,3 @@ public:
                      int size=70, int index=-1,
-                     QComboBox::Policy policy = QComboBox::AtBottom);
+                     QComboBox::Policy policy = QComboBox::InsertAtBottom);
 
@@ -377,3 +385,3 @@ public:
                      int size=70, int index=-1,
-                     QComboBox::Policy policy = QComboBox::AtBottom);
+                     QComboBox::Policy policy = QComboBox::InsertAtBottom);
 
@@ -467,3 +475,3 @@ public:
    */
-    void setButtonIconSet( int id, const QIconSet& iconset );
+    void setButtonIconSet( int id, const QIcon& iconset );
 
@@ -493,3 +501,3 @@ public:
    */
-    void setDelayedPopup (int id , QPopupMenu *_popup, bool toggle = false);
+    void setDelayedPopup (int id , Q3PopupMenu *_popup, bool toggle = false);
 
@@ -1062,3 +1070,3 @@ public slots:
     virtual void setIconText( const QString &txt )
-    { QToolBar::setIconText( txt ); }
+    { Q3ToolBar::setIconText( txt ); }
     void slotRepaint();
@@ -1079,3 +1087,3 @@ private slots:
     void slotIconChanged(int);
-    void toolBarPosChanged( QToolBar *tb );
+    void toolBarPosChanged( Q3ToolBar *tb );
     void slotContextAboutToShow();
@@ -1092,3 +1100,3 @@ private:
 //US    KPopupMenu *contextMenu();
-    QPopupMenu *contextMenu();
+    Q3PopupMenu *contextMenu();
 
@@ -1098,6 +1106,6 @@ private:
 //US    KPopupMenu *context;
-    QPopupMenu *context;
-    QPtrList<QWidget> widgets;
+    Q3PopupMenu *context;
+    Q3PtrList<QWidget> widgets;
     QTimer *layoutTimer;
-    QGuardedPtr<QWidget> stretchableWidget, rightAligned;
+    QPointer<QWidget> stretchableWidget, rightAligned;
 protected: