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/workspace | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/workspace')
| -rw-r--r-- | src/workspace/ntqworkspace.h | 6 | ||||
| -rw-r--r-- | src/workspace/qworkspace.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h index 7a29e975..6d454cce 100644 --- a/src/workspace/ntqworkspace.h +++ b/src/workspace/ntqworkspace.h @@ -48,7 +48,7 @@ #ifndef QT_NO_WORKSPACE -#if !defined( QT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE ) +#if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE ) #define TQM_EXPORT_WORKSPACE #else #define TQM_EXPORT_WORKSPACE Q_EXPORT @@ -62,7 +62,7 @@ class TQDockWindow; class TQM_EXPORT_WORKSPACE TQWorkspace : public TQWidget { - Q_OBJECT + TQ_OBJECT Q_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled ) #ifdef QT_WORKSPACE_WINDOWMODE @@ -157,7 +157,7 @@ private: friend class TQWorkspaceChild; private: // Disabled copy constructor and operator= -#if defined(Q_DISABLE_COPY) +#if defined(TQ_DISABLE_COPY) TQWorkspace( const TQWorkspace & ); TQWorkspace& operator=( const TQWorkspace & ); #endif diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp index d37f2573..4ec3d57e 100644 --- a/src/workspace/qworkspace.cpp +++ b/src/workspace/qworkspace.cpp @@ -138,7 +138,7 @@ static bool inCaptionChange = FALSE; class TQWorkspaceChild : public TQFrame { - Q_OBJECT + TQ_OBJECT friend class TQWorkspace; friend class TQTitleBar; @@ -209,7 +209,7 @@ private: bool shademode :1; bool snappedRight :1; bool snappedDown :1; -#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator= +#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator= TQWorkspaceChild( const TQWorkspaceChild & ); TQWorkspaceChild &operator=( const TQWorkspaceChild & ); #endif |