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

diff --git a/lib/kotext/KoTextCommand.h b/lib/kotext/KoTextCommand.h
index 352fc2fb..c9b4c3b6 100644
--- a/lib/kotext/KoTextCommand.h
+++ b/lib/kotext/KoTextCommand.h
@@ -38,7 +38,7 @@ class KoVariable;
 class KOTEXT_EXPORT KoTextCommand : public KNamedCommand
 {
 public:
-    KoTextCommand( KoTextObject * textobj, const QString & name ) :
+    KoTextCommand( KoTextObject * textobj, const TQString & name ) :
         KNamedCommand( name ), m_textobj(textobj) {}
     ~KoTextCommand() {}
 
@@ -55,13 +55,13 @@ protected:
 class KOTEXT_EXPORT KoTextDeleteCommand : public KoTextDocDeleteCommand
 {
 public:
-    KoTextDeleteCommand( KoTextDocument *d, int i, int idx, const QMemArray<KoTextStringChar> &str,
+    KoTextDeleteCommand( KoTextDocument *d, int i, int idx, const TQMemArray<KoTextStringChar> &str,
                          const CustomItemsMap & customItemsMap,
-                         const QValueList<KoParagLayout> & oldParagLayouts );
+                         const TQValueList<KoParagLayout> & oldParagLayouts );
     KoTextCursor *execute( KoTextCursor *c );
     KoTextCursor *unexecute( KoTextCursor *c );
 protected:
-    QValueList<KoParagLayout> m_oldParagLayouts;
+    TQValueList<KoParagLayout> m_oldParagLayouts;
     CustomItemsMap m_customItemsMap;
 };
 
@@ -71,9 +71,9 @@ protected:
 class KoTextInsertCommand : public KoTextDeleteCommand
 {
 public:
-    KoTextInsertCommand( KoTextDocument *d, int i, int idx, const QMemArray<KoTextStringChar> &str,
+    KoTextInsertCommand( KoTextDocument *d, int i, int idx, const TQMemArray<KoTextStringChar> &str,
                          const CustomItemsMap & customItemsMap,
-                         const QValueList<KoParagLayout> &oldParagLayouts )
+                         const TQValueList<KoParagLayout> &oldParagLayouts )
         : KoTextDeleteCommand( d, i, idx, str, customItemsMap, oldParagLayouts ) {}
     Commands type() const { return Insert; };
     KoTextCursor *execute( KoTextCursor *c ) { return KoTextDeleteCommand::unexecute( c ); }
@@ -87,16 +87,16 @@ class KOTEXT_EXPORT KoTextParagCommand : public KoTextDocCommand
 {
 public:
     KoTextParagCommand( KoTextDocument *d, int fParag, int lParag,
-                        const QValueList<KoParagLayout> &oldParagLayouts,
+                        const TQValueList<KoParagLayout> &oldParagLayouts,
                         KoParagLayout newParagLayout,
                         int /*KoParagLayout::Flags*/ flags,
-                        QStyleSheetItem::Margin margin = (QStyleSheetItem::Margin)-1 );
+                        TQStyleSheetItem::Margin margin = (TQStyleSheetItem::Margin)-1 );
                         // margin is only meaningful if flags==Margins only. -1 means all.
     KoTextCursor *execute( KoTextCursor *c );
     KoTextCursor *unexecute( KoTextCursor *c );
 protected:
     int firstParag, lastParag;
-    QValueList<KoParagLayout> m_oldParagLayouts;
+    TQValueList<KoParagLayout> m_oldParagLayouts;
     KoParagLayout m_newParagLayout;
     int m_flags;
     int m_margin;
@@ -111,14 +111,14 @@ class KoParagFormatCommand : public KoTextDocCommand
 {
 public:
     KoParagFormatCommand( KoTextDocument *d, int fParag, int lParag,
-                          const QValueList<KoTextFormat *> &oldFormats,
+                          const TQValueList<KoTextFormat *> &oldFormats,
                           KoTextFormat * newFormat );
     ~KoParagFormatCommand();
     KoTextCursor *execute( KoTextCursor *c );
     KoTextCursor *unexecute( KoTextCursor *c );
 protected:
     int firstParag, lastParag;
-    QValueList<KoTextFormat *> m_oldFormats;
+    TQValueList<KoTextFormat *> m_oldFormats;
     KoTextFormat * m_newFormat;
 };
 
@@ -128,7 +128,7 @@ protected:
 class KoTextFormatCommand : public KoTextDocFormatCommand
 {
 public:
-    KoTextFormatCommand( KoTextDocument *d, int sid, int sidx, int eid, int eidx, const QMemArray<KoTextStringChar> &old, const KoTextFormat *f, int fl );
+    KoTextFormatCommand( KoTextDocument *d, int sid, int sidx, int eid, int eidx, const TQMemArray<KoTextStringChar> &old, const KoTextFormat *f, int fl );
     virtual ~KoTextFormatCommand();
 
     KoTextCursor *execute( KoTextCursor *c );
@@ -146,7 +146,7 @@ public:
     KoChangeVariableSubType( short int _oldValue, short int _newValue, KoVariable *var );
     void execute();
     void unexecute();
-    virtual QString name() const;
+    virtual TQString name() const;
 private:
     short int m_newValue;
     short int m_oldValue;
@@ -160,13 +160,13 @@ private:
 class KoChangeVariableFormatProperties : public KCommand
 {
  public:
-    KoChangeVariableFormatProperties( const QString &_oldValue, const QString &_newValue, KoVariable *var);
-    virtual QString name() const;
+    KoChangeVariableFormatProperties( const TQString &_oldValue, const TQString &_newValue, KoVariable *var);
+    virtual TQString name() const;
     void execute();
     void unexecute();
 private:
-    QString m_newValue;
-    QString m_oldValue;
+    TQString m_newValue;
+    TQString m_oldValue;
     KoVariable *m_var;
 };