initial public commit of qt4 portp1

1 files changed, 7 insertions, 5 deletions

diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index 52ec809..cc95dd4 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -15,37 +15,39 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KPREFSDIALOG_H
 #define _KPREFSDIALOG_H
 // $Id$
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qlineedit.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include <kdialogbase.h>
 
 class KPrefs;
 class KPrefsDialog;
 
 class KColorButton;
 class QCheckBox;
 class QLabel;
 class QSpinBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 
 /**
   @short Base class for widgets used by @ref KPrefsDialog.
   @author Cornelius Schumacher
   @see KPrefsDialog
 
   This class provides the interface for the preferences widgets used by
   KPrefsDialog.
 */
 class KPrefsDialogWid : public QObject
 {
   public:
@@ -249,33 +251,33 @@ class KPrefsDialogWidRadios : public KPrefsDialogWid
     virtual ~KPrefsDialogWidRadios();
 
     /**
       Add a radio button.
       
       @param text Text of the button.
     */
     void addRadio(const QString &text);
     
     /**
       Return the box widget used by this widget.
     */
-    QButtonGroup *groupBox();
+    Q3ButtonGroup *groupBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     int *mReference;
 
-    QButtonGroup *mBox;
+    Q3ButtonGroup *mBox;
 };
 
 
 /**
   @short Widget for string settings in @ref KPrefsDialog.
   
   This class provides a widget for configuring string values. It is meant to be
   used by KPrefsDialog. The user is responsible for the layout management.
 */
 class KPrefsDialogWidString : public KPrefsDialogWid
 {
   public:
@@ -430,25 +432,25 @@ class KPrefsDialog : public KDialogBase
     /** Set preferences to default values */
     void slotDefault();
   
   protected:
     /** Implement this to read custom configuration widgets. */
     virtual void usrReadConfig() {}
     /** Implement this to write custom configuration widgets. */
     virtual void usrWriteConfig() {}
 
   private:
     KPrefs *mPrefs;
 
-    QPtrList<KPrefsDialogWid> mPrefsWids;
+    Q3PtrList<KPrefsDialogWid> mPrefsWids;
 };
 
 
 #include "kcmconfigs/kdepimconfigwidget.h"
 class KPimPrefsGlobalDialog : public KPrefsDialog
 {
     Q_OBJECT
         public:
     KPimPrefsGlobalDialog(QWidget *parent=0,char *name=0,bool modal=true);
         /**
            Destructor.
         */