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, 11 insertions, 11 deletions

diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp
index 4fff7085f..7eac38815 100644
--- a/lib/kotext/tests/KoUserStyleTester.cpp
+++ b/lib/kotext/tests/KoUserStyleTester.cpp
@@ -53,9 +53,9 @@ void KoUserStyleTester::testAddStyle()
     KoUserStyleCollection coll( "test" );
 
     KoUserStyle* style = new KoUserStyle( "test1" );
-    COMPARE( style->name(), QString( "test1" ) );
-    COMPARE( style->displayName(), QString( "test1" ) );
-    const QString displayName = "A lovely name";
+    COMPARE( style->name(), TQString( "test1" ) );
+    COMPARE( style->displayName(), TQString( "test1" ) );
+    const TQString displayName = "A lovely name";
     style->setDisplayName( displayName );
     COMPARE( style->displayName(), displayName );
 
@@ -63,7 +63,7 @@ void KoUserStyleTester::testAddStyle()
     COMPARE( ret, style );
 
     KoUserStyle* style2 = new KoUserStyle( "test1" );
-    COMPARE( style2->name(), QString( "test1" ) );
+    COMPARE( style2->name(), TQString( "test1" ) );
     style2->setDisplayName( displayName );
     ret = coll.addStyle( style2 );
     // here style2 got deleted.
@@ -75,10 +75,10 @@ void KoUserStyleTester::testAddStyle()
 
     // Add another style for good this time
     KoUserStyle* style3 = new KoUserStyle( "test3" );
-    COMPARE( style3->name(), QString( "test3" ) );
+    COMPARE( style3->name(), TQString( "test3" ) );
     ret = coll.addStyle( style3 );
 
-    QStringList displayNames = coll.displayNameList();
+    TQStringList displayNames = coll.displayNameList();
     COMPARE( (int)displayNames.count(), 2 );
     COMPARE( displayNames[0], displayName );
     COMPARE( displayNames[1], style3->name() );
@@ -88,15 +88,15 @@ void KoUserStyleTester::testFindStyle()
 {
     KoUserStyleCollection coll( "test" );
     KoUserStyle* style = new KoUserStyle( "test1" );
-    const QString displayName = "A lovely name";
+    const TQString displayName = "A lovely name";
     style->setDisplayName( displayName );
     coll.addStyle( style );
 
     // --- findStyle tests ---
-    KoUserStyle* ret = coll.findStyle( "test1", QString::null );
+    KoUserStyle* ret = coll.findStyle( "test1", TQString() );
     COMPARE( ret, style );
 
-    ret = coll.findStyle( "foo", QString::null );
+    ret = coll.findStyle( "foo", TQString() );
     COMPARE( ret, (KoUserStyle*)0 );
 
     ret = coll.findStyle( "foo", "test1" ); // fallback not used for style 'foo'
@@ -150,13 +150,13 @@ void KoUserStyleTester::testReorder()
     coll.addStyle( style );
     COMPARE( coll.count(), 3 );
 
-    QStringList newOrder;
+    TQStringList newOrder;
     newOrder << "test3";
     newOrder << "test2";
     newOrder << "test1";
     coll.updateStyleListOrder( newOrder );
     COMPARE( coll.count(), 3 );
-    QStringList displayNames = coll.displayNameList();
+    TQStringList displayNames = coll.displayNameList();
     COMPARE( (int)displayNames.count(), 3 );
     COMPARE( displayNames.join(","), newOrder.join(",") );
 }