From 1711870a073597c2282f32ad39a9b8ad5e1cf6bb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 5 Nov 2024 12:24:20 +0900 Subject: Rename KUniqueApplication to TDEUniqueApplication and remove obsolete kapp.h and kuniqueapp.h headers Signed-off-by: Michele Calgaro --- tdecore/tests/CMakeLists.txt | 2 +- tdecore/tests/Makefile.am | 4 +-- tdecore/tests/kresolvertest.cpp | 8 +++--- tdecore/tests/ksocktest.cpp | 2 +- tdecore/tests/kuniqueapptest.cpp | 59 -------------------------------------- tdecore/tests/tdeuniqueapptest.cpp | 59 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 tdecore/tests/kuniqueapptest.cpp create mode 100644 tdecore/tests/tdeuniqueapptest.cpp (limited to 'tdecore/tests') diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt index 36377a255..f3e0aae45 100644 --- a/tdecore/tests/CMakeLists.txt +++ b/tdecore/tests/CMakeLists.txt @@ -32,7 +32,7 @@ tde_add_library( tdeconfigtest SHARED AUTOMOC set( CHECKS tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest kstddirstest - kuniqueapptest ktempfiletest krandomsequencetest kdebugtest + tdeuniqueapptest ktempfiletest krandomsequencetest kdebugtest ksocktest kstringhandlertest kcmdlineargstest kapptest kmemtest dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest ksortablevaluelisttest krfcdatetest testqtargs diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am index 73e06f588..9398716eb 100644 --- a/tdecore/tests/Makefile.am +++ b/tdecore/tests/Makefile.am @@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH) check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \ - kstddirstest kurltest kuniqueapptest ktempfiletest krandomsequencetest \ + kstddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \ kdebugtest ksocktest kstringhandlertest kcmdlineargstest kapptest \ kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \ cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \ @@ -47,7 +47,7 @@ ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp kurltest_SOURCES = kurltest.cpp kstddirstest_SOURCES = kstddirstest.cpp kprocesstest_SOURCES = kprocesstest.cpp -kuniqueapptest_SOURCES = kuniqueapptest.cpp +tdeuniqueapptest_SOURCES = tdeuniqueapptest.cpp kapptest_SOURCES = kapptest.cpp ksocktest_SOURCES = ksocktest.cpp ktempfiletest_SOURCES = ktempfiletest.cpp diff --git a/tdecore/tests/kresolvertest.cpp b/tdecore/tests/kresolvertest.cpp index 9f476cd51..58d0e9ac1 100644 --- a/tdecore/tests/kresolvertest.cpp +++ b/tdecore/tests/kresolvertest.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include @@ -62,11 +62,11 @@ namespace KDE extern const int resolverFlags; } -class TestApp : public KUniqueApplication +class TestApp : public TDEUniqueApplication { public: TestApp() : - KUniqueApplication() + TDEUniqueApplication() { } int newInstance(TQValueList params); @@ -412,7 +412,7 @@ int main(int argc, char **argv) { TDEAboutData about("socktest2", "SockTest", "1.0"); TDECmdLineArgs::init(argc, argv, &about); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); /* TestApp a; a.exec();*/ diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp index a1ce8f86b..ac0bf5510 100644 --- a/tdecore/tests/ksocktest.cpp +++ b/tdecore/tests/ksocktest.cpp @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ -#include "kuniqueapplication.h" +#include "tdeuniqueapplication.h" #include "tdeglobal.h" #include "kdebug.h" #include "ksock.h" diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp deleted file mode 100644 index 13b8ca534..000000000 --- a/tdecore/tests/kuniqueapptest.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (c) 1999 Waldo Bastian - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kuniqueapplication.h" -#include "tdeglobalsettings.h" - -#include -#include -#include -#include -#include - -class TestApp : public KUniqueApplication -{ -public: - TestApp() : KUniqueApplication("TestApp") { } - virtual int newInstance( ); -}; - - -int -TestApp::newInstance( ) -{ - tqWarning("NewInstance"); - return 0; -} - -int -main(int argc, char *argv[]) -{ - TDEAboutData about("kuniqueapptest", "kuniqueapptest", "version"); - TDECmdLineArgs::init(argc, argv, &about); - KUniqueApplication::addCmdLineOptions(); - - if (!TestApp::start()) - { - exit(0); - } - TestApp a; - - printf("Running.\n"); - kapp->exec(); - printf("Terminating.\n"); -} diff --git a/tdecore/tests/tdeuniqueapptest.cpp b/tdecore/tests/tdeuniqueapptest.cpp new file mode 100644 index 000000000..9a002c6d8 --- /dev/null +++ b/tdecore/tests/tdeuniqueapptest.cpp @@ -0,0 +1,59 @@ +/* This file is part of the KDE libraries + Copyright (c) 1999 Waldo Bastian + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "tdeuniqueapplication.h" +#include "tdeglobalsettings.h" + +#include +#include +#include +#include +#include + +class TestApp : public TDEUniqueApplication +{ +public: + TestApp() : TDEUniqueApplication("TestApp") { } + virtual int newInstance( ); +}; + + +int +TestApp::newInstance( ) +{ + tqWarning("NewInstance"); + return 0; +} + +int +main(int argc, char *argv[]) +{ + TDEAboutData about("tdeuniqueapptest", "tdeuniqueapptest", "version"); + TDECmdLineArgs::init(argc, argv, &about); + TDEUniqueApplication::addCmdLineOptions(); + + if (!TestApp::start()) + { + exit(0); + } + TestApp a; + + printf("Running.\n"); + kapp->exec(); + printf("Terminating.\n"); +} -- cgit v1.2.1