initial public commit of qt4 portp1

1 files changed, 9 insertions, 7 deletions

diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h
index 17c186b..64cbd17 100644
--- a/microkde/kdialogbase.h
+++ b/microkde/kdialogbase.h
@@ -1,23 +1,25 @@
 #ifndef MINIKDE_KDIALOGBASE_H
 #define MINIKDE_KDIALOGBASE_H
 
-#include <qframe.h>
+#include <q3frame.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 #include "kdialog.h"
 
 class QPushButton;
 class QLayout;
 class QTabWidget;
-class QBoxLayout;
+class Q3BoxLayout;
 
 class KDialogBase : public KDialog
 {
     Q_OBJECT
   public:
     enum ButtonCode
     {
       Help    = 0x00000001,
       Default = 0x00000002,
       Ok      = 0x00000004,
       Apply   = 0x00000008,
       Try     = 0x00000010,
@@ -50,43 +52,43 @@ class KDialogBase : public KDialog
                  const QString &user1=QString::null,
                  const QString &user2=QString::null,
                  const QString &user3=QString::null);
     KDialogBase( int dialogFace, const QString &caption, 
                  int buttonMask, ButtonCode defaultButton, 
                  QWidget *parent=0, const char *name=0, bool modal=true, 
                  bool separator=false,
                  const QString &user1=QString::null,
                  const QString &user2=QString::null,
                  const QString &user3=QString::null);
     virtual ~KDialogBase();
     
-    QFrame *addPage( const QString & );
-    QFrame *addPage( const QString &, int, const QPixmap & );
+    Q3Frame *addPage( const QString & );
+    Q3Frame *addPage( const QString &, int, const QPixmap & );
 
     void setMainWidget( QWidget *widget );
 
     void setButtonText( ButtonCode id, const QString &text );
 
     void enableButton( ButtonCode id, bool state );
     void enableButtonOK( bool state );
     void enableButtonApply( bool state );
 
     void showButton( ButtonCode, bool show );
 
     int pageIndex( QWidget *widget ) const;
 
     bool showPage( int index );
     void hideButtons();
 
-    QFrame *plainPage();
+    Q3Frame *plainPage();
 
   signals:
     void user1Clicked();
     void user2Clicked();
  /**
      * The Apply button was pressed. This signal is only emitted if
      * @ref slotApply() is not replaced.
      */
     void applyClicked();
 
     /**
      * The OK button was pressed. This signal is only emitted if
@@ -119,25 +121,25 @@ class KDialogBase : public KDialog
     virtual void accept ();
   protected:
     QPushButton *findButton( ButtonCode );
     QTabWidget *tabWidget();
 
   private:
     void init( const QString &caption, int buttonMask,
                const QString &user1=QString::null, const QString &user2=QString::null );
     void initLayout();
 
     QWidget *mMainWidget;
     QTabWidget *mTabWidget;
-    QFrame *mPlainPage;
-    QBoxLayout *mTopLayout;
+    Q3Frame *mPlainPage;
+    Q3BoxLayout *mTopLayout;
     
     QPushButton *mUser1Button;
     QPushButton *mUser2Button;
     QPushButton *mCloseButton;
     QPushButton *mOkButton;
     QPushButton *mApplyButton;
     QPushButton *mCancelButton;     
     QPushButton *mDefaultButton;    
 };
 
 #endif