rename the following methods:

tqparent parent
tqmask mask


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

4 files changed, 31 insertions, 31 deletions

diff --git a/gtk2/kgtk2.c b/gtk2/kgtk2.c
index 1c97f8a..0dddab5 100644
--- a/gtk2/kgtk2.c
+++ b/gtk2/kgtk2.c
@@ -149,7 +149,7 @@ static const gchar *getAppName(const gchar *app)
         const gchar *a=app ? app : kgtk_get_app_name(getpid());
         gchar       *slash;
 
-        /* Was the cmdline app java? if so, try to use its tqparent name - just in case
+        /* Was the cmdline app java? if so, try to use its parent name - just in case
            its run from a shell script, etc. - e.g. as eclipse does */
         if(a && 0==strcmp(a, "java"))
             a=kgtk_get_app_name(getppid());
@@ -249,7 +249,7 @@ static gboolean sendMessage(GtkWidget *widget, Operation op, GSList **res, gchar
             if(widget->parent)
             {
 #ifdef KGTK_DEBUG
-                printf("KGTK::Dialog has a tqparent!\n");
+                printf("KGTK::Dialog has a parent!\n");
 #endif
                 xid=GDK_WINDOW_XID(gtk_widget_get_toplevel(widget->parent));
             }
@@ -632,7 +632,7 @@ RowType;
 
 static GtkWidget *
 kgtk_file_chooser_dialog_new_valist (const gchar          *title,
-                                    GtkWindow            *tqparent,
+                                    GtkWindow            *parent,
                                     GtkFileChooserAction  action,
                                     const gchar          *backend,
                                     const gchar          *first_button_text,
@@ -648,8 +648,8 @@ kgtk_file_chooser_dialog_new_valist (const gchar          *title,
                          "file-system-backend", backend,
                          NULL);
 
-  if (tqparent)
-    gtk_window_set_transient_for (GTK_WINDOW (result), tqparent);
+  if (parent)
+    gtk_window_set_transient_for (GTK_WINDOW (result), parent);
 
   while (button_text)
     {
@@ -1737,7 +1737,7 @@ void g_signal_stop_emission_by_name(gpointer instance, const gchar *detailed_sig
 #endif
 }
 
-GtkWidget * gtk_file_chooser_dialog_new(const gchar *title, GtkWindow *tqparent,
+GtkWidget * gtk_file_chooser_dialog_new(const gchar *title, GtkWindow *parent,
                              GtkFileChooserAction action, const gchar *first_button_text,
                              ...)
 {
@@ -1748,7 +1748,7 @@ GtkWidget * gtk_file_chooser_dialog_new(const gchar *title, GtkWindow *tqparent,
     va_list      varargs;
 
     va_start(varargs, first_button_text);
-    dlg=kgtk_file_chooser_dialog_new_valist(title, tqparent, action, NULL, first_button_text, varargs);
+    dlg=kgtk_file_chooser_dialog_new_valist(title, parent, action, NULL, first_button_text, varargs);
     va_end(varargs);
 
 #ifdef KGTK_DEBUG
diff --git a/kdialogd3/kdialogd.cpp b/kdialogd3/kdialogd.cpp
index b7a84c7..5049f69 100644
--- a/kdialogd3/kdialogd.cpp
+++ b/kdialogd3/kdialogd.cpp
@@ -121,7 +121,7 @@ static int createSocket()
     return sockitsFd;
 }
 
-static void urls2Local(KURL::List &urls, TQStringList &items, TQWidget *tqparent)
+static void urls2Local(KURL::List &urls, TQStringList &items, TQWidget *parent)
 {
     KURL::List::Iterator it(urls.begin()),
                          end(urls.end());
@@ -132,7 +132,7 @@ static void urls2Local(KURL::List &urls, TQStringList &items, TQWidget *tqparent
         else
         {
 #if KDE_IS_VERSION(3, 5, 0)
-            KURL url(KIO::NetAccess::mostLocalURL(*it, tqparent));
+            KURL url(KIO::NetAccess::mostLocalURL(*it, parent));
 
             if(url.isLocalFile())
                 items.append(url.path());
@@ -144,8 +144,8 @@ static void urls2Local(KURL::List &urls, TQStringList &items, TQWidget *tqparent
         }
 }
 
-KDialogD::KDialogD(TQObject *tqparent)
-        : TQObject(tqparent),
+KDialogD::KDialogD(TQObject *parent)
+        : TQObject(parent),
 #ifdef KDIALOGD_APP
           itsTimer(NULL),
           itsTimeoutVal(DEFAULT_TIMEOUT),
@@ -272,8 +272,8 @@ void KDialogD::timeout()
 #endif
 }
 
-KDialogDClient::KDialogDClient(int sock, const TQString &an, TQObject *tqparent)
-              : TQObject(tqparent),
+KDialogDClient::KDialogDClient(int sock, const TQString &an, TQObject *parent)
+              : TQObject(parent),
                 itsFd(sock),
                 itsDlg(NULL),
                 itsAccepted(false),
@@ -624,10 +624,10 @@ KDialogDFileDialog::~KDialogDFileDialog()
 }
 
 KDialogDDirSelectDialog::KDialogDDirSelectDialog(TQString &an, const TQString &startDir, bool localOnly,
-                                                 TQWidget *tqparent, const char *name, bool modal)
+                                                 TQWidget *parent, const char *name, bool modal)
                        : KDirSelectDialog(startDir.isEmpty() || "~"==startDir
                                               ? TQDir::homeDirPath() : startDir,
-                                          localOnly, tqparent, name, modal),
+                                          localOnly, parent, name, modal),
                          itsAppName(an)
 {
     kdDebug() << "startDir:" << startDir << endl;
diff --git a/kdialogd3/kdialogd.h b/kdialogd3/kdialogd.h
index f317443..05ad19a 100644
--- a/kdialogd3/kdialogd.h
+++ b/kdialogd3/kdialogd.h
@@ -51,7 +51,7 @@ class KDialogDDirSelectDialog : public KDirSelectDialog
 
     KDialogDDirSelectDialog(TQString &an, const TQString &startDir = TQString(),
                             bool localOnly = false,
-                            TQWidget *tqparent = 0L,
+                            TQWidget *parent = 0L,
                             const char *name = 0, bool modal = false);
     virtual ~KDialogDDirSelectDialog();
 
@@ -75,7 +75,7 @@ class KDialogDClient : public TQObject
 
     public:
 
-    KDialogDClient(int sock, const TQString &an, TQObject *tqparent);
+    KDialogDClient(int sock, const TQString &an, TQObject *parent);
     virtual ~KDialogDClient();
 
     public slots:
@@ -114,7 +114,7 @@ class KDialogD : public TQObject
 
     public:
 
-    KDialogD(TQObject *tqparent=0L);
+    KDialogD(TQObject *parent=0L);
     virtual ~KDialogD();
 
     public slots:
diff --git a/qt3/kqt3.cpp b/qt3/kqt3.cpp
index 660a6ce..7407f76 100644
--- a/qt3/kqt3.cpp
+++ b/qt3/kqt3.cpp
@@ -102,7 +102,7 @@ static const char * getAppName(bool useTQt=true)
         const char *a=useTQt && tqApp ? tqApp->argv()[0] : getAppNameFromPid(getpid());
         const char *slash;
 
-        // Was the cmdline app java? if so, try to use its tqparent name - just in case
+        // Was the cmdline app java? if so, try to use its parent name - just in case
         //   its run from a shell script, etc. - e.g. as eclipse does
         if(a && 0==strcmp(a, "java"))
             a=getAppNameFromPid(getppid());
@@ -309,7 +309,7 @@ class KTQtDialog : public TQDialog
 {
     public:
 
-    KTQtDialog(TQWidget *tqparent) : TQDialog(tqparent, "kqt", true, WStyle_NoBorder|WX11BypassWM)
+    KTQtDialog(TQWidget *parent) : TQDialog(parent, "kqt", true, WStyle_NoBorder|WX11BypassWM)
     {
         resize(1, 1);
         setWindowOpacity(0.0);
@@ -391,13 +391,13 @@ class KTQtThread : public TQThread
     int         fd;
 };
 
-static bool sendMessage(TQWidget *tqparent, Operation op, TQStringList &res, TQString &selFilter,
+static bool sendMessage(TQWidget *parent, Operation op, TQStringList &res, TQString &selFilter,
                         const TQString &title, const TQString &p1, const TQString *p2, bool ow)
 {
     if(connectToKDialogD(getAppName()))
     {
         char o=(char)op;
-        int  xid=tqparent ? tqparent->tqtopLevelWidget()->winId() : tqApp->activeWindow()->winId();
+        int  xid=parent ? parent->tqtopLevelWidget()->winId() : tqApp->activeWindow()->winId();
 
         if(writeBlock(kdialogdSocket, &o, 1) &&
            writeBlock(kdialogdSocket, (char *)&xid, 4) &&
@@ -406,7 +406,7 @@ static bool sendMessage(TQWidget *tqparent, Operation op, TQStringList &res, TQS
            (p2? writeString(kdialogdSocket, *p2) : true) &&
            (OP_FILE_SAVE==op ? writeBool(kdialogdSocket, ow) : true))
         {
-            KTQtDialog dlg(tqparent);
+            KTQtDialog dlg(parent);
             KTQtThread thread(res, selFilter, kdialogdSocket, &dlg);
 
             thread.start();
@@ -486,14 +486,14 @@ static const TQString & startDir(const TQString &d)
 }
 
 TQString TQFileDialog::getOpenFileName(const TQString &initially, const TQString &filter,
-                                     TQWidget *tqparent, const char *name, const TQString &caption,
+                                     TQWidget *parent, const char *name, const TQString &caption,
                                      TQString *selectedFilter, bool resolveSymlinks)
 {
     TQStringList res;
     TQString     f(qt2KdeFilter(filter));
     kqtInit();
 
-    if(openKdeDialog(tqparent, caption, startDir(initially), &f, OP_FILE_OPEN, res, selectedFilter))
+    if(openKdeDialog(parent, caption, startDir(initially), &f, OP_FILE_OPEN, res, selectedFilter))
     {
         kde2TQtFilter(filter, selectedFilter);
         TQString fn(res.first());
@@ -504,7 +504,7 @@ TQString TQFileDialog::getOpenFileName(const TQString &initially, const TQString
     return TQString();
 }
 
-TQString TQFileDialog::getSaveFileName(const TQString &initially, const TQString &filter, TQWidget *tqparent,
+TQString TQFileDialog::getSaveFileName(const TQString &initially, const TQString &filter, TQWidget *parent,
                                      const char *name, const TQString &caption,
                                      TQString *selectedFilter, bool resolveSymlinks)
 {
@@ -512,7 +512,7 @@ TQString TQFileDialog::getSaveFileName(const TQString &initially, const TQString
     TQString     f(qt2KdeFilter(filter));
     kqtInit();
 
-    if (openKdeDialog(tqparent, caption, startDir(initially), &f, OP_FILE_SAVE, res, selectedFilter))
+    if (openKdeDialog(parent, caption, startDir(initially), &f, OP_FILE_SAVE, res, selectedFilter))
     {
         kde2TQtFilter(filter, selectedFilter);
         TQString fn(res.first());
@@ -523,7 +523,7 @@ TQString TQFileDialog::getSaveFileName(const TQString &initially, const TQString
     return TQString();
 }
 
-TQString TQFileDialog::getExistingDirectory(const TQString &dir, TQWidget *tqparent, const char *name,
+TQString TQFileDialog::getExistingDirectory(const TQString &dir, TQWidget *parent, const char *name,
                                           const TQString &caption, bool dirOnly, bool resolveSymlinks)
 {
     TQStringList res;
@@ -531,12 +531,12 @@ TQString TQFileDialog::getExistingDirectory(const TQString &dir, TQWidget *tqpar
 
     kqtInit();
 
-    return openKdeDialog(tqparent, caption, dir, NULL, OP_FOLDER, res, &dummy)
+    return openKdeDialog(parent, caption, dir, NULL, OP_FOLDER, res, &dummy)
             ? res.first()
             : TQString();
 }
 
-TQStringList TQFileDialog::getOpenFileNames(const TQString &filter, const TQString &dir, TQWidget *tqparent,
+TQStringList TQFileDialog::getOpenFileNames(const TQString &filter, const TQString &dir, TQWidget *parent,
                                           const char *name, const TQString &caption,
                                           TQString *selectedFilter, bool resolveSymlinks)
 {
@@ -544,7 +544,7 @@ TQStringList TQFileDialog::getOpenFileNames(const TQString &filter, const TQStri
     TQString     f(qt2KdeFilter(filter));
     kqtInit();
 
-    openKdeDialog(tqparent, caption, startDir(dir), &f, OP_FILE_OPEN_MULTIPLE, res, selectedFilter);
+    openKdeDialog(parent, caption, startDir(dir), &f, OP_FILE_OPEN_MULTIPLE, res, selectedFilter);
 
     if(res.count())
     {