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

diff --git a/lib/kotext/KoTextBookmark.h b/lib/kotext/KoTextBookmark.h
index 0be20518..eff1a353 100644
--- a/lib/kotext/KoTextBookmark.h
+++ b/lib/kotext/KoTextBookmark.h
@@ -22,9 +22,9 @@
 #define KOTEXTBOOKMARK_H
 
 #include <koffice_export.h>
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qmap.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqmap.h>
 class KoTextParag;
 class KoTextDocument;
 
@@ -33,13 +33,13 @@ class KoTextDocument;
  */
 class KOTEXT_EXPORT KoTextBookmark {
 public:
-    KoTextBookmark( const QString& name = QString::null /*for QValueList; remove default value when going Qt4*/ );
-    KoTextBookmark( const QString& name,
+    KoTextBookmark( const TQString& name = TQString() /*for TQValueList; remove default value when going TQt4*/ );
+    KoTextBookmark( const TQString& name,
                     KoTextParag* startParag, KoTextParag* endParag,
                     int start, int end );
 
-    QString bookmarkName() const { return m_name; }
-    void setBookmarkName( const QString &name ) { m_name = name; }
+    TQString bookmarkName() const { return m_name; }
+    void setBookmarkName( const TQString &name ) { m_name = name; }
 
     // Note: the text document always m_startParag->document(), which is also m_endParag->document().
     KoTextDocument* textDocument() const;
@@ -59,29 +59,29 @@ public:
     bool isSimple() const { return m_startParag == m_endParag && m_startIndex == m_endIndex; }
 
 private:
-    QString m_name;
+    TQString m_name;
     KoTextParag* m_startParag;
     KoTextParag* m_endParag;
     int m_startIndex;
     int m_endIndex;
 };
 
-class KOTEXT_EXPORT KoTextBookmarkList : public QValueList<KoTextBookmark>
+class KOTEXT_EXPORT KoTextBookmarkList : public TQValueList<KoTextBookmark>
 {
 public:
-    const_iterator findByName( const QString& name ) const {
+    const_iterator findByName( const TQString& name ) const {
         for ( const_iterator it = begin(), itend = end(); it != itend; ++it )
             if ( (*it).bookmarkName() == name )
                 return it;
         return end();
     }
-    iterator findByName( const QString& name ) {
+    iterator findByName( const TQString& name ) {
         for ( iterator it = begin(), itend = end(); it != itend; ++it )
             if ( (*it).bookmarkName() == name )
                 return it;
         return end();
     }
-    bool removeByName( const QString& name ) {
+    bool removeByName( const TQString& name ) {
         for ( iterator it = begin(), itend = end(); it != itend; ++it )
             if ( (*it).bookmarkName() == name ) {
                 remove( it );
@@ -91,8 +91,8 @@ public:
     }
     /// return a map of bookmarks per paragraph. Note that multi-paragraph bookmarks
     /// will be present twice in the map.
-    QMap<const KoTextParag*, KoTextBookmarkList> bookmarksPerParagraph() const {
-        QMap<const KoTextParag*, KoTextBookmarkList> ret;
+    TQMap<const KoTextParag*, KoTextBookmarkList> bookmarksPerParagraph() const {
+        TQMap<const KoTextParag*, KoTextBookmarkList> ret;
         for ( const_iterator it = begin(), itend = end(); it != itend; ++it ) {
             ret[ (*it).startParag() ].append( *it );
             if ( (*it).startParag() != (*it).endParag() )