initial public commit of qt4 portp1

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
@@ -17,33 +17,36 @@
     You should have received a copy of the GNU Library General Public License
     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 _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
 #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>
 
 class KToolBar;
 class KToolBarButtonPrivate;
 //USclass KInstance;
 class QEvent;
-class QPopupMenu;
+class Q3PopupMenu;
 class QPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
  * KToolBar methods instead.
  * @internal
  */
 class KToolBarButton : public QToolButton
 {
   Q_OBJECT
 
 public:
@@ -141,25 +144,25 @@ public:
   virtual void setIcon(const QString &icon);
 
   /// @since 3.1
   virtual void setIcon( const QPixmap &pixmap )
   { QToolButton::setIcon( pixmap ); }
 
   /**
    * Set the pixmaps for this toolbar button from a QIconSet.
    * If you call this you don't need to call any of the other methods
    * that set icons or pixmaps.
    * @param iconset  The iconset to use
    */
-  virtual void setIconSet( const QIconSet &iconset );
+  virtual void setIconSet( const QIcon &iconset );
 
 #ifndef KDE_NO_COMPAT
   /**
    * @deprecated
    * Set the active icon for this button.  The pixmap itself is loaded
    * internally based on the icon size...  .. the disabled and default
    * pixmaps, however will only be constructed if @ref #generate is
    * true.  This function is preferred over @ref setPixmap
    *
    * @param icon     The name of the active icon
    * @param generate If true, then the other icons are automagically
    *                 generated from this one
@@ -200,51 +203,51 @@ public:
   /**
    * Turn this button into a toggle button or disable the toggle
    * aspects of it.  This does not toggle the button itself.
    * Use @ref toggle() for that.
    *
    * @param toggle true or false
    */
   void setToggle(bool toggle = true);
 
   /**
    * Return a pointer to this button's popup menu (if it exists)
    */
-  QPopupMenu *popup();
+  QMenu *popup();
 
   /**
    * Returns the button's id.
    * @since 3.2
    */
   int id() const;
 
   /**
    * Give this button a popup menu.  There will not be a delay when
    * you press the button.  Use @ref setDelayedPopup if you want that
    * behavior. 
    *
    * @param p The new popup menu
    */
-  void setPopup (QPopupMenu *p, bool unused = false);
+  void setPopup (Q3PopupMenu *p, bool unused = false);
 
   /**
    * Gives this button a delayed popup menu.
    *
    * This function allows you to add a delayed popup menu to the button.
    * The popup menu is then only displayed when the button is pressed and
    * held down for about half a second.
    *
    * @param p the new popup menu
    */
-  void setDelayedPopup(QPopupMenu *p, bool unused = false);
+  void setDelayedPopup(Q3PopupMenu *p, bool unused = false);
 
   /**
    * Turn this button into a radio button
    *
    * @param f true or false
    */
   void setRadio(bool f = true);
 
   /**
    * Toolbar buttons naturally will assume the global styles
    * concerning icons, icons sizes, etc.  You can use this function to
    * explicitely turn this off, if you like.
@@ -294,20 +297,20 @@ protected slots:
 
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
   KToolBarButtonPrivate *d;
 };
 
 /**
 * List of @ref KToolBarButton objects.
 * @internal
 * @version $Id$
 */
-class KToolBarButtonList : public QIntDict<KToolBarButton>
+class KToolBarButtonList : public Q3IntDict<KToolBarButton>
 {
 public:
    KToolBarButtonList();
    ~KToolBarButtonList() {}
 };
 
 #endif