diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /kinit/tests | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kinit/tests')
| -rw-r--r-- | kinit/tests/Makefile.am | 6 | ||||
| -rw-r--r-- | kinit/tests/tdelaunchertest.cpp (renamed from kinit/tests/klaunchertest.cpp) | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kinit/tests/Makefile.am b/kinit/tests/Makefile.am index 909e7c14b..e1157bf72 100644 --- a/kinit/tests/Makefile.am +++ b/kinit/tests/Makefile.am @@ -3,8 +3,8 @@ INCLUDES= -I$(srcdir)/../.. $(all_includes) ####### Files -check_PROGRAMS = klaunchertest +check_PROGRAMS = tdelaunchertest -klaunchertest_SOURCES = klaunchertest.cpp -klaunchertest_LDADD = $(LIB_KIO) +tdelaunchertest_SOURCES = tdelaunchertest.cpp +tdelaunchertest_LDADD = $(LIB_KIO) diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/tdelaunchertest.cpp index f246e7086..07eaf21f7 100644 --- a/kinit/tests/klaunchertest.cpp +++ b/kinit/tests/tdelaunchertest.cpp @@ -19,7 +19,7 @@ */ #include <tqstring.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <stdio.h> #include <tqvaluelist.h> @@ -28,9 +28,9 @@ int main(int argc, char *argv[]) { - KApplication::tdeinitExec("konsole"); + TDEApplication::tdeinitExec("konsole"); - KApplication k(argc, argv, "klaunchertest"); + TDEApplication k(argc, argv, "tdelaunchertest"); kapp->dcopClient()->registerAs( kapp->name()) ; @@ -38,13 +38,13 @@ int main(int argc, char *argv[]) TQString error; TQCString dcopService; int pid; - int result = KApplication::startServiceByDesktopName( + int result = TDEApplication::startServiceByDesktopName( 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( + result = TDEApplication::startServiceByDesktopName( TQString::fromLatin1("konqueror"), TQString::null, &error, &dcopService, &pid ); printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n", |