summaryrefslogtreecommitdiffabout
path: root/kmicromail/koprefsdialog.cpp
Side-by-side diff
Diffstat (limited to 'kmicromail/koprefsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/koprefsdialog.cpp149
1 files changed, 77 insertions, 72 deletions
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 017f1f7..e3102a4 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -25,4 +25,4 @@
#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
+#include <q3groupbox.h>
+#include <q3buttongroup.h>
#include <qlineedit.h>
@@ -31,6 +31,6 @@
#include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
#include <qcombobox.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
#include <qregexp.h>
@@ -41,4 +41,9 @@
#include <qpushbutton.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
#include <qapplication.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <QPixmap>
+#include <Q3Frame>
@@ -113,5 +118,5 @@ void KOPrefsDialog::setupMainTab()
{
- QFrame *topFrame = addPage(i18n("General"),0,0);
+ Q3Frame *topFrame = addPage(i18n("General"),0,0);
- QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
topLayout->setSpacing(spacingHint());
@@ -138,5 +143,5 @@ void KOPrefsDialog::setupMailTab()
{
- QFrame *topFrame = addPage(i18n("Mail"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Mail"),0,0);
- QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
topLayout->setSpacing(spacingHint());
@@ -184,6 +189,6 @@ void KOPrefsDialog::setupFontsTab()
- QFrame *topFrame = addPage(i18n("Fonts"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Fonts"),0,0);
// DesktopIcon("fonts",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,7,3);
topLayout->setSpacing(1);
@@ -240,4 +245,4 @@ void KOPrefsDialog::setupLocaleDateTab()
{
-QFrame *topFrame = addPage(i18n("Date Format"),0,0);
- QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
+Q3Frame *topFrame = addPage(i18n("Date Format"),0,0);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,3,2);
topLayout->setSpacing(spacingHint());
@@ -294,4 +299,4 @@ void KOPrefsDialog::setupLocaleTab()
{
- QFrame *topFrame = addPage(i18n("Locale"),0,0);
- QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+ Q3Frame *topFrame = addPage(i18n("Locale"),0,0);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
topLayout->setSpacing(spacingHint());
@@ -333,3 +338,3 @@ void KOPrefsDialog::setupLocaleTab()
QWidget * hb = new QWidget( topFrame );
- QHBoxLayout *hbLayout = new QHBoxLayout(hb);
+ Q3HBoxLayout *hbLayout = new Q3HBoxLayout(hb);
sb =
@@ -363,5 +368,5 @@ void KOPrefsDialog::setupSyncAlgTab()
QLabel * lab;
- QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Sync Prefs"),0,0);
mSetupSyncAlgTab = topFrame;
- QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
topLayout->setSpacing(spacingHint());
@@ -405,4 +410,4 @@ void KOPrefsDialog::setupSyncTab()
QLabel * lab;
- QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
- QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+ Q3Frame *topFrame = addPage(i18n("Sync Network"),0,0);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
topLayout->setSpacing(spacingHint());
@@ -453,6 +458,6 @@ void KOPrefsDialog::setupMainTab()
{
- QFrame *topFrame = addPage(i18n("General"),0,0);
+ Q3Frame *topFrame = addPage(i18n("General"),0,0);
// DesktopIcon("identity",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
topLayout->setSpacing(spacingHint());
@@ -477,7 +482,7 @@ void KOPrefsDialog::setupMainTab()
KPrefsDialogWidBool *wb;
- QHBox *dummy;
+ Q3HBox *dummy;
if ( QApplication::desktop()->width() > 480 ) {
- dummy = new QHBox(topFrame);
+ dummy = new Q3HBox(topFrame);
} else {
- dummy = new QVBox(topFrame);
+ dummy = new Q3VBox(topFrame);
}
@@ -493,3 +498,3 @@ void KOPrefsDialog::setupMainTab()
- dummy = new QHBox(topFrame);
+ dummy = new Q3HBox(topFrame);
new QLabel(i18n("Days in What's Next:"),dummy);
@@ -501,3 +506,3 @@ void KOPrefsDialog::setupMainTab()
- dummy = new QHBox(topFrame);
+ dummy = new Q3HBox(topFrame);
new QLabel(i18n("Days in Next-X-Days:"),dummy);
@@ -507,3 +512,3 @@ void KOPrefsDialog::setupMainTab()
- QHBox *prioBox = new QHBox(topFrame);
+ Q3HBox *prioBox = new Q3HBox(topFrame);
// intervalBox->setSpacing(spacingHint());
@@ -531,3 +536,3 @@ void KOPrefsDialog::setupMainTab()
- QHBox *intervalBox = new QHBox(topFrame);
+ Q3HBox *intervalBox = new Q3HBox(topFrame);
// intervalBox->setSpacing(spacingHint());
@@ -622,6 +627,6 @@ void KOPrefsDialog::setupTimeTab()
{
- QFrame *topFrame = addPage(i18n("Time"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Time"),0,0);
// DesktopIcon("clock",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
topLayout->setSpacing(spacingHint());
@@ -629,3 +634,3 @@ void KOPrefsDialog::setupTimeTab()
- QHBox *dummy = new QHBox(topFrame);
+ Q3HBox *dummy = new Q3HBox(topFrame);
KPrefsWidTime *dayBegins =
@@ -660,3 +665,3 @@ void KOPrefsDialog::setupTimeTab()
- QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
+ Q3GroupBox *workingHoursGroup = new Q3GroupBox(1,Qt::Horizontal,
i18n("Working Hours"),
@@ -666,3 +671,3 @@ void KOPrefsDialog::setupTimeTab()
workingHoursGroup->layout()->setMargin( 4 );
- QHBox *workStartBox = new QHBox(workingHoursGroup);
+ Q3HBox *workStartBox = new Q3HBox(workingHoursGroup);
// workStartBox->setMargin( 0 );
@@ -671,3 +676,3 @@ void KOPrefsDialog::setupTimeTab()
- QHBox *workEndBox = new QHBox(workingHoursGroup);
+ Q3HBox *workEndBox = new Q3HBox(workingHoursGroup);
//workEndBox->setMargin( 0 );
@@ -675,3 +680,3 @@ void KOPrefsDialog::setupTimeTab()
&(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
- QVBox *excludeBox = new QVBox(workingHoursGroup);
+ Q3VBox *excludeBox = new Q3VBox(workingHoursGroup);
//excludeBox->setMargin( 0 );
@@ -695,6 +700,6 @@ void KOPrefsDialog::setupViewsTab()
- QFrame *topFrame = addPage(i18n("Views"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Views"),0,0);
// DesktopIcon("viewmag",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,1);
topLayout->setSpacing(spacingHint());
@@ -787,3 +792,3 @@ void KOPrefsDialog::setupViewsTab()
- topLayout = new QGridLayout(topFrame,6,1);
+ topLayout = new Q3GridLayout(topFrame,6,1);
topLayout->setSpacing(spacingHint());
@@ -840,3 +845,3 @@ void KOPrefsDialog::setupViewsTab()
- topLayout = new QGridLayout(topFrame,5,1);
+ topLayout = new Q3GridLayout(topFrame,5,1);
topLayout->setSpacing(spacingHint());
@@ -845,3 +850,3 @@ void KOPrefsDialog::setupViewsTab()
QLabel *lab;
- QHBox *habo = new QHBox( topFrame );
+ Q3HBox *habo = new Q3HBox( topFrame );
if ( QApplication::desktop()->width() < 320 ) {
@@ -867,3 +872,3 @@ void KOPrefsDialog::setupViewsTab()
- habo = new QHBox( topFrame );
+ habo = new Q3HBox( topFrame );
if ( QApplication::desktop()->width() < 320 ) {
@@ -935,3 +940,3 @@ void KOPrefsDialog::setupViewsTab()
- topLayout = new QGridLayout(topFrame,4,1);
+ topLayout = new Q3GridLayout(topFrame,4,1);
topLayout->setSpacing(spacingHint());
@@ -967,3 +972,3 @@ void KOPrefsDialog::setupViewsTab()
&(KOPrefs::instance()->mTodoDueTodayColor),wid);
- QHBoxLayout *widLayout = new QHBoxLayout(wid);
+ Q3HBoxLayout *widLayout = new Q3HBoxLayout(wid);
widLayout->addWidget( todoDueTodayColor->label() );
@@ -975,3 +980,3 @@ void KOPrefsDialog::setupViewsTab()
wid = new QWidget( topFrame );
- widLayout = new QHBoxLayout(wid);
+ widLayout = new Q3HBoxLayout(wid);
KPrefsWidColor *todoOverdueColor =
@@ -999,3 +1004,3 @@ void KOPrefsDialog::setupViewsTab()
- topLayout = new QGridLayout(topFrame,2,1);
+ topLayout = new Q3GridLayout(topFrame,2,1);
topLayout->setSpacing(spacingHint());
@@ -1012,5 +1017,5 @@ void KOPrefsDialog::setupViewsTab()
#ifndef DESKTOP_VERSION
- lab->setAlignment( AlignLeft|WordBreak|AlignTop);
+ lab->setAlignment( Qt::AlignLeft|Qt::TextWordWrap|Qt::AlignTop);
#else
- lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
+ lab->setAlignment( Qt::AlignLeft|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
@@ -1018,3 +1023,3 @@ void KOPrefsDialog::setupViewsTab()
- QHBox* dummyBox = new QHBox(topFrame);
+ Q3HBox* dummyBox = new Q3HBox(topFrame);
new QLabel(i18n("Play beeps count:"),dummyBox);
@@ -1023,3 +1028,3 @@ void KOPrefsDialog::setupViewsTab()
- dummyBox = new QHBox(topFrame);
+ dummyBox = new Q3HBox(topFrame);
new QLabel(i18n("Beeps interval in sec:"),dummyBox);
@@ -1028,3 +1033,3 @@ void KOPrefsDialog::setupViewsTab()
- dummyBox = new QHBox(topFrame);
+ dummyBox = new Q3HBox(topFrame);
new QLabel(i18n("Default suspend time in min:"),dummyBox);
@@ -1033,3 +1038,3 @@ void KOPrefsDialog::setupViewsTab()
- dummyBox = new QHBox(topFrame);
+ dummyBox = new Q3HBox(topFrame);
new QLabel(i18n("Auto suspend count:"),dummyBox);
@@ -1044,3 +1049,3 @@ void KOPrefsDialog::setupViewsTab()
- QHBox* hbo = new QHBox ( topFrame );
+ Q3HBox* hbo = new Q3HBox ( topFrame );
mDefaultAlarmFile = new QLineEdit(hbo);
@@ -1084,6 +1089,6 @@ void KOPrefsDialog::setupFontsTab()
- QFrame *topFrame = addPage(i18n("Fonts"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Fonts"),0,0);
// DesktopIcon("fonts",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,7,3);
topLayout->setSpacing(1);
@@ -1154,3 +1159,3 @@ void KOPrefsDialog::setupFontsTab()
- topLayout = new QGridLayout(topFrame,7,3);
+ topLayout = new Q3GridLayout(topFrame,7,3);
topLayout->setSpacing(1);
@@ -1222,6 +1227,6 @@ void KOPrefsDialog::setupColorsTab()
{
- QFrame *topFrame = addPage(i18n("Colors"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Colors"),0,0);
// DesktopIcon("colorize",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
// topLayout->setSpacing(spacingHint());
@@ -1233,5 +1238,5 @@ void KOPrefsDialog::setupColorsTab()
int ii = 1;
- QGroupBox *categoryGroup ;
+ Q3GroupBox *categoryGroup ;
- categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
+ categoryGroup = new Q3GroupBox(1,Qt::Vertical,i18n("Categories"),
topFrame);
@@ -1328,3 +1333,3 @@ void KOPrefsDialog::setupPrinterTab()
- QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(mPrinterTab,5,2);
topLayout->setSpacing(spacingHint());
@@ -1338,6 +1343,6 @@ void KOPrefsDialog::setupGroupSchedulingTab()
#if 0
- QFrame *topFrame = addPage(i18n("Group Scheduling"),0,
+ Q3Frame *topFrame = addPage(i18n("Group Scheduling"),0,
DesktopIcon("personal",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
topLayout->setSpacing(spacingHint());
@@ -1364,3 +1369,3 @@ void KOPrefsDialog::setupGroupSchedulingTab()
topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
- mAMails = new QListView(topFrame);
+ mAMails = new Q3ListView(topFrame);
mAMails->addColumn(i18n("Email"),300);
@@ -1382,3 +1387,3 @@ void KOPrefsDialog::setupGroupSchedulingTab()
connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
- connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
+ connect(mAMails,SIGNAL(selectionChanged(Q3ListViewItem *)),SLOT(updateInput()));
#endif
@@ -1389,6 +1394,6 @@ void KOPrefsDialog::setupGroupAutomationTab()
return;
- QFrame *topFrame = addPage(i18n("Group Automation"),0,
+ Q3Frame *topFrame = addPage(i18n("Group Automation"),0,
DesktopIcon("personal",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,1);
topLayout->setSpacing(spacingHint());
@@ -1545,3 +1550,3 @@ void KOPrefsDialog::usrWriteConfig()
- QDictIterator<QColor> it(mCategoryDict);
+ Q3DictIterator<QColor> it(mCategoryDict);
while (it.current()) {
@@ -1685,6 +1690,6 @@ void KOPrefsDialog::setupTimeZoneTab()
{
- QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Time Zone"),0,0);
// DesktopIcon("clock",KIcon::SizeMedium));
- QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+ Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
topLayout->setSpacing(spacingHint());
@@ -1692,3 +1697,3 @@ void KOPrefsDialog::setupTimeZoneTab()
- QHBox *timeZoneBox = new QHBox( topFrame );
+ Q3HBox *timeZoneBox = new Q3HBox( topFrame );
topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );