rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 8 deletions

diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 775821c5e..8a620afd5 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -788,7 +788,7 @@ void KAlarmApp::quitIf(int exitCode, bool force)
 		MainWindow* mw = mwcount ? MainWindow::firstWindow() : 0;
 		if (mwcount > 1  ||  mwcount && (!mw->isHidden() || !mw->isTrayParent()))
 			return;
-		// There are no windows left except perhaps a main window which is a hidden tray icon tqparent
+		// There are no windows left except perhaps a main window which is a hidden tray icon parent
 		if (mTrayWindow)
 		{
 			// There is a system tray icon.
@@ -816,11 +816,11 @@ void KAlarmApp::quitIf(int exitCode, bool force)
 * Closes the system tray window and all main windows, but does not exit the
 * program if other windows are still open.
 */
-void KAlarmApp::doQuit(TQWidget* tqparent)
+void KAlarmApp::doQuit(TQWidget* parent)
 {
 	kdDebug(5950) << "KAlarmApp::doQuit()\n";
 	if (mDisableAlarmsIfStopped
-	&&  MessageBox::warningContinueCancel(tqparent, KMessageBox::Cancel,
+	&&  MessageBox::warningContinueCancel(parent, KMessageBox::Cancel,
 	                                      i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."),
 	                                      TQString(), KStdGuiItem::quit(), Preferences::TQUIT_WARN
 	                                     ) != KMessageBox::Yes)
@@ -973,7 +973,7 @@ void KAlarmApp::removeWindow(TrayWindow*)
 /******************************************************************************
 *  Display or close the system tray icon.
 */
-bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent)
+bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent)
 {
 	static bool creating = false;
 	if (show)
@@ -985,10 +985,10 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* tqparent)
 			if (!MainWindow::count()  &&  wantRunInSystemTray())
 			{
 				creating = true;    // prevent main window constructor from creating an additional tray icon
-				tqparent = MainWindow::create();
+				parent = MainWindow::create();
 				creating = false;
 			}
-			mTrayWindow = new TrayWindow(tqparent ? tqparent : MainWindow::firstWindow());
+			mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow());
 			connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled()));
 			mTrayWindow->show();
 			emit trayIconToggled();
@@ -1917,7 +1917,7 @@ void KAlarmApp::commandErrorMsg(const ShellProcess* proc, const KAEvent& event,
 /******************************************************************************
 * Notes that an informational KMessageBox is displayed for this process.
 */
-void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent)
+void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* parent)
 {
 	// Find this command in the command list
 	for (TQValueList<ProcData*>::Iterator it = mCommandProcesses.begin();  it != mCommandProcesses.end();  ++it)
@@ -1925,7 +1925,7 @@ void KAlarmApp::commandMessage(ShellProcess* proc, TQWidget* tqparent)
 		ProcData* pd = *it;
 		if (pd->process == proc)
 		{
-			pd->messageBoxParent = tqparent;
+			pd->messageBoxParent = parent;
 			break;
 		}
 	}