summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/tests/kopeteemoticontest.cpp
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/kopeteemoticontest.cpp
parent50d6569cdef5f0aac099f5d01864bd0e14f82ae3 (diff)
downloadtdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.tar.gz
tdenetwork-3e4d718796cddcc798d9f737037ef4bad540a0af.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kopete/libkopete/tests/kopeteemoticontest.cpp')
-rw-r--r--kopete/libkopete/tests/kopeteemoticontest.cpp4
1 files changed, 2 insertions, 2 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();
}