diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /src/table | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/table')
| -rw-r--r-- | src/table/ntqtable.h | 8 | ||||
| -rw-r--r-- | src/table/qtable.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h index 67f7f2a6..a5202725 100644 --- a/src/table/ntqtable.h +++ b/src/table/ntqtable.h @@ -57,7 +57,7 @@ #ifndef QT_NO_TABLE -#if !defined( QT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE ) +#if !defined( TQT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE ) #define TQM_EXPORT_TABLE #ifndef TQM_TEMPLATE_EXTERN_TABLE # define TQM_TEMPLATE_EXTERN_TABLE @@ -175,7 +175,7 @@ private: uint enabled : 1; int rw, cl; int rowspan, colspan; -#if (QT_VERSION >= 0x040000) +#if (TQT_VERSION >= 0x040000) #error "Add a setAlignment() function in 4.0 (but no d pointer)" #endif }; @@ -246,7 +246,7 @@ private: class TQM_EXPORT_TABLE TQTable : public TQScrollView { - Q_OBJECT + TQ_OBJECT Q_ENUMS( SelectionMode FocusStyle ) Q_PROPERTY( int numRows READ numRows WRITE setNumRows ) Q_PROPERTY( int numCols READ numCols WRITE setNumCols ) @@ -552,7 +552,7 @@ private: FocusStyle focusStl; TQSize unused_cachedSizeHint; // ### remove in 4.0 -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) TQTable( const TQTable & ); TQTable &operator=( const TQTable & ); #endif diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp index 4695d09a..b9926f3f 100644 --- a/src/table/qtable.cpp +++ b/src/table/qtable.cpp @@ -80,7 +80,7 @@ void qt_set_table_clipper_enabled( bool enabled ) class TQM_EXPORT_TABLE TQTableHeader : public TQHeader { friend class TQTable; - Q_OBJECT + TQ_OBJECT public: enum SectionState { |