diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
| commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
| tree | a0d01a91644fd94aa6da5d8944e052b67461faad /tdecore/tests | |
| parent | 3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff) | |
| download | tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/tests')
| -rw-r--r-- | tdecore/tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tdecore/tests/tdestdacceltest.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am index 90ba46051..2911d3ab8 100644 --- a/tdecore/tests/Makefile.am +++ b/tdecore/tests/Makefile.am @@ -28,9 +28,9 @@ check_PROGRAMS = tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest \ cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \ ksortablevaluelisttest krfcdatetest testqtargs kprociotest \ kcharsetstest kcalendartest kmacroexpandertest kshelltest \ - kxerrorhandlertest startserviceby kstdacceltest kglobaltest ktimezonestest + kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest -TESTS = kurltest kstdacceltest +TESTS = kurltest tdestdacceltest noinst_HEADERS = klocaletest.h kprocesstest.h KIDLTest.h \ kipctest.h kprociotest.h @@ -75,7 +75,7 @@ kmacroexpandertest_SOURCES = kmacroexpandertest.cpp kshelltest_SOURCES = kshelltest.cpp kxerrorhandlertest_SOURCES = kxerrorhandlertest.cpp startserviceby_SOURCES = startserviceby.cpp -kstdacceltest_SOURCES = kstdacceltest.cpp +tdestdacceltest_SOURCES = tdestdacceltest.cpp kglobaltest_SOURCES = kglobaltest.cpp ktimezonestest_SOURCES = ktimezonestest.cpp diff --git a/tdecore/tests/tdestdacceltest.cpp b/tdecore/tests/tdestdacceltest.cpp index a3e2d2473..fbc5077a5 100644 --- a/tdecore/tests/tdestdacceltest.cpp +++ b/tdecore/tests/tdestdacceltest.cpp @@ -2,7 +2,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <stdlib.h> // for exit static bool check(TQString txt, TQString a, TQString b) @@ -24,7 +24,7 @@ static bool check(TQString txt, TQString a, TQString b) int main(int argc, char *argv[]) { TDEApplication::disableAutoDcopRegistration(); - TDEApplication app(argc,argv,"kstdacceltest",false,false); + TDEApplication app(argc,argv,"tdestdacceltest",false,false); check( "shortcutDefault FullScreen", TDEStdAccel::shortcutDefault( TDEStdAccel::FullScreen ).toString(), "Ctrl+Shift+F" ); check( "shortcutDefault BeginningOfLine", TDEStdAccel::shortcutDefault( TDEStdAccel::BeginningOfLine ).toString(), "Home" ); |