summaryrefslogtreecommitdiffstats
path: root/lib/kotext
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:57:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:57:47 -0600
commit6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch)
tree7e66b929b5455837f22ea54ed91fc9af6f64f7bf /lib/kotext
parent68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff)
downloadkoffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz
koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'lib/kotext')
-rw-r--r--lib/kotext/kohyphen/kohyphentest.cpp2
-rw-r--r--lib/kotext/tests/kobordertest.cpp4
-rw-r--r--lib/kotext/tests/kotextformattertest.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/kotext/kohyphen/kohyphentest.cpp b/lib/kotext/kohyphen/kohyphentest.cpp
index 96e0bd2d..f756b421 100644
--- a/lib/kotext/kohyphen/kohyphentest.cpp
+++ b/lib/kotext/kohyphen/kohyphentest.cpp
@@ -40,7 +40,7 @@ void check_hyphenation( const TQStringList& tests, const TQStringList& results,
int main (int argc, char ** argv)
{
- KApplication app(argc, argv, "KoHyphenator test");
+ TDEApplication app(argc, argv, "KoHyphenator test");
try {
hypher = KoHyphenator::self();
diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp
index 6dd37aa4..c4e59ffc 100644
--- a/lib/kotext/tests/kobordertest.cpp
+++ b/lib/kotext/tests/kobordertest.cpp
@@ -47,9 +47,9 @@ private:
int main (int argc, char ** argv)
{
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"kobordertest", 0, 0, 0, 0);
- KApplication app;
+ TDEApplication app;
KoZoomHandler* zh = new KoZoomHandler();
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 6721f771..38aab237 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -202,7 +202,7 @@ void KoTextFormatterTest::counterAndBigChar()
int main (int argc, char ** argv)
{
- KApplication app(argc, argv, "KoTextFormatter test");
+ TDEApplication app(argc, argv, "KoTextFormatter test");
// Don't let locale settings lead to different hyphenation output
KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );