Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 29 insertions, 29 deletions

diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 70e720dc0..ec6aa4837 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -43,7 +43,7 @@
 #include <kiconloader.h>
 #include <kcolorcombo.h>
 #include <kstdguiitem.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <kwin.h>
 #endif
 #include <kdebug.h>
@@ -87,7 +87,7 @@ static TQString xtermCommands[] = {
 	TQString::tqfromLatin1("eterm --pause -T %t -e %C"),    // some systems use eterm...
 	TQString::tqfromLatin1("Eterm --pause -T %t -e %C"),    // while some use Eterm
 	TQString::tqfromLatin1("rxvt -title %t -e ${SHELL:-sh} -c %w"),
-	TQString::null       // end of list indicator - don't change!
+	TQString()       // end of list indicator - don't change!
 };
 
 
@@ -106,7 +106,7 @@ void KAlarmPrefDlg::display()
 	}
 	else
 	{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		KWin::WindowInfo info = KWin::windowInfo(mInstance->winId(), static_cast<unsigned long>(NET::WMGeometry | NET::WMDesktop));
 		KWin::setCurrentDesktop(info.desktop());
 #endif
@@ -119,7 +119,7 @@ void KAlarmPrefDlg::display()
 KAlarmPrefDlg::KAlarmPrefDlg()
 	: KDialogBase(IconList, i18n("Preferences"), Help | Default | Ok | Apply | Cancel, Ok, 0, "PrefDlg", false, true)
 {
-	setWFlags(Qt::WDestructiveClose);
+	setWFlags(TQt::WDestructiveClose);
 	setIconListAllVisible(true);
 
 	TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("misc"));
@@ -251,7 +251,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
 	// Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
-	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 	TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup");
 	TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint());
@@ -405,12 +405,12 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 		cmd.tqreplace("%C", "[command]");
 		cmd.tqreplace("%W", "[command; sleep]");
 		TQWhatsThis::add(radio, whatsThis.arg(cmd));
-		grid->addWidget(radio, (row = index/3 + 1), index % 3, Qt::AlignAuto);
+		grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto);
 		++index;
 	}
 
 	box = new TQHBox(group);
-	grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto);
 	TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box);
 	radio->setFixedSize(radio->tqsizeHint());
 	connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool)));
@@ -444,7 +444,7 @@ void MiscPrefTab::restore()
 	{
 		for ( ;  id < mXtermCount;  ++id)
 		{
-			if (mXtermType->find(id)  &&  xtermCmd == xtermCommands[id])
+			if (mXtermType->tqfind(id)  &&  xtermCmd == xtermCommands[id])
 				break;
 		}
 	}
@@ -466,7 +466,7 @@ void MiscPrefTab::apply(bool syncToDisc)
 		else
 		{
 			TQStringList args = KShell::splitArgs(cmd);
-			cmd = args.isEmpty() ? TQString::null : args[0];
+			cmd = args.isEmpty() ? TQString() : args[0];
 			if (KStandardDirs::findExe(cmd).isEmpty())
 			{
 				mXtermCommand->setFocus();
@@ -526,7 +526,7 @@ void MiscPrefTab::slotAutostartDaemonClicked()
 	if (!mAutostartDaemon->isChecked()
 	&&  KMessageBox::warningYesNo(this,
 		                      i18n("You should not uncheck this option unless you intend to discontinue use of KAlarm"),
-		                      TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()
+		                      TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()
 		                     ) != KMessageBox::Yes)
 		mAutostartDaemon->setChecked(true);	
 }
@@ -659,7 +659,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	mFromAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, to identify you as the sender when sending email alarms."));
-	grid->addMultiCellWidget(radio, 2, 2, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(radio, 2, 2, 1, 2, TQt::AlignAuto);
 
 	// 'From' email address to be picked from KMail's identities when the email alarm is configured
 	radio = new RadioButton(i18n("Use KMail &identities"), group);
@@ -669,7 +669,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	      i18n("Check to use KMail's email identities to identify you as the sender when sending email alarms. "
 	           "For existing email alarms, KMail's default identity will be used. "
 	           "For new email alarms, you will be able to pick which of KMail's identities to use."));
-	grid->addMultiCellWidget(radio, 3, 3, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(radio, 3, 3, 1, 2, TQt::AlignAuto);
 
 	// 'Bcc' email address controls ...
 	grid->addRowSpacing(4, KDialog::spacingHint());
@@ -700,7 +700,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	mBccAddressGroup->insert(radio, Preferences::MAIL_FROM_CONTROL_CENTRE);
 	TQWhatsThis::add(radio,
 	      i18n("Check to use the email address set in the KDE Control Center, for blind copying email alarms to yourself."));
-	grid->addMultiCellWidget(radio, 6, 6, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(radio, 6, 6, 1, 2, TQt::AlignAuto);
 
 	group->setFixedHeight(group->tqsizeHint().height());
 
@@ -788,7 +788,7 @@ TQString EmailPrefTab::validate()
 		mBccAddressChanged = false;
 		return validateAddr(mBccAddressGroup, mEmailBccAddress, i18n("No valid 'Bcc' email address is specified."));
 	}
-	return TQString::null;
+	return TQString();
 }
 
 TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg)
@@ -798,17 +798,17 @@ TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const
 	{
 		case Preferences::MAIL_FROM_CONTROL_CENTRE:
 			if (!KAMail::controlCentreAddress().isEmpty())
-				return TQString::null;
+				return TQString();
 			errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_KMAIL:
 			if (KAMail::identitiesExist())
-				return TQString::null;
+				return TQString();
 			errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_ADDR:
 			if (!addr->text().stripWhiteSpace().isEmpty())
-				return TQString::null;
+				return TQString();
 			break;
 	}
 	return errmsg;
@@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults()
 EditPrefTab::EditPrefTab(TQVBox* frame)
 	: PrefsTabBase(frame)
 {
-	// Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | Qt::WordBreak)
+	// Get tqalignment to use in TQLabel::tqsetAlignment(tqalignment | TQt::WordBreak)
 	// (AlignAuto doesn't work correctly there)
-	int tqalignment = TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft;
+	int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
 
 	int groupTopMargin = fontMetrics().lineSpacing()/2;
 	TQString defsetting   = i18n("The default setting for \"%1\" in the alarm edit dialog.");
@@ -903,12 +903,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
 	mConfirmAck->setMinimumSize(mConfirmAck->tqsizeHint());
 	TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
-	tqlayout->addWidget(mConfirmAck, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto);
 
 	mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
 	mAutoClose->setMinimumSize(mAutoClose->tqsizeHint());
 	TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
-	tqlayout->addWidget(mAutoClose, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
@@ -996,7 +996,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
 	mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint());
 	TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
-	tqlayout->addWidget(mEmailBcc, 0, Qt::AlignAuto);
+	tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
 
 	// MISCELLANEOUS
 	// Show in KOrganizer
@@ -1035,7 +1035,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	TQVBox* vbox = new TQVBox(mPage);   // this is to control the TQWhatsThis text display area
 	vbox->setSpacing(KDialog::spacingHint());
 	label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox);
-	label->tqsetAlignment(tqalignment | Qt::WordBreak);
+	label->tqsetAlignment(tqalignment | TQt::WordBreak);
 	itemBox = new TQHBox(vbox);
 	itemBox->setSpacing(2*KDialog::spacingHint());
 	mFeb29 = new TQButtonGroup(itemBox);
@@ -1181,7 +1181,7 @@ TQString EditPrefTab::validate()
 		mSoundFile->setFocus();
 		return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
@@ -1204,7 +1204,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool)));
 	TQWhatsThis::add(mTooltipShowAlarms,
 	      i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours"));
-	grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, TQt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
 	box->setSpacing(KDialog::spacingHint());
@@ -1217,21 +1217,21 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQWhatsThis::add(box,
 	      i18n("Uncheck to display all of the next 24 hours' alarms in the system tray tooltip. "
 	           "Check to enter an upper limit on the number to be displayed."));
-	grid->addMultiCellWidget(box, 2, 2, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(box, 2, 2, 1, 2, TQt::AlignAuto);
 
 	mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime");
 	mTooltipShowTime->setMinimumSize(mTooltipShowTime->tqsizeHint());
 	connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTime,
 	      i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due"));
-	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto);
 
 	mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo");
 	mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->tqsizeHint());
 	connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool)));
 	TQWhatsThis::add(mTooltipShowTimeTo,
 	      i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due"));
-	grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, Qt::AlignAuto);
+	grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, TQt::AlignAuto);
 
 	box = new TQHBox(group);   // this is to control the TQWhatsThis text display area
 	box->setSpacing(KDialog::spacingHint());
@@ -1242,7 +1242,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame)
 	TQWhatsThis::add(box,
 	      i18n("Enter the text to be displayed in front of the time until the alarm, in the system tray tooltip"));
 	box->setFixedHeight(box->tqsizeHint().height());
-	grid->addWidget(box, 5, 2, Qt::AlignAuto);
+	grid->addWidget(box, 5, 2, TQt::AlignAuto);
 	group->setMaximumHeight(group->tqsizeHint().height());
 
 	mModalMessages = new TQCheckBox(i18n("Message &windows have a title bar and take keyboard focus"), mPage, "modalMsg");