Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

1 files changed, 20 insertions, 20 deletions

diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index ec6aa4837..90b48dd85 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -233,7 +233,7 @@ PrefsTabBase::PrefsTabBase(TQVBox* frame)
 	  mPage(frame)
 {
 	if (!mIndentWidth)
-		mIndentWidth = style().subRect(TQStyle::SR_RadioButtonIndicator, this).width();
+		mIndentWidth = tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, this).width();
 }
 
 void PrefsTabBase::apply(bool syncToDisc)
@@ -310,7 +310,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	TQWhatsThis::add(mAutostartDaemon,
 	      i18n("Automatically start alarm monitoring whenever you start KDE, by running the alarm daemon (%1).\n\n"
 	           "This option should always be checked unless you intend to discontinue use of KAlarm.")
-	          .arg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
+	          .tqarg(TQString::tqfromLatin1(DAEMON_APP_NAME)));
 	grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment);
 
 	group->setFixedHeight(group->tqsizeHint().height());
@@ -325,7 +325,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 	label->setBuddy(mStartOfDay);
 	static const TQString startOfDayText = i18n("The earliest time of day at which a date-only alarm (i.e. "
 	                                           "an alarm with \"any time\" specified) will be triggered.");
-	TQWhatsThis::add(box, TQString("%1\n\n%2").arg(startOfDayText).arg(TimeSpinBox::shiftWhatsThis()));
+	TQWhatsThis::add(box, TQString("%1\n\n%2").tqarg(startOfDayText).tqarg(TimeSpinBox::shiftWhatsThis()));
 	itemBox->setStretchFactor(new TQWidget(itemBox), 1);    // left adjust the controls
 	itemBox->setFixedHeight(box->tqsizeHint().height());
 
@@ -404,7 +404,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
 		cmd.tqreplace("%w", "<command; sleep>");
 		cmd.tqreplace("%C", "[command]");
 		cmd.tqreplace("%W", "[command; sleep]");
-		TQWhatsThis::add(radio, whatsThis.arg(cmd));
+		TQWhatsThis::add(radio, whatsThis.tqarg(cmd));
 		grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto);
 		++index;
 	}
@@ -470,7 +470,7 @@ void MiscPrefTab::apply(bool syncToDisc)
 			if (KStandardDirs::findExe(cmd).isEmpty())
 			{
 				mXtermCommand->setFocus();
-				if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").arg(cmd))
+				if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").tqarg(cmd))
 				                != KMessageBox::Continue)
 					return;
 			}
@@ -618,10 +618,10 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
 	           "your system is configured to use sendmail or a sendmail compatible mail transport agent."));
 
 	box = new TQHBox(mPage);   // this is to allow left adjustment
-	mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").arg(KAMail::i18n_sent_mail()), box);
+	mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()), box);
 	mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->tqsizeHint());
 	TQWhatsThis::add(mEmailCopyToKMail,
-	      i18n("After sending an email, store a copy in KMail's %1 folder").arg(KAMail::i18n_sent_mail()));
+	      i18n("After sending an email, store a copy in KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
 	box->setFixedHeight(box->tqsizeHint().height());
 
@@ -793,18 +793,18 @@ TQString EmailPrefTab::validate()
 
 TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg)
 {
-	TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").arg(msg);
+	TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").tqarg(msg);
 	switch (group->selectedId())
 	{
 		case Preferences::MAIL_FROM_CONTROL_CENTRE:
 			if (!KAMail::controlCentreAddress().isEmpty())
 				return TQString();
-			errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg);
+			errmsg = i18n("No email address is currently set in the KDE Control Center. %1").tqarg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_KMAIL:
 			if (KAMail::identitiesExist())
 				return TQString();
-			errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg);
+			errmsg = i18n("No KMail identities currently exist. %1").tqarg(errmsg);
 			break;
 		case Preferences::MAIL_FROM_ADDR:
 			if (!addr->text().stripWhiteSpace().isEmpty())
@@ -902,12 +902,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()));
+	TQWhatsThis::add(mConfirmAck, defsetting.tqarg(EditAlarmDlg::i18n_ConfirmAck()));
 	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()));
+	TQWhatsThis::add(mAutoClose, defsetting.tqarg(LateCancelSelector::i18n_AutoCloseWin()));
 	tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto);
 
 	TQHBox* box = new TQHBox(group);
@@ -942,14 +942,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	if (theApp()->speechEnabled())
 		mSound->insertItem(SoundPicker::i18n_Speak());  // index 3
 	mSound->setMinimumSize(mSound->tqsizeHint());
-	TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound()));
+	TQWhatsThis::add(mSound, defsetting.tqarg(SoundPicker::i18n_Sound()));
 	htqlayout->addWidget(mSound);
 	htqlayout->addStretch(1);
 
 #ifndef WITHOUT_ARTS
 	mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound");
 	mSoundRepeat->setMinimumSize(mSoundRepeat->tqsizeHint());
-	TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat()));
+	TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").tqarg(SoundDlg::i18n_Repeat()));
 	htqlayout->addWidget(mSoundRepeat);
 #endif
 
@@ -978,13 +978,13 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 
 	mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript");
 	mCmdScript->setMinimumSize(mCmdScript->tqsizeHint());
-	TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript()));
+	TQWhatsThis::add(mCmdScript, defsetting.tqarg(EditAlarmDlg::i18n_EnterScript()));
 	tqlayout->addWidget(mCmdScript);
 	tqlayout->addStretch();
 
 	mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm");
 	mCmdXterm->setMinimumSize(mCmdXterm->tqsizeHint());
-	TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow()));
+	TQWhatsThis::add(mCmdXterm, defsetting.tqarg(EditAlarmDlg::i18n_ExecInTermWindow()));
 	tqlayout->addWidget(mCmdXterm);
 
 	// EMAIL ALARMS
@@ -995,21 +995,21 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
 	// BCC email to sender
 	mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
 	mEmailBcc->setMinimumSize(mEmailBcc->tqsizeHint());
-	TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
+	TQWhatsThis::add(mEmailBcc, defsetting.tqarg(EditAlarmDlg::i18n_CopyEmailToSelf()));
 	tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
 
 	// MISCELLANEOUS
 	// Show in KOrganizer
 	mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg");
 	mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->tqsizeHint());
-	TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer()));
+	TQWhatsThis::add(mCopyToKOrganizer, defsetting.tqarg(EditAlarmDlg::i18n_ShowInKOrganizer()));
 
 	// Late cancellation
 	box = new TQHBox(mPage);
 	box->setSpacing(KDialog::spacingHint());
 	mLateCancel = new TQCheckBox(LateCancelSelector::i18n_n_CancelIfLate(), box, "defCancelLate");
 	mLateCancel->setMinimumSize(mLateCancel->tqsizeHint());
-	TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate()));
+	TQWhatsThis::add(mLateCancel, defsetting.tqarg(LateCancelSelector::i18n_CancelIfLate()));
 	box->setStretchFactor(new TQWidget(box), 1);    // left adjust the control
 
 	// Recurrence
@@ -1179,7 +1179,7 @@ TQString EditPrefTab::validate()
 	if (mSound->currentItem() == SoundPicker::PLAY_FILE  &&  mSoundFile->text().isEmpty())
 	{
 		mSoundFile->setFocus();
-		return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());;
+		return i18n("You must enter a sound file when %1 is selected as the default sound type").tqarg(SoundPicker::i18n_File());;
 	}
 	return TQString();
 }