Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 7 insertions, 7 deletions

diff --git a/filters/kword/oowriter/conversion.cpp b/filters/kword/oowriter/conversion.cpp
index 259d97b5..871489a1 100644
--- a/filters/kword/oowriter/conversion.cpp
+++ b/filters/kword/oowriter/conversion.cpp
@@ -30,20 +30,20 @@ TQPair<int,TQString> Conversion::importWrapping( const TQString& oowrap )
 {
     if ( oowrap == "none" )
         // 'no wrap' means 'avoid horizontal space'
-        return tqMakePair( 2, TQString() );
+        return qMakePair( 2, TQString() );
     if ( oowrap == "left" || oowrap == "right" )
         // Left and right, no problem
-        return tqMakePair( 1, oowrap );
+        return qMakePair( 1, oowrap );
     if ( oowrap == "run-through" )
-        return tqMakePair( 0, TQString() );
+        return qMakePair( 0, TQString() );
     if ( oowrap == "biggest" ) // OASIS extension
-        return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
+        return qMakePair( 1, TQString::fromLatin1( "biggest" ) );
 
     ////if ( oowrap == "parallel" || oowrap == "dynamic" )
     // dynamic is called "optimal" in the OO GUI. It's different from biggest because it can lead to parallel.
 
     // Those are not supported in KWord, let's use biggest instead
-    return tqMakePair( 1, TQString::fromLatin1( "biggest" ) );
+    return qMakePair( 1, TQString::fromLatin1( "biggest" ) );
 }
 
 TQString Conversion::exportWrapping( const TQPair<int,TQString>& runAroundAttribs )
diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp
index 1513208d..03254939 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -48,12 +48,12 @@ SelectionRange::SelectionRange(const TQString &s)
     for (TQStringList::iterator it = list.begin(); it!=list.end(); ++it) {
         if ( one.exactMatch(*it) ) {
             uint p = (*it).toUInt();
-            r.push_back( tqMakePair(p, p) );
+            r.push_back( qMakePair(p, p) );
         } else if ( range.exactMatch(*it) ) {
             uint p1 = range.cap(1).toUInt();
             uint p2 = range.cap(2).toUInt();
             if ( p1>p2 ) continue;
-            r.push_back( tqMakePair(p1, p2) );
+            r.push_back( qMakePair(p1, p2) );
         }
     }