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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
---
 kinit/kdostartupconfig.cpp    | 2 +-
 kinit/kinit.cpp               | 2 +-
 kinit/klauncher.cpp           | 2 +-
 kinit/tests/klaunchertest.cpp | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kinit')

diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp
index 4f2571a12..fceed88e2 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/kdostartupconfig.cpp
@@ -27,7 +27,7 @@ DEALINGS IN THE SOFTWARE.
 // See description in kstartupconfig.cpp .
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <kconfig.h>
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index de448fdd6..6859282d3 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -49,7 +49,7 @@
 #include <tqfile.h>
 #include <tqdatetime.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqregexp.h>
 #include <tqfont.h>
 #include <kinstance.h>
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 69a2e10d2..47b3b5f42 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -182,7 +182,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
                                     objId(), "terminateKDE()", false );
 
    TQString prefix = locateLocal("socket", "klauncher");
-   KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
+   KTempFile domainname(prefix, TQString::tqfromLatin1(".slave-socket"));
    if (domainname.status() != 0)
    {
       // Sever error!
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp
index f246e7086..46a4e5635 100644
--- a/kinit/tests/klaunchertest.cpp
+++ b/kinit/tests/klaunchertest.cpp
@@ -39,13 +39,13 @@ int main(int argc, char *argv[])
    TQCString dcopService;
    int pid;
    int result = KApplication::startServiceByDesktopName(
-		TQString::fromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
+		TQString::tqfromLatin1("konsole"), TQString::null, &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
       result, error.ascii(), dcopService.data(), pid);
 
    result = KApplication::startServiceByDesktopName(
-		TQString::fromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
+		TQString::tqfromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
 
    printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
       result, error.ascii(), dcopService.data(), pid);
-- 
cgit v1.2.1