From f01eee0362e54f47d0266295c5263790c04b6510 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Jul 2011 19:19:15 -0500 Subject: [PATCH] Revert "Revert accidental tqsize*Cursor conversion from prior commit" This reverts commit 79213c7dcd5754122caa8047676cff8f9352e9bb. --- tqtinterface/qt4/bin/qt20fix | 2 +- tqtinterface/qt4/include/tqtglobaldefines.h~ | 20 +++++----- tqtinterface/qt4/src/kernel/tqcursor_x11.cpp | 40 +++++++++---------- tqtinterface/qt4/src/kernel/tqnamespace.h | 10 ++--- .../qt4/src/kernel/tqtglobaldefines.h | 20 +++++----- .../tools/designer/designer/sizehandle.cpp | 16 ++++---- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tqtinterface/qt4/bin/qt20fix b/tqtinterface/qt4/bin/qt20fix index cff7e4d..4036738 100755 --- a/tqtinterface/qt4/bin/qt20fix +++ b/tqtinterface/qt4/bin/qt20fix @@ -62,7 +62,7 @@ sub parseline{ # -# this is the big array of globals and their replacements. add stuff +# this is the big array of globals and their tqreplacements. add stuff # at will. # diff --git a/tqtinterface/qt4/include/tqtglobaldefines.h~ b/tqtinterface/qt4/include/tqtglobaldefines.h~ index 03721ed..04b86e3 100644 --- a/tqtinterface/qt4/include/tqtglobaldefines.h~ +++ b/tqtinterface/qt4/include/tqtglobaldefines.h~ @@ -193,11 +193,11 @@ // #define tqcrossCursor Qt::CrossCursor // #define tqwaitCursor Qt::WaitCursor // #define tqibeamCursor Qt::IBeamCursor -// #define tqsizeVerCursor Qt::SizeVerCursor -// #define tqsizeHorCursor Qt::SizeHorCursor -// #define tqsizeBDiagCursor Qt::SizeBDiagCursor -// #define tqsizeFDiagCursor Qt::SizeFDiagCursor -// #define tqsizeAllCursor Qt::SizeAllCursor +// #define sizeVerCursor Qt::SizeVerCursor +// #define sizeHorCursor Qt::SizeHorCursor +// #define sizeBDiagCursor Qt::SizeBDiagCursor +// #define sizeFDiagCursor Qt::SizeFDiagCursor +// #define sizeAllCursor Qt::SizeAllCursor // #define tqblankCursor Qt::BlankCursor // #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitHCursor Qt::SplitHCursor @@ -211,11 +211,11 @@ #define tqcrossCursor TQt::crossCursor #define tqwaitCursor TQt::waitCursor #define tqibeamCursor TQt::ibeamCursor -#define tqsizeVerCursor TQt::tqsizeVerCursor -#define tqsizeHorCursor TQt::tqsizeHorCursor -#define tqsizeBDiagCursor TQt::tqsizeBDiagCursor -#define tqsizeFDiagCursor TQt::tqsizeFDiagCursor -#define tqsizeAllCursor TQt::tqsizeAllCursor +#define sizeVerCursor TQt::sizeVerCursor +#define sizeHorCursor TQt::sizeHorCursor +#define sizeBDiagCursor TQt::sizeBDiagCursor +#define sizeFDiagCursor TQt::sizeFDiagCursor +#define sizeAllCursor TQt::sizeAllCursor #define tqblankCursor TQt::blankCursor #define tqsplitVCursor TQt::splitVCursor #define tqsplitHCursor TQt::splitHCursor diff --git a/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp b/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp index 159e72d..36f2504 100644 --- a/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp @@ -66,11 +66,11 @@ TQT_STATIC_CONST_IMPL TQCursor & TQt::upArrowCursor = cursorTable[1]; TQT_STATIC_CONST_IMPL TQCursor & TQt::crossCursor = cursorTable[2]; TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3]; TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeVerCursor = cursorTable[5]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeHorCursor = cursorTable[6]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeBDiagCursor = cursorTable[7]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeFDiagCursor = cursorTable[8]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeAllCursor = cursorTable[9]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = cursorTable[5]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = cursorTable[6]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = cursorTable[7]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = cursorTable[8]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = cursorTable[9]; TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10]; TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11]; TQT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = cursorTable[12]; @@ -84,11 +84,11 @@ TQT_STATIC_CONST_IMPL TQCursor & TQt::busyCursor = cursorTable[16]; // TQT_STATIC_CONST TQCursor & crossCursor = Qt::CrossCursor; // TQT_STATIC_CONST TQCursor & waitCursor = Qt::WaitCursor; // TQT_STATIC_CONST TQCursor & ibeamCursor = Qt::IBeamCursor; -// TQT_STATIC_CONST TQCursor & tqsizeVerCursor = Qt::SizeVerCursor; -// TQT_STATIC_CONST TQCursor & tqsizeHorCursor = Qt::SizeHorCursor; -// TQT_STATIC_CONST TQCursor & tqsizeBDiagCursor = Qt::SizeBDiagCursor; -// TQT_STATIC_CONST TQCursor & tqsizeFDiagCursor = Qt::SizeFDiagCursor; -// TQT_STATIC_CONST TQCursor & tqsizeAllCursor = Qt::SizeAllCursor; +// TQT_STATIC_CONST TQCursor & sizeVerCursor = Qt::SizeVerCursor; +// TQT_STATIC_CONST TQCursor & sizeHorCursor = Qt::SizeHorCursor; +// TQT_STATIC_CONST TQCursor & sizeBDiagCursor = Qt::SizeBDiagCursor; +// TQT_STATIC_CONST TQCursor & sizeFDiagCursor = Qt::SizeFDiagCursor; +// TQT_STATIC_CONST TQCursor & sizeAllCursor = Qt::SizeAllCursor; // TQT_STATIC_CONST TQCursor & blankCursor = Qt::BlankCursor; // TQT_STATIC_CONST TQCursor & splitVCursor = Qt::SplitVCursor; // TQT_STATIC_CONST TQCursor & splitHCursor = Qt::SplitHCursor; @@ -102,11 +102,11 @@ TQT_STATIC_CONST_IMPL TQCursor & TQt::busyCursor = cursorTable[16]; // TQT_STATIC_CONST_IMPL TQCursor & TQt::crossCursor = Qt::CrossCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = Qt::WaitCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = Qt::IBeamCursor; -// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeVerCursor = Qt::SizeVerCursor; -// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeHorCursor = Qt::SizeHorCursor; -// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeBDiagCursor = Qt::SizeBDiagCursor; -// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeFDiagCursor = Qt::SizeFDiagCursor; -// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeAllCursor = Qt::SizeAllCursor; +// TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = Qt::SizeVerCursor; +// TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = Qt::SizeHorCursor; +// TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = Qt::SizeBDiagCursor; +// TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = Qt::SizeFDiagCursor; +// TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = Qt::SizeAllCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = Qt::BlankCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = Qt::SplitVCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = Qt::SplitHCursor; @@ -288,11 +288,11 @@ TQT_STATIC_CONST_IMPL TQCursor & TQt::upArrowCursor = cursorTable[1]; TQT_STATIC_CONST_IMPL TQCursor & TQt::crossCursor = cursorTable[2]; TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3]; TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeVerCursor = cursorTable[5]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeHorCursor = cursorTable[6]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeBDiagCursor = cursorTable[7]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeFDiagCursor = cursorTable[8]; -TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeAllCursor = cursorTable[9]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = cursorTable[5]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = cursorTable[6]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = cursorTable[7]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = cursorTable[8]; +TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = cursorTable[9]; TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10]; TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11]; TQT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = cursorTable[12]; diff --git a/tqtinterface/qt4/src/kernel/tqnamespace.h b/tqtinterface/qt4/src/kernel/tqnamespace.h index 6587a71..b158936 100644 --- a/tqtinterface/qt4/src/kernel/tqnamespace.h +++ b/tqtinterface/qt4/src/kernel/tqnamespace.h @@ -1009,11 +1009,11 @@ typedef Qt::Orientation Orientation; TQT_STATIC_CONST TQCursor & crossCursor; // crosshair TQT_STATIC_CONST TQCursor & waitCursor; // hourglass/watch TQT_STATIC_CONST TQCursor & ibeamCursor; // ibeam/text entry - TQT_STATIC_CONST TQCursor & tqsizeVerCursor; // vertical resize - TQT_STATIC_CONST TQCursor & tqsizeHorCursor; // horizontal resize - TQT_STATIC_CONST TQCursor & tqsizeBDiagCursor; // diagonal resize (/) - TQT_STATIC_CONST TQCursor & tqsizeFDiagCursor; // diagonal resize (\) - TQT_STATIC_CONST TQCursor & tqsizeAllCursor; // all directions resize + TQT_STATIC_CONST TQCursor & sizeVerCursor; // vertical resize + TQT_STATIC_CONST TQCursor & sizeHorCursor; // horizontal resize + TQT_STATIC_CONST TQCursor & sizeBDiagCursor; // diagonal resize (/) + TQT_STATIC_CONST TQCursor & sizeFDiagCursor; // diagonal resize (\) + TQT_STATIC_CONST TQCursor & sizeAllCursor; // all directions resize TQT_STATIC_CONST TQCursor & blankCursor; // blank/invisible cursor TQT_STATIC_CONST TQCursor & splitVCursor; // vertical bar with left-right // arrows diff --git a/tqtinterface/qt4/src/kernel/tqtglobaldefines.h b/tqtinterface/qt4/src/kernel/tqtglobaldefines.h index c17f1e6..35de7c7 100644 --- a/tqtinterface/qt4/src/kernel/tqtglobaldefines.h +++ b/tqtinterface/qt4/src/kernel/tqtglobaldefines.h @@ -195,11 +195,11 @@ // #define tqcrossCursor Qt::CrossCursor // #define tqwaitCursor Qt::WaitCursor // #define tqibeamCursor Qt::IBeamCursor -// #define tqsizeVerCursor Qt::SizeVerCursor -// #define tqsizeHorCursor Qt::SizeHorCursor -// #define tqsizeBDiagCursor Qt::SizeBDiagCursor -// #define tqsizeFDiagCursor Qt::SizeFDiagCursor -// #define tqsizeAllCursor Qt::SizeAllCursor +// #define sizeVerCursor Qt::SizeVerCursor +// #define sizeHorCursor Qt::SizeHorCursor +// #define sizeBDiagCursor Qt::SizeBDiagCursor +// #define sizeFDiagCursor Qt::SizeFDiagCursor +// #define sizeAllCursor Qt::SizeAllCursor // #define tqblankCursor Qt::BlankCursor // #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitHCursor Qt::SplitHCursor @@ -213,11 +213,11 @@ #define tqcrossCursor TQt::crossCursor #define tqwaitCursor TQt::waitCursor #define tqibeamCursor TQt::ibeamCursor -#define tqsizeVerCursor TQt::tqsizeVerCursor -#define tqsizeHorCursor TQt::tqsizeHorCursor -#define tqsizeBDiagCursor TQt::tqsizeBDiagCursor -#define tqsizeFDiagCursor TQt::tqsizeFDiagCursor -#define tqsizeAllCursor TQt::tqsizeAllCursor +#define sizeVerCursor TQt::sizeVerCursor +#define sizeHorCursor TQt::sizeHorCursor +#define sizeBDiagCursor TQt::sizeBDiagCursor +#define sizeFDiagCursor TQt::sizeFDiagCursor +#define sizeAllCursor TQt::sizeAllCursor #define tqblankCursor TQt::blankCursor #define tqsplitVCursor TQt::splitVCursor #define tqsplitHCursor TQt::splitHCursor diff --git a/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp b/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp index f0c6ef3..76743d6 100644 --- a/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp +++ b/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp @@ -64,28 +64,28 @@ void SizeHandle::updateCursor() switch ( dir ) { case LeftTop: - setCursor( tqsizeFDiagCursor ); + setCursor( sizeFDiagCursor ); break; case Top: - setCursor( tqsizeVerCursor ); + setCursor( sizeVerCursor ); break; case RightTop: - setCursor( tqsizeBDiagCursor ); + setCursor( sizeBDiagCursor ); break; case Right: - setCursor( tqsizeHorCursor ); + setCursor( sizeHorCursor ); break; case RightBottom: - setCursor( tqsizeFDiagCursor ); + setCursor( sizeFDiagCursor ); break; case Bottom: - setCursor( tqsizeVerCursor ); + setCursor( sizeVerCursor ); break; case LeftBottom: - setCursor( tqsizeBDiagCursor ); + setCursor( sizeBDiagCursor ); break; case Left: - setCursor( tqsizeHorCursor ); + setCursor( sizeHorCursor ); break; } }