diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/html/qglobal-h.html | 13 | ||||
| -rw-r--r-- | doc/html/qnamespace-h.html | 72 | ||||
| -rw-r--r-- | doc/html/qsqldatabase-h.html | 2 | ||||
| -rw-r--r-- | doc/html/qstring-h.html | 12 |
4 files changed, 43 insertions, 56 deletions
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index bd41a2385..2a3a3a13d 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -715,19 +715,6 @@ const bool true = TRUE; // -// Workaround for static const members on MSVC++. -// - -#if defined(Q_CC_MSVC) -# define QT_STATIC_CONST static -# define QT_STATIC_CONST_IMPL -#else -# define QT_STATIC_CONST static const -# define QT_STATIC_CONST_IMPL const -#endif - - -// // Utility macros and inline functions // diff --git a/doc/html/qnamespace-h.html b/doc/html/qnamespace-h.html index d8aece710..3e8a6b3a6 100644 --- a/doc/html/qnamespace-h.html +++ b/doc/html/qnamespace-h.html @@ -88,25 +88,25 @@ class TQCursor; class TQ_EXPORT TQt { public: - QT_STATIC_CONST TQColor & color0; - QT_STATIC_CONST TQColor & color1; - QT_STATIC_CONST TQColor & black; - QT_STATIC_CONST TQColor & white; - QT_STATIC_CONST TQColor & darkGray; - QT_STATIC_CONST TQColor & gray; - QT_STATIC_CONST TQColor & lightGray; - QT_STATIC_CONST TQColor & red; - QT_STATIC_CONST TQColor & green; - QT_STATIC_CONST TQColor & blue; - QT_STATIC_CONST TQColor & cyan; - QT_STATIC_CONST TQColor & magenta; - QT_STATIC_CONST TQColor & yellow; - QT_STATIC_CONST TQColor & darkRed; - QT_STATIC_CONST TQColor & darkGreen; - QT_STATIC_CONST TQColor & darkBlue; - QT_STATIC_CONST TQColor & darkCyan; - QT_STATIC_CONST TQColor & darkMagenta; - QT_STATIC_CONST TQColor & darkYellow; + static const TQColor & color0; + static const TQColor & color1; + static const TQColor & black; + static const TQColor & white; + static const TQColor & darkGray; + static const TQColor & gray; + static const TQColor & lightGray; + static const TQColor & red; + static const TQColor & green; + static const TQColor & blue; + static const TQColor & cyan; + static const TQColor & magenta; + static const TQColor & yellow; + static const TQColor & darkRed; + static const TQColor & darkGreen; + static const TQColor & darkBlue; + static const TQColor & darkCyan; + static const TQColor & darkMagenta; + static const TQColor & darkYellow; // documented in qevent.cpp enum ButtonState { // mouse/keyboard state values @@ -815,25 +815,25 @@ public: // Global cursors - QT_STATIC_CONST TQCursor & arrowCursor; // standard arrow cursor - QT_STATIC_CONST TQCursor & upArrowCursor; // upwards arrow - QT_STATIC_CONST TQCursor & crossCursor; // crosshair - QT_STATIC_CONST TQCursor & waitCursor; // hourglass/watch - QT_STATIC_CONST TQCursor & ibeamCursor; // ibeam/text entry - QT_STATIC_CONST TQCursor & sizeVerCursor; // vertical resize - QT_STATIC_CONST TQCursor & sizeHorCursor; // horizontal resize - QT_STATIC_CONST TQCursor & sizeBDiagCursor; // diagonal resize (/) - QT_STATIC_CONST TQCursor & sizeFDiagCursor; // diagonal resize (\) - QT_STATIC_CONST TQCursor & sizeAllCursor; // all directions resize - QT_STATIC_CONST TQCursor & blankCursor; // blank/invisible cursor - QT_STATIC_CONST TQCursor & splitVCursor; // vertical bar with left-right + static const TQCursor & arrowCursor; // standard arrow cursor + static const TQCursor & upArrowCursor; // upwards arrow + static const TQCursor & crossCursor; // crosshair + static const TQCursor & waitCursor; // hourglass/watch + static const TQCursor & ibeamCursor; // ibeam/text entry + static const TQCursor & sizeVerCursor; // vertical resize + static const TQCursor & sizeHorCursor; // horizontal resize + static const TQCursor & sizeBDiagCursor; // diagonal resize (/) + static const TQCursor & sizeFDiagCursor; // diagonal resize (\) + static const TQCursor & sizeAllCursor; // all directions resize + static const TQCursor & blankCursor; // blank/invisible cursor + static const TQCursor & splitVCursor; // vertical bar with left-right // arrows - QT_STATIC_CONST TQCursor & splitHCursor; // horizontal bar with up-down + static const TQCursor & splitHCursor; // horizontal bar with up-down // arrows - QT_STATIC_CONST TQCursor & pointingHandCursor; // pointing hand - QT_STATIC_CONST TQCursor & forbiddenCursor; // forbidden cursor (slashed circle) - QT_STATIC_CONST TQCursor & whatsThisCursor; // arrow with a question mark - QT_STATIC_CONST TQCursor & busyCursor; // arrow with hourglass + static const TQCursor & pointingHandCursor; // pointing hand + static const TQCursor & forbiddenCursor; // forbidden cursor (slashed circle) + static const TQCursor & whatsThisCursor; // arrow with a question mark + static const TQCursor & busyCursor; // arrow with hourglass enum TextFormat { diff --git a/doc/html/qsqldatabase-h.html b/doc/html/qsqldatabase-h.html index e89c2d5d2..0e78bf809 100644 --- a/doc/html/qsqldatabase-h.html +++ b/doc/html/qsqldatabase-h.html @@ -160,7 +160,7 @@ public: TQSqlDriver* driver() const; // MOC_SKIP_BEGIN - QT_STATIC_CONST char * const defaultConnection; + static const char * const defaultConnection; // MOC_SKIP_END static TQSqlDatabase* addDatabase( const TQString& type, const TQString& connectionName = defaultConnection ); diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html index 1c566e581..a3c3dbef7 100644 --- a/doc/html/qstring-h.html +++ b/doc/html/qstring-h.html @@ -121,11 +121,11 @@ public: TQChar( uint rc ); TQChar( int rc ); - QT_STATIC_CONST TQChar null; // 0000 - QT_STATIC_CONST TQChar replacement; // FFFD - QT_STATIC_CONST TQChar byteOrderMark; // FEFF - QT_STATIC_CONST TQChar byteOrderSwapped; // FFFE - QT_STATIC_CONST TQChar nbsp; // 00A0 + static const TQChar null; // 0000 + static const TQChar replacement; // FFFD + static const TQChar byteOrderMark; // FEFF + static const TQChar byteOrderSwapped; // FFFE + static const TQChar nbsp; // 00A0 // Unicode information @@ -458,7 +458,7 @@ public: TQString &operator=( TQChar c ); TQString &operator=( char c ); - QT_STATIC_CONST TQString null; + static const TQString null; bool isNull() const; bool isEmpty() const; |