From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- kpresenter/KPrCommand.h | 318 ++++++++++++++++++++++++------------------------ 1 file changed, 159 insertions(+), 159 deletions(-) (limited to 'kpresenter/KPrCommand.h') diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h index a3e06e3e..4a4cc0ec 100644 --- a/kpresenter/KPrCommand.h +++ b/kpresenter/KPrCommand.h @@ -23,22 +23,22 @@ #define kprcommand_h #include -#include -#include -#include -#include +#include +#include +#include +#include #include "global.h" #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include "KPrBackground.h" #include "KPrVariableCollection.h" #include @@ -67,11 +67,11 @@ public: { int shadowDistance; ShadowDirection shadowDirection; - QColor shadowColor; + TQColor shadowColor; }; - KPrShadowCmd( const QString &_name, QPtrList &_oldShadow, ShadowValues _newShadow, - QPtrList &_objects, KPrDocument *_doc ); + KPrShadowCmd( const TQString &_name, TQPtrList &_oldShadow, ShadowValues _newShadow, + TQPtrList &_objects, KPrDocument *_doc ); ~KPrShadowCmd(); virtual void execute(); @@ -79,8 +79,8 @@ public: protected: KPrDocument *doc; - QPtrList oldShadow; - QPtrList objects; + TQPtrList oldShadow; + TQPtrList objects; ShadowValues newShadow; KPrPage *m_page; }; @@ -88,9 +88,9 @@ protected: class KPrSetOptionsCmd : public KNamedCommand { public: - KPrSetOptionsCmd( const QString &_name, QValueList &_diffs, QPtrList &_objects, + KPrSetOptionsCmd( const TQString &_name, TQValueList &_diffs, TQPtrList &_objects, double _rastX, double _rastY, double _orastX, double _orastY, - const QColor &_txtBackCol, const QColor &_otxtBackCol, KPrDocument *_doc ); + const TQColor &_txtBackCol, const TQColor &_otxtBackCol, KPrDocument *_doc ); ~KPrSetOptionsCmd(); virtual void execute(); @@ -98,21 +98,21 @@ public: protected: - QValueList diffs; - QPtrList objects; + TQValueList diffs; + TQPtrList objects; double gridX; double gridY; double oldGridX; double oldGridY; KPrDocument *doc; - QColor txtBackCol; - QColor otxtBackCol; + TQColor txtBackCol; + TQColor otxtBackCol; }; class KPrSetBackCmd : public KNamedCommand { public: - KPrSetBackCmd( const QString &name, const KPrBackGround::Settings &settings, + KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings, const KPrBackGround::Settings &oldSettings, bool useMasterBackground, bool takeGlobal, KPrDocument *doc, KPrPage *page ); @@ -139,7 +139,7 @@ public: float angle; }; - KPrRotateCmd( const QString &_name, float newAngle, QPtrList &objects, + KPrRotateCmd( const TQString &_name, float newAngle, TQPtrList &objects, KPrDocument *doc, bool addAngle = false ); ~KPrRotateCmd(); @@ -148,8 +148,8 @@ public: protected: KPrDocument *m_doc; - QPtrList m_oldAngles; - QPtrList m_objects; + TQPtrList m_oldAngles; + TQPtrList m_objects; float m_newAngle; //necessary for duplicate object, we can duplicated and add angle. bool m_addAngle; @@ -159,7 +159,7 @@ protected: class KPrResizeCmd : public KNamedCommand { public: - KPrResizeCmd( const QString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, + KPrResizeCmd( const TQString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, KPrObject *_object, KPrDocument *_doc ); ~KPrResizeCmd(); @@ -178,7 +178,7 @@ protected: class KPrChgPixCmd : public KNamedCommand { public: - KPrChgPixCmd( const QString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, + KPrChgPixCmd( const TQString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, KPrDocument *_doc, KPrPage *_page ); ~KPrChgPixCmd(); @@ -195,7 +195,7 @@ protected: class KPrDeleteCmd : public KNamedCommand { public: - KPrDeleteCmd( const QString &_name, QPtrList &_objects, KPrDocument *_doc, + KPrDeleteCmd( const TQString &_name, TQPtrList &_objects, KPrDocument *_doc, KPrPage *_page); ~KPrDeleteCmd(); @@ -203,8 +203,8 @@ public: virtual void unexecute(); protected: - QPtrList m_oldObjectList; - QPtrList m_objectsToDelete; + TQPtrList m_oldObjectList; + TQPtrList m_objectsToDelete; KPrDocument *m_doc; KPrPage *m_page; }; @@ -222,11 +222,11 @@ public: bool disappear; int appearTimer, disappearTimer; bool appearSoundEffect, disappearSoundEffect; - QString a_fileName, d_fileName; + TQString a_fileName, d_fileName; }; - KPrEffectCmd( const QString &_name, const QPtrList &_objs, - const QValueList &_oldEffects, EffectStruct _newEffect ); + KPrEffectCmd( const TQString &_name, const TQPtrList &_objs, + const TQValueList &_oldEffects, EffectStruct _newEffect ); ~KPrEffectCmd(); virtual void execute(); @@ -234,16 +234,16 @@ public: protected: - QValueList oldEffects; + TQValueList oldEffects; EffectStruct newEffect; - QPtrList objs; + TQPtrList objs; }; class KPrGroupObjCmd : public KNamedCommand { public: - KPrGroupObjCmd( const QString &_name, - const QPtrList &_objects, + KPrGroupObjCmd( const TQString &_name, + const TQPtrList &_objects, KPrDocument *_doc, KPrPage *_page ); ~KPrGroupObjCmd(); @@ -252,8 +252,8 @@ public: protected: - QPtrList m_objectsToGroup; - QPtrList m_oldObjectList; + TQPtrList m_objectsToGroup; + TQPtrList m_oldObjectList; KPrDocument *m_doc; KPrGroupObject *m_groupObject; KPrPage *m_page; @@ -263,7 +263,7 @@ protected: class UnGroupObjCmd : public KNamedCommand { public: - UnGroupObjCmd( const QString &_name, + UnGroupObjCmd( const TQString &_name, KPrGroupObject *grpObj_, KPrDocument *_doc, KPrPage *_page ); ~UnGroupObjCmd(); @@ -273,7 +273,7 @@ public: protected: - QPtrList m_groupedObjects; + TQPtrList m_groupedObjects; KPrGroupObject *m_groupObject; KPrDocument *m_doc; KPrPage *m_page; @@ -283,15 +283,15 @@ protected: class KPrInsertCmd : public KNamedCommand { public: - KPrInsertCmd( const QString &name, const QValueList objects, KPrDocument *doc, KPrPage *page ); - KPrInsertCmd( const QString &name, KPrObject *object, KPrDocument *doc, KPrPage *page ); + KPrInsertCmd( const TQString &name, const TQValueList objects, KPrDocument *doc, KPrPage *page ); + KPrInsertCmd( const TQString &name, KPrObject *object, KPrDocument *doc, KPrPage *page ); ~KPrInsertCmd(); virtual void execute(); virtual void unexecute(); protected: - QValueList m_objects; + TQValueList m_objects; KPrObject *m_object; KPrDocument *m_doc; KPrPage *m_page; @@ -301,8 +301,8 @@ protected: class KPrLowerRaiseCmd : public KNamedCommand { public: - KPrLowerRaiseCmd( const QString &_name, const QPtrList& _oldList, - const QPtrList& _newList, + KPrLowerRaiseCmd( const TQString &_name, const TQPtrList& _oldList, + const TQPtrList& _newList, KPrDocument *_doc, KPrPage *_page ); ~KPrLowerRaiseCmd(); @@ -311,7 +311,7 @@ public: protected: - QPtrList oldList, newList; + TQPtrList oldList, newList; KPrDocument *doc; KPrPage *m_page; }; @@ -319,7 +319,7 @@ protected: class KPrMoveByCmd : public KNamedCommand { public: - KPrMoveByCmd( const QString &_name, const KoPoint &_diff, QPtrList &_objects, + KPrMoveByCmd( const TQString &_name, const KoPoint &_diff, TQPtrList &_objects, KPrDocument *_doc, KPrPage *_page ); ~KPrMoveByCmd(); @@ -329,7 +329,7 @@ public: protected: KoPoint diff; - QPtrList objects; + TQPtrList objects; KPrDocument *doc; KPrPage *m_page; }; @@ -340,15 +340,15 @@ protected: class KPrAlignCmd : public KNamedCommand { public: - KPrAlignCmd( const QString &_name, QPtrList &_objects, AlignType _at, KPrDocument *_doc ); + KPrAlignCmd( const TQString &_name, TQPtrList &_objects, AlignType _at, KPrDocument *_doc ); ~KPrAlignCmd(); virtual void execute(); virtual void unexecute(); protected: - QPtrList diffs; - QPtrList objects; + TQPtrList diffs; + TQPtrList objects; KPrDocument *doc; KPrPage *m_page; }; @@ -384,7 +384,7 @@ public: All = LineBegin | LineEnd | Color | Width | Style }; - KoPenCmd( const QString &_name, QPtrList &_objects, Pen _newPen, + KoPenCmd( const TQString &_name, TQPtrList &_objects, Pen _newPen, KPrDocument *_doc, KPrPage *_page, int _flags = All); ~KoPenCmd(); @@ -392,13 +392,13 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList &_objects ); + void addObjects( const TQPtrList &_objects ); void applyPen( KPrObject *object, Pen *tmpPen ); KPrDocument *doc; KPrPage *m_page; - QPtrList oldPen; - QPtrList objects; + TQPtrList oldPen; + TQPtrList objects; Pen newPen; int flags; }; @@ -408,7 +408,7 @@ class KPrBrushCmd : public KNamedCommand public: struct Brush { Brush() {} - Brush( QBrush _brush, QColor _gColor1, QColor _gColor2, + Brush( TQBrush _brush, TQColor _gColor1, TQColor _gColor2, BCType _gType, FillType _fillType, bool _unbalanced, int _xfactor, int _yfactor ) : brush( _brush ) @@ -421,9 +421,9 @@ public: , yfactor( _yfactor ) {} - QBrush brush; - QColor gColor1; - QColor gColor2; + TQBrush brush; + TQColor gColor1; + TQColor gColor2; BCType gType; FillType fillType; bool unbalanced; @@ -456,7 +456,7 @@ public: All = BrushColor | BrushStyle | BrushGradientSelect | GradientColor1 | GradientColor2 | GradientType | GradientBalanced | GradientXFactor | GradientYFactor }; - KPrBrushCmd( const QString &_name, QPtrList &_objects, Brush _newBrush, + KPrBrushCmd( const TQString &_name, TQPtrList &_objects, Brush _newBrush, KPrDocument *_doc, KPrPage *_page, int _flags = All ); ~KPrBrushCmd(); @@ -464,12 +464,12 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList &_objects ); + void addObjects( const TQPtrList &_objects ); void applyBrush( KPr2DObject *object, Brush *tmpBrush ); KPrDocument *doc; - QPtrList oldBrush; - QPtrList objects; + TQPtrList oldBrush; + TQPtrList objects; Brush newBrush; KPrPage *m_page; int flags; @@ -478,12 +478,12 @@ protected: class KPrPgConfCmd : public KNamedCommand { public: - KPrPgConfCmd( const QString &_name, bool _manualSwitch, bool _infiniteLoop, - bool _showEndOfPresentationSlide, bool _showPresentationDuration, QPen _pen, - QValueList _selectedSlides, const QString & _presentationName, + KPrPgConfCmd( const TQString &_name, bool _manualSwitch, bool _infiniteLoop, + bool _showEndOfPresentationSlide, bool _showPresentationDuration, TQPen _pen, + TQValueList _selectedSlides, const TQString & _presentationName, bool _oldManualSwitch, bool _oldInfiniteLoop, - bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, QPen _oldPen, - QValueList _oldSelectedSlides, const QString & _oldPresentationName, + bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, TQPen _oldPen, + TQValueList _oldSelectedSlides, const TQString & _oldPresentationName, KPrDocument *_doc ); virtual void execute(); @@ -494,9 +494,9 @@ protected: bool infiniteLoop, oldInfiniteLoop; bool showEndOfPresentationSlide, oldShowEndOfPresentationSlide; bool showPresentationDuration, oldShowPresentationDuration; - QPen pen, oldPen; - QValueList selectedSlides, oldSelectedSlides; - QString oldPresentationName, presentationName; + TQPen pen, oldPen; + TQValueList selectedSlides, oldSelectedSlides; + TQString oldPresentationName, presentationName; KPrDocument *doc; }; @@ -508,25 +508,25 @@ public: PageEffect pageEffect; EffectSpeed effectSpeed; bool soundEffect; - QString soundFileName; + TQString soundFileName; bool autoAdvance; int slideTime; void applyTo( KPrPage * ); }; // TODO also pass a flag to know which settings need to be applied (especially for "all pages") - KPrTransEffectCmd( QValueVector oldSettings, + KPrTransEffectCmd( TQValueVector oldSettings, PageEffectSettings newSettings, KPrPage* page, KPrDocument* doc ); virtual void execute(); virtual void unexecute(); - virtual QString name() const; + virtual TQString name() const; private: void exec( KPrPage* page ); void unexec( KPrPage* page ); - QValueVector m_oldSettings; + TQValueVector m_oldSettings; PageEffectSettings m_newSettings; KPrPage *m_page; KPrDocument *m_doc; @@ -535,7 +535,7 @@ private: class KPrPgLayoutCmd : public KNamedCommand { public: - KPrPgLayoutCmd( const QString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, + KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, KoUnit::Unit _oldUnit, KoUnit::Unit _unit,KPrDocument *_doc ); virtual void execute(); @@ -543,7 +543,7 @@ public: protected: KPrDocument *m_doc; - KoPageLayout layout, oldLayout; + KoPageLayout tqlayout, oldLayout; KoUnit::Unit unit, oldUnit; }; @@ -564,23 +564,23 @@ public: All = Type | Angle | Length }; - KPrPieValueCmd( const QString &name, PieValues newValues, - QPtrList &objects, KPrDocument *doc, + KPrPieValueCmd( const TQString &name, PieValues newValues, + TQPtrList &objects, KPrDocument *doc, KPrPage *page, int flags = All ); - KPrPieValueCmd( const QString &_name, QPtrList &_oldValues, PieValues _newValues, - QPtrList &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); + KPrPieValueCmd( const TQString &_name, TQPtrList &_oldValues, PieValues _newValues, + TQPtrList &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); ~KPrPieValueCmd(); virtual void execute(); virtual void unexecute(); protected: - void addObjects( const QPtrList &objects ); + void addObjects( const TQPtrList &objects ); KPrDocument *m_doc; KPrPage *m_page; - QPtrList m_oldValues; - QPtrList m_objects; + TQPtrList m_oldValues; + TQPtrList m_objects; PieValues m_newValues; int m_flags; }; @@ -603,8 +603,8 @@ public: All = ConcaveConvex | Corners | Sharpness }; - KPrPolygonSettingCmd( const QString &name, PolygonSettings newSettings, - QPtrList &objects, KPrDocument *doc, + KPrPolygonSettingCmd( const TQString &name, PolygonSettings newSettings, + TQPtrList &objects, KPrDocument *doc, KPrPage *page, int flags = All ); ~KPrPolygonSettingCmd(); @@ -612,12 +612,12 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList &objects ); + void addObjects( const TQPtrList &objects ); KPrDocument *m_doc; KPrPage *m_page; - QPtrList m_oldSettings; - QPtrList m_objects; + TQPtrList m_oldSettings; + TQPtrList m_objects; PolygonSettings m_newSettings; int m_flags; }; @@ -643,11 +643,11 @@ public: All = MirrorType | Depth | SwapRGB | Grayscal | Bright }; - KPrPictureSettingCmd( const QString &name, PictureSettings newSettings, - QPtrList &objects, KPrDocument *doc, + KPrPictureSettingCmd( const TQString &name, PictureSettings newSettings, + TQPtrList &objects, KPrDocument *doc, KPrPage *page, int flags = All ); - KPrPictureSettingCmd( const QString &_name, QPtrList &_oldSettings, - PictureSettings _newSettings, QPtrList &_objects, + KPrPictureSettingCmd( const TQString &_name, TQPtrList &_oldSettings, + PictureSettings _newSettings, TQPtrList &_objects, KPrDocument *_doc, int flags = All ); ~KPrPictureSettingCmd(); @@ -655,11 +655,11 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList &_objects ); + void addObjects( const TQPtrList &_objects ); KPrDocument *m_doc; - QPtrList m_oldValues; - QPtrList m_objects; + TQPtrList m_oldValues; + TQPtrList m_objects; PictureSettings m_newSettings; KPrPage *m_page; int m_flags; @@ -671,13 +671,13 @@ public: struct ImageEffectSettings { ImageEffect effect; - QVariant param1; - QVariant param2; - QVariant param3; + TQVariant param1; + TQVariant param2; + TQVariant param3; }; - KPrImageEffectCmd(const QString &_name, QPtrList &_oldSettings, - ImageEffectSettings _newSettings, QPtrList &_objects, + KPrImageEffectCmd(const TQString &_name, TQPtrList &_oldSettings, + ImageEffectSettings _newSettings, TQPtrList &_objects, KPrDocument *_doc ); ~KPrImageEffectCmd(); @@ -686,8 +686,8 @@ public: protected: KPrDocument *doc; - QPtrList oldSettings; - QPtrList objects; + TQPtrList oldSettings; + TQPtrList objects; ImageEffectSettings newSettings; KPrPage *m_page; @@ -708,9 +708,9 @@ public: All = XRnd | YRnd }; - KPrRectValueCmd( const QString &_name, QPtrList &_oldValues, RectValues _newValues, - QPtrList &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); - KPrRectValueCmd( const QString &_name, QPtrList &_objects, RectValues _newValues, + KPrRectValueCmd( const TQString &_name, TQPtrList &_oldValues, RectValues _newValues, + TQPtrList &_objects, KPrDocument *_doc, KPrPage *_page, int _flags = All ); + KPrRectValueCmd( const TQString &_name, TQPtrList &_objects, RectValues _newValues, KPrDocument *_doc, KPrPage *_page, int _flags = All ); ~KPrRectValueCmd(); @@ -718,12 +718,12 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList &_objects ); + void addObjects( const TQPtrList &_objects ); KPrDocument *m_doc; KPrPage *m_page; - QPtrList m_oldValues; - QPtrList m_objects; + TQPtrList m_oldValues; + TQPtrList m_objects; RectValues m_newValues; int m_flags; }; @@ -731,7 +731,7 @@ protected: class KPrDeletePageCmd : public KNamedCommand { public: - KPrDeletePageCmd( const QString &name, int pageNum, KPrDocument *doc ); + KPrDeletePageCmd( const TQString &name, int pageNum, KPrDocument *doc ); ~KPrDeletePageCmd(); virtual void execute(); @@ -746,7 +746,7 @@ protected: class KPrInsertPageCmd : public KNamedCommand { public: - KPrInsertPageCmd( const QString &name, int currentPageNum, InsertPos pos, + KPrInsertPageCmd( const TQString &name, int currentPageNum, InsertPos pos, KPrPage *page, KPrDocument *doc ); ~KPrInsertPageCmd(); @@ -762,7 +762,7 @@ protected: class KPrMovePageCmd : public KNamedCommand { public: - KPrMovePageCmd( const QString &_name, int from,int to, KPrDocument *_doc ); + KPrMovePageCmd( const TQString &_name, int from,int to, KPrDocument *_doc ); ~KPrMovePageCmd(); virtual void execute(); @@ -780,13 +780,13 @@ class KPrOasisPasteTextCommand : public KoTextDocCommand { public: KPrOasisPasteTextCommand( 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; @@ -799,7 +799,7 @@ protected: class KPrChangeStartingPageCommand : public KNamedCommand { public: - KPrChangeStartingPageCommand( const QString &name, KPrDocument *_doc, + KPrChangeStartingPageCommand( const TQString &name, KPrDocument *_doc, int _oldStartingPage, int _newStartingPage); ~KPrChangeStartingPageCommand(){} @@ -818,7 +818,7 @@ class KPrChangeVariableSettingsCommand : public KNamedCommand { public: enum VariableProperties { VS_DISPLAYLINK, VS_UNDERLINELINK, VS_DISPLAYCOMMENT, VS_DISPLAYFIELDCODE}; - KPrChangeVariableSettingsCommand( const QString &name, KPrDocument *_doc, bool _oldValue, + KPrChangeVariableSettingsCommand( const TQString &name, KPrDocument *_doc, bool _oldValue, bool _newValue, VariableProperties _type); ~KPrChangeVariableSettingsCommand(){} @@ -838,48 +838,48 @@ protected: class KPrChangeTitlePageNameCommand : public KNamedCommand { public: - KPrChangeTitlePageNameCommand( const QString &name, KPrDocument *_doc, const QString &_oldPageName, - const QString &_newPageName, KPrPage *_page); + KPrChangeTitlePageNameCommand( const TQString &name, KPrDocument *_doc, const TQString &_oldPageName, + const TQString &_newPageName, KPrPage *_page); ~KPrChangeTitlePageNameCommand(){} void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString oldPageName; - QString newPageName; + TQString oldPageName; + TQString newPageName; KPrPage *m_page; }; class KPrChangeCustomVariableValue : public KNamedCommand { public: - KPrChangeCustomVariableValue( const QString &name, KPrDocument *_doc,const QString & _oldValue, - const QString & _newValue, KoCustomVariable *var); + KPrChangeCustomVariableValue( const TQString &name, KPrDocument *_doc,const TQString & _oldValue, + const TQString & _newValue, KoCustomVariable *var); void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString newValue; - QString oldValue; + TQString newValue; + TQString oldValue; KoCustomVariable *m_var; }; class KPrChangeLinkVariable : public KNamedCommand { public: - KPrChangeLinkVariable( const QString &name, KPrDocument *_doc,const QString & _oldHref, - const QString & _newHref, const QString & _oldLink,const QString &_newLink, KoLinkVariable *var); + KPrChangeLinkVariable( const TQString &name, KPrDocument *_doc,const TQString & _oldHref, + const TQString & _newHref, const TQString & _oldLink,const TQString &_newLink, KoLinkVariable *var); ~KPrChangeLinkVariable(){}; void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString oldHref; - QString newHref; - QString oldLink; - QString newLink; + TQString oldHref; + TQString newHref; + TQString oldLink; + TQString newLink; KoLinkVariable *m_var; }; @@ -887,12 +887,12 @@ protected: class KPrNameObjectCommand : public KNamedCommand { public: - KPrNameObjectCommand( const QString &_name, const QString &_objectName, KPrObject *_obj, KPrDocument *_doc ); + KPrNameObjectCommand( const TQString &_name, const TQString &_objectName, KPrObject *_obj, KPrDocument *_doc ); ~KPrNameObjectCommand(); void execute(); void unexecute(); protected: - QString oldObjectName, newObjectName; + TQString oldObjectName, newObjectName; KPrObject *object; KPrDocument *doc; KPrPage *m_page; @@ -901,7 +901,7 @@ protected: class KPrDisplayObjectFromMasterPage : public KNamedCommand { public: - KPrDisplayObjectFromMasterPage( const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); + KPrDisplayObjectFromMasterPage( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); ~KPrDisplayObjectFromMasterPage(){}; void execute(); void unexecute(); @@ -914,7 +914,7 @@ protected: class KPrDisplayBackgroundPage : public KNamedCommand { public: - KPrDisplayBackgroundPage( const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); + KPrDisplayBackgroundPage( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue); ~KPrDisplayBackgroundPage(){}; void execute(); void unexecute(); @@ -927,7 +927,7 @@ protected: class KPrHideShowHeaderFooter : public KNamedCommand { public: - KPrHideShowHeaderFooter( const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue,KPrTextObject *_textObject); + KPrHideShowHeaderFooter( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue,KPrTextObject *_textObject); ~KPrHideShowHeaderFooter(){}; void execute(); void unexecute(); @@ -941,15 +941,15 @@ protected: class KPrFlipObjectCommand : public KNamedCommand { public: - KPrFlipObjectCommand( const QString &name, KPrDocument *_doc, bool _horizontal , - QPtrList &_objects ); + KPrFlipObjectCommand( const TQString &name, KPrDocument *_doc, bool _horizontal , + TQPtrList &_objects ); ~KPrFlipObjectCommand(); void execute(); void unexecute(); protected: void flipObjects(); KPrDocument *m_doc; - QPtrList objects; + TQPtrList objects; bool horizontal; KPrPage *m_page; }; @@ -958,9 +958,9 @@ class KPrGeometryPropertiesCommand : public KNamedCommand { public: enum KgpType { ProtectSize, KeepRatio}; - KPrGeometryPropertiesCommand( const QString &name, QPtrList &objects, + KPrGeometryPropertiesCommand( const TQString &name, TQPtrList &objects, bool newValue, KgpType type, KPrDocument *_doc ); - KPrGeometryPropertiesCommand( const QString &name, QValueList &lst, QPtrList &objects, + KPrGeometryPropertiesCommand( const TQString &name, TQValueList &lst, TQPtrList &objects, bool newValue, KgpType type, KPrDocument *_doc ); ~KPrGeometryPropertiesCommand(); @@ -968,8 +968,8 @@ public: virtual void unexecute(); protected: - QValueList m_oldValue; - QPtrList m_objects; + TQValueList m_oldValue; + TQPtrList m_objects; bool m_newValue; KgpType m_type; KPrDocument *m_doc; @@ -978,9 +978,9 @@ protected: class KPrProtectContentCommand : public KNamedCommand { public: - KPrProtectContentCommand( const QString &name, QPtrList &objects, + KPrProtectContentCommand( const TQString &name, TQPtrList &objects, bool protectContent, KPrDocument *doc ); - KPrProtectContentCommand( const QString &name, bool protectContent, + KPrProtectContentCommand( const TQString &name, bool protectContent, KPrTextObject *obj, KPrDocument *doc ); ~KPrProtectContentCommand(); @@ -988,18 +988,18 @@ public: virtual void unexecute(); protected: - void addObjects( const QPtrList &objects ); + void addObjects( const TQPtrList &objects ); - QPtrList m_objects; + TQPtrList m_objects; bool m_protectContent; - QValueList m_oldValues; + TQValueList m_oldValues; KPrDocument *m_doc; }; class KPrCloseObjectCommand : public KNamedCommand { public: - KPrCloseObjectCommand( const QString &name, QPtrList objects, KPrDocument *doc ); + KPrCloseObjectCommand( const TQString &name, TQPtrList objects, KPrDocument *doc ); ~KPrCloseObjectCommand(); virtual void execute(); @@ -1008,8 +1008,8 @@ public: protected: void closeObject(bool close); - QPtrList m_openObjects; - QPtrList m_closedObjects; + TQPtrList m_openObjects; + TQPtrList m_closedObjects; KPrDocument * m_doc; KPrPage *m_page; }; @@ -1027,16 +1027,16 @@ struct MarginsStruct { class KPrChangeMarginCommand : public KNamedCommand { public: - KPrChangeMarginCommand( const QString &name, QPtrList &objects, MarginsStruct newMargins, + KPrChangeMarginCommand( const TQString &name, TQPtrList &objects, MarginsStruct newMargins, KPrDocument *doc, KPrPage *page ); ~KPrChangeMarginCommand(); virtual void execute(); virtual void unexecute(); protected: - void addObjects( const QPtrList &objects ); - QPtrList m_oldMargins; - QPtrList m_objects; + void addObjects( const TQPtrList &objects ); + TQPtrList m_oldMargins; + TQPtrList m_objects; MarginsStruct m_newMargins; KPrPage *m_page; KPrDocument *m_doc; @@ -1046,7 +1046,7 @@ protected: class KPrChangeVerticalAlignmentCommand : public KNamedCommand { public: - KPrChangeVerticalAlignmentCommand( const QString &name, KPrTextObject *_obj, VerticalAlignmentType _oldAlign, + KPrChangeVerticalAlignmentCommand( const TQString &name, KPrTextObject *_obj, VerticalAlignmentType _oldAlign, VerticalAlignmentType _newAlign, KPrDocument *_doc); ~KPrChangeVerticalAlignmentCommand() {} @@ -1064,7 +1064,7 @@ protected: class KPrChangeTabStopValueCommand : public KNamedCommand { public: - KPrChangeTabStopValueCommand( const QString &name, double _oldValue, double _newValue, KPrDocument *_doc); + KPrChangeTabStopValueCommand( const TQString &name, double _oldValue, double _newValue, KPrDocument *_doc); ~KPrChangeTabStopValueCommand() {} @@ -1079,14 +1079,14 @@ protected: class KPrChangeVariableNoteText : public KNamedCommand { public: - KPrChangeVariableNoteText( const QString &name, KPrDocument *_doc, const QString &_oldValue,const QString &_newValue, KoNoteVariable *var); + KPrChangeVariableNoteText( const TQString &name, KPrDocument *_doc, const TQString &_oldValue,const TQString &_newValue, KoNoteVariable *var); ~KPrChangeVariableNoteText(); void execute(); void unexecute(); protected: KPrDocument *m_doc; - QString newValue; - QString oldValue; + TQString newValue; + TQString oldValue; KoNoteVariable *m_var; }; -- cgit v1.2.1