diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-15 18:49:06 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-02-15 18:58:23 +0900 |
commit | 1d318a47b0b45a7f916f526de60d628302cbfd4c (patch) | |
tree | 40e178533acb193432ab512d05eb3f03ff4a855c /src/kernel | |
parent | 67bff2edcacb208dc44dcd521386bef686dc6dbf (diff) | |
download | tqt3-1d318a47b0b45a7f916f526de60d628302cbfd4c.tar.gz tqt3-1d318a47b0b45a7f916f526de60d628302cbfd4c.zip |
Replace QT_STATIC_CONST_* with actual definitions
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/ntqnamespace.h | 72 | ||||
-rw-r--r-- | src/kernel/qcolor.cpp | 38 | ||||
-rw-r--r-- | src/kernel/qcursor_x11.cpp | 34 |
3 files changed, 72 insertions, 72 deletions
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h index 218529349..14b4a67e1 100644 --- a/src/kernel/ntqnamespace.h +++ b/src/kernel/ntqnamespace.h @@ -52,25 +52,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 @@ -892,25 +892,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/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp index 6278730f6..0e74dc462 100644 --- a/src/kernel/qcolor.cpp +++ b/src/kernel/qcolor.cpp @@ -199,25 +199,25 @@ static TQColor stdcol[19] = { static TQColor stdcol[19]; #endif -QT_STATIC_CONST_IMPL TQColor & TQt::color0 = stdcol[0]; -QT_STATIC_CONST_IMPL TQColor & TQt::color1 = stdcol[1]; -QT_STATIC_CONST_IMPL TQColor & TQt::black = stdcol[2]; -QT_STATIC_CONST_IMPL TQColor & TQt::white = stdcol[3]; -QT_STATIC_CONST_IMPL TQColor & TQt::darkGray = stdcol[4]; -QT_STATIC_CONST_IMPL TQColor & TQt::gray = stdcol[5]; -QT_STATIC_CONST_IMPL TQColor & TQt::lightGray = stdcol[6]; -QT_STATIC_CONST_IMPL TQColor & TQt::red = stdcol[7]; -QT_STATIC_CONST_IMPL TQColor & TQt::green = stdcol[8]; -QT_STATIC_CONST_IMPL TQColor & TQt::blue = stdcol[9]; -QT_STATIC_CONST_IMPL TQColor & TQt::cyan = stdcol[10]; -QT_STATIC_CONST_IMPL TQColor & TQt::magenta = stdcol[11]; -QT_STATIC_CONST_IMPL TQColor & TQt::yellow = stdcol[12]; -QT_STATIC_CONST_IMPL TQColor & TQt::darkRed = stdcol[13]; -QT_STATIC_CONST_IMPL TQColor & TQt::darkGreen = stdcol[14]; -QT_STATIC_CONST_IMPL TQColor & TQt::darkBlue = stdcol[15]; -QT_STATIC_CONST_IMPL TQColor & TQt::darkCyan = stdcol[16]; -QT_STATIC_CONST_IMPL TQColor & TQt::darkMagenta = stdcol[17]; -QT_STATIC_CONST_IMPL TQColor & TQt::darkYellow = stdcol[18]; +const TQColor & TQt::color0 = stdcol[0]; +const TQColor & TQt::color1 = stdcol[1]; +const TQColor & TQt::black = stdcol[2]; +const TQColor & TQt::white = stdcol[3]; +const TQColor & TQt::darkGray = stdcol[4]; +const TQColor & TQt::gray = stdcol[5]; +const TQColor & TQt::lightGray = stdcol[6]; +const TQColor & TQt::red = stdcol[7]; +const TQColor & TQt::green = stdcol[8]; +const TQColor & TQt::blue = stdcol[9]; +const TQColor & TQt::cyan = stdcol[10]; +const TQColor & TQt::magenta = stdcol[11]; +const TQColor & TQt::yellow = stdcol[12]; +const TQColor & TQt::darkRed = stdcol[13]; +const TQColor & TQt::darkGreen = stdcol[14]; +const TQColor & TQt::darkBlue = stdcol[15]; +const TQColor & TQt::darkCyan = stdcol[16]; +const TQColor & TQt::darkMagenta = stdcol[17]; +const TQColor & TQt::darkYellow = stdcol[18]; /***************************************************************************** diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp index 9fd666397..f3b034da8 100644 --- a/src/kernel/qcursor_x11.cpp +++ b/src/kernel/qcursor_x11.cpp @@ -105,23 +105,23 @@ static TQCursor cursorTable[TQt::LastCursor+1]; static const int arrowCursorIdx = 0; -QT_STATIC_CONST_IMPL TQCursor & TQt::arrowCursor = cursorTable[0]; -QT_STATIC_CONST_IMPL TQCursor & TQt::upArrowCursor = cursorTable[1]; -QT_STATIC_CONST_IMPL TQCursor & TQt::crossCursor = cursorTable[2]; -QT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3]; -QT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4]; -QT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = cursorTable[5]; -QT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = cursorTable[6]; -QT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = cursorTable[7]; -QT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = cursorTable[8]; -QT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = cursorTable[9]; -QT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10]; -QT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11]; -QT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = cursorTable[12]; -QT_STATIC_CONST_IMPL TQCursor & TQt::pointingHandCursor = cursorTable[13]; -QT_STATIC_CONST_IMPL TQCursor & TQt::forbiddenCursor = cursorTable[14]; -QT_STATIC_CONST_IMPL TQCursor & TQt::whatsThisCursor = cursorTable[15]; -QT_STATIC_CONST_IMPL TQCursor & TQt::busyCursor = cursorTable[16]; +const TQCursor & TQt::arrowCursor = cursorTable[0]; +const TQCursor & TQt::upArrowCursor = cursorTable[1]; +const TQCursor & TQt::crossCursor = cursorTable[2]; +const TQCursor & TQt::waitCursor = cursorTable[3]; +const TQCursor & TQt::ibeamCursor = cursorTable[4]; +const TQCursor & TQt::sizeVerCursor = cursorTable[5]; +const TQCursor & TQt::sizeHorCursor = cursorTable[6]; +const TQCursor & TQt::sizeBDiagCursor = cursorTable[7]; +const TQCursor & TQt::sizeFDiagCursor = cursorTable[8]; +const TQCursor & TQt::sizeAllCursor = cursorTable[9]; +const TQCursor & TQt::blankCursor = cursorTable[10]; +const TQCursor & TQt::splitVCursor = cursorTable[11]; +const TQCursor & TQt::splitHCursor = cursorTable[12]; +const TQCursor & TQt::pointingHandCursor = cursorTable[13]; +const TQCursor & TQt::forbiddenCursor = cursorTable[14]; +const TQCursor & TQt::whatsThisCursor = cursorTable[15]; +const TQCursor & TQt::busyCursor = cursorTable[16]; TQCursor *TQCursor::find_cur( int shape ) // find predefined cursor |