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, 18 insertions, 18 deletions

diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index b93f681e6..f4ea9e654 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -129,10 +129,10 @@ inline TQString recurText(const KAEvent& event)
 {
 	TQString r;
 	if (event.repeatCount())
-		r = TQString::tqfromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText());
+		r = TQString::tqfromLatin1("%1 / %2").tqarg(event.recurrenceText()).tqarg(event.repetitionText());
 	else
 		r = event.recurrenceText();
-	return i18n("&Recurrence - [%1]").arg(r);
+	return i18n("&Recurrence - [%1]").tqarg(r);
 }
 
 // Collect these widget labels together to ensure consistent wording and
@@ -273,7 +273,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
 	tqlayout->addWidget(mEmailFrame);
 
 	// Deferred date/time: visible only for a deferred recurring event.
-	mDeferGroup = new TQGroupBox(1, TQt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
+	mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup");
 	topLayout->addWidget(mDeferGroup);
 	TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup);
 	label->setFixedSize(label->tqsizeHint());
@@ -318,8 +318,8 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
 		mTemplateTime->setFixedSize(mTemplateTime->tqsizeHint());
 		mTemplateTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateTime,
-		      TQString("%1\n\n%2").arg(i18n("Enter the start time for alarms based on this template."))
-		                         .arg(TimeSpinBox::shiftWhatsThis()));
+		      TQString("%1\n\n%2").tqarg(i18n("Enter the start time for alarms based on this template."))
+		                         .tqarg(TimeSpinBox::shiftWhatsThis()));
 		box->setStretchFactor(new TQWidget(box), 1);    // left adjust the controls
 		box->setFixedHeight(box->tqsizeHint().height());
 		grid->addWidget(box, 0, 1, tqalignment);
@@ -328,7 +328,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
 		mTemplateAnyTime->setFixedSize(mTemplateAnyTime->tqsizeHint());
 		mTemplateAnyTime->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateAnyTime,
-		      i18n("Set the '%1' option for alarms based on this template.").arg(i18n("Any time")));
+		      i18n("Set the '%1' option for alarms based on this template.").tqarg(i18n("Any time")));
 		grid->addWidget(mTemplateAnyTime, 1, 0, tqalignment);
 
 		box = new TQHBox(mTemplateTimeGroup);
@@ -345,8 +345,8 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
 		mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->tqsizeHint());
 		mTemplateTimeAfter->setReadOnly(mReadOnly);
 		TQWhatsThis::add(mTemplateTimeAfter,
-		      TQString("%1\n\n%2").arg(AlarmTimeWidget::i18n_TimeAfterPeriod())
-		                         .arg(TimeSpinBox::shiftWhatsThis()));
+		      TQString("%1\n\n%2").tqarg(AlarmTimeWidget::i18n_TimeAfterPeriod())
+		                         .tqarg(TimeSpinBox::shiftWhatsThis()));
 		box->setFixedHeight(box->tqsizeHint().height());
 		grid->addWidget(box, 1, 1, tqalignment);
 
@@ -363,7 +363,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* tqp
 	static const TQString reminderText = i18n("Enter how long in advance of the main alarm to display a reminder alarm.");
 	mReminder = new Reminder(i18n("Rem&inder:"),
 	                         i18n("Check to additionally display a reminder in advance of the main alarm time(s)."),
-	                         TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()),
+	                         TQString("%1\n\n%2").tqarg(reminderText).tqarg(TimeSpinBox::shiftWhatsThis()),
 	                         true, true, mainPage);
 	mReminder->setFixedSize(mReminder->tqsizeHint());
 	topLayout->addWidget(mReminder, 0, TQt::AlignAuto);
@@ -517,7 +517,7 @@ void EditAlarmDlg::initCommand(TQWidget* tqparent)
 
 	// Log file name edit box
 	TQHBox* box = new TQHBox(mCmdOutputGroup);
-	(new TQWidget(box))->setFixedWidth(button->style().subRect(TQStyle::SR_RadioButtonIndicator, button).width());   // indent the edit box
+	(new TQWidget(box))->setFixedWidth(button->tqstyle().subRect(TQStyle::SR_RadioButtonIndicator, button).width());   // indent the edit box
 //	(new TQWidget(box))->setFixedWidth(button->style().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth));   // indent the edit box
 	mCmdLogFileEdit = new LineEdit(LineEdit::Url, box);
 	mCmdLogFileEdit->setAcceptDrops(true);
@@ -712,7 +712,7 @@ void EditAlarmDlg::initialise(const KAEvent* event)
 				int afterTime = event->templateAfterTime();
 				if (afterTime >= 0)
 				{
-					mTimeWidget->setDateTime(now.addSecs(afterTime * 60));
+					mTimeWidget->setDateTime(TQDateTime(now.addSecs(afterTime * 60)));
 					mTimeWidget->selectTimeFromNow();
 				}
 				else
@@ -1424,7 +1424,7 @@ void EditAlarmDlg::slotOk()
 				mTabs->setCurrentPage(mMainPageIndex);
 				mReminder->setFocusOnCount();
 				KMessageBox::sorry(this, i18n("Reminder period must be less than the recurrence interval, unless '%1' is checked."
-				                             ).arg(Reminder::i18n_first_recurrence_only()));
+				                             ).tqarg(Reminder::i18n_first_recurrence_only()));
 				return;
 			}
 		}
@@ -1479,15 +1479,15 @@ void EditAlarmDlg::slotTry()
 			if (mCommandRadio->isOn()  &&  mCmdOutputGroup->selectedId() != EXEC_IN_TERMINAL)
 			{
 				theApp()->commandMessage((ShellProcess*)proc, this);
-				KMessageBox::information(this, i18n("Command executed:\n%1").arg(text));
+				KMessageBox::information(this, i18n("Command executed:\n%1").tqarg(text));
 				theApp()->commandMessage((ShellProcess*)proc, 0);
 			}
 			else if (mEmailRadio->isOn())
 			{
 				TQString bcc;
 				if (mEmailBcc->isChecked())
-					bcc = i18n("\nBcc: %1").arg(Preferences::emailBccAddress());
-				KMessageBox::information(this, i18n("Email sent to:\n%1%2").arg(mEmailAddresses.join("\n")).arg(bcc));
+					bcc = i18n("\nBcc: %1").tqarg(Preferences::emailBccAddress());
+				KMessageBox::information(this, i18n("Email sent to:\n%1%2").tqarg(mEmailAddresses.join("\n")).tqarg(bcc));
 			}
 		}
 	}
@@ -1728,7 +1728,7 @@ bool EditAlarmDlg::checkEmailData()
 			if (!bad.isEmpty())
 			{
 				mEmailToEdit->setFocus();
-				KMessageBox::error(this, i18n("Invalid email address:\n%1").arg(bad));
+				KMessageBox::error(this, i18n("Invalid email address:\n%1").tqarg(bad));
 				return false;
 			}
 		}
@@ -1752,7 +1752,7 @@ bool EditAlarmDlg::checkEmailData()
 					break;      // empty
 				case -1:
 					mEmailAttachList->setFocus();
-					KMessageBox::error(this, i18n("Invalid email attachment:\n%1").arg(att));
+					KMessageBox::error(this, i18n("Invalid email attachment:\n%1").tqarg(att));
 					return false;
 			}
 		}
@@ -2012,7 +2012,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
 				default:
 					break;
 			}
-			if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.arg(alarmtext))
+			if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.tqarg(alarmtext))
 			    == KMessageBox::Cancel)
 				return false;
 		}