1 files changed, 27 insertions, 24 deletions

diff --git a/microkde/kdeui/kactionclasses.h b/microkde/kdeui/kactionclasses.h
index f6e7a0f..a9b9104 100644
--- a/microkde/kdeui/kactionclasses.h
+++ b/microkde/kdeui/kactionclasses.h
@@ -31,17 +31,20 @@
 //US#include <qkeysequence.h>
 //US#include <qobject.h>
 //US#include <qvaluelist.h>
 //US#include <qguardedptr.h>
 //US#include <kguiitem.h>
 #include <kshortcut.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PopupMenu>
 //US#include <kstdaction.h>
 //US#include <kicontheme.h>
 
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 //USclass QComboBox;
 //USclass QPoint;
 //USclass QIconSet;
 //USclass QString;
 //USclass KToolBar;
 
@@ -51,13 +54,13 @@ class KConfig;
 //USclass KConfigBase;
 class KURL;
 //USclass KInstance;
 
 
 //US class KToolBar needs to be replaced
-class KToolBar;
+#include "ktoolbar.h"
 class KActionCollection;
 
 //US class KPopupMenu needs to be replaced
 //US class KPopupMenu;
 //USclass KMainWindow;
 
@@ -102,13 +105,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KToggleAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
              QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -124,13 +127,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KToggleAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                    const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -243,13 +246,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KRadioAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                   QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -265,13 +268,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KRadioAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                   const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -349,13 +352,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KSelectAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
              QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -371,13 +374,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KSelectAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                    const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -435,13 +438,13 @@ public:
     /**
      * When this action is plugged into a toolbar, it creates a combobox.
      * This returns the maximum width set by setComboWidth
      */
     virtual int comboWidth() const;
 
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
 
     /**
      * Deprecated. See @ref setMenuAccelsEnabled .
      * @since 3.1
      */
     void setRemoveAmpersandsInCombo( bool b );
@@ -564,13 +567,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KListAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                       QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -586,13 +589,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KListAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                           const QObject* receiver, const char* slot, QObject* parent,
                   const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
@@ -682,13 +685,13 @@ public:
    *  @param pix The icons that go with this action.
    *  @param cut The corresponding keyboard accelerator (shortcut).
    *  @param parent This action's parent.
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+  KRecentFilesAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                       QObject* parent, const char* name = 0,
                       uint maxItems = 10 );
 
   /**
    *  @param text The text that will be displayed.
    *  @param pix The dynamically loaded icon that goes with this action.
@@ -709,13 +712,13 @@ public:
    *  @param slot The SLOT to invoke when a URL is selected.
    *  Its signature is of the form slotURLSelected( const KURL & ).
    *  @param parent This action's parent.
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+  KRecentFilesAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                       const QObject* receiver, const char* slot,
                       QObject* parent, const char* name = 0,
                       uint maxItems = 10 );
 
   /**
    *  @param text The text that will be displayed.
@@ -831,17 +834,17 @@ class KFontAction : public KSelectAction
 public:
     KFontAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0,
                  const char* name = 0 );
     KFontAction( const QString& text, const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent,
                  const char* name = 0 );
-    KFontAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KFontAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                  QObject* parent = 0, const char* name = 0 );
     KFontAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                  QObject* parent = 0, const char* name = 0 );
-    KFontAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KFontAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent,
                  const char* name = 0 );
     KFontAction( const QString& text, const QString& pix, const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent,
                  const char* name = 0 );
 
@@ -870,17 +873,17 @@ class KFontSizeAction : public KSelectAction
     Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
     KFontSizeAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0,
                      const char* name = 0 );
     KFontSizeAction( const QString& text, const KShortcut& cut, const QObject* receiver,
                      const char* slot, QObject* parent, const char* name = 0 );
-    KFontSizeAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KFontSizeAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                      QObject* parent = 0, const char* name = 0 );
     KFontSizeAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                      QObject* parent = 0, const char* name = 0 );
-    KFontSizeAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KFontSizeAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                      const QObject* receiver, const char* slot,
                      QObject* parent, const char* name = 0 );
     KFontSizeAction( const QString& text, const QString& pix, const KShortcut& cut,
                      const QObject* receiver, const char* slot,
                      QObject* parent, const char* name = 0 );
     KFontSizeAction( QObject* parent = 0, const char* name = 0 );
@@ -928,24 +931,24 @@ class KActionMenu : public KAction
   Q_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 
 public:
     KActionMenu( const QString& text, QObject* parent = 0,
                  const char* name = 0 );
-    KActionMenu( const QString& text, const QIconSet& icon,
+    KActionMenu( const QString& text, const QIcon& icon,
                  QObject* parent = 0, const char* name = 0 );
     KActionMenu( const QString& text, const QString& icon,
                  QObject* parent = 0, const char* name = 0 );
     KActionMenu( QObject* parent = 0, const char* name = 0 );
     virtual ~KActionMenu();
 
     virtual void insert( KAction*, int index = -1 );
     virtual void remove( KAction* );
 
 //US    KPopupMenu* popupMenu() const;
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
     void popup( const QPoint& global );
 
     /**
      * Returns true if this action creates a delayed popup menu
      * when plugged in a KToolbar.
      */
@@ -1064,13 +1067,13 @@ public:
     /**
      * The popup menu that is shown when clicking (some time) on the toolbar
      * button. You may want to plug items into it on creation, or connect to
      * aboutToShow for a more dynamic menu.
      */
 //US    KPopupMenu *popupMenu() const;
-    QPopupMenu *popupMenu() const;
+    Q3PopupMenu *popupMenu() const;
 
     /**
      * Returns true if this action creates a delayed popup menu
      * when plugged in a KToolbar.
      */
     bool delayed() const;
@@ -1095,13 +1098,13 @@ public:
      * Default: sticky.
      */
     void setStickyMenu(bool sticky);
 
 private:
 //US    KPopupMenu *m_popup;
-    QPopupMenu *m_popup;
+    Q3PopupMenu *m_popup;
     bool m_delayed:1;
     bool m_stickyMenu:1;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     class KToolBarPopupActionPrivate;
@@ -1144,14 +1147,14 @@ public:
     }
 
 public slots:
     virtual void setChecked( bool );
 
 private:
-    QCString               m_toolBarName;
-    QGuardedPtr<KToolBar>  m_toolBar;
+    Q3CString               m_toolBarName;
+    QPointer<KToolBar>  m_toolBar;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     class KToggleToolBarActionPrivate;
     KToggleToolBarActionPrivate *d;
 };
@@ -1192,13 +1195,13 @@ public:
      * destroyed. It will be hidden and reparented to 0L instead.
      */
     virtual void unplug( QWidget *w );
 protected slots:
     void slotToolbarDestroyed();
 private:
-    QGuardedPtr<QWidget> m_widget;
+    QPointer<QWidget> m_widget;
     bool                 m_autoSized;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     class KWidgetActionPrivate;
     KWidgetActionPrivate *d;