From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:04:16 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kinit/tests/Makefile.am         |  6 ++---
 kinit/tests/klaunchertest.cpp   | 54 -----------------------------------------
 kinit/tests/tdelaunchertest.cpp | 54 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 kinit/tests/klaunchertest.cpp
 create mode 100644 kinit/tests/tdelaunchertest.cpp

(limited to 'kinit/tests')

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/klaunchertest.cpp
deleted file mode 100644
index 3293c07be..000000000
--- a/kinit/tests/klaunchertest.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-    This file is part of KDE 
-
-    Copyright (C) 1998 Waldo Bastian (bastian@kde.org)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License 
-    version 2 as published by the Free Software Foundation.
-
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this library; see the file COPYING. If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include <tqstring.h>
-#include <kapplication.h>
-#include <dcopclient.h>
-#include <stdio.h>
-#include <tqvaluelist.h>
-#include <kservice.h>
-
-
-int main(int argc, char *argv[])
-{
-   TDEApplication::tdeinitExec("konsole");
-
-   TDEApplication k(argc, argv, "klaunchertest");
- 
-   kapp->dcopClient()->registerAs( kapp->name()) ;
-
-#if 0
-   TQString error;
-   TQCString dcopService;
-   int pid;
-   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 = TDEApplication::startServiceByDesktopName(
-		TQString::fromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
-
-   printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
-      result, error.ascii(), dcopService.data(), pid);
-#endif
-}
-
diff --git a/kinit/tests/tdelaunchertest.cpp b/kinit/tests/tdelaunchertest.cpp
new file mode 100644
index 000000000..a8989870b
--- /dev/null
+++ b/kinit/tests/tdelaunchertest.cpp
@@ -0,0 +1,54 @@
+/*
+    This file is part of KDE 
+
+    Copyright (C) 1998 Waldo Bastian (bastian@kde.org)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License 
+    version 2 as published by the Free Software Foundation.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this library; see the file COPYING. If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <tqstring.h>
+#include <kapplication.h>
+#include <dcopclient.h>
+#include <stdio.h>
+#include <tqvaluelist.h>
+#include <kservice.h>
+
+
+int main(int argc, char *argv[])
+{
+   TDEApplication::tdeinitExec("konsole");
+
+   TDEApplication k(argc, argv, "tdelaunchertest");
+ 
+   kapp->dcopClient()->registerAs( kapp->name()) ;
+
+#if 0
+   TQString error;
+   TQCString dcopService;
+   int pid;
+   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 = TDEApplication::startServiceByDesktopName(
+		TQString::fromLatin1("konqueror"), TQString::null,  &error, &dcopService, &pid );
+
+   printf("Result = %d, error = \"%s\", dcopService = \"%s\", pid = %d\n",
+      result, error.ascii(), dcopService.data(), pid);
+#endif
+}
+
-- 
cgit v1.2.1