summaryrefslogtreecommitdiffstats
path: root/kalarm/traywindow.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:50:21 -0600
commit3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (patch)
tree89de88213bd261e4ccaade899ab2d6ec34b3a5a7 /kalarm/traywindow.cpp
parent1dad5f662a09dfc5cc041caffe0f674044a4dcec (diff)
downloadtdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.tar.gz
tdepim-3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kalarm/traywindow.cpp')
-rw-r--r--kalarm/traywindow.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 9f3524b9d..81af39266 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(setEnabledtqStatus(bool)));
+ connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(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::checktqStatus();
- setEnabledtqStatus(Daemon::monitoringAlarms());
+ Daemon::checkStatus();
+ setEnabledStatus(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::checktqStatus();
+ Daemon::checkStatus();
}
/******************************************************************************
@@ -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::setEnabledtqStatus(bool status)
+void TrayWindow::setEnabledStatus(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::tqcurrentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
// 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)").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
+ item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").arg(prefix).arg(mins/60).arg(minutes);
else
- item.text += i18n("prefix + hours:minutes", "%1%2:%3").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
+ item.text += i18n("prefix + hours:minutes", "%1%2:%3").arg(prefix).arg(mins/60).arg(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* tqchildren = 0;
- unsigned int ntqchildren;
+ Window* children = 0;
+ unsigned int nchildren;
// 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, &tqchildren, &ntqchildren))
+ if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren))
return true; // error determining its parent X window
- if (tqchildren)
- XFree(tqchildren);
+ if (children)
+ XFree(children);
// 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").tqarg(kapp->aboutData()->programName());
+ text = i18n("%1 - disabled").arg(kapp->aboutData()->programName());
kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
if (Preferences::tooltipAlarmCount())
parent->tooltipAlarmText(text);