TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 0a4ab140..b6138315 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -72,8 +72,8 @@ private:
 KoTextFormatterTest::KoTextFormatterTest()
 {
     zh = new KoTextZoomHandler;
-    QFont defaultFont( "helvetica", 12 );
-    KoTextFormatCollection* fc = new KoTextFormatCollection( defaultFont, Qt::black, "en_US", false /*no hyphenation*/ );
+    TQFont defaultFont( "helvetica", 12 );
+    KoTextFormatCollection* fc = new KoTextFormatCollection( defaultFont, TQt::black, "en_US", false /*no hyphenation*/ );
     KoTextFormatter* formatter = new KoTextFormatter;
     // fc and formatter are owned by the doc
     doc = new KoTextDocument( zh, fc, formatter );
@@ -89,7 +89,7 @@ void KoTextFormatterTest::speedTest()
     // Format it 50 times
     for ( uint i = 0 ; i < 50 ; ++i )
     {
-      parag->invalidate(0);
+      parag->tqinvalidate(0);
       parag->format();
     }
     doc->clear(false);
@@ -205,8 +205,8 @@ int main (int argc, char ** argv)
     KApplication app(argc, argv, "KoTextFormatter test");
 
     // Don't let locale settings lead to different hyphenation output
-    KGlobal::locale()->setLanguage( QString::fromLatin1( "en_US" ) );
-    KGlobal::locale()->setCountry( QString::fromLatin1( "C" ) );
+    KGlobal::locale()->setLanguage( TQString::tqfromLatin1( "en_US" ) );
+    KGlobal::locale()->setCountry( TQString::tqfromLatin1( "C" ) );
 
     KoTextFormatterTest test;
     //test.speedTest();