summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/tdeappdcopinterface.h4
-rw-r--r--tdecore/tdeapplication.h4
-rw-r--r--tdecore/tests/CMakeLists.txt2
-rw-r--r--tdecore/tests/Makefile.am4
-rw-r--r--tdecore/tests/startserviceby.cpp2
-rw-r--r--tdecore/tests/tdeapptest.cpp (renamed from tdecore/tests/kapptest.cpp)2
6 files changed, 9 insertions, 9 deletions
diff --git a/tdecore/tdeappdcopinterface.h b/tdecore/tdeappdcopinterface.h
index 0288e4b01..281f452c2 100644
--- a/tdecore/tdeappdcopinterface.h
+++ b/tdecore/tdeappdcopinterface.h
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef TDEAPPDCOP_INTERFACE_H
-#define TDEAPPDCOP_INTERFACE_H
+#ifndef __TDEAPPDCOP_INTERFACE_H__
+#define __TDEAPPDCOP_INTERFACE_H__
#include <dcopobject.h>
#include <tqstringlist.h>
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index b239922e2..1922fa462 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef _TDEAPP_H
-#define _TDEAPP_H
+#ifndef __TDEAPPLICATION_H__
+#define __TDEAPPLICATION_H__
// Version macros. Never put this further down.
#include "tdeversion.h"
diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt
index fa14f6357..b0c1fb36b 100644
--- a/tdecore/tests/CMakeLists.txt
+++ b/tdecore/tests/CMakeLists.txt
@@ -33,7 +33,7 @@ tde_add_library( tdeconfigtest SHARED AUTOMOC
set( CHECKS
tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest kstddirstest
tdeuniqueapptest ktempfiletest krandomsequencetest kdebugtest
- ksocktest kstringhandlertest kcmdlineargstest kapptest kmemtest
+ ksocktest kstringhandlertest kcmdlineargstest tdeapptest kmemtest
dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest
kmdcodectest knotifytest ksortablevaluelisttest krfcdatetest testqtargs
kprociotest kcharsetstest kcalendartest kmacroexpandertest kshelltest
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index 19787c4df..c7b1f7d0e 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -23,7 +23,7 @@ AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest \
kstddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \
- kdebugtest ksocktest kstringhandlertest kcmdlineargstest kapptest \
+ kdebugtest ksocktest kstringhandlertest kcmdlineargstest tdeapptest \
kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \
cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
ksortablevaluelisttest krfcdatetest testqtargs kprociotest \
@@ -48,7 +48,7 @@ kurltest_SOURCES = kurltest.cpp
kstddirstest_SOURCES = kstddirstest.cpp
tdeprocesstest_SOURCES = tdeprocesstest.cpp
tdeuniqueapptest_SOURCES = tdeuniqueapptest.cpp
-kapptest_SOURCES = kapptest.cpp
+tdeapptest_SOURCES = tdeapptest.cpp
ksocktest_SOURCES = ksocktest.cpp
ktempfiletest_SOURCES = ktempfiletest.cpp
krandomsequencetest_SOURCES = krandomsequencetest.cpp
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index 67c535cec..8d23042ef 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -27,7 +27,7 @@
int
main(int argc, char *argv[])
{
- TDEAboutData about("kapptest", "kapptest", "version");
+ TDEAboutData about("tdeapptest", "tdeapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a;
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/tdeapptest.cpp
index 6a3abace9..09e9124b6 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/tdeapptest.cpp
@@ -28,7 +28,7 @@
int
main(int argc, char *argv[])
{
- TDEAboutData about("kapptest", "kapptest", "version");
+ TDEAboutData about("tdeapptest", "tdeapptest", "version");
TDECmdLineArgs::init(argc, argv, &about);
TDEApplication a;