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 --- kspread/kspread_undo.h | 298 ++++++++++++++++++++++++------------------------- 1 file changed, 149 insertions(+), 149 deletions(-) (limited to 'kspread/kspread_undo.h') diff --git a/kspread/kspread_undo.h b/kspread/kspread_undo.h index 130b1a80..bb68a43f 100644 --- a/kspread/kspread_undo.h +++ b/kspread/kspread_undo.h @@ -20,12 +20,12 @@ #ifndef __kspread_undo_h__ #define __kspread_undo_h__ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -57,28 +57,28 @@ double columnWidth; struct textOfCell { int row; int col; -QString text; +TQString text; }; -struct layoutTextCell { +struct tqlayoutTextCell { int row; int col; Format * l; -QString text; +TQString text; }; -struct layoutCell { +struct tqlayoutCell { int row; int col; Format *l; }; -struct layoutColumn { +struct tqlayoutColumn { int col; ColumnFormat *l; }; -struct layoutRow { +struct tqlayoutRow { int row; RowFormat *l; }; @@ -86,27 +86,27 @@ RowFormat *l; struct styleCell { int row; int col; - QString action; + TQString action; }; class FormulaOfCell { public: FormulaOfCell(): m_sheetName(0) {} - FormulaOfCell( QString & sheetName, int col, int row, QString & formula ) + FormulaOfCell( TQString & sheetName, int col, int row, TQString & formula ) : m_sheetName( sheetName ), m_col( col ), m_row( row ), m_formula( formula ) {} - QString sheetName() const { return m_sheetName; } - QString formula() const { return m_formula; } + TQString sheetName() const { return m_sheetName; } + TQString formula() const { return m_formula; } int col() const { return m_col; } int row() const { return m_row; } private: - QString m_sheetName; + TQString m_sheetName; int m_col; int m_row; - QString m_formula; + TQString m_formula; }; /** @@ -124,17 +124,17 @@ public: Doc* doc()const { return m_pDoc; } - QString getName()const {return name ;} + TQString getName()const {return name ;} protected: Doc *m_pDoc; - QString name; + TQString name; }; class MacroUndoAction : public UndoAction { public: - MacroUndoAction( Doc * _doc, const QString & _name ); + MacroUndoAction( Doc * _doc, const TQString & _name ); virtual ~MacroUndoAction(); void addCommand(UndoAction *command); @@ -143,7 +143,7 @@ public: virtual void redo(); protected: - QPtrList m_commands; + TQPtrList m_commands; }; class UndoInsertRemoveAction : public UndoAction @@ -152,11 +152,11 @@ public: UndoInsertRemoveAction( Doc *_doc ); virtual ~UndoInsertRemoveAction(); - void saveFormulaReference( Sheet *_sheet, int col, int row, QString & formula ); + void saveFormulaReference( Sheet *_sheet, int col, int row, TQString & formula ); protected: void undoFormulaReference(); - QValueList m_lstFormulaCells; + TQValueList m_lstFormulaCells; }; class UndoRemoveColumn : public UndoInsertRemoveAction @@ -169,12 +169,12 @@ public: virtual void redo(); protected: - QString m_sheetName; - QCString m_data; + TQString m_sheetName; + TQCString m_data; int m_iColumn; int m_iNbCol; - QRect m_printRange; - QPair m_printRepeatColumns; + TQRect m_printRange; + TQPair m_printRepeatColumns; }; class UndoInsertColumn : public UndoInsertRemoveAction @@ -187,7 +187,7 @@ public: virtual void redo(); protected: - QString m_sheetName; + TQString m_sheetName; int m_iColumn; int m_iNbCol; }; @@ -202,12 +202,12 @@ public: virtual void redo(); protected: - QString m_sheetName; - QCString m_data; + TQString m_sheetName; + TQCString m_data; int m_iRow; int m_iNbRow; - QRect m_printRange; - QPair m_printRepeatRows; + TQRect m_printRange; + TQPair m_printRepeatRows; }; class UndoInsertRow : public UndoInsertRemoveAction @@ -220,7 +220,7 @@ public: virtual void redo(); protected: - QString m_sheetName; + TQString m_sheetName; int m_iRow; int m_iNbRow; }; @@ -229,69 +229,69 @@ protected: class UndoHideColumn : public UndoAction { public: - UndoHideColumn( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, QValueListlistCol=QValueList() ); + UndoHideColumn( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, TQValueListlistCol=TQValueList() ); virtual ~UndoHideColumn(); virtual void undo(); virtual void redo(); - void createList( QValueList&list,Sheet *_tab ); + void createList( TQValueList&list,Sheet *_tab ); protected: - QString m_sheetName; + TQString m_sheetName; int m_iColumn; int m_iNbCol; - QValueList listCol; + TQValueList listCol; }; class UndoHideRow : public UndoAction { public: - UndoHideRow( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, QValueList_listRow=QValueList() ); + UndoHideRow( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, TQValueList_listRow=TQValueList() ); virtual ~UndoHideRow(); virtual void undo(); virtual void redo(); protected: - void createList( QValueList&list,Sheet *_tab ); + void createList( TQValueList&list,Sheet *_tab ); - QString m_sheetName; + TQString m_sheetName; int m_iRow; int m_iNbRow; - QValueList listRow; + TQValueList listRow; }; class UndoShowColumn : public UndoAction { public: - UndoShowColumn( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, QValueList_list=QValueList() ); + UndoShowColumn( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, TQValueList_list=TQValueList() ); virtual ~UndoShowColumn(); virtual void undo(); virtual void redo(); protected: - void createList( QValueList&list,Sheet *_tab ); + void createList( TQValueList&list,Sheet *_tab ); - QString m_sheetName; + TQString m_sheetName; int m_iColumn; int m_iNbCol; - QValueList listCol; + TQValueList listCol; }; class UndoShowRow : public UndoAction { public: - UndoShowRow( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, QValueListlist=QValueList() ); + UndoShowRow( Doc *_doc, Sheet *_sheet, int _column,int _nbCol=0, TQValueListlist=TQValueList() ); virtual ~UndoShowRow(); virtual void undo(); virtual void redo(); protected: - void createList( QValueList&list,Sheet *_tab ); - QString m_sheetName; + void createList( TQValueList&list,Sheet *_tab ); + TQString m_sheetName; int m_iRow; int m_iNbRow; - QValueList listRow; + TQValueList listRow; }; @@ -305,7 +305,7 @@ public: virtual void redo(); protected: - QString m_sheetName; + TQString m_sheetName; KoPageLayout m_pl; KoPageLayout m_plRedo; KoHeadFoot m_hf; @@ -318,12 +318,12 @@ protected: bool m_printCommentIndicatorRedo; bool m_printFormulaIndicator; bool m_printFormulaIndicatorRedo; - QRect m_printRange; - QRect m_printRangeRedo; - QPair m_printRepeatColumns; - QPair m_printRepeatColumnsRedo; - QPair m_printRepeatRows; - QPair m_printRepeatRowsRedo; + TQRect m_printRange; + TQRect m_printRangeRedo; + TQPair m_printRepeatColumns; + TQPair m_printRepeatColumnsRedo; + TQPair m_printRepeatRows; + TQPair m_printRepeatRowsRedo; double m_dZoom; double m_dZoomRedo; int m_iPageLimitX; @@ -336,18 +336,18 @@ protected: class UndoSetText : public UndoAction { public: - UndoSetText( Doc *_doc, Sheet *_sheet, const QString& _text, int _column, int _row, FormatType _formatType ); + UndoSetText( Doc *_doc, Sheet *_sheet, const TQString& _text, int _column, int _row, FormatType _formatType ); virtual ~UndoSetText(); virtual void undo(); virtual void redo(); protected: - QString m_sheetName; + TQString m_sheetName; int m_iRow; int m_iColumn; - QString m_strText; - QString m_strRedoText; + TQString m_strText; + TQString m_strRedoText; FormatType m_eFormatType; FormatType m_eFormatTypeRedo; }; @@ -355,24 +355,24 @@ protected: class UndoCellFormat : public UndoAction { public: - UndoCellFormat( Doc *_doc, Sheet *_sheet, const Region &_selection, const QString &_title ); + UndoCellFormat( Doc *_doc, Sheet *_sheet, const Region &_selection, const TQString &_title ); virtual ~UndoCellFormat(); virtual void undo(); virtual void redo(); protected: - void copyFormat( QValueList &list,QValueList &listCol,QValueList &listRow, Sheet* sheet ); + void copyFormat( TQValueList &list,TQValueList &listCol,TQValueList &listRow, Sheet* sheet ); Region m_region; - QValueList m_lstFormats; - QValueList m_lstRedoFormats; - QValueList m_lstColFormats; - QValueList m_lstRedoColFormats; - QValueList m_lstRowFormats; - QValueList m_lstRedoRowFormats; + TQValueList m_lstFormats; + TQValueList m_lstRedoFormats; + TQValueList m_lstColFormats; + TQValueList m_lstRedoColFormats; + TQValueList m_lstRowFormats; + TQValueList m_lstRedoRowFormats; - QString m_sheetName; + TQString m_sheetName; }; class UndoChangeAngle : public UndoAction @@ -401,16 +401,16 @@ public: virtual void redo(); protected: - void createListCell( QCString &listCell,QValueList &listCol,QValueList &listRow, Sheet* sheet ); + void createListCell( TQCString &listCell,TQValueList &listCol,TQValueList &listRow, Sheet* sheet ); Region m_region; - QCString m_data; - QCString m_dataRedo; - QValueList m_lstColumn; - QValueList m_lstRedoColumn; - QValueList m_lstRow; - QValueList m_lstRedoRow; - QString m_sheetName; + TQCString m_data; + TQCString m_dataRedo; + TQValueList m_lstColumn; + TQValueList m_lstRedoColumn; + TQValueList m_lstRow; + TQValueList m_lstRedoRow; + TQString m_sheetName; }; class UndoDragDrop : public UndoAction @@ -425,13 +425,13 @@ public: protected: Region m_selectionSource; Region m_selectionTarget; - QCString m_dataSource; - QCString m_dataTarget; - QCString m_dataRedoSource; - QCString m_dataRedoTarget; - QString m_sheetName; + TQCString m_dataSource; + TQCString m_dataTarget; + TQCString m_dataRedoSource; + TQCString m_dataRedoTarget; + TQString m_sheetName; - void saveCellRect( QCString & cells, Sheet * sheet, + void saveCellRect( TQCString & cells, Sheet * sheet, const Region& region ); }; @@ -445,14 +445,14 @@ public: virtual void redo(); protected: - void createList( QValueList &listCol,QValueList &listRow, Sheet* sheet ); + void createList( TQValueList &listCol,TQValueList &listRow, Sheet* sheet ); Region m_region; - QValueList m_lstColumn; - QValueList m_lstRedoColumn; - QValueList m_lstRow; - QValueList m_lstRedoRow; - QString m_sheetName; + TQValueList m_lstColumn; + TQValueList m_lstRedoColumn; + TQValueList m_lstRow; + TQValueList m_lstRedoRow; + TQString m_sheetName; }; class UndoChangeAreaTextCell : public UndoAction @@ -465,36 +465,36 @@ public: virtual void redo(); protected: - void createList( QMap &list, Sheet* sheet ); + void createList( TQMap &list, Sheet* sheet ); Region m_region; - QMap m_lstTextCell; - QMap m_lstRedoTextCell; - QString m_sheetName; + TQMap m_lstTextCell; + TQMap m_lstRedoTextCell; + TQString m_sheetName; }; class UndoSort : public UndoAction { public: - UndoSort( Doc *_doc, Sheet *_sheet, const QRect &_selection); + UndoSort( Doc *_doc, Sheet *_sheet, const TQRect &_selection); virtual ~UndoSort(); virtual void undo(); virtual void redo(); protected: - void copyAll( QValueList & list, QValueList & listCol, - QValueList & listRow, Sheet * sheet ); + void copyAll( TQValueList & list, TQValueList & listCol, + TQValueList & listRow, Sheet * sheet ); - QRect m_rctRect; - QValueList m_lstFormats; - QValueList m_lstRedoFormats; - QValueList m_lstColFormats; - QValueList m_lstRedoColFormats; - QValueList m_lstRowFormats; - QValueList m_lstRedoRowFormats; + TQRect m_rctRect; + TQValueList m_lstFormats; + TQValueList m_lstRedoFormats; + TQValueList m_lstColFormats; + TQValueList m_lstRedoColFormats; + TQValueList m_lstRowFormats; + TQValueList m_lstRedoRowFormats; - QString m_sheetName; + TQString m_sheetName; }; class UndoMergedCell : public UndoAction @@ -513,82 +513,82 @@ protected: int m_iExtraY; int m_iExtraRedoX; int m_iExtraRedoY; - QString m_sheetName; + TQString m_sheetName; }; class UndoAutofill : public UndoAction { public: - UndoAutofill( Doc *_doc, Sheet *_sheet, const QRect &_rect ); + UndoAutofill( Doc *_doc, Sheet *_sheet, const TQRect &_rect ); virtual ~UndoAutofill(); virtual void undo(); virtual void redo(); protected: - void createListCell( QCString &list, Sheet* sheet ); - QRect m_selection; - QCString m_data; - QCString m_dataRedo; - QString m_sheetName; + void createListCell( TQCString &list, Sheet* sheet ); + TQRect m_selection; + TQCString m_data; + TQCString m_dataRedo; + TQString m_sheetName; }; class UndoInsertCellCol : public UndoInsertRemoveAction { public: - UndoInsertCellCol( Doc *_doc, Sheet *_sheet, const QRect &_rect ); + UndoInsertCellCol( Doc *_doc, Sheet *_sheet, const TQRect &_rect ); virtual ~UndoInsertCellCol(); virtual void undo(); virtual void redo(); protected: - QString m_sheetName; - QRect m_rect; + TQString m_sheetName; + TQRect m_rect; }; class UndoInsertCellRow : public UndoInsertRemoveAction { public: - UndoInsertCellRow( Doc *_doc, Sheet *_sheet,const QRect &_rect ); + UndoInsertCellRow( Doc *_doc, Sheet *_sheet,const TQRect &_rect ); virtual ~UndoInsertCellRow(); virtual void undo(); virtual void redo(); protected: - QString m_sheetName; - QRect m_rect; + TQString m_sheetName; + TQRect m_rect; }; class UndoRemoveCellCol : public UndoInsertRemoveAction { public: - UndoRemoveCellCol( Doc *_doc, Sheet *_sheet, const QRect &_rect ); + UndoRemoveCellCol( Doc *_doc, Sheet *_sheet, const TQRect &_rect ); virtual ~UndoRemoveCellCol(); virtual void undo(); virtual void redo(); protected: - QString m_sheetName; - QRect m_rect; - QCString m_data; + TQString m_sheetName; + TQRect m_rect; + TQCString m_data; }; class UndoRemoveCellRow : public UndoInsertRemoveAction { public: - UndoRemoveCellRow( Doc *_doc, Sheet *_sheet, const QRect &_rect ); + UndoRemoveCellRow( Doc *_doc, Sheet *_sheet, const TQRect &_rect ); virtual ~UndoRemoveCellRow(); virtual void undo(); virtual void redo(); protected: - QString m_sheetName; - QRect m_rect; - QCString m_data; + TQString m_sheetName; + TQRect m_rect; + TQCString m_data; }; class UndoConditional : public UndoAction @@ -600,11 +600,11 @@ public: virtual void undo(); virtual void redo(); protected: - void createListCell( QCString &list, Sheet* sheet ); + void createListCell( TQCString &list, Sheet* sheet ); Region m_region; - QCString m_data; - QCString m_dataRedo; - QString m_sheetName; + TQCString m_data; + TQCString m_dataRedo; + TQString m_sheetName; }; class UndoCellPaste : public UndoAction @@ -619,44 +619,44 @@ public: virtual void redo(); protected: - void createListCell( QCString &listCell,QValueList &listCol,QValueList &listRow, Sheet* sheet ); + void createListCell( TQCString &listCell,TQValueList &listCol,TQValueList &listRow, Sheet* sheet ); Region m_region; - QCString m_data; - QCString m_dataRedo; - QValueList m_lstColumn; - QValueList m_lstRedoColumn; - QValueList m_lstRow; - QValueList m_lstRedoRow; + TQCString m_data; + TQCString m_dataRedo; + TQValueList m_lstColumn; + TQValueList m_lstRedoColumn; + TQValueList m_lstRow; + TQValueList m_lstRedoRow; int xshift; int yshift; bool b_insert; int m_iInsertTo; - QString m_sheetName; + TQString m_sheetName; }; class UndoStyleCell : public UndoAction { public: - UndoStyleCell( Doc *_doc, Sheet *_sheet, const QRect &_rect ); + UndoStyleCell( Doc *_doc, Sheet *_sheet, const TQRect &_rect ); virtual ~UndoStyleCell(); virtual void undo(); virtual void redo(); protected: - void createListCell( QValueList &listCell, Sheet* sheet ); - QRect m_selection; - QValueList m_lstStyleCell; - QValueList m_lstRedoStyleCell; - QString m_sheetName; + void createListCell( TQValueList &listCell, Sheet* sheet ); + TQRect m_selection; + TQValueList m_lstStyleCell; + TQValueList m_lstRedoStyleCell; + TQString m_sheetName; }; class UndoInsertData : public UndoChangeAreaTextCell { public: - UndoInsertData( Doc * _doc, Sheet * _sheet, QRect & _selection ); + UndoInsertData( Doc * _doc, Sheet * _sheet, TQRect & _selection ); }; @@ -679,12 +679,12 @@ public: void appendUndo( UndoAction *_action ); - QString getUndoName(); - QString getRedoName(); + TQString getUndoName(); + TQString getRedoName(); protected: - QPtrStack m_stckUndo; - QPtrStack m_stckRedo; + TQPtrStack m_stckUndo; + TQPtrStack m_stckRedo; Doc *m_pDoc; }; -- cgit v1.2.1