From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: 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
---
 kalarm/traywindow.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'kalarm/traywindow.cpp')

diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 190cb5384..3dd686a9e 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -88,15 +88,15 @@ TrayWindow::TrayWindow(MainWindow* tqparent, const char* name)
 	AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable");
 	a->plug(contextMenu());
 	connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledtqStatus(bool)));
-	KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
-	KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
-	KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu());
+	KAlarm::createNewAlarmAction(i18n("&New Alarm..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
+	KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
+	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu());
 
 	// Replace the default handler for the Quit context menu item
 	const char* quitName = KStdAction::name(KStdAction::Quit);
 	actcol->remove(actcol->action(quitName));
 	actcol->accel()->remove(quitName);
-	KStdAction::quit(this, TQT_SLOT(slotQuit()), actcol);
+	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol);
 
 	// Set icon to correspond with the alarms enabled menu status
 	Daemon::checktqStatus();
@@ -173,12 +173,12 @@ void TrayWindow::setEnabledtqStatus(bool status)
 */
 void TrayWindow::mousePressEvent(TQMouseEvent* e)
 {
-	if (e->button() == LeftButton  &&  !theApp()->wantRunInSystemTray())
+	if (e->button() == Qt::LeftButton  &&  !theApp()->wantRunInSystemTray())
 	{
 		// Left click: display/hide the first main window
 		mAssocMainWindow = MainWindow::toggleWindow(mAssocMainWindow);
 	}
-	else if (e->button() == MidButton)
+	else if (e->button() == Qt::MidButton)
 		MainWindow::executeNew();    // display a New Alarm dialog
 	else
 		KSystemTray::mousePressEvent(e);
@@ -191,7 +191,7 @@ void TrayWindow::mousePressEvent(TQMouseEvent* e)
 */
 void TrayWindow::mouseReleaseEvent(TQMouseEvent* e)
 {
-	if (e->button() == LeftButton  &&  mAssocMainWindow  &&  mAssocMainWindow->isVisible())
+	if (e->button() == Qt::LeftButton  &&  mAssocMainWindow  &&  mAssocMainWindow->isVisible())
 	{
 		mAssocMainWindow->raise();
 		mAssocMainWindow->setActiveWindow();
@@ -266,9 +266,9 @@ void TrayWindow::tooltipAlarmText(TQString& text) const
 				minutes[0] = (mins%60) / 10 + '0';
 				minutes[1] = (mins%60) % 10 + '0';
 				if (Preferences::showTooltipAlarmTime())
-					item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").arg(prefix).arg(mins/60).arg(minutes);
+					item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
 				else
-					item.text += i18n("prefix + hours:minutes", "%1%2:%3").arg(prefix).arg(mins/60).arg(minutes);
+					item.text += i18n("prefix + hours:minutes", "%1%2:%3").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
 				item.text += ' ';
 				space = true;
 			}
@@ -353,7 +353,7 @@ void TrayTooltip::maybeTip(const TQPoint&)
 	if (Daemon::monitoringAlarms())
 		text = kapp->aboutData()->programName();
 	else
-		text = i18n("%1 - disabled").arg(kapp->aboutData()->programName());
+		text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName());
 	kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
 	if (Preferences::tooltipAlarmCount())
 		tqparent->tooltipAlarmText(text);
-- 
cgit v1.2.1