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 --- kivio/kiviopart/kivio_command.h | 104 ++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'kivio/kiviopart/kivio_command.h') diff --git a/kivio/kiviopart/kivio_command.h b/kivio/kiviopart/kivio_command.h index 5a98bf2b..af08a2e3 100644 --- a/kivio/kiviopart/kivio_command.h +++ b/kivio/kiviopart/kivio_command.h @@ -21,9 +21,9 @@ #define kiviocommand_h #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -36,22 +36,22 @@ struct KoPageLayout; class KivioChangePageNameCommand : public KNamedCommand { public: - KivioChangePageNameCommand( const QString &_name, const QString & _oldPageName, const QString & _newPageName, KivioPage *_page ); + KivioChangePageNameCommand( const TQString &_name, const TQString & _oldPageName, const TQString & _newPageName, KivioPage *_page ); ~KivioChangePageNameCommand(); virtual void execute(); virtual void unexecute(); protected: - QString oldPageName; - QString newPageName; + TQString oldPageName; + TQString newPageName; KivioPage * m_page; }; class KivioHidePageCommand : public KNamedCommand { public: - KivioHidePageCommand( const QString &_name, KivioPage *_page ); + KivioHidePageCommand( const TQString &_name, KivioPage *_page ); ~KivioHidePageCommand(); virtual void execute(); @@ -64,7 +64,7 @@ protected: class KivioShowPageCommand : public KivioHidePageCommand { public: - KivioShowPageCommand( const QString &_name, KivioPage *_page ); + KivioShowPageCommand( const TQString &_name, KivioPage *_page ); ~KivioShowPageCommand() {} void execute() { KivioHidePageCommand::unexecute(); } @@ -74,7 +74,7 @@ public: class KivioAddPageCommand : public KNamedCommand { public: - KivioAddPageCommand( const QString &_name, KivioPage *_page ); + KivioAddPageCommand( const TQString &_name, KivioPage *_page ); ~KivioAddPageCommand(); virtual void execute(); @@ -87,7 +87,7 @@ protected: class KivioRemovePageCommand : public KNamedCommand { public: - KivioRemovePageCommand( const QString &_name, KivioPage *_page ); + KivioRemovePageCommand( const TQString &_name, KivioPage *_page ); ~KivioRemovePageCommand(); virtual void execute(); @@ -100,7 +100,7 @@ protected: class KivioAddStencilCommand : public KNamedCommand { public: - KivioAddStencilCommand( const QString &_name, KivioPage *_page, KivioLayer * _layer, KivioStencil *_stencil ); + KivioAddStencilCommand( const TQString &_name, KivioPage *_page, KivioLayer * _layer, KivioStencil *_stencil ); ~KivioAddStencilCommand(); virtual void execute(); @@ -116,7 +116,7 @@ protected: class KivioRemoveStencilCommand : public KivioAddStencilCommand { public: - KivioRemoveStencilCommand(const QString &_name, KivioPage *_page, KivioLayer * _layer, KivioStencil *_stencil ); + KivioRemoveStencilCommand(const TQString &_name, KivioPage *_page, KivioLayer * _layer, KivioStencil *_stencil ); ~KivioRemoveStencilCommand() {} void execute() { KivioAddStencilCommand::unexecute(); } @@ -126,22 +126,22 @@ public: class KIVIO_EXPORT KivioChangeStencilTextCommand : public KNamedCommand { public: - KivioChangeStencilTextCommand( const QString &_name, KivioStencil *_stencil, const QString & _oldText, const QString & _newText, KivioPage *_page, const QString& textBoxName = QString::null); + KivioChangeStencilTextCommand( const TQString &_name, KivioStencil *_stencil, const TQString & _oldText, const TQString & _newText, KivioPage *_page, const TQString& textBoxName = TQString()); ~KivioChangeStencilTextCommand(); virtual void execute(); virtual void unexecute(); protected: KivioStencil *m_stencil; - QString oldText; - QString newText; + TQString oldText; + TQString newText; KivioPage *m_page; - QString m_textBoxName; + TQString m_textBoxName; }; class KivioAddLayerCommand : public KNamedCommand { public: - KivioAddLayerCommand( const QString &_name, KivioPage *_page, KivioLayer * _layer,int _pos ); + KivioAddLayerCommand( const TQString &_name, KivioPage *_page, KivioLayer * _layer,int _pos ); ~KivioAddLayerCommand(); virtual void execute(); @@ -156,7 +156,7 @@ protected: class KivioRemoveLayerCommand : public KivioAddLayerCommand { public: - KivioRemoveLayerCommand( const QString &_name, KivioPage *_page, KivioLayer * _layer, int _pos ); + KivioRemoveLayerCommand( const TQString &_name, KivioPage *_page, KivioLayer * _layer, int _pos ); ~KivioRemoveLayerCommand() {} void execute() { KivioAddLayerCommand::unexecute(); } @@ -166,22 +166,22 @@ public: class KivioRenameLayerCommand : public KNamedCommand { public: - KivioRenameLayerCommand( const QString &_name, KivioLayer * _layer, const QString & _oldName, const QString & _newName); + KivioRenameLayerCommand( const TQString &_name, KivioLayer * _layer, const TQString & _oldName, const TQString & _newName); ~KivioRenameLayerCommand(); virtual void execute(); virtual void unexecute(); protected: KivioLayer *m_layer; - QString oldName; - QString newName; + TQString oldName; + TQString newName; }; class KIVIO_EXPORT KivioResizeStencilCommand : public KNamedCommand { public: - KivioResizeStencilCommand(const QString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page ); + KivioResizeStencilCommand(const TQString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page ); ~KivioResizeStencilCommand(); virtual void execute(); @@ -197,7 +197,7 @@ protected: class KIVIO_EXPORT KivioMoveStencilCommand : public KNamedCommand { public: - KivioMoveStencilCommand(const QString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page ); + KivioMoveStencilCommand(const TQString &_name, KivioStencil *_stencil, KoRect _initSize, KoRect _endSize, KivioPage *_page ); ~KivioMoveStencilCommand(); virtual void execute(); @@ -213,7 +213,7 @@ protected: class KivioChangeLayoutCommand : public KNamedCommand { public: - KivioChangeLayoutCommand(const QString &_name, KivioPage *_page, KoPageLayout _oldLayout, KoPageLayout _newLayout); + KivioChangeLayoutCommand(const TQString &_name, KivioPage *_page, KoPageLayout _oldLayout, KoPageLayout _newLayout); ~KivioChangeLayoutCommand(); virtual void execute(); @@ -229,8 +229,8 @@ protected: class KivioChangeStencilHAlignmentCommand : public KNamedCommand { public: - KivioChangeStencilHAlignmentCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil, - int _oldAlign, int _newAlign, const QString& textBoxName = QString::null); + KivioChangeStencilHAlignmentCommand(const TQString& _name, KivioPage* _page, KivioStencil* _stencil, + int _oldAlign, int _newAlign, const TQString& textBoxName = TQString()); ~KivioChangeStencilHAlignmentCommand(); virtual void execute(); @@ -241,14 +241,14 @@ class KivioChangeStencilHAlignmentCommand : public KNamedCommand KivioStencil *m_stencil; int oldAlign; int newAlign; - QString m_textBoxName; + TQString m_textBoxName; }; class KivioChangeStencilVAlignmentCommand : public KNamedCommand { public: - KivioChangeStencilVAlignmentCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil, - int _oldAlign, int _newAlign, const QString& textBoxName = QString::null); + KivioChangeStencilVAlignmentCommand(const TQString& _name, KivioPage* _page, KivioStencil* _stencil, + int _oldAlign, int _newAlign, const TQString& textBoxName = TQString()); ~KivioChangeStencilVAlignmentCommand(); virtual void execute(); @@ -259,16 +259,16 @@ class KivioChangeStencilVAlignmentCommand : public KNamedCommand KivioStencil *m_stencil; int oldAlign; int newAlign; - QString m_textBoxName; + TQString m_textBoxName; }; class KivioChangeStencilFontCommand : public KNamedCommand { public: - KivioChangeStencilFontCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil, - const QFont& _oldFont, const QFont& _newFont, - const QString& textBoxName = QString::null); + KivioChangeStencilFontCommand(const TQString& _name, KivioPage* _page, KivioStencil* _stencil, + const TQFont& _oldFont, const TQFont& _newFont, + const TQString& textBoxName = TQString()); ~KivioChangeStencilFontCommand(); virtual void execute(); @@ -277,18 +277,18 @@ class KivioChangeStencilFontCommand : public KNamedCommand protected: KivioPage *m_page; KivioStencil *m_stencil; - QFont oldFont; - QFont newFont; - QString m_textBoxName; + TQFont oldFont; + TQFont newFont; + TQString m_textBoxName; }; class KivioChangeStencilColorCommand : public KNamedCommand { public: enum ColorType { CT_TEXTCOLOR, CT_FGCOLOR, CT_BGCOLOR }; - KivioChangeStencilColorCommand(const QString& _name, KivioPage* _page, KivioStencil* _stencil, - const QColor& _oldColor, const QColor& _newColor, ColorType _type, - const QString& textBoxName = QString::null); + KivioChangeStencilColorCommand(const TQString& _name, KivioPage* _page, KivioStencil* _stencil, + const TQColor& _oldColor, const TQColor& _newColor, ColorType _type, + const TQString& textBoxName = TQString()); ~KivioChangeStencilColorCommand(); virtual void execute(); @@ -297,16 +297,16 @@ class KivioChangeStencilColorCommand : public KNamedCommand protected: KivioPage *m_page; KivioStencil *m_stencil; - QColor oldColor; - QColor newColor; + TQColor oldColor; + TQColor newColor; ColorType type; - QString m_textBoxName; + TQString m_textBoxName; }; class KivioChangeRotationCommand : public KNamedCommand { public: - KivioChangeRotationCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue, int _newValue); + KivioChangeRotationCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue, int _newValue); ~KivioChangeRotationCommand(); virtual void execute(); @@ -322,7 +322,7 @@ protected: class KivioChangeLineStyleCommand : public KNamedCommand { public: - KivioChangeLineStyleCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue, int _newValue); + KivioChangeLineStyleCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldValue, int _newValue); ~KivioChangeLineStyleCommand(); virtual void execute(); @@ -339,7 +339,7 @@ protected: class KivioChangeLineWidthCommand : public KNamedCommand { public: - KivioChangeLineWidthCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, double _oldValue, double _newValue); + KivioChangeLineWidthCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, double _oldValue, double _newValue); ~KivioChangeLineWidthCommand(); virtual void execute(); @@ -355,7 +355,7 @@ protected: class KivioChangeBeginEndArrowCommand : public KNamedCommand { public: - KivioChangeBeginEndArrowCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldArrow, int _newArrow, bool _beginArrow); + KivioChangeBeginEndArrowCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, int _oldArrow, int _newArrow, bool _beginArrow); ~KivioChangeBeginEndArrowCommand(); @@ -373,7 +373,7 @@ protected: class KivioChangeBeginEndSizeArrowCommand : public KNamedCommand { public: - KivioChangeBeginEndSizeArrowCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, float _oldH,float _oldW, float _newH,float _newW, bool _beginArrow); + KivioChangeBeginEndSizeArrowCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, float _oldH,float _oldW, float _newH,float _newW, bool _beginArrow); ~KivioChangeBeginEndSizeArrowCommand(); @@ -395,7 +395,7 @@ class KivioChangeStencilProtectCommand : public KNamedCommand { public: enum KVP_TYPE {KV_POSX, KV_POSY,KV_WIDTH, KV_HEIGHT, KV_ASPECT, KV_DELETE}; - KivioChangeStencilProtectCommand( const QString &_name, KivioPage *_page, KivioStencil * _stencil, bool _state, KVP_TYPE _type); + KivioChangeStencilProtectCommand( const TQString &_name, KivioPage *_page, KivioStencil * _stencil, bool _state, KVP_TYPE _type); ~KivioChangeStencilProtectCommand(){}; @@ -413,7 +413,7 @@ protected: class KivioAddConnectorTargetCommand : public KNamedCommand { public: - KivioAddConnectorTargetCommand(const QString& name, KivioPage* page, + KivioAddConnectorTargetCommand(const TQString& name, KivioPage* page, KivioStencil* stencil, const KoPoint& targetPoint); virtual void execute(); @@ -428,7 +428,7 @@ class KivioAddConnectorTargetCommand : public KNamedCommand class KivioCustomDragCommand : public KNamedCommand { public: - KivioCustomDragCommand(const QString& name, KivioPage* page, KivioStencil* stencil, + KivioCustomDragCommand(const TQString& name, KivioPage* page, KivioStencil* stencil, int customID, const KoPoint& originalPoint, const KoPoint& newPoint); virtual void execute(); @@ -446,7 +446,7 @@ class KivioCustomDragCommand : public KNamedCommand class KivioGroupCommand : public KNamedCommand { public: - KivioGroupCommand(const QString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group); + KivioGroupCommand(const TQString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group); virtual void execute(); virtual void unexecute(); @@ -461,7 +461,7 @@ class KivioGroupCommand : public KNamedCommand class KivioUnGroupCommand : public KivioGroupCommand { public: - KivioUnGroupCommand(const QString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group) + KivioUnGroupCommand(const TQString& name, KivioPage* page, KivioLayer* layer, KivioGroupStencil* group) : KivioGroupCommand(name, page, layer, group) {} -- cgit v1.2.1