1 files changed, 10 insertions, 9 deletions

diff --git a/libkdepim/kprefswidget.cpp b/libkdepim/kprefswidget.cpp
index f6a0b38..51431e2 100644
--- a/libkdepim/kprefswidget.cpp
+++ b/libkdepim/kprefswidget.cpp
@@ -4,65 +4,66 @@
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     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.
 */
 
 // $Id$
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
+#include <q3groupbox.h>
+#include <q3buttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
-#include <qtextstream.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3textstream.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 
 #include "kprefs.h"
 
 #include "kprefswidget.h"
 //#include "kprefsdialog.moc"
 
 KPrefsWidBool::KPrefsWidBool(const QString &text,bool *reference,
                              QWidget *parent)
 {
   mReference = reference;
 
   mCheck = new QCheckBox(text,parent);
 
   connect( mCheck, SIGNAL( toggled( bool ) ), SIGNAL( modified() ) );
 
@@ -110,49 +111,49 @@ void KPrefsWidColor::readConfig()
 
 void KPrefsWidColor::writeConfig()
 {
   *mReference = mButton->color();
 }
 
 QLabel *KPrefsWidColor::label()
 {
   return mLabel;
 }
 
 KColorButton *KPrefsWidColor::button()
 {
   return mButton;
 }
 
 KPrefsWidFont::KPrefsWidFont(const QString &sampleText,const QString &labelText,
                              QFont *reference,QWidget *parent)
 {
   mReference = reference;
 
   mLabel = new QLabel(labelText, parent);
 
   mPreview = new QLabel(sampleText,parent);
-  mPreview->setFrameStyle(QFrame::Panel|QFrame::Sunken);
+  mPreview->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken);
 
   mButton = new QPushButton(i18n("Choose..."), parent);
   connect(mButton,SIGNAL(clicked()),SLOT(selectFont())); 
   mPreview->setMaximumHeight( QApplication::desktop()->height() / 12 );
   mPreview->setMaximumWidth( (QApplication::desktop()->width() / 2)-10 );
 }
 
 KPrefsWidFont::~KPrefsWidFont()
 {
 }
 
 void KPrefsWidFont::readConfig()
 {
   mPreview->setFont(*mReference);
 }
 
 void KPrefsWidFont::writeConfig()
 {
   *mReference = mPreview->font();
 }
 
 QLabel *KPrefsWidFont::label()
 {
   return mLabel;
@@ -197,62 +198,62 @@ void KPrefsWidTime::readConfig()
   mSpin->setValue(*mReference);
 }
 
 void KPrefsWidTime::writeConfig()
 {
   *mReference = mSpin->value();
 }
 
 QLabel *KPrefsWidTime::label()
 {
   return mLabel;
 }
 
 QSpinBox *KPrefsWidTime::spinBox()
 {
   return mSpin;
 }
 
 
 KPrefsWidRadios::KPrefsWidRadios(const QString &text,int *reference,
                 QWidget *parent)
 {
   mReference = reference;
 
-  mBox = new QButtonGroup(1,Qt::Horizontal,text,parent);
+  mBox = new Q3ButtonGroup(1,Qt::Horizontal,text,parent);
   connect( mBox, SIGNAL( clicked(int)), SIGNAL( modified() ) );
 }
 
 KPrefsWidRadios::~KPrefsWidRadios()
 {
 }
 
 void KPrefsWidRadios::addRadio(const QString &text)
 {
   new QRadioButton(text,mBox);
 }
 
-QButtonGroup *KPrefsWidRadios::groupBox()
+Q3ButtonGroup *KPrefsWidRadios::groupBox()
 {
   return mBox;
 }
 
 void KPrefsWidRadios::readConfig()
 {
   mBox->setButton(*mReference);
 }
 
 void KPrefsWidRadios::writeConfig()
 {
   *mReference = mBox->id(mBox->selected());
 }
 
 
 KPrefsWidString::KPrefsWidString(const QString &text,QString *reference,
                                  QWidget *parent, QLineEdit::EchoMode echomode)
 {
   mReference = reference;
   
   mLabel = new QLabel(text,parent);
   mEdit = new QLineEdit(parent);
   mEdit->setEchoMode( echomode );
   connect( mEdit, SIGNAL( textChanged(const QString&) ), SIGNAL( modified() ) );