From 1623fe64102c18ab098b79656b80f28cef840756 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 10:00:25 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.
---
 lib/util/blockingkprocess.cpp     |  4 ++--
 lib/util/domutil.cpp              | 16 ++++++++--------
 lib/util/domutil.h                |  2 +-
 lib/util/execcommand.cpp          |  4 ++--
 lib/util/filetemplate.cpp         |  6 +++---
 lib/util/kscriptactionmanager.cpp |  2 +-
 lib/util/settings.cpp             |  6 +++---
 lib/util/urlutil.cpp              |  2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'lib/util')

diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp
index c0d1b106..51845a5c 100644
--- a/lib/util/blockingkprocess.cpp
+++ b/lib/util/blockingkprocess.cpp
@@ -68,12 +68,12 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm)
 
 void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen)
 {
-  m_stdOut += TQString::fromLatin1(buffer, buflen);
+  m_stdOut += TQString::tqfromLatin1(buffer, buflen);
 }
 
 void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen)
 {
-  m_stdErr += TQString::fromLatin1(buffer, buflen);
+  m_stdErr += TQString::tqfromLatin1(buffer, buflen);
 }
 
 void BlockingKProcess::slotProcessExited(KProcess *)
diff --git a/lib/util/domutil.cpp b/lib/util/domutil.cpp
index 1f148fad..0c9a2491 100644
--- a/lib/util/domutil.cpp
+++ b/lib/util/domutil.cpp
@@ -260,18 +260,18 @@ TQDomElement DomUtil::elementByPathExt(TQDomDocument &doc, const TQString &paths
 {
   DomPath dompath = resolvPathStringExt(pathstring);
   TQDomElement elem = doc.documentElement();
-  TQDomNodeList children;
+  TQDomNodeList tqchildren;
   TQDomElement nextElem = elem;
   for (unsigned int j=0; j<dompath.count(); j++)
   {
-    children = nextElem.childNodes();
+    tqchildren = nextElem.childNodes();
     DomPathElement dompathelement= dompath[j];
     bool wrongchild = false;
     int matchCount = 0;
-    for (unsigned int i=0; i<children.count(); i++)
+    for (unsigned int i=0; i<tqchildren.count(); i++)
     {
       wrongchild = false;
-      TQDomElement child = children.item(i).toElement();
+      TQDomElement child = tqchildren.item(i).toElement();
       TQString tag = child.tagName();
       tag = dompathelement.tagName;
       if (child.tagName() == dompathelement.tagName)
@@ -339,10 +339,10 @@ bool DomUtil::removeTextNodes(TQDomDocument doc,TQString pathExt)
   TQDomElement elem = elementByPathExt(doc,pathExt);
   if (elem.isNull())
     return false;
-  TQDomNodeList children = elem.childNodes();
-  for (unsigned int i=0;i<children.count();i++)
-    if (children.item(i).isText())
-      elem.removeChild(children.item(i));
+  TQDomNodeList tqchildren = elem.childNodes();
+  for (unsigned int i=0;i<tqchildren.count();i++)
+    if (tqchildren.item(i).isText())
+      elem.removeChild(tqchildren.item(i));
   return true;
 }
 
diff --git a/lib/util/domutil.h b/lib/util/domutil.h
index 7856e3c6..ea28a407 100644
--- a/lib/util/domutil.h
+++ b/lib/util/domutil.h
@@ -168,7 +168,7 @@ public:
       Retrieve an element specified with extended path
       examples:
 
-       - 1: "widget|class=TQDialog/property|name=geometry"
+       - 1: "widget|class=TQDialog/property|name=tqgeometry"
          or "widget|class=TQDialog/property||1"
        - 2: "widget/property|name=caption/string"
          or "widget/property||2/string"
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp
index 62eb5924..b3d83746 100644
--- a/lib/util/execcommand.cpp
+++ b/lib/util/execcommand.cpp
@@ -49,7 +49,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
   bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
 
   if ( !ok ) {
-    KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ),
+    KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").tqarg( executable ),
                         i18n("Error Invoking Command") );
 
     emit finished( TQString(), TQString() );
@@ -57,7 +57,7 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args,
 
   } else {
     progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."),
-                      i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false );
+                      i18n("Please wait until the \"%1\" command finishes.").tqarg( executable ), false );
     connect( progressDlg, TQT_SIGNAL(cancelClicked()),
              this, TQT_SLOT(cancelClicked()) );
   }
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index 34165e84..e0425614 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -23,7 +23,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kstandarddirs.h>
 
@@ -69,8 +69,8 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString &
     TQString email = DomUtil::readEntry(dom, "/general/email");
     TQString version = DomUtil::readEntry(dom, "/general/version");
     TQString appname = DomUtil::readEntry(dom, "/general/projectname");
-    TQString date = TQDate::currentDate().toString();
-    TQString year = TQString::number(TQDate::currentDate().year());
+    TQString date = TQDate::tqcurrentDate().toString();
+    TQString year = TQString::number(TQDate::tqcurrentDate().year());
 
     TQString str = text;
     str.replace(TQRegExp("\\$EMAIL\\$"),email);
diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp
index ffc3a536..3c906902 100644
--- a/lib/util/kscriptactionmanager.cpp
+++ b/lib/util/kscriptactionmanager.cpp
@@ -95,7 +95,7 @@ void KScriptAction::activate( )
         }
         else
         {
-            KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error"));
+            KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").tqarg(m_scriptType), i18n("KScript Error"));
 	    kdDebug() << "Query string: " << scriptTypeQuery << endl;
             return;
         }
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index c9087942..f91c91f0 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -23,12 +23,12 @@ TQString Settings::terminalEmulatorName( KConfig & config )
 
 	if ( useKDESetting )
 	{
-		KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
-		terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole"));
+		KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
+		terminal = confGroup.readEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
 	}
 	else
 	{
-		terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole"));
+		terminal = config.readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole"));
 	}
 	return terminal;
 }
diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp
index 81eecf84..12b00065 100644
--- a/lib/util/urlutil.cpp
+++ b/lib/util/urlutil.cpp
@@ -303,7 +303,7 @@ TQString URLUtil::envExpand ( const TQString& str )
       if (pos < 0)
         pos = len;
 
-      char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
+      char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
 
       if (ret)
       {
-- 
cgit v1.2.1