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

diff --git a/kword/KWCommand.h b/kword/KWCommand.h
index 02d58f9a..a3272104 100644
--- a/kword/KWCommand.h
+++ b/kword/KWCommand.h
@@ -59,13 +59,13 @@ class KWOasisPasteCommand : public KoTextDocCommand
 {
 public:
     KWOasisPasteCommand( KoTextDocument *d, int parag, int idx,
-                             const QByteArray & data );
+                             const TQByteArray & data );
     KoTextCursor *execute( KoTextCursor *c );
     KoTextCursor *unexecute( KoTextCursor *c );
 protected:
     int m_parag;
     int m_idx;
-    QByteArray m_data;
+    TQByteArray m_data;
     // filled in by execute(), for unexecute()
     int m_lastParag;
     int m_lastIndex;
@@ -73,7 +73,7 @@ protected:
 };
 
 struct ParagBookmark {
-    QString m_bookName;
+    TQString m_bookName;
     int m_startParagIndex;
     int m_endParagIndex;
 };
@@ -81,14 +81,14 @@ struct ParagBookmark {
 class KWTextDeleteCommand : public KoTextDeleteCommand
 {
 public:
-    KWTextDeleteCommand( KoTextDocument *d, int i, int idx, const QMemArray<KoTextStringChar> &str,
+    KWTextDeleteCommand( 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 );
     void createBookmarkList();
 private:
-    QValueList<ParagBookmark> m_listParagBookmark;
+    TQValueList<ParagBookmark> m_listParagBookmark;
 };
 
 
@@ -116,15 +116,15 @@ public:
         KoBorder m_OldBorder;
     };
 
-    KWFrameBorderCommand( const QString &name, QPtrList<FrameIndex> &_listFrameIndex, QPtrList<FrameBorderTypeStruct> &_frameTypeBorder,const KoBorder & _newBorder ) ;
+    KWFrameBorderCommand( const TQString &name, TQPtrList<FrameIndex> &_listFrameIndex, TQPtrList<FrameBorderTypeStruct> &_frameTypeBorder,const KoBorder & _newBorder ) ;
     ~ KWFrameBorderCommand();
 
     void execute();
     void unexecute();
 
 protected:
-    QPtrList<FrameIndex> m_indexFrame;
-    QPtrList<FrameBorderTypeStruct> m_oldBorderFrameType;
+    TQPtrList<FrameIndex> m_indexFrame;
+    TQPtrList<FrameBorderTypeStruct> m_oldBorderFrameType;
     KoBorder m_newBorder;
 };
 
@@ -134,16 +134,16 @@ protected:
 class KWFrameBackGroundColorCommand : public KNamedCommand
 {
 public:
-    KWFrameBackGroundColorCommand( const QString &name, QPtrList<FrameIndex> &_listFrameIndex, QPtrList<QBrush> &_oldBrush, const QBrush & _newColor ) ;
+    KWFrameBackGroundColorCommand( const TQString &name, TQPtrList<FrameIndex> &_listFrameIndex, TQPtrList<TQBrush> &_oldBrush, const TQBrush & _newColor ) ;
     ~KWFrameBackGroundColorCommand();
 
     void execute();
     void unexecute();
 
 protected:
-    QPtrList<FrameIndex> m_indexFrame;
-    QPtrList<QBrush> m_oldBackGroundColor;
-    QBrush m_newColor;
+    TQPtrList<FrameIndex> m_indexFrame;
+    TQPtrList<TQBrush> m_oldBackGroundColor;
+    TQBrush m_newColor;
 };
 
 /**
@@ -152,7 +152,7 @@ protected:
 class KWFrameStyleCommand : public KNamedCommand
 {
 public:
-    KWFrameStyleCommand( const QString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _repaintViews = true );
+    KWFrameStyleCommand( const TQString &name, KWFrame *_frame, KWFrameStyle *_fs, bool _tqrepaintViews = true );
     ~ KWFrameStyleCommand() { if (m_oldValues) delete m_oldValues; }
 
     void execute();
@@ -163,7 +163,7 @@ protected:
     KWFrame *m_frame ;
     KWFrameStyle * m_fs;
     KWFrameStyle * m_oldValues;
-    bool repaintViews;
+    bool tqrepaintViews;
 };
 
 
@@ -173,7 +173,7 @@ protected:
 class KWTableStyleCommand : public KNamedCommand
 {
 public:
-    KWTableStyleCommand( const QString &name, KWFrame *_frame, KWTableStyle *_ts, bool _repaintViews = true );
+    KWTableStyleCommand( const TQString &name, KWFrame *_frame, KWTableStyle *_ts, bool _tqrepaintViews = true );
     ~ KWTableStyleCommand();
 
     void execute();
@@ -184,7 +184,7 @@ protected:
     KWTableStyle * m_ts;
     KWFrameStyleCommand * m_fsc;
     KCommand * m_sc;
-    bool repaintViews;
+    bool tqrepaintViews;
 };
 
 /**
@@ -193,7 +193,7 @@ protected:
 class KWTableTemplateCommand : public KNamedCommand
 {
 public:
-    KWTableTemplateCommand( const QString &name, KWTableFrameSet *_table, KWTableTemplate *_tt );
+    KWTableTemplateCommand( const TQString &name, KWTableFrameSet *_table, KWTableTemplate *_tt );
     ~ KWTableTemplateCommand();
 
     void execute();
@@ -227,16 +227,16 @@ struct FrameResizeStruct {
 class KWFrameResizeCommand : public KNamedCommand
 {
 public:
-    KWFrameResizeCommand(const QString &name, const QValueList<FrameIndex> &frameIndex, const QValueList<FrameResizeStruct> &frameResize );
-    KWFrameResizeCommand(const QString &name, FrameIndex frameIndex, const FrameResizeStruct &frameResize );
+    KWFrameResizeCommand(const TQString &name, const TQValueList<FrameIndex> &frameIndex, const TQValueList<FrameResizeStruct> &frameResize );
+    KWFrameResizeCommand(const TQString &name, FrameIndex frameIndex, const FrameResizeStruct &frameResize );
     ~KWFrameResizeCommand() {}
 
     void execute();
     void unexecute();
 
 protected:
-    QValueList<FrameIndex> m_indexFrame;
-    QValueList<FrameResizeStruct> m_frameResize;
+    TQValueList<FrameIndex> m_indexFrame;
+    TQValueList<FrameResizeStruct> m_frameResize;
 };
 
 /**
@@ -245,7 +245,7 @@ protected:
 class KWFrameChangePictureCommand : public KNamedCommand
 {
 public:
-    KWFrameChangePictureCommand( const QString &name, FrameIndex _frameIndex, const KoPictureKey & _oldFile, const KoPictureKey & _newFile) ;
+    KWFrameChangePictureCommand( const TQString &name, FrameIndex _frameIndex, const KoPictureKey & _oldFile, const KoPictureKey & _newFile) ;
     ~KWFrameChangePictureCommand() {}
 
     void execute();
@@ -258,7 +258,7 @@ protected:
 };
 
 struct FrameMoveStruct {
-    FrameMoveStruct() {} // for QValueList
+    FrameMoveStruct() {} // for TQValueList
     FrameMoveStruct( const KoPoint& p1, const KoPoint& p2 )
         : oldPos(p1), newPos(p2) {
     }
@@ -272,17 +272,17 @@ struct FrameMoveStruct {
 class KWFrameMoveCommand : public KNamedCommand
 {
 public:
-    KWFrameMoveCommand( const QString &name,
-                        const QValueList<FrameIndex> & _frameIndex,
-                        const QValueList<FrameMoveStruct> & _frameMove );
+    KWFrameMoveCommand( const TQString &name,
+                        const TQValueList<FrameIndex> & _frameIndex,
+                        const TQValueList<FrameMoveStruct> & _frameMove );
     ~KWFrameMoveCommand() {}
 
     void execute();
     void unexecute();
-    QValueList<FrameMoveStruct> & listFrameMoved() { return m_frameMove; }
+    TQValueList<FrameMoveStruct> & listFrameMoved() { return m_frameMove; }
 protected:
-    QValueList<FrameIndex> m_indexFrame;
-    QValueList<FrameMoveStruct> m_frameMove;
+    TQValueList<FrameIndex> m_indexFrame;
+    TQValueList<FrameMoveStruct> m_frameMove;
 };
 
 /**
@@ -299,7 +299,7 @@ public:
     /** A copy of frameAfter is done internally.
      * But make sure frameBefore is already a copy, its ownership is moved to the command.
      */
-    KWFramePropertiesCommand( const QString &name, KWFrame *_frameBefore,  KWFrame *_frameAfter );
+    KWFramePropertiesCommand( const TQString &name, KWFrame *_frameBefore,  KWFrame *_frameAfter );
     ~KWFramePropertiesCommand();
     void execute();
     void unexecute();
@@ -316,7 +316,7 @@ protected:
 class KWFramePartMoveCommand : public KNamedCommand
 {
 public:
-    KWFramePartMoveCommand( const QString &name,FrameIndex _frameIndex,FrameResizeStruct _frameMove ) ;
+    KWFramePartMoveCommand( const TQString &name,FrameIndex _frameIndex,FrameResizeStruct _frameMove ) ;
     ~KWFramePartMoveCommand() {}
 
     void execute();
@@ -334,7 +334,7 @@ protected:
 class KWFramePartInternalCommand : public KNamedCommand
 {
 public:
-    KWFramePartInternalCommand( const QString &name, KWPartFrameSet *part ) ;
+    KWFramePartInternalCommand( const TQString &name, KWPartFrameSet *part ) ;
     ~KWFramePartInternalCommand() {}
 
     void execute();
@@ -350,7 +350,7 @@ protected:
 class KWFramePartExternalCommand : public KNamedCommand
 {
 public:
-    KWFramePartExternalCommand( const QString &name, KWPartFrameSet *part ) ;
+    KWFramePartExternalCommand( const TQString &name, KWPartFrameSet *part ) ;
     ~KWFramePartExternalCommand() {}
 
     void execute();
@@ -365,7 +365,7 @@ protected:
 class KWFrameSetInlineCommand : public KNamedCommand
 {
 public:
-    KWFrameSetInlineCommand( const QString &name, KWFrameSet *frameset,
+    KWFrameSetInlineCommand( const TQString &name, KWFrameSet *frameset,
                              bool value );
     ~KWFrameSetInlineCommand() {}
 
@@ -380,7 +380,7 @@ protected:
     bool m_oldValue;
 };
 
-///////////////////////////////layout command///////////////////////////
+///////////////////////////////tqlayout command///////////////////////////
 struct KWPageLayoutStruct {
     KWPageLayoutStruct( const KoPageLayout& pgLayout, const KoColumns& cl, const KoKWHeaderFooter& hf )
         : _pgLayout(pgLayout), _cl(cl), _hf(hf) {
@@ -391,12 +391,12 @@ struct KWPageLayoutStruct {
 };
 
 /**
- * Command created when changing the page layout
+ * Command created when changing the page tqlayout
  */
 class KWPageLayoutCommand : public KNamedCommand
 {
 public:
-    KWPageLayoutCommand( const QString &name, KWDocument *_doc, KWPageLayoutStruct &_oldLayout, KWPageLayoutStruct &_newLayout);
+    KWPageLayoutCommand( const TQString &name, KWDocument *_doc, KWPageLayoutStruct &_oldLayout, KWPageLayoutStruct &_newLayout);
     ~KWPageLayoutCommand() {}
 
     void execute();
@@ -414,7 +414,7 @@ protected:
 class KWDeleteFrameCommand : public KNamedCommand
 {
 public:
-    KWDeleteFrameCommand( const QString &name, KWFrame * frame) ;
+    KWDeleteFrameCommand( const TQString &name, KWFrame * frame) ;
     /**
      * Constructor to be used for chaining commands, i.e. inside another command.
      * @param frameIndex a frameIndex object that specifies which frame to delete
@@ -435,7 +435,7 @@ protected:
 class KWCreateFrameCommand : public KWDeleteFrameCommand
 {
 public:
-    KWCreateFrameCommand( const QString &name, KWFrame * frame);
+    KWCreateFrameCommand( const TQString &name, KWFrame * frame);
     ~KWCreateFrameCommand() {}
 
     void execute() { KWDeleteFrameCommand::unexecute(); }
@@ -448,14 +448,14 @@ public:
 class KWUngroupTableCommand : public KNamedCommand
 {
 public:
-    KWUngroupTableCommand( const QString &name, KWTableFrameSet * _table) ;
+    KWUngroupTableCommand( const TQString &name, KWTableFrameSet * _table) ;
     ~KWUngroupTableCommand() {}
 
     void execute();
     void unexecute();
 protected:
     KWTableFrameSet *m_pTable;
-    QPtrList<KWFrameSet> m_ListFrame;
+    TQPtrList<KWFrameSet> m_ListFrame;
 };
 
 /**
@@ -464,7 +464,7 @@ protected:
 class KWDeleteTableCommand : public KNamedCommand
 {
 public:
-    KWDeleteTableCommand( const QString &name, KWTableFrameSet * _table) ;
+    KWDeleteTableCommand( const TQString &name, KWTableFrameSet * _table) ;
     ~KWDeleteTableCommand() {}
 
     void execute();
@@ -480,7 +480,7 @@ protected:
 class KWCreateTableCommand : public KWDeleteTableCommand
 {
 public:
-    KWCreateTableCommand( const QString &name, KWTableFrameSet * _table)
+    KWCreateTableCommand( const TQString &name, KWTableFrameSet * _table)
         : KWDeleteTableCommand( name, _table ) {}
     ~KWCreateTableCommand() {}
 
@@ -495,7 +495,7 @@ class KWInsertColumnCommand : public KNamedCommand
 {
 public:
     /* for the last parameter, _maxRight, you should pass the maximum offset that the table can use at its right (normally m_maxRight - m_pTable->boundingRect().left())*/
-    KWInsertColumnCommand( const QString &name, KWTableFrameSet * _table, int _pos, double _maxRight);
+    KWInsertColumnCommand( const TQString &name, KWTableFrameSet * _table, int _pos, double _maxRight);
     ~KWInsertColumnCommand();
 
     void execute();
@@ -516,7 +516,7 @@ protected:
 class KWInsertRowCommand : public KNamedCommand
 {
 public:
-    KWInsertRowCommand( const QString &name, KWTableFrameSet * _table, int _pos);
+    KWInsertRowCommand( const TQString &name, KWTableFrameSet * _table, int _pos);
     ~KWInsertRowCommand();
 
     void execute();
@@ -534,7 +534,7 @@ protected:
 class KWRemoveRowCommand : public KNamedCommand
 {
 public:
-    KWRemoveRowCommand( const QString &name, KWTableFrameSet * _table, int _pos);
+    KWRemoveRowCommand( const TQString &name, KWTableFrameSet * _table, int _pos);
     ~KWRemoveRowCommand();
 
     void execute();
@@ -551,7 +551,7 @@ protected:
 class KWRemoveColumnCommand : public KNamedCommand
 {
 public:
-    KWRemoveColumnCommand( const QString &name, KWTableFrameSet * _table, int _pos);
+    KWRemoveColumnCommand( const TQString &name, KWTableFrameSet * _table, int _pos);
     ~KWRemoveColumnCommand();
 
     void execute();
@@ -568,7 +568,7 @@ protected:
 class KWSplitCellCommand : public KNamedCommand
 {
 public:
-    KWSplitCellCommand( const QString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd );
+    KWSplitCellCommand( const TQString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd );
     ~KWSplitCellCommand() {}
 
     void execute();
@@ -579,7 +579,7 @@ protected:
     unsigned int m_rowBegin;
     unsigned int m_colEnd;
     unsigned int m_rowEnd;
-    QPtrList<KWFrameSet> m_ListFrameSet;
+    TQPtrList<KWFrameSet> m_ListFrameSet;
 };
 
 /**
@@ -588,7 +588,7 @@ protected:
 class KWJoinCellCommand : public KNamedCommand
 {
 public:
-    KWJoinCellCommand( const QString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd, QPtrList<KWFrameSet> listFrameSet,QPtrList<KWFrame> listCopyFrame);
+    KWJoinCellCommand( const TQString &name, KWTableFrameSet * _table,unsigned int colBegin,unsigned int rowBegin, unsigned int colEnd,unsigned int rowEnd, TQPtrList<KWFrameSet> listFrameSet,TQPtrList<KWFrame> listCopyFrame);
     ~KWJoinCellCommand();
 
     void execute();
@@ -599,8 +599,8 @@ protected:
     unsigned int m_rowBegin;
     unsigned int m_colEnd;
     unsigned int m_rowEnd;
-    QPtrList<KWFrameSet> m_ListFrameSet;
-    QPtrList<KWFrame> m_copyFrame;
+    TQPtrList<KWFrameSet> m_ListFrameSet;
+    TQPtrList<KWFrame> m_copyFrame;
 };
 
 /**
@@ -609,7 +609,7 @@ protected:
 class KWChangeStartingPageCommand : public KNamedCommand
 {
 public:
-    KWChangeStartingPageCommand( const QString &name, KWDocument *_doc, int _oldStartingPage, int _newStartingPage);
+    KWChangeStartingPageCommand( const TQString &name, KWDocument *_doc, int _oldStartingPage, int _newStartingPage);
     ~KWChangeStartingPageCommand(){}
 
     void execute();
@@ -627,7 +627,7 @@ class KWChangeVariableSettingsCommand : public KNamedCommand
 {
 public:
     enum VariableProperties { VS_DISPLAYLINK, VS_UNDERLINELINK, VS_DISPLAYCOMMENT, VS_DISPLAYFIELDCODE};
-    KWChangeVariableSettingsCommand( const QString &name, KWDocument *_doc, bool _oldDisplay, bool _newDisplay, VariableProperties _type);
+    KWChangeVariableSettingsCommand( const TQString &name, KWDocument *_doc, bool _oldDisplay, bool _newDisplay, VariableProperties _type);
     ~KWChangeVariableSettingsCommand(){}
 
     void execute();
@@ -643,51 +643,51 @@ protected:
 class KWChangeCustomVariableValue : public KNamedCommand
 {
  public:
-    KWChangeCustomVariableValue( const QString &name, KWDocument *_doc,const QString & _oldValue, const QString & _newValue, KoCustomVariable *var);
+    KWChangeCustomVariableValue( const TQString &name, KWDocument *_doc,const TQString & _oldValue, const TQString & _newValue, KoCustomVariable *var);
     ~KWChangeCustomVariableValue();
     void execute();
     void unexecute();
  protected:
     KWDocument *m_doc;
-    QString newValue;
-    QString oldValue;
+    TQString newValue;
+    TQString oldValue;
     KoCustomVariable *m_var;
 };
 
 class KWChangeVariableNoteText : public KNamedCommand
 {
  public:
-    KWChangeVariableNoteText( const QString &name, KWDocument *_doc, const QString &_oldValue,const QString &_newValue, KoNoteVariable *var);
+    KWChangeVariableNoteText( const TQString &name, KWDocument *_doc, const TQString &_oldValue,const TQString &_newValue, KoNoteVariable *var);
     ~KWChangeVariableNoteText();
     void execute();
     void unexecute();
  protected:
     KWDocument *m_doc;
-    QString newValue;
-    QString oldValue;
+    TQString newValue;
+    TQString oldValue;
      KoNoteVariable *m_var;
 };
 
 class KWChangeLinkVariable : public KNamedCommand
 {
  public:
-    KWChangeLinkVariable( const QString &name, KWDocument *_doc,const QString & _oldHref, const QString & _newHref, const QString & _oldLink,const QString &_newLink, KoLinkVariable *var);
+    KWChangeLinkVariable( const TQString &name, KWDocument *_doc,const TQString & _oldHref, const TQString & _newHref, const TQString & _oldLink,const TQString &_newLink, KoLinkVariable *var);
     ~KWChangeLinkVariable(){};
     void execute();
     void unexecute();
  protected:
     KWDocument *m_doc;
-    QString oldHref;
-    QString newHref;
-    QString oldLink;
-    QString newLink;
+    TQString oldHref;
+    TQString newHref;
+    TQString oldLink;
+    TQString newLink;
     KoLinkVariable *m_var;
 };
 
 class KWHideShowHeader : public KNamedCommand
 {
  public:
-    KWHideShowHeader( const QString &name, KWDocument *_doc, bool _newValue);
+    KWHideShowHeader( const TQString &name, KWDocument *_doc, bool _newValue);
     ~KWHideShowHeader(){};
     void execute();
     void unexecute();
@@ -699,7 +699,7 @@ class KWHideShowHeader : public KNamedCommand
 class KWHideShowFooter : public KNamedCommand
 {
  public:
-    KWHideShowFooter( const QString &name, KWDocument *_doc, bool _newValue);
+    KWHideShowFooter( const TQString &name, KWDocument *_doc, bool _newValue);
     ~KWHideShowFooter(){};
     void execute();
     void unexecute();
@@ -712,7 +712,7 @@ class KWHideShowFooter : public KNamedCommand
 class KWProtectContentCommand : public KNamedCommand
 {
 public:
-    KWProtectContentCommand( const QString &name, KWTextFrameSet*frameset,bool protect );
+    KWProtectContentCommand( const TQString &name, KWTextFrameSet*frameset,bool protect );
     ~KWProtectContentCommand() {}
 
     void execute();
@@ -729,14 +729,14 @@ class KWInsertRemovePageCommand : public KCommand
     enum Command { Insert, Remove };
     KWInsertRemovePageCommand( KWDocument *_doc, Command cmd, int pgNum);
     ~KWInsertRemovePageCommand();
-    virtual QString name() const;
+    virtual TQString name() const;
     void execute();
     void unexecute();
  protected:
     KWDocument *m_doc;
     Command m_cmd;
     int m_pgNum;
-    QValueList<KCommand*> childCommands;
+    TQValueList<KCommand*> childCommands;
 
     void doRemove(int pageNumber);
     void doInsert(int pageNumber);
@@ -758,7 +758,7 @@ struct FramePaddingStruct {
 class KWFrameChangeFramePaddingCommand :public KNamedCommand
 {
 public:
-    KWFrameChangeFramePaddingCommand( const QString &name, FrameIndex _frameIndex, FramePaddingStruct _framePaddingBegin, FramePaddingStruct _framePaddingEnd );
+    KWFrameChangeFramePaddingCommand( const TQString &name, FrameIndex _frameIndex, FramePaddingStruct _framePaddingBegin, FramePaddingStruct _framePaddingEnd );
     ~KWFrameChangeFramePaddingCommand() {}
     void execute();
     void unexecute();
@@ -772,7 +772,7 @@ protected:
 class KWChangeFootEndNoteSettingsCommand : public KNamedCommand
 {
 public:
-    KWChangeFootEndNoteSettingsCommand( const QString &name, KoParagCounter _oldCounter, KoParagCounter _newCounter ,bool _footNote ,KWDocument *_doc );
+    KWChangeFootEndNoteSettingsCommand( const TQString &name, KoParagCounter _oldCounter, KoParagCounter _newCounter ,bool _footNote ,KWDocument *_doc );
     ~KWChangeFootEndNoteSettingsCommand() {}
 
     void execute();
@@ -789,7 +789,7 @@ protected:
 class KWChangeTabStopValueCommand : public KNamedCommand
 {
 public:
-    KWChangeTabStopValueCommand( const QString &name,  double _oldValue, double _newValue, KWDocument *_doc);
+    KWChangeTabStopValueCommand( const TQString &name,  double _oldValue, double _newValue, KWDocument *_doc);
 
     ~KWChangeTabStopValueCommand() {}
 
@@ -805,16 +805,16 @@ protected:
 struct FootNoteParameter {
     FootNoteParameter() {}
     FootNoteParameter( KWFootNoteVariable *_var );
-    FootNoteParameter( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const QString &_manualString);
+    FootNoteParameter( NoteType _noteType, KWFootNoteVariable::Numbering _numberingType, const TQString &_manualString);
     NoteType noteType;
     KWFootNoteVariable::Numbering numberingType;
-    QString manualString;
+    TQString manualString;
 };
 
 class KWChangeFootNoteParametersCommand : public KNamedCommand
 {
 public:
-    KWChangeFootNoteParametersCommand( const QString &name, KWFootNoteVariable * _var, FootNoteParameter _oldParameter, FootNoteParameter _newParameter, KWDocument *_doc);
+    KWChangeFootNoteParametersCommand( const TQString &name, KWFootNoteVariable * _var, FootNoteParameter _oldParameter, FootNoteParameter _newParameter, KWDocument *_doc);
 
     ~KWChangeFootNoteParametersCommand() {}
 
@@ -832,7 +832,7 @@ protected:
 class KWChangeFootNoteLineSeparatorParametersCommand : public KNamedCommand
 {
 public:
-    KWChangeFootNoteLineSeparatorParametersCommand( const QString &name, SeparatorLinePos _oldValuePos, SeparatorLinePos _newValuePos, int _oldLength, int _newLength, double _oldWidth, double _newWidth,SeparatorLineLineType _oldLineType, SeparatorLineLineType _newLineType, KWDocument *_doc);
+    KWChangeFootNoteLineSeparatorParametersCommand( const TQString &name, SeparatorLinePos _oldValuePos, SeparatorLinePos _newValuePos, int _oldLength, int _newLength, double _oldWidth, double _newWidth,SeparatorLineLineType _oldLineType, SeparatorLineLineType _newLineType, KWDocument *_doc);
 
     ~KWChangeFootNoteLineSeparatorParametersCommand() {}
 
@@ -854,7 +854,7 @@ protected:
 class KWRenameBookmarkCommand : public KNamedCommand
 {
 public:
-    KWRenameBookmarkCommand( const QString &name, const QString & _oldname, const QString & _newName, KWDocument *_doc);
+    KWRenameBookmarkCommand( const TQString &name, const TQString & _oldname, const TQString & _newName, KWDocument *_doc);
 
     ~KWRenameBookmarkCommand() {}
 
@@ -862,8 +862,8 @@ public:
     virtual void unexecute();
 protected:
     KWDocument *m_doc;
-    QString m_oldName;
-    QString m_newName;
+    TQString m_oldName;
+    TQString m_newName;
 };
 
 class KWResizeColumnCommand : public KNamedCommand