summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/tests
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:22:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:22:10 -0600
commit3e4d718796cddcc798d9f737037ef4bad540a0af (patch)
tree69d0aaad3f8f46c1dbb4939b7fcda8e7de12c481 /kopete/libkopete/tests
parent50d6569cdef5f0aac099f5d01864bd0e14f82ae3 (diff)
downloadtdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.tar.gz
tdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/tests')
-rw-r--r--kopete/libkopete/tests/kopeteemoticontest.cpp4
-rw-r--r--kopete/libkopete/tests/kopetemessage_test.cpp4
-rw-r--r--kopete/libkopete/tests/kopetepasswordtest_program.cpp2
-rw-r--r--kopete/libkopete/tests/kopetewallettest_program.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index 50c023d9..08910d46 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -53,8 +53,8 @@ void KopeteEmoticonTest::allTests()
// change user data dir to avoid messing with user's .kde dir
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
- //KApplication::disableAutoDcopRegistration();
- //KApplication app;
+ //TDEApplication::disableAutoDcopRegistration();
+ //TDEApplication app;
testEmoticonParser();
}
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index df675fa1..c2881d2f 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -64,7 +64,7 @@ KopeteMessage_Test::KopeteMessage_Test()
void KopeteMessage_Test::allTests()
{
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
//TDECmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0);
// At least Kopete::Message::asXML() seems to require that a TQApplication
@@ -72,7 +72,7 @@ void KopeteMessage_Test::allTests()
// version does.
if (!kapp)
- new KApplication();
+ new TDEApplication();
testPrimitives();
testLinkParser();
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
index 039f4a39..df0dcc64 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp
@@ -71,7 +71,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::addCmdLineOptions( opts );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- KApplication app( "kopetepasswordtest" );
+ TDEApplication app( "kopetepasswordtest" );
bool setPassword = args->isSet("set");
TQString newPwd = args->getOption("set");
diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp
index 49376651..092f59ff 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.cpp
+++ b/kopete/libkopete/tests/kopetewallettest_program.cpp
@@ -65,7 +65,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::init( argc, argv, &aboutData );
KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption };
TDECmdLineArgs::addCmdLineOptions( opts );
- KApplication app( "kopetewallettest" );
+ TDEApplication app( "kopetewallettest" );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();