Rename old tq methods that no longer need a unique name

1 files changed, 26 insertions, 26 deletions

diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 6985430b5..d6597fe20 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -71,11 +71,11 @@ using namespace KCal;
 static const char* UI_FILE     = "kalarmui.rc";
 static const char* WINDOW_NAME = "MainWindow";
 
-static const TQString VIEW_GROUP         = TQString::tqfromLatin1("View");
-static const TQString SHOW_TIME_KEY      = TQString::tqfromLatin1("ShowAlarmTime");
-static const TQString SHOW_TIME_TO_KEY   = TQString::tqfromLatin1("ShowTimeToAlarm");
-static const TQString SHOW_ARCHIVED_KEY  = TQString::tqfromLatin1("ShowArchivedAlarms");
-static const TQString SHOW_RESOURCES_KEY = TQString::tqfromLatin1("ShowResources");
+static const TQString VIEW_GROUP         = TQString::fromLatin1("View");
+static const TQString SHOW_TIME_KEY      = TQString::fromLatin1("ShowAlarmTime");
+static const TQString SHOW_TIME_TO_KEY   = TQString::fromLatin1("ShowTimeToAlarm");
+static const TQString SHOW_ARCHIVED_KEY  = TQString::fromLatin1("ShowArchivedAlarms");
+static const TQString SHOW_RESOURCES_KEY = TQString::fromLatin1("ShowResources");
 
 static TQString   undoText;
 static TQString   undoTextStripped;
@@ -123,7 +123,7 @@ MainWindow::MainWindow(bool restored)
 	  mHiddenTrayParent(false)
 {
 	kdDebug(5950) << "MainWindow::MainWindow()\n";
-	setAutoSaveSettings(TQString::tqfromLatin1(WINDOW_NAME));    // save window sizes etc.
+	setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME));    // save window sizes etc.
 	setPlainCaption(kapp->aboutData()->programName());
 	KConfig* config = KGlobal::config();
 	config->setGroup(VIEW_GROUP);
@@ -136,8 +136,8 @@ MainWindow::MainWindow(bool restored)
 		if (KAlarm::readConfigWindowSize(WINDOW_NAME, s))
 			resize(s);
 	}
-	config->setGroup(TQString::tqfromLatin1(WINDOW_NAME));
-	TQValueList<int> order = config->readIntListEntry(TQString::tqfromLatin1("ColumnOrder"));
+	config->setGroup(TQString::fromLatin1(WINDOW_NAME));
+	TQValueList<int> order = config->readIntListEntry(TQString::fromLatin1("ColumnOrder"));
 
 	setAcceptDrops(true);         // allow drag-and-drop onto this window
 	if (!mShowTimeTo)
@@ -201,10 +201,10 @@ MainWindow::~MainWindow()
 */
 void MainWindow::saveProperties(KConfig* config)
 {
-	config->writeEntry(TQString::tqfromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
-	config->writeEntry(TQString::tqfromLatin1("ShowExpired"), mShowExpired);
-	config->writeEntry(TQString::tqfromLatin1("ShowTime"), mShowTime);
-	config->writeEntry(TQString::tqfromLatin1("ShowTimeTo"), mShowTimeTo);
+	config->writeEntry(TQString::fromLatin1("HiddenTrayParent"), isTrayParent() && isHidden());
+	config->writeEntry(TQString::fromLatin1("ShowExpired"), mShowExpired);
+	config->writeEntry(TQString::fromLatin1("ShowTime"), mShowTime);
+	config->writeEntry(TQString::fromLatin1("ShowTimeTo"), mShowTimeTo);
 }
 
 /******************************************************************************
@@ -214,10 +214,10 @@ void MainWindow::saveProperties(KConfig* config)
 */
 void MainWindow::readProperties(KConfig* config)
 {
-	mHiddenTrayParent = config->readBoolEntry(TQString::tqfromLatin1("HiddenTrayParent"));
-	mShowExpired      = config->readBoolEntry(TQString::tqfromLatin1("ShowExpired"));
-	mShowTime         = config->readBoolEntry(TQString::tqfromLatin1("ShowTime"));
-	mShowTimeTo       = config->readBoolEntry(TQString::tqfromLatin1("ShowTimeTo"));
+	mHiddenTrayParent = config->readBoolEntry(TQString::fromLatin1("HiddenTrayParent"));
+	mShowExpired      = config->readBoolEntry(TQString::fromLatin1("ShowExpired"));
+	mShowTime         = config->readBoolEntry(TQString::fromLatin1("ShowTime"));
+	mShowTimeTo       = config->readBoolEntry(TQString::fromLatin1("ShowTimeTo"));
 }
 
 /******************************************************************************
@@ -294,7 +294,7 @@ void MainWindow::show()
 		// Show error message now that the main window has been displayed.
 		// Waiting until now lets the user easily associate the message with
 		// the main window which is faulty.
-		KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").tqarg(TQString::tqfromLatin1(UI_FILE)));
+		KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").tqarg(TQString::fromLatin1(UI_FILE)));
 		mMenuError = false;
 	}
 }
@@ -315,8 +315,8 @@ void MainWindow::hideEvent(TQHideEvent* he)
 void MainWindow::columnsReordered()
 {
 	KConfig* config = KGlobal::config();
-	config->setGroup(TQString::tqfromLatin1(WINDOW_NAME));
-	config->writeEntry(TQString::tqfromLatin1("ColumnOrder"), mListView->columnOrder());
+	config->setGroup(TQString::fromLatin1(WINDOW_NAME));
+	config->writeEntry(TQString::fromLatin1("ColumnOrder"), mListView->columnOrder());
 	config->sync();
 }
 
@@ -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(slotUndotqStatus(const TQString&, const TQString&)));
+	connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&)));
 	connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool)));
 	Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(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::checktqStatus();
+	Daemon::checkStatus();
 	Daemon::monitoringAlarms();
 }
 
@@ -947,7 +947,7 @@ void MainWindow::updateTrayIconAction()
 */
 void MainWindow::updateActionsMenu()
 {
-	Daemon::checktqStatus();   // update the Alarms Enabled item status
+	Daemon::checkStatus();   // 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::slotUndotqStatus(const TQString& undo, const TQString& redo)
+void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo)
 {
 	if (undo.isNull())
 	{
@@ -1196,7 +1196,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
 	AlarmText      alarmText;
 	KPIM::MailList mailList;
 	KURL::List     files;
-	KCal::CalendarLocal calendar(TQString::tqfromLatin1("UTC"));
+	KCal::CalendarLocal calendar(TQString::fromLatin1("UTC"));
 	calendar.setLocalTime();    // default to local time (i.e. no time zone)
 #ifndef NDEBUG
 	TQCString fmts;
@@ -1213,7 +1213,7 @@ void MainWindow::executeDropEvent(MainWindow* win, TQDropEvent* e)
 	 * Don't change them without careful thought !!
 	 */
 	if (e->provides("message/rfc822")
-	&&  !(bytes = e->tqencodedData("message/rfc822")).isEmpty())
+	&&  !(bytes = e->encodedData("message/rfc822")).isEmpty())
 	{
 		// Email message(s). Ignore all but the first.
 		kdDebug(5950) << "MainWindow::executeDropEvent(email)" << endl;
@@ -1299,7 +1299,7 @@ void MainWindow::slotSelection()
 	bool enableEnableDisable = true;
 	bool enableEnable = false;
 	bool enableDisable = false;
-	TQDateTime now = TQDateTime::tqcurrentDateTime();
+	TQDateTime now = TQDateTime::currentDateTime();
 	for (TQValueList<EventListViewItemBase*>::Iterator it = items.begin();  it != items.end();  ++it)
 	{
 		const KAEvent& event = ((AlarmListViewItem*)(*it))->event();