1 files changed, 14 insertions, 12 deletions

diff --git a/microkde/kdeui/kaction.h b/microkde/kdeui/kaction.h
index 13e2e1e..5c690ec 100644
--- a/microkde/kdeui/kaction.h
+++ b/microkde/kdeui/kaction.h
@@ -20,39 +20,41 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 //$Id$
 
 #ifndef __kaction_h__
 #define __kaction_h__
 
 
 //US #include <qkeysequence.h>
 #include <qobject.h>
-#include <qvaluelist.h>
-#include <qguardedptr.h>
+#include <q3valuelist.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
 #include <kguiitem.h>
 #include <kshortcut.h>
 #include <kstdaction.h>
 //US#include <kicontheme.h>
 
 //US added the following files
 #include <kiconloader.h>
 
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 //USclass QComboBox;
 //USclass QPoint;
-class QIconSet;
+class QIcon;
 class QString;
 class KToolBar;
 
 class KAccel;
 //USclass KAccelActions;
 //USclass KConfig;
 //USclass KConfigBase;
 //USclass KURL;
 //USclass KInstance;
 //USclass KToolBar;
 class KActionCollection;
 //USclass KPopupMenu;
@@ -250,25 +252,25 @@ public:
      * This is the other common KAction used.  Use it when you
      * @p do have a corresponding icon.
      *
      * @param text The text that will be displayed.
      * @param pix The icon to display.
      * @param cut The corresponding keyboard 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.
      */
      
-    KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
              const QObject* receiver, const char* slot,
              KActionCollection* parent, const char* name );
 
     /**
      * Constructs an action with text, icon, potential keyboard
      * shortcut, and a SLOT to call when this action is invoked by
      * the user.  The icon is loaded on demand later based on where it
      * is plugged in.
      *
      * If you do not want or have a keyboard shortcut, set the
      * @p cut param to 0.
      *
@@ -299,35 +301,35 @@ public:
         /**
          * @obsolete
          */
         KAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0, const char* name = 0 );
         /**
          * @obsolete
          */
         KAction( const QString& text, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
         /**
          * @obsolete
          */
-        KAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+        KAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                 QObject* parent = 0, const char* name = 0 );
         /**
          * @obsolete
          */
         KAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                 QObject* parent = 0, const char* name = 0 );
         /**
          * @obsolete
          */
-        KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+        KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
         /**
          * @obsolete
          */
         KAction( const QString& text, const QString& pix, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent,
                 const char* name = 0 );
         /**
          * @obsolete
          */
   KAction( QObject* parent = 0, const char* name = 0 );
 
@@ -452,28 +454,28 @@ public:
      */
     virtual QString whatsThis() const;
 
     /**
      * Get the tooltip text for the action.
      */
     virtual QString toolTip() const;
 
     /**
      * Get the QIconSet from which the icons used to display this action will
      * be chosen.
      */
-    virtual QIconSet iconSet( KIcon::Group group, int size=0 ) const;
+    virtual QIcon iconSet( KIcon::Group group, int size=0 ) const;
 
 #ifndef KDE_NO_COMPAT
-    QIconSet iconSet() const
+    QIcon iconSet() const
     {
       return iconSet( KIcon::Small );
     }
 #endif
 
     virtual QString icon() const;
 
     KActionCollection *parentCollection() const;
 
     /**
      * @internal
      * Generate a toolbar button id. Made public for reimplementations.
@@ -509,25 +511,25 @@ public slots:
     /**
      * Sets the tooltip text for the action.
      * This will be used as a tooltip for a toolbar button, as a
      * statusbar help-text for a menu item, and it also appears
      * in the toolbar editor, to describe the action.
      */
     virtual void setToolTip( const QString& );
 
     /**
      * Sets the QIconSet from which the icons used to display this action will
      * be chosen.
      */
-    virtual void setIconSet( const QIconSet &iconSet );
+    virtual void setIconSet( const QIcon &iconSet );
 
     virtual void setIcon( const QString& icon );
 
     /**
      * Enables or disables this action. All uses of this action (eg. in menus
      * or toolbars) will be updated to reflect the state of the action.
      */
     virtual void setEnabled(bool enable);
 
     /**
      * Indicate whether the user may configure the action's shortcut.
      */
@@ -537,34 +539,34 @@ public slots:
      * Emulate user's interaction programmatically, by activating the action.
      * The implementation simply emits activated().
      */
     virtual void activate();
 
 protected slots:
     virtual void slotDestroyed();
     virtual void slotKeycodeChanged();
     virtual void slotActivated();
 
 protected:
     KToolBar* toolBar( int index ) const;
-    QPopupMenu* popupMenu( int index ) const;
+    Q3PopupMenu* popupMenu( int index ) const;
     void removeContainer( int index );
     int findContainer( const QWidget* widget ) const;
     void plugMainWindowAccel( QWidget *w );
 
     void addContainer( QWidget* parent, int id );
     void addContainer( QWidget* parent, QWidget* representative );
 
     virtual void updateShortcut( int i );
-    virtual void updateShortcut( QPopupMenu* menu, int id );
+    virtual void updateShortcut( Q3PopupMenu* menu, int id );
     virtual void updateGroup( int id );
     virtual void updateText(int i );
     virtual void updateEnabled(int i);
     virtual void updateIconSet(int i);
     virtual void updateIcon( int i);
     virtual void updateToolTip( int id );
     virtual void updateWhatsThis( int i );
 
     KActionCollection *m_parentCollection;
     QString whatsThisWithIcon() const;
 
 signals: