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, 13 insertions, 13 deletions

diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 21efed81..906ff2cc 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -53,7 +53,7 @@
 class TrayTooltip : public TQToolTip
 {
 	public:
-		TrayTooltip(TQWidget* tqparent) : TQToolTip(tqparent) { }
+		TrayTooltip(TQWidget* parent) : TQToolTip(parent) { }
 		virtual ~TrayTooltip() {}
 	protected:
 		virtual void maybeTip(const TQPoint&);
@@ -71,9 +71,9 @@ struct TipItem
 = The KDE system tray window.
 =============================================================================*/
 
-TrayWindow::TrayWindow(MainWindow* tqparent, const char* name)
-	: KSystemTray((theApp()->wantRunInSystemTray() ? tqparent : 0), name),
-	  mAssocMainWindow(tqparent)
+TrayWindow::TrayWindow(MainWindow* parent, const char* name)
+	: KSystemTray((theApp()->wantRunInSystemTray() ? parent : 0), name),
+	  mAssocMainWindow(parent)
 {
 	kdDebug(5950) << "TrayWindow::TrayWindow()\n";
 	// Set up GUI icons
@@ -316,7 +316,7 @@ void TrayWindow::removeWindow(MainWindow* win)
 /******************************************************************************
 * Check whether the widget is in the system tray.
 * Note that it is only sometime AFTER the show event that the system tray
-* becomes the widget's tqparent. So for a definitive status, call this method
+* becomes the widget's parent. So for a definitive status, call this method
 * only after waiting a bit...
 * Reply = true if the widget is in the system tray, or its status can't be determined.
 *       = false if it is not currently in the system tray.
@@ -324,18 +324,18 @@ void TrayWindow::removeWindow(MainWindow* win)
 bool TrayWindow::inSystemTray() const
 {
 #ifdef HAVE_X11_HEADERS
-	Window  xParent;    // receives tqparent window
+	Window  xParent;    // receives parent window
 	Window  root;
 	Window* tqchildren = 0;
 	unsigned int ntqchildren;
-	// Find the X tqparent window of the widget. This is not the same as the TQt tqparent widget.
+	// 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))
-		return true;    // error determining its tqparent X window
+		return true;    // error determining its parent X window
 	if (tqchildren)
 		XFree(tqchildren);
 
-	// If it is in the system tray, the system tray window will be its X tqparent.
-	// Otherwise, the root window will be its X tqparent.
+	// 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.
 	return xParent != root;
 #else
 	return true;
@@ -348,7 +348,7 @@ bool TrayWindow::inSystemTray() const
 */
 void TrayTooltip::maybeTip(const TQPoint&)
 {
-	TrayWindow* tqparent = (TrayWindow*)parentWidget();
+	TrayWindow* parent = (TrayWindow*)parentWidget();
 	TQString text;
 	if (Daemon::monitoringAlarms())
 		text = kapp->aboutData()->programName();
@@ -356,6 +356,6 @@ void TrayTooltip::maybeTip(const TQPoint&)
 		text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName());
 	kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
 	if (Preferences::tooltipAlarmCount())
-		tqparent->tooltipAlarmText(text);
-	tip(tqparent->rect(), text);
+		parent->tooltipAlarmText(text);
+	tip(parent->rect(), text);
 }