Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 14 insertions, 14 deletions

diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 81af39266..9f3524b9d 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -87,7 +87,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name)
 	KActionCollection* actcol = actionCollection();
 	AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable");
 	a->plug(contextMenu());
-	connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool)));
+	connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledtqStatus(bool)));
 	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());
@@ -99,8 +99,8 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name)
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol);
 
 	// Set icon to correspond with the alarms enabled menu status
-	Daemon::checkStatus();
-	setEnabledStatus(Daemon::monitoringAlarms());
+	Daemon::checktqStatus();
+	setEnabledtqStatus(Daemon::monitoringAlarms());
 
 	mTooltip = new TrayTooltip(this);
 }
@@ -121,7 +121,7 @@ TrayWindow::~TrayWindow()
 void TrayWindow::contextMenuAboutToShow(KPopupMenu* menu)
 {
 	KSystemTray::contextMenuAboutToShow(menu);     // needed for KDE <= 3.1 compatibility
-	Daemon::checkStatus();
+	Daemon::checktqStatus();
 }
 
 /******************************************************************************
@@ -160,7 +160,7 @@ void TrayWindow::slotQuit()
 * Called when the Alarms Enabled action status has changed.
 * Updates the alarms enabled menu item check state, and the icon pixmap.
 */
-void TrayWindow::setEnabledStatus(bool status)
+void TrayWindow::setEnabledtqStatus(bool status)
 {
 	kdDebug(5950) << "TrayWindow::setEnabledStatus(" << (int)status << ")\n";
 	setPixmap(status ? mPixmapEnabled : mPixmapDisabled);
@@ -226,7 +226,7 @@ void TrayWindow::tooltipAlarmText(TQString& text) const
 	KAEvent event;
 	const TQString& prefix = Preferences::tooltipTimeToPrefix();
 	int maxCount = Preferences::tooltipAlarmCount();
-	TQDateTime now = TQDateTime::currentDateTime();
+	TQDateTime now = TQDateTime::tqcurrentDateTime();
 
 	// Get today's and tomorrow's alarms, sorted in time order
 	TQValueList<TipItem> items;
@@ -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;
 			}
@@ -326,13 +326,13 @@ bool TrayWindow::inSystemTray() const
 #ifdef HAVE_X11_HEADERS
 	Window  xParent;    // receives parent window
 	Window  root;
-	Window* children = 0;
-	unsigned int nchildren;
+	Window* tqchildren = 0;
+	unsigned int ntqchildren;
 	// Find the X parent window of the widget. This is not the same as the TQt parent widget.
-	if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren))
+	if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren))
 		return true;    // error determining its parent X window
-	if (children)
-		XFree(children);
+	if (tqchildren)
+		XFree(tqchildren);
 
 	// If it is in the system tray, the system tray window will be its X parent.
 	// Otherwise, the root window will be its X parent.
@@ -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())
 		parent->tooltipAlarmText(text);