initial public commit of qt4 portp1

3 files changed, 36 insertions, 27 deletions

diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
index 5094830..9f47766 100644
--- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
+++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
@@ -21,49 +21,51 @@
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 //#include <klocale.h>
 //#include <stdlib.h>
 
 #include "kdepimconfigwidget.h"
 
 #include "kcmkdepimconfig.h"
 #include "kprefs.h"
 #include "kpimglobalprefs.h"
 
 #ifndef _WIN32_
 extern "C"
 {
   KCModule *create_kdepimconfig(QWidget *parent, const char * ) {
     return new KCMKdePimConfig(parent, "kcmkdepimconfig" );
   }
 }
 #endif
 
 KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name )
   : KCModule( KPimGlobalPrefs::instance(), parent, name )
 {
     //abort();
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   mConfigWidget = new KDEPIMConfigWidget( (KPimGlobalPrefs*)getPreferences(), this, "KDEPIMConfigWidget" );
   layout->addWidget( mConfigWidget );
   layout->setSpacing( 0 );
   layout->setMargin( 0 );
 
   connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
 }
 
 void KCMKdePimConfig::load()
 {
   mConfigWidget->readConfig();
 }
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 292951b..11a2b45 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -22,34 +22,39 @@
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcheckbox.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qdir.h>
 #include <qregexp.h>
 #include <qspinbox.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
 #include <kdialog.h>
 #include <kprefsdialog.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kdateedit.h>
 #include <kglobal.h>
 #include <stdlib.h>
 
 /*US
 #include <qcheckbox.h>
 #include <qframe.h>
@@ -92,124 +97,124 @@ $Id$
 
 KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
   : KPrefsWidget(prefs, parent, name )
 {
   mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
   mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
   mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
   mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
   mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
   mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
 
 
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
 
   setupLocaleTab();
   setupLocaleDateTab();
   setupTimeZoneTab();
   setupExternalAppTab();
   setupStoreTab();
   setupBackupTab();
 }
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
     tabWidget->setCurrentPage ( 3 ) ;
 }
 void KDEPIMConfigWidget::setupBackupTab()
 {
-    QVBox *colorPage = new QVBox( this );
+    Q3VBox *colorPage = new Q3VBox( this );
     tabWidget->addTab( colorPage, i18n( "Backup" ) );
     QWidget* topFrame = new QWidget( colorPage ); 
-    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3VBoxLayout *topLayout = new Q3VBoxLayout(topFrame);
     KPrefsWidBool *sb = addWidBool(i18n("Backup enabled"),
                       &(KPimGlobalPrefs::instance()->mBackupEnabled),topFrame);
     topLayout->addWidget((QWidget*)sb->checkBox());
     QWidget* bupFrame = new QWidget( topFrame ); 
     topLayout->addWidget((bupFrame));
     QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), bupFrame, SLOT ( setEnabled( bool ) ) );
-    QVBoxLayout *bupLayout = new QVBoxLayout(bupFrame);
+    Q3VBoxLayout *bupLayout = new Q3VBoxLayout(bupFrame);
     sb = addWidBool(i18n("Use standard backup dir"),
                       &(KPimGlobalPrefs::instance()->mBackupUseDefaultDir),bupFrame);
     bupLayout->addWidget((QWidget*)sb->checkBox());
     mBackupUrl = new KURLRequester( bupFrame );
     mBackupUrl->setPathIsDir();
     mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
     QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), mBackupUrl ,SLOT ( setDisabled( bool ) ) );
     bupLayout->addWidget( mBackupUrl );
 
     mBackupUrl->setEnabled( !KPimGlobalPrefs::instance()->mBackupUseDefaultDir );
     bupFrame->setEnabled( KPimGlobalPrefs::instance()->mBackupEnabled );
-    QHBox *dummy = new QHBox(bupFrame);
+    Q3HBox *dummy = new Q3HBox(bupFrame);
     new QLabel(i18n("Number of Backups:"),dummy);
     mBackupNumbersSpin = new QSpinBox(1,21,1,dummy);
     new QLabel(i18n(" "),dummy);
     bupLayout->addWidget( dummy );
 
-    dummy = new QHBox(bupFrame);
+    dummy = new Q3HBox(bupFrame);
     new QLabel(i18n("Make backup every "),dummy);
     mBackupDayCountSpin = new QSpinBox(1,28,1,dummy);
     new QLabel(i18n(" days"),dummy);
     new QLabel(i18n(" "),dummy);
     bupLayout->addWidget( dummy ); 
     QString localKdeDir;
     localKdeDir = readEnvPath("LOCALMICROKDEHOME");
     if ( ! localKdeDir.isEmpty() ) {
         sb->checkBox()->setEnabled( false );
         sb->checkBox()->setChecked( true );
         mBackupUrl->setEnabled( false );
         KPimGlobalPrefs::instance()->mBackupUseDefaultDir = true;
     }
 
 }
 void KDEPIMConfigWidget::setupStoreTab()
 {
-    QVBox *colorPage = new QVBox( this );
+    Q3VBox *colorPage = new Q3VBox( this );
     tabWidget->addTab( colorPage, i18n( "Colors" ) );
     QWidget* cw = new QWidget( colorPage ); 
     KPrefsWidColor *holidayColor =
       addWidColor(i18n("Alternating background of list views"),
                   &(KPimGlobalPrefs::instance()->mAlternateColor),cw);
-    QHBoxLayout *topLayout = new QHBoxLayout(cw);
+    Q3HBoxLayout *topLayout = new Q3HBoxLayout(cw);
     topLayout->addWidget(holidayColor->label());
     topLayout->addWidget( (QWidget* )holidayColor->button());
 
 
-    QVBox *storePage = new QVBox( this ); 
+    Q3VBox *storePage = new Q3VBox( this ); 
     if (  QApplication::desktop()->height() > 240 )
     new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage  );
     new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
     mStoreUrl = new KURLRequester( storePage );
     mStoreUrl->setPathIsDir();
     mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
 #ifdef DESKTOP_VERSION     
     QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ;
     QFileInfo fi ( confFile );
     if ( fi.exists() ) {
         KConfig cfg (   confFile );
         cfg.setGroup("Global");
         QString localKdeDir = cfg.readEntry( "MICROKDEHOME", "x_x_x" );
         if ( localKdeDir != "x_x_x" ) {
             mStoreUrl->setURL( localKdeDir );
             qDebug("Reading config from %s ", confFile.latin1());
         }
     }
                
 #endif 
     new QLabel( i18n("New dirs are created automatically"), storePage  );
-    QHBox *bb = new QHBox( storePage );
+    Q3HBox *bb = new Q3HBox( storePage );
     QPushButton * pb;
     if ( QApplication::desktop()->width() < 640 )
         pb = new QPushButton ( i18n("Save"), bb  );
     else
         pb = new QPushButton ( i18n("Save settings"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
     pb = new QPushButton ( i18n("Save standard"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) );
 #ifdef DESKTOP_VERSION
     pb = new QPushButton ( i18n("Save using LOCAL storage"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) );
 #endif
@@ -261,41 +266,41 @@ void KDEPIMConfigWidget::saveStoreSettings()
         cfg.writeEntry( "MICROKDEHOME", url ); 
         qDebug("cfg.writeEntry( MICROKDEHOME, %s  ", url.latin1());
         cfg.sync();
         mDataStoragePath->setText( i18n("Settings are stored in\n%1").arg( path+"/.microkdehome" ));
     } else {
         mStoreUrl->setURL(  QDir::homeDirPath() + "/kdepim"  );
         saveStoreSettings();
     }
 }
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
   QWidget *externalAppsPage = new QWidget( this );
-  QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout* layout = new Q3VBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   mExternalApps = new QComboBox( externalAppsPage );
 
   QMap<ExternalAppHandler::Types, QString>::Iterator it;
   for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
     mExternalApps->insertItem( it.data(), it.key() );
 
   layout->addWidget( mExternalApps );
 
   connect( mExternalApps, SIGNAL( activated( int ) ),
            this, SLOT (externalapp_changed( int ) ) );
 
 
-  mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
-  QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
+  mExternalAppGroupBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
+  Q3GridLayout *boxLayout = new Q3GridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
   mExternalAppGroupBox->layout()->setMargin(4);
 
   mClient = new QComboBox( mExternalAppGroupBox );
   boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
 
   connect( mClient, SIGNAL( activated( int ) ),
            this, SLOT (client_changed( int ) ) );
 
   QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
   boxLayout->addWidget( lab, 1, 0 );
   mChannel = new QLineEdit(mExternalAppGroupBox);
   mChannel->setReadOnly(true);
@@ -343,25 +348,25 @@ void KDEPIMConfigWidget::setupExternalAppTab()
   connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
 
 
   layout->addWidget( mExternalAppGroupBox );
   tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
 
 }
 
   
 void KDEPIMConfigWidget::setupLocaleDateTab()
 {
   QWidget *topFrame = new QWidget( this );
-  QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
+  Q3GridLayout *topLayout = new Q3GridLayout( topFrame, 3, 2);
 
    topLayout->setSpacing(KDialog::spacingHintSmall());
    topLayout->setMargin(KDialog::marginHintSmall());  
    int iii = 0;
 
    
    KPrefsWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
    else 
@@ -411,47 +416,47 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
 
   connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
   connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & ))  );
 
 
    tabWidget->addTab( topFrame, i18n( "Date Format" ) );
 }
 
 void KDEPIMConfigWidget::setupLocaleTab()
 {
 
   QWidget *topFrame = new QWidget( this );
-   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
 
    topLayout->setSpacing(KDialog::spacingHint());
    topLayout->setMargin(KDialog::marginHint());  
    int iii = 0;
  KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
    syncPrefsGroup->addRadio(i18n("German")); 
    syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("Italian")); 
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
    if (  QApplication::desktop()->width() <  300   ) {
        syncPrefsGroup->groupBox()->layout()->setMargin( 5 );
        syncPrefsGroup->groupBox()->layout()->setSpacing( 0 );
    }
    topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
 
    tabWidget->addTab( topFrame, i18n( "Language" ) );
    topFrame = new QWidget( this );
-   topLayout = new QGridLayout(topFrame,4,2);
+   topLayout = new Q3GridLayout(topFrame,4,2);
    
    topLayout->setSpacing(KDialog::spacingHint());
    topLayout->setMargin(KDialog::marginHint());  
    iii = 0;
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame);
    if (  QApplication::desktop()->width() >  300   )
        syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
    syncPrefsGroup->addRadio(i18n("24:00"));
    syncPrefsGroup->addRadio(i18n("12:00am"));
    syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
@@ -462,37 +467,37 @@ void KDEPIMConfigWidget::setupLocaleTab()
    topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
    ++iii;   
 
 
    tabWidget->addTab( topFrame, i18n( "Time Format" ) );
 
 }
 
 
 void KDEPIMConfigWidget::setupTimeZoneTab()
 {
     QWidget *topFrame;
-    QGridLayout *topLayout ;
+    Q3GridLayout *topLayout ;
 
  
 
 
 
 
   topFrame = new QWidget( this );
-  topLayout = new QGridLayout( topFrame, 5, 2);
+  topLayout = new Q3GridLayout( topFrame, 5, 2);
   topLayout->setSpacing(KDialog::spacingHintSmall());
   topLayout->setMargin(KDialog::marginHintSmall());
 
-  QHBox *timeZoneBox = new QHBox( topFrame );
+  Q3HBox *timeZoneBox = new Q3HBox( topFrame );
   topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
 
   new QLabel( i18n("Timezone:"), timeZoneBox );
   mTimeZoneCombo = new QComboBox( timeZoneBox ); 
   if ( QApplication::desktop()->width() <  300 ) {
        mTimeZoneCombo->setMaximumWidth(150);
     }
 
   QStringList list;
   list = KGlobal::locale()->timeZoneList();
   mTimeZoneCombo->insertStringList(list);
 
@@ -541,25 +546,25 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
   ++iii;
   QDate current ( 2001, 1,1);
   mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1));
   mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1));
 
   connect( mStartDateSavingEdit, SIGNAL(  dateChanged(QDate)), this, SLOT( modified())  );
   connect( mEndDateSavingEdit, SIGNAL(  dateChanged(QDate)), this, SLOT( modified())  );
   connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) );
   tabWidget->addTab( topFrame, i18n( "Time Zone" ) );
  
 
   topFrame = new QWidget( this );
-  topLayout = new QGridLayout( topFrame, 3, 2);
+  topLayout = new Q3GridLayout( topFrame, 3, 2);
   topLayout->setSpacing(KDialog::spacingHintSmall());
   topLayout->setMargin(KDialog::marginHintSmall());
   tabWidget->addTab( topFrame, i18n( "Fonts" ) );
 
   QLabel* labb = new QLabel( i18n("Global application font for all apps:"),  topFrame );
   topLayout->addMultiCellWidget(labb,0,0,0,2);
   int i = 1;
   KPrefsWidFont *timeLabelsFont =
       addWidFont(i18n("Kx/Pi"),i18n("Application Font"),
                  &(KPimGlobalPrefs::instance()->mApplicationFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
@@ -702,25 +707,25 @@ void KDEPIMConfigWidget::updateClientWidgets()
 
   // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display
   QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp );
   if (it == mExternalAppsMap.end())
     return;
 
   // update group box
   mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data()));
 
   //update the entries in the client combobox
   mClient->clear();
 
-  QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
+  Q3PtrList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
   DefaultAppItem* dai;
   for ( dai=items.first(); dai != 0; dai=items.next() )
   {
     mClient->insertItem( i18n(dai->_label), dai->_id );
 
     if (dai->_id == mCurrentClient)
     {
       //restore the edit fields with the data of the local membervariables if we had set it to "other".
       //Otherwise take the default data from externalapphandler.
       mChannel->setText(dai->_channel);
       mMessage->setText(dai->_message);
       mParameters->setText(dai->_parameters);  
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 824ef79..d693015 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -25,32 +25,34 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KDEPIMCONFIGWIDGET_H
 #define KDEPIMCONFIGWIDGET_H
 
 #include <kprefswidget.h>
 #include <kio/kfile/kurlrequester.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include "externalapphandler.h"
 
 
 class QComboBox;
 class QLineEdit;
 class KPimGlobalPrefs;
-class QGroupBox;
+class Q3GroupBox;
 class QTabWidget;
 class KDateEdit;
 
 class KDEPIMConfigWidget : public KPrefsWidget
 {
   Q_OBJECT
 
   public:
     KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 );
 
   public slots:
     void textChanged( const QString& text );
@@ -97,25 +99,25 @@ class KDEPIMConfigWidget : public KPrefsWidget
     KDateEdit* mStartDateSavingEdit;
     KDateEdit* mEndDateSavingEdit; 
 
 //    void restoreExtensionSettings();
 //    void saveExtensionSettings();
 
 //    KListView *mExtensionView;
 
 //    QCheckBox *mNameParsing;
 //    QCheckBox *mViewsSingleClickBox;
 //    QPushButton *mConfigureButton;
         QComboBox* mExternalApps;
-        QGroupBox* mExternalAppGroupBox;
+        Q3GroupBox* mExternalAppGroupBox;
 
 
     QComboBox* mClient;
     QLineEdit* mChannel;
     QLineEdit* mMessage;
     QLineEdit* mParameters;
     QLineEdit* mMessage2;
     QLineEdit* mParameters2;
 
     ExternalAppHandler::Types mCurrentApp;
     int mCurrentClient;