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

diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index c6a0916c8..7bf51b0a6 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -429,12 +429,12 @@ void MessageWin::initView()
 			if (mDateTime.isDateOnly()  ||  TQDate::tqcurrentDate().daysTo(mDateTime.date()) > 0)
 			{
 				setRemainingTextDay();
-				MidnightTimer::connect(this, TQT_SLOT(setRemainingTextDay()));    // update every day
+				MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay()));    // update every day
 			}
 			else
 			{
 				setRemainingTextMinute();
-				MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute()));   // update every minute
+				MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute()));   // update every minute
 			}
 			topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter);
 			topLayout->addSpacing(KDialog::spacingHint());
@@ -510,7 +510,7 @@ void MessageWin::initView()
 	mOkButton = new KPushButton(KStdGuiItem::close(), topWidget);
 	// Prevent accidental acknowledgement of the message if the user is typing when the window appears
 	mOkButton->clearFocus();
-	mOkButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
+	mOkButton->setFocusPolicy(Qt::ClickFocus);    // don't allow keyboard selection
 	mOkButton->setFixedSize(mOkButton->tqsizeHint());
 	connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
 	grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter);
@@ -520,7 +520,7 @@ void MessageWin::initView()
 	{
 		// Edit button
 		mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
-		mEditButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
+		mEditButton->setFocusPolicy(Qt::ClickFocus);    // don't allow keyboard selection
 		mEditButton->setFixedSize(mEditButton->tqsizeHint());
 		connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
 		grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter);
@@ -531,7 +531,7 @@ void MessageWin::initView()
 	{
 		// Defer button
 		mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget);
-		mDeferButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
+		mDeferButton->setFocusPolicy(Qt::ClickFocus);    // don't allow keyboard selection
 		mDeferButton->setFixedSize(mDeferButton->tqsizeHint());
 		connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer()));
 		grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter);
@@ -619,9 +619,9 @@ void MessageWin::setRemainingTextDay()
 	if (days <= 0  &&  !mDateTime.isDateOnly())
 	{
 		// The alarm is due today, so start refreshing every minute
-		MidnightTimer::disconnect(this, TQT_SLOT(setRemainingTextDay()));
+		MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay()));
 		setRemainingTextMinute();
-		MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute()));   // update every minute
+		MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute()));   // update every minute
 	}
 	else
 	{
@@ -650,7 +650,7 @@ void MessageWin::setRemainingTextMinute()
 	else if (mins % 60 == 1)
 		text = i18n("in 1 hour 1 minute's time", "in %n hours 1 minute's time", mins/60);
 	else
-		text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).arg(mins%60);
+		text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).tqarg(mins%60);
 	mRemainingText->setText(text);
 }
 
@@ -859,7 +859,7 @@ void MessageWin::slotPlayAudio()
 		kdError(5950) << "MessageWin::playAudio(): Open failure: " << mAudioFile << endl;
 		if (!haveErrorMessage(ErrMsg_AudioFile))
 		{
-			KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mAudioFile));
+			KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mAudioFile));
 			clearErrorMessage(ErrMsg_AudioFile);
 		}
 		return;
@@ -882,7 +882,7 @@ void MessageWin::slotPlayAudio()
 			kdWarning(5950) << "Unable to set master volume (KMix: " << mKMixError << ")\n";
 			if (!haveErrorMessage(ErrMsg_Volume))
 			{
-				KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError),
+				KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").tqarg(mKMixError),
 				                         TQString(), TQString::tqfromLatin1("KMixError"));
 				clearErrorMessage(ErrMsg_Volume);
 			}
@@ -1497,7 +1497,7 @@ void MessageWin::setDeferralLimit(const KAEvent& event)
 	if (mDeferButton)
 	{
 		mDeferLimit = event.deferralLimit().dateTime();
-		MidnightTimer::connect(this, TQT_SLOT(checkDeferralLimit()));   // check every day
+		MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit()));   // check every day
 		mDisableDeferral = false;
 		checkDeferralLimit();
 	}
@@ -1519,7 +1519,7 @@ void MessageWin::checkDeferralLimit()
 	int n = TQDate::tqcurrentDate().daysTo(mDeferLimit.date());
 	if (n > 0)
 		return;
-	MidnightTimer::disconnect(this, TQT_SLOT(checkDeferralLimit()));
+	MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit()));
 	if (n == 0)
 	{
 		// The deferral limit will be reached today
@@ -1540,7 +1540,7 @@ void MessageWin::checkDeferralLimit()
 */
 void MessageWin::slotDefer()
 {
-	mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime::tqcurrentDateTime().addSecs(60),
+	mDeferDlg = new DeferAlarmDlg(i18n("Defer Alarm"), TQDateTime(TQDateTime::tqcurrentDateTime().addSecs(60)),
 	                              false, this, "deferDlg");
 	if (mDefaultDeferMinutes > 0)
 		mDeferDlg->setDeferMinutes(mDefaultDeferMinutes);