summaryrefslogtreecommitdiffstats
path: root/lib/kotext/tests/kotextformattertest.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:23:24 -0600
commit5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch)
treefb31321c80b12ee8e2237bdcf8c228fe44e67772 /lib/kotext/tests/kotextformattertest.cpp
parentfe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff)
downloadkoffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz
koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'lib/kotext/tests/kotextformattertest.cpp')
-rw-r--r--lib/kotext/tests/kotextformattertest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 38aab237..c75d8c89 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -205,8 +205,8 @@ int main (int argc, char ** argv)
TDEApplication app(argc, argv, "KoTextFormatter test");
// Don't let locale settings lead to different hyphenation output
- KGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );
- KGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) );
+ TDEGlobal::locale()->setLanguage( TQString::fromLatin1( "en_US" ) );
+ TDEGlobal::locale()->setCountry( TQString::fromLatin1( "C" ) );
KoTextFormatterTest test;
//test.speedTest();