summaryrefslogtreecommitdiffstats
path: root/kalarm/mainwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/mainwindow.cpp')
-rw-r--r--kalarm/mainwindow.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 6ebe19c8..07e976c6 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -221,7 +221,7 @@ void MainWindow::readProperties(KConfig* config)
}
/******************************************************************************
-* Get the main main window, i.e. the parent of the system tray icon, or if
+* Get the main main window, i.e. the tqparent of the system tray icon, or if
* none, the first main window to be created. Visible windows take precedence
* over hidden ones.
*/
@@ -241,7 +241,7 @@ MainWindow* MainWindow::mainMainWindow()
}
/******************************************************************************
-* Check whether this main window is the parent of the system tray icon.
+* Check whether this main window is the tqparent of the system tray icon.
*/
bool MainWindow::isTrayParent() const
{
@@ -330,17 +330,17 @@ void MainWindow::initActions()
mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQT_SLOT(slotNew()), actions, "new");
mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
mActionCreateTemplate = new KAction(i18n("Create Tem&plate..."), 0, this, TQT_SLOT(slotNewTemplate()), actions, "createTemplate");
- mActionCopy = new KAction(i18n("&Copy..."), "editcopy", Qt::SHIFT+Qt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy");
- mActionModify = new KAction(i18n("&Edit..."), "edit", Qt::CTRL+Qt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify");
- mActionDelete = new KAction(i18n("&Delete"), "editdelete", Qt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete");
- mActionReactivate = new KAction(i18n("Reac&tivate"), 0, Qt::CTRL+Qt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete");
- mActionEnable = new KAction(TQString::null, 0, Qt::CTRL+Qt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable");
- mActionView = new KAction(i18n("&View"), "viewmag", Qt::CTRL+Qt::Key_W, this, TQT_SLOT(slotView()), actions, "view");
- mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), Qt::CTRL+Qt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
+ mActionCopy = new KAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy");
+ mActionModify = new KAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify");
+ mActionDelete = new KAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete");
+ mActionReactivate = new KAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete");
+ mActionEnable = new KAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable");
+ mActionView = new KAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQT_SLOT(slotView()), actions, "view");
+ mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
mActionShowTime->setCheckedState(i18n("Hide &Alarm Times"));
- mActionShowTimeTo = new KToggleAction(i18n_o_ShowTimeToAlarms(), Qt::CTRL+Qt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
+ mActionShowTimeTo = new KToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms"));
- mActionShowExpired = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", Qt::CTRL+Qt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
+ mActionShowExpired = new KToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms());
mActionToggleTrayIcon = new KToggleAction(i18n("Show in System &Tray"), 0, this, TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray");
mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray"));
@@ -366,9 +366,9 @@ void MainWindow::initActions()
}
mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo");
mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo");
- KStdAction::find(mListView, TQT_SLOT(slotFind()), actions);
- mActionFindNext = KStdAction::tqfindNext(mListView, TQT_SLOT(slotFindNext()), actions);
- mActionFindPrev = KStdAction::tqfindPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
+ KStdAction::tqfind(mListView, TQT_SLOT(slotFind()), actions);
+ mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions);
+ mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions);
KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions);
KStdAction::quit(this, TQT_SLOT(slotQuit()), actions);
@@ -386,7 +386,7 @@ void MainWindow::initActions()
connect(mActionUndo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotUndoItem(int)));
connect(mActionRedo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitRedoMenu()));
connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int)));
- connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&)));
+ connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndotqStatus(const TQString&, const TQString&)));
connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool)));
Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPrefsChanged()));
connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction()));
@@ -415,7 +415,7 @@ void MainWindow::initActions()
tb->applySettings(KGlobal::config(), "Toolbars");
Undo::emitChanged(); // set the Undo/Redo menu texts
- Daemon::checkStatus();
+ Daemon::checktqStatus();
Daemon::monitoringAlarms();
}
@@ -947,7 +947,7 @@ void MainWindow::updateTrayIconAction()
*/
void MainWindow::updateActionsMenu()
{
- Daemon::checkStatus(); // update the Alarms Enabled item status
+ Daemon::checktqStatus(); // update the Alarms Enabled item status
}
/******************************************************************************
@@ -1033,7 +1033,7 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type)
* Called when the status of the Undo or Redo list changes.
* Change the Undo or Redo text to include the action which would be undone/redone.
*/
-void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo)
+void MainWindow::slotUndotqStatus(const TQString& undo, const TQString& redo)
{
if (undo.isNull())
{
@@ -1118,7 +1118,7 @@ void MainWindow::closeEvent(TQCloseEvent* ce)
if (!theApp()->sessionClosingDown() && isTrayParent())
{
// The user (not the session manager) wants to close the window.
- // It's the parent window of the system tray icon, so just hide
+ // It's the tqparent window of the system tray icon, so just hide
// it to prevent the system tray icon closing.
hide();
theApp()->quitIf();
@@ -1181,7 +1181,7 @@ void MainWindow::dropEvent(TQDropEvent* e)
static TQString getMailHeader(const char* header, KMime::Content& content)
{
KMime::Headers::Base* hd = content.getHeaderByType(header);
- return hd ? hd->asUnicodeString() : TQString::null;
+ return hd ? hd->asUnicodeString() : TQString();
}
/******************************************************************************
@@ -1257,7 +1257,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
TQDateTime dt;
dt.setTime_t(summary.date());
TQString body = KAMail::getMailBody(summary.serialNumber());
- alarmText.setEmail(summary.to(), summary.from(), TQString::null,
+ alarmText.setEmail(summary.to(), summary.from(), TQString(),
KGlobal::locale()->formatDateTime(dt), summary.subject(),
body, summary.serialNumber());
}
@@ -1350,7 +1350,7 @@ void MainWindow::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p
*/
void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoint& pt, int)
{
- if (button != Qt::RightButton && !item)
+ if (button != TQt::RightButton && !item)
{
kdDebug(5950) << "MainWindow::slotMouseClicked(left)" << endl;
mListView->clearSelection();
@@ -1397,7 +1397,7 @@ void MainWindow::setEnableText(bool enable)
*/
MainWindow* MainWindow::toggleWindow(MainWindow* win)
{
- if (win && mWindowList.find(win) != mWindowList.end())
+ if (win && mWindowList.tqfind(win) != mWindowList.end())
{
// A window is specified (and it exists)
if (win->isVisible())