Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

4 files changed, 16 insertions, 16 deletions

diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 81613785..90a8ef28 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -407,8 +407,8 @@ static ParseNode f_createWidget(Parser* p, const ParameterList& params)
 {
   TQString widgetName = params[0].toString();
   TQString widgetType = params[1].toString();
-  TQString tqparentName = params[2].toString();
-  KommanderWidget *widget = p->currentWidget()->widgetByName(tqparentName);
+  TQString parentName = params[2].toString();
+  KommanderWidget *widget = p->currentWidget()->widgetByName(parentName);
   if (!widget)
     return ParseNode::error("unknown widget");
   TQWidget *tqparent = dynamic_cast<TQWidget*>(widget->object());
@@ -944,7 +944,7 @@ void ParserData::registerStandardFunctions()
   registerFunction("dcop", Function(&f_dcop, ValueString, ValueString, ValueString, 3, 100));
   registerFunction("dcopid", Function(&f_dcopid, ValueString, ValueNone, 0, 0));
   registerFunction("pid", Function(&f_pid, ValueString, ValueNone, 0, 0));
-  registerFunction("tqparentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0));
+  registerFunction("parentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0));
   registerFunction("dialog", Function(&f_dialog, ValueString, ValueString, ValueString, 1, 2));
   registerFunction("exec", Function(&f_exec, ValueString, ValueString, ValueString, 1, 2));
   registerFunction("execBackground", Function(&f_execBackground, ValueString, ValueString, ValueString, 1, 2));
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 7efe5b27..0ddcb951 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -52,7 +52,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
       return execCommand(args[0]);
     case Kommander::dcop:
       return DCOPQuery(args);
-    case Kommander::tqparentPid:
+    case Kommander::parentPid:
       return global("_PARENTPID").isEmpty() ? TQString().setNum(getppid()) : global("_PARENTPID");
     case Kommander::env:
       return TQString(getenv(args[0].latin1())); 
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 2fc867f7..6c9540be 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -271,7 +271,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
   }
   if (!ok)
   {
-    printError(i18n("Unmatched tqparenthesis in DCOP call \'%1\'.").tqarg(a_query[2]));
+    printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").tqarg(a_query[2]));
     return TQString();
   }
   const TQStringList argTypes = parseArgs(pTypes, ok);
@@ -413,12 +413,12 @@ void KommanderWidget::printError(const TQString& a_error) const
       case KDialogBase::Yes:
         break;
       case KDialogBase::Cancel:
-        if (tqparentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING))
+        if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING))
         {
-          tqparentDialog()->close();
+          parentDialog()->close();
           exit(-1);
         }
-        else if (tqparentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
+        else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
           kapp->quit();
     }
   }
@@ -557,16 +557,16 @@ KommanderWidget* KommanderWidget::widgetByName(const TQString& a_name) const
 
 KommanderWidget* KommanderWidget::parseWidget(const TQString& widgetName) const
 {
-  if (TQString(tqparentDialog()->name()) == widgetName)
-    return dynamic_cast <KommanderWidget*>(tqparentDialog());
+  if (TQString(parentDialog()->name()) == widgetName)
+    return dynamic_cast <KommanderWidget*>(parentDialog());
   TQCString s = widgetName.lower() == "self" ? m_thisObject->name() : widgetName.latin1();
-  TQObject* childObj = tqparentDialog()->child(s);
+  TQObject* childObj = parentDialog()->child(s);
 /*  if (!childObj)
   {
      Parser parser(internalParserData());
      TQString variableValue = parser.variable(widgetName).toString();
      s = variableValue.lower() == "self" ? m_thisObject->name() : variableValue.latin1();
-     childObj = tqparentDialog()->child(s);  
+     childObj = parentDialog()->child(s);  
   }*/
   return dynamic_cast <KommanderWidget*>(childObj);
 }
@@ -579,7 +579,7 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin
   TQString arg = parseBrackets(s, from, ok);
   if (!ok)
   {
-    printError(i18n("Unmatched tqparenthesis after \'%1\'.").tqarg(function));
+    printError(i18n("Unmatched parenthesis after \'%1\'.").tqarg(function));
     return TQString();
   }
   const TQStringList args = parseArgs(arg, ok);
@@ -649,7 +649,7 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T
 
 
 
-TQWidget* KommanderWidget::tqparentDialog() const
+TQWidget* KommanderWidget::parentDialog() const
 {
   TQObject *superParent = m_thisObject;
   while (superParent->tqparent())
@@ -722,7 +722,7 @@ ParserData* KommanderWidget::internalParserData() const
 
 TQString KommanderWidget::fileName()
 {
-  KommanderWindow* window = dynamic_cast<KommanderWindow*>(tqparentDialog());
+  KommanderWindow* window = dynamic_cast<KommanderWindow*>(parentDialog());
   if (window)
     return TQString(window->fileName());
   else
diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h
index 2087d086..bb223f3d 100644
--- a/kommander/widget/kommanderwidget.h
+++ b/kommander/widget/kommanderwidget.h
@@ -141,7 +141,7 @@ protected:
   // Parse given identifier as widget name
   KommanderWidget* parseWidget(const TQString& name) const;
   // Return tqparent dialog of this widget
-  TQWidget* tqparentDialog() const;
+  TQWidget* parentDialog() const;
   TQString substituteVariable(TQString text, TQString variable, TQString value) const;
 
   ParserData* internalParserData() const;