diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:48:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:48:49 -0600 |
| commit | 13281e2856a2ef43bbab78c5528470309c23aa77 (patch) | |
| tree | 936bcf8145dc235004c73e9fb3d6b3dca9aa370b /kinit | |
| parent | e81c741bb2cf337a43524e75f22f7728ce17a343 (diff) | |
| download | tdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.tar.gz tdelibs-13281e2856a2ef43bbab78c5528470309c23aa77.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kinit')
| -rw-r--r-- | kinit/kdostartupconfig.cpp | 2 | ||||
| -rw-r--r-- | kinit/kinit.cpp | 2 | ||||
| -rw-r--r-- | kinit/klauncher.cpp | 2 | ||||
| -rw-r--r-- | kinit/tests/klaunchertest.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp index fceed88e2..4f2571a12 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 <tqtextstream.h> +#include <textstream.h> #include <kinstance.h> #include <kstandarddirs.h> #include <kconfig.h> diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index 6859282d3..de448fdd6 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -49,7 +49,7 @@ #include <tqfile.h> #include <tqdatetime.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqfont.h> #include <kinstance.h> diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp index 47b3b5f42..69a2e10d2 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::tqfromLatin1(".slave-socket")); + KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket")); if (domainname.status() != 0) { // Sever error! diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/klaunchertest.cpp index 46a4e5635..f246e7086 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::tqfromLatin1("konsole"), TQString::null, &error, &dcopService, &pid ); + TQString::fromLatin1("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::tqfromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); + TQString::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", result, error.ascii(), dcopService.data(), pid); |