TDE
/
tqt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace QT_STATIC_CONST_* with actual definitions

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1d318a47b0)
r14.1.x
Michele Calgaro 10 months ago
parent 473cd1e8a5
commit 33c36fae2a
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
12 changed files with 129 additions and 155 deletions
Show Stats Download Patch File Download Diff File

13
doc/html/qglobal-h.html
Unescape View File

@ -714,19 +714,6 @@ const bool true = TRUE;
#endif #endif
//
// 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 // Utility macros and inline functions
// //

72
doc/html/qnamespace-h.html
Unescape View File

@ -88,25 +88,25 @@ class TQCursor;
class TQ_EXPORT TQt { class TQ_EXPORT TQt {
public: public:
QT_STATIC_CONST TQColor &amp; color0; static const TQColor &amp; color0;
QT_STATIC_CONST TQColor &amp; color1; static const TQColor &amp; color1;
QT_STATIC_CONST TQColor &amp; black; static const TQColor &amp; black;
QT_STATIC_CONST TQColor &amp; white; static const TQColor &amp; white;
QT_STATIC_CONST TQColor &amp; darkGray; static const TQColor &amp; darkGray;
QT_STATIC_CONST TQColor &amp; gray; static const TQColor &amp; gray;
QT_STATIC_CONST TQColor &amp; lightGray; static const TQColor &amp; lightGray;
QT_STATIC_CONST TQColor &amp; red; static const TQColor &amp; red;
QT_STATIC_CONST TQColor &amp; green; static const TQColor &amp; green;
QT_STATIC_CONST TQColor &amp; blue; static const TQColor &amp; blue;
QT_STATIC_CONST TQColor &amp; cyan; static const TQColor &amp; cyan;
QT_STATIC_CONST TQColor &amp; magenta; static const TQColor &amp; magenta;
QT_STATIC_CONST TQColor &amp; yellow; static const TQColor &amp; yellow;
QT_STATIC_CONST TQColor &amp; darkRed; static const TQColor &amp; darkRed;
QT_STATIC_CONST TQColor &amp; darkGreen; static const TQColor &amp; darkGreen;
QT_STATIC_CONST TQColor &amp; darkBlue; static const TQColor &amp; darkBlue;
QT_STATIC_CONST TQColor &amp; darkCyan; static const TQColor &amp; darkCyan;
QT_STATIC_CONST TQColor &amp; darkMagenta; static const TQColor &amp; darkMagenta;
QT_STATIC_CONST TQColor &amp; darkYellow; static const TQColor &amp; darkYellow;
// documented in qevent.cpp // documented in qevent.cpp
enum ButtonState { // mouse/keyboard state values enum ButtonState { // mouse/keyboard state values
@ -815,25 +815,25 @@ public:
// Global cursors // Global cursors
QT_STATIC_CONST TQCursor &amp; arrowCursor; // standard arrow cursor static const TQCursor &amp; arrowCursor; // standard arrow cursor
QT_STATIC_CONST TQCursor &amp; upArrowCursor; // upwards arrow static const TQCursor &amp; upArrowCursor; // upwards arrow
QT_STATIC_CONST TQCursor &amp; crossCursor; // crosshair static const TQCursor &amp; crossCursor; // crosshair
QT_STATIC_CONST TQCursor &amp; waitCursor; // hourglass/watch static const TQCursor &amp; waitCursor; // hourglass/watch
QT_STATIC_CONST TQCursor &amp; ibeamCursor; // ibeam/text entry static const TQCursor &amp; ibeamCursor; // ibeam/text entry
QT_STATIC_CONST TQCursor &amp; sizeVerCursor; // vertical resize static const TQCursor &amp; sizeVerCursor; // vertical resize
QT_STATIC_CONST TQCursor &amp; sizeHorCursor; // horizontal resize static const TQCursor &amp; sizeHorCursor; // horizontal resize
QT_STATIC_CONST TQCursor &amp; sizeBDiagCursor; // diagonal resize (/) static const TQCursor &amp; sizeBDiagCursor; // diagonal resize (/)
QT_STATIC_CONST TQCursor &amp; sizeFDiagCursor; // diagonal resize (\) static const TQCursor &amp; sizeFDiagCursor; // diagonal resize (\)
QT_STATIC_CONST TQCursor &amp; sizeAllCursor; // all directions resize static const TQCursor &amp; sizeAllCursor; // all directions resize
QT_STATIC_CONST TQCursor &amp; blankCursor; // blank/invisible cursor static const TQCursor &amp; blankCursor; // blank/invisible cursor
QT_STATIC_CONST TQCursor &amp; splitVCursor; // vertical bar with left-right static const TQCursor &amp; splitVCursor; // vertical bar with left-right
// arrows // arrows
QT_STATIC_CONST TQCursor &amp; splitHCursor; // horizontal bar with up-down static const TQCursor &amp; splitHCursor; // horizontal bar with up-down
// arrows // arrows
QT_STATIC_CONST TQCursor &amp; pointingHandCursor; // pointing hand static const TQCursor &amp; pointingHandCursor; // pointing hand
QT_STATIC_CONST TQCursor &amp; forbiddenCursor; // forbidden cursor (slashed circle) static const TQCursor &amp; forbiddenCursor; // forbidden cursor (slashed circle)
QT_STATIC_CONST TQCursor &amp; whatsThisCursor; // arrow with a question mark static const TQCursor &amp; whatsThisCursor; // arrow with a question mark
QT_STATIC_CONST TQCursor &amp; busyCursor; // arrow with hourglass static const TQCursor &amp; busyCursor; // arrow with hourglass
enum TextFormat { enum TextFormat {

2
doc/html/qsqldatabase-h.html
Unescape View File

@ -160,7 +160,7 @@ public:
TQSqlDriver* driver() const; TQSqlDriver* driver() const;
// MOC_SKIP_BEGIN // MOC_SKIP_BEGIN
QT_STATIC_CONST char * const defaultConnection; static const char * const defaultConnection;
// MOC_SKIP_END // MOC_SKIP_END
static TQSqlDatabase* addDatabase( const TQString&amp; type, const TQString&amp; connectionName = defaultConnection ); static TQSqlDatabase* addDatabase( const TQString&amp; type, const TQString&amp; connectionName = defaultConnection );

12
doc/html/qstring-h.html
Unescape View File

@ -121,11 +121,11 @@ public:
TQChar( uint rc ); TQChar( uint rc );
TQChar( int rc ); TQChar( int rc );
QT_STATIC_CONST TQChar null; // 0000 static const TQChar null; // 0000
QT_STATIC_CONST TQChar replacement; // FFFD static const TQChar replacement; // FFFD
QT_STATIC_CONST TQChar byteOrderMark; // FEFF static const TQChar byteOrderMark; // FEFF
QT_STATIC_CONST TQChar byteOrderSwapped; // FFFE static const TQChar byteOrderSwapped; // FFFE
QT_STATIC_CONST TQChar nbsp; // 00A0 static const TQChar nbsp; // 00A0
// Unicode information // Unicode information
@ -458,7 +458,7 @@ public:
TQString &amp;operator=( TQChar c ); TQString &amp;operator=( TQChar c );
TQString &amp;operator=( char c ); TQString &amp;operator=( char c );
QT_STATIC_CONST TQString null; static const TQString null;
bool isNull() const; bool isNull() const;
bool isEmpty() const; bool isEmpty() const;

72
src/kernel/ntqnamespace.h
Unescape View File

@ -52,25 +52,25 @@ class TQCursor;
class TQ_EXPORT TQt { class TQ_EXPORT TQt {
public: public:
QT_STATIC_CONST TQColor & color0; static const TQColor & color0;
QT_STATIC_CONST TQColor & color1; static const TQColor & color1;
QT_STATIC_CONST TQColor & black; static const TQColor & black;
QT_STATIC_CONST TQColor & white; static const TQColor & white;
QT_STATIC_CONST TQColor & darkGray; static const TQColor & darkGray;
QT_STATIC_CONST TQColor & gray; static const TQColor & gray;
QT_STATIC_CONST TQColor & lightGray; static const TQColor & lightGray;
QT_STATIC_CONST TQColor & red; static const TQColor & red;
QT_STATIC_CONST TQColor & green; static const TQColor & green;
QT_STATIC_CONST TQColor & blue; static const TQColor & blue;
QT_STATIC_CONST TQColor & cyan; static const TQColor & cyan;
QT_STATIC_CONST TQColor & magenta; static const TQColor & magenta;
QT_STATIC_CONST TQColor & yellow; static const TQColor & yellow;
QT_STATIC_CONST TQColor & darkRed; static const TQColor & darkRed;
QT_STATIC_CONST TQColor & darkGreen; static const TQColor & darkGreen;
QT_STATIC_CONST TQColor & darkBlue; static const TQColor & darkBlue;
QT_STATIC_CONST TQColor & darkCyan; static const TQColor & darkCyan;
QT_STATIC_CONST TQColor & darkMagenta; static const TQColor & darkMagenta;
QT_STATIC_CONST TQColor & darkYellow; static const TQColor & darkYellow;
// documented in qevent.cpp // documented in qevent.cpp
enum ButtonState { // mouse/keyboard state values enum ButtonState { // mouse/keyboard state values
@ -892,25 +892,25 @@ public:
// Global cursors // Global cursors
QT_STATIC_CONST TQCursor & arrowCursor; // standard arrow cursor static const TQCursor & arrowCursor; // standard arrow cursor
QT_STATIC_CONST TQCursor & upArrowCursor; // upwards arrow static const TQCursor & upArrowCursor; // upwards arrow
QT_STATIC_CONST TQCursor & crossCursor; // crosshair static const TQCursor & crossCursor; // crosshair
QT_STATIC_CONST TQCursor & waitCursor; // hourglass/watch static const TQCursor & waitCursor; // hourglass/watch
QT_STATIC_CONST TQCursor & ibeamCursor; // ibeam/text entry static const TQCursor & ibeamCursor; // ibeam/text entry
QT_STATIC_CONST TQCursor & sizeVerCursor; // vertical resize static const TQCursor & sizeVerCursor; // vertical resize
QT_STATIC_CONST TQCursor & sizeHorCursor; // horizontal resize static const TQCursor & sizeHorCursor; // horizontal resize
QT_STATIC_CONST TQCursor & sizeBDiagCursor; // diagonal resize (/) static const TQCursor & sizeBDiagCursor; // diagonal resize (/)
QT_STATIC_CONST TQCursor & sizeFDiagCursor; // diagonal resize (\) static const TQCursor & sizeFDiagCursor; // diagonal resize (\)
QT_STATIC_CONST TQCursor & sizeAllCursor; // all directions resize static const TQCursor & sizeAllCursor; // all directions resize
QT_STATIC_CONST TQCursor & blankCursor; // blank/invisible cursor static const TQCursor & blankCursor; // blank/invisible cursor
QT_STATIC_CONST TQCursor & splitVCursor; // vertical bar with left-right static const TQCursor & splitVCursor; // vertical bar with left-right
// arrows // arrows
QT_STATIC_CONST TQCursor & splitHCursor; // horizontal bar with up-down static const TQCursor & splitHCursor; // horizontal bar with up-down
// arrows // arrows
QT_STATIC_CONST TQCursor & pointingHandCursor; // pointing hand static const TQCursor & pointingHandCursor; // pointing hand
QT_STATIC_CONST TQCursor & forbiddenCursor; // forbidden cursor (slashed circle) static const TQCursor & forbiddenCursor; // forbidden cursor (slashed circle)
QT_STATIC_CONST TQCursor & whatsThisCursor; // arrow with a question mark static const TQCursor & whatsThisCursor; // arrow with a question mark
QT_STATIC_CONST TQCursor & busyCursor; // arrow with hourglass static const TQCursor & busyCursor; // arrow with hourglass
enum TextFormat { enum TextFormat {

38
src/kernel/qcolor.cpp
Unescape View File

@ -199,25 +199,25 @@ static TQColor stdcol[19] = {
static TQColor stdcol[19]; static TQColor stdcol[19];
#endif #endif
QT_STATIC_CONST_IMPL TQColor & TQt::color0 = stdcol[0]; const TQColor & TQt::color0 = stdcol[0];
QT_STATIC_CONST_IMPL TQColor & TQt::color1 = stdcol[1]; const TQColor & TQt::color1 = stdcol[1];
QT_STATIC_CONST_IMPL TQColor & TQt::black = stdcol[2]; const TQColor & TQt::black = stdcol[2];
QT_STATIC_CONST_IMPL TQColor & TQt::white = stdcol[3]; const TQColor & TQt::white = stdcol[3];
QT_STATIC_CONST_IMPL TQColor & TQt::darkGray = stdcol[4]; const TQColor & TQt::darkGray = stdcol[4];
QT_STATIC_CONST_IMPL TQColor & TQt::gray = stdcol[5]; const TQColor & TQt::gray = stdcol[5];
QT_STATIC_CONST_IMPL TQColor & TQt::lightGray = stdcol[6]; const TQColor & TQt::lightGray = stdcol[6];
QT_STATIC_CONST_IMPL TQColor & TQt::red = stdcol[7]; const TQColor & TQt::red = stdcol[7];
QT_STATIC_CONST_IMPL TQColor & TQt::green = stdcol[8]; const TQColor & TQt::green = stdcol[8];
QT_STATIC_CONST_IMPL TQColor & TQt::blue = stdcol[9]; const TQColor & TQt::blue = stdcol[9];
QT_STATIC_CONST_IMPL TQColor & TQt::cyan = stdcol[10]; const TQColor & TQt::cyan = stdcol[10];
QT_STATIC_CONST_IMPL TQColor & TQt::magenta = stdcol[11]; const TQColor & TQt::magenta = stdcol[11];
QT_STATIC_CONST_IMPL TQColor & TQt::yellow = stdcol[12]; const TQColor & TQt::yellow = stdcol[12];
QT_STATIC_CONST_IMPL TQColor & TQt::darkRed = stdcol[13]; const TQColor & TQt::darkRed = stdcol[13];
QT_STATIC_CONST_IMPL TQColor & TQt::darkGreen = stdcol[14]; const TQColor & TQt::darkGreen = stdcol[14];
QT_STATIC_CONST_IMPL TQColor & TQt::darkBlue = stdcol[15]; const TQColor & TQt::darkBlue = stdcol[15];
QT_STATIC_CONST_IMPL TQColor & TQt::darkCyan = stdcol[16]; const TQColor & TQt::darkCyan = stdcol[16];
QT_STATIC_CONST_IMPL TQColor & TQt::darkMagenta = stdcol[17]; const TQColor & TQt::darkMagenta = stdcol[17];
QT_STATIC_CONST_IMPL TQColor & TQt::darkYellow = stdcol[18]; const TQColor & TQt::darkYellow = stdcol[18];
/***************************************************************************** /*****************************************************************************

34
src/kernel/qcursor_x11.cpp
Unescape View File

@ -105,23 +105,23 @@ static TQCursor cursorTable[TQt::LastCursor+1];
static const int arrowCursorIdx = 0; static const int arrowCursorIdx = 0;
QT_STATIC_CONST_IMPL TQCursor & TQt::arrowCursor = cursorTable[0]; const TQCursor & TQt::arrowCursor = cursorTable[0];
QT_STATIC_CONST_IMPL TQCursor & TQt::upArrowCursor = cursorTable[1]; const TQCursor & TQt::upArrowCursor = cursorTable[1];
QT_STATIC_CONST_IMPL TQCursor & TQt::crossCursor = cursorTable[2]; const TQCursor & TQt::crossCursor = cursorTable[2];
QT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3]; const TQCursor & TQt::waitCursor = cursorTable[3];
QT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4]; const TQCursor & TQt::ibeamCursor = cursorTable[4];
QT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = cursorTable[5]; const TQCursor & TQt::sizeVerCursor = cursorTable[5];
QT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = cursorTable[6]; const TQCursor & TQt::sizeHorCursor = cursorTable[6];
QT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = cursorTable[7]; const TQCursor & TQt::sizeBDiagCursor = cursorTable[7];
QT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = cursorTable[8]; const TQCursor & TQt::sizeFDiagCursor = cursorTable[8];
QT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = cursorTable[9]; const TQCursor & TQt::sizeAllCursor = cursorTable[9];
QT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10]; const TQCursor & TQt::blankCursor = cursorTable[10];
QT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11]; const TQCursor & TQt::splitVCursor = cursorTable[11];
QT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = cursorTable[12]; const TQCursor & TQt::splitHCursor = cursorTable[12];
QT_STATIC_CONST_IMPL TQCursor & TQt::pointingHandCursor = cursorTable[13]; const TQCursor & TQt::pointingHandCursor = cursorTable[13];
QT_STATIC_CONST_IMPL TQCursor & TQt::forbiddenCursor = cursorTable[14]; const TQCursor & TQt::forbiddenCursor = cursorTable[14];
QT_STATIC_CONST_IMPL TQCursor & TQt::whatsThisCursor = cursorTable[15]; const TQCursor & TQt::whatsThisCursor = cursorTable[15];
QT_STATIC_CONST_IMPL TQCursor & TQt::busyCursor = cursorTable[16]; const TQCursor & TQt::busyCursor = cursorTable[16];
TQCursor *TQCursor::find_cur( int shape ) // find predefined cursor TQCursor *TQCursor::find_cur( int shape ) // find predefined cursor

2
src/sql/ntqsqldatabase.h
Unescape View File

@ -129,7 +129,7 @@ public:
TQSqlDriver* driver() const; TQSqlDriver* driver() const;
// MOC_SKIP_BEGIN // MOC_SKIP_BEGIN
QT_STATIC_CONST char * const defaultConnection; static const char * const defaultConnection;
// MOC_SKIP_END // MOC_SKIP_END
static TQSqlDatabase* addDatabase( const TQString& type, const TQString& connectionName = defaultConnection ); static TQSqlDatabase* addDatabase( const TQString& type, const TQString& connectionName = defaultConnection );

2
src/sql/qsqldatabase.cpp
Unescape View File

@ -87,7 +87,7 @@
#include "ntqdict.h" #include "ntqdict.h"
#include <stdlib.h> #include <stdlib.h>
QT_STATIC_CONST_IMPL char * const TQSqlDatabase::defaultConnection = "qt_sql_default_connection"; const char * const TQSqlDatabase::defaultConnection = "qt_sql_default_connection";
TQPtrDict<TQSqlDriverExtension> *qt_driver_extension_dict = 0; TQPtrDict<TQSqlDriverExtension> *qt_driver_extension_dict = 0;
TQPtrDict<TQSqlOpenExtension> *qt_open_extension_dict = 0; TQPtrDict<TQSqlOpenExtension> *qt_open_extension_dict = 0;

13
src/tools/ntqglobal.h
Unescape View File

@ -680,19 +680,6 @@ const bool true = TRUE;
#endif #endif
//
// 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 // Utility macros and inline functions
// //

12
src/tools/ntqstring.h
Unescape View File

@ -90,11 +90,11 @@ public:
TQChar( uint rc ); TQChar( uint rc );
TQChar( int rc ); TQChar( int rc );
QT_STATIC_CONST TQChar null; // 0000 static const TQChar null; // 0000
QT_STATIC_CONST TQChar replacement; // FFFD static const TQChar replacement; // FFFD
QT_STATIC_CONST TQChar byteOrderMark; // FEFF static const TQChar byteOrderMark; // FEFF
QT_STATIC_CONST TQChar byteOrderSwapped; // FFFE static const TQChar byteOrderSwapped; // FFFE
QT_STATIC_CONST TQChar nbsp; // 00A0 static const TQChar nbsp; // 00A0
// Unicode information // Unicode information
@ -423,7 +423,7 @@ public:
TQString &operator=( TQChar c ); TQString &operator=( TQChar c );
TQString &operator=( char c ); TQString &operator=( char c );
QT_STATIC_CONST TQString null; static const TQString null;
bool isNull() const; bool isNull() const;
bool isEmpty() const; bool isEmpty() const;

12
src/tools/qstring.cpp
Unescape View File

@ -1457,12 +1457,12 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l, bool unpaged)
*/ */
TQ_EXPORT TQStringData *TQString::shared_null = 0; TQ_EXPORT TQStringData *TQString::shared_null = 0;
QT_STATIC_CONST_IMPL TQString TQString::null; const TQString TQString::null;
QT_STATIC_CONST_IMPL TQChar TQChar::null; const TQChar TQChar::null;
QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); const TQChar TQChar::replacement((ushort)0xfffd);
QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff); const TQChar TQChar::byteOrderMark((ushort)0xfeff);
QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe); const TQChar TQChar::byteOrderSwapped((ushort)0xfffe);
QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0); const TQChar TQChar::nbsp((ushort)0x00a0);
TQStringData* TQString::makeSharedNull() TQStringData* TQString::makeSharedNull()
{ {

Write Preview
Loading…
Cancel
Save