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

Revert "Revert accidental tqsize*Cursor conversion from prior commit"

Browse Source 
This reverts commit 79213c7dcd5754122caa8047676cff8f9352e9bb.
pull/1/head
Timothy Pearson 14 years ago
parent a0486cd21b
commit f01eee0362
6 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
tqtinterface/qt4/bin/qt20fix
Unescape View File

@ -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. # at will.
# #

20
tqtinterface/qt4/include/tqtglobaldefines.h~
Unescape View File

@ -193,11 +193,11 @@
// #define tqcrossCursor Qt::CrossCursor // #define tqcrossCursor Qt::CrossCursor
// #define tqwaitCursor Qt::WaitCursor // #define tqwaitCursor Qt::WaitCursor
// #define tqibeamCursor Qt::IBeamCursor // #define tqibeamCursor Qt::IBeamCursor
// #define tqsizeVerCursor Qt::SizeVerCursor // #define sizeVerCursor Qt::SizeVerCursor
// #define tqsizeHorCursor Qt::SizeHorCursor // #define sizeHorCursor Qt::SizeHorCursor
// #define tqsizeBDiagCursor Qt::SizeBDiagCursor // #define sizeBDiagCursor Qt::SizeBDiagCursor
// #define tqsizeFDiagCursor Qt::SizeFDiagCursor // #define sizeFDiagCursor Qt::SizeFDiagCursor
// #define tqsizeAllCursor Qt::SizeAllCursor // #define sizeAllCursor Qt::SizeAllCursor
// #define tqblankCursor Qt::BlankCursor // #define tqblankCursor Qt::BlankCursor
// #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitVCursor Qt::SplitVCursor
// #define tqsplitHCursor Qt::SplitHCursor // #define tqsplitHCursor Qt::SplitHCursor
@ -211,11 +211,11 @@
#define tqcrossCursor TQt::crossCursor #define tqcrossCursor TQt::crossCursor
#define tqwaitCursor TQt::waitCursor #define tqwaitCursor TQt::waitCursor
#define tqibeamCursor TQt::ibeamCursor #define tqibeamCursor TQt::ibeamCursor
#define tqsizeVerCursor TQt::tqsizeVerCursor #define sizeVerCursor TQt::sizeVerCursor
#define tqsizeHorCursor TQt::tqsizeHorCursor #define sizeHorCursor TQt::sizeHorCursor
#define tqsizeBDiagCursor TQt::tqsizeBDiagCursor #define sizeBDiagCursor TQt::sizeBDiagCursor
#define tqsizeFDiagCursor TQt::tqsizeFDiagCursor #define sizeFDiagCursor TQt::sizeFDiagCursor
#define tqsizeAllCursor TQt::tqsizeAllCursor #define sizeAllCursor TQt::sizeAllCursor
#define tqblankCursor TQt::blankCursor #define tqblankCursor TQt::blankCursor
#define tqsplitVCursor TQt::splitVCursor #define tqsplitVCursor TQt::splitVCursor
#define tqsplitHCursor TQt::splitHCursor #define tqsplitHCursor TQt::splitHCursor

40
tqtinterface/qt4/src/kernel/tqcursor_x11.cpp
Unescape View File

@ -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::crossCursor = cursorTable[2];
TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3]; TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3];
TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4]; TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeVerCursor = cursorTable[5]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = cursorTable[5];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeHorCursor = cursorTable[6]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = cursorTable[6];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeBDiagCursor = cursorTable[7]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = cursorTable[7];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeFDiagCursor = cursorTable[8]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = cursorTable[8];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeAllCursor = cursorTable[9]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = cursorTable[9];
TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10]; TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10];
TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11]; TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11];
TQT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = cursorTable[12]; 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 & crossCursor = Qt::CrossCursor;
// TQT_STATIC_CONST TQCursor & waitCursor = Qt::WaitCursor; // TQT_STATIC_CONST TQCursor & waitCursor = Qt::WaitCursor;
// TQT_STATIC_CONST TQCursor & ibeamCursor = Qt::IBeamCursor; // TQT_STATIC_CONST TQCursor & ibeamCursor = Qt::IBeamCursor;
// TQT_STATIC_CONST TQCursor & tqsizeVerCursor = Qt::SizeVerCursor; // TQT_STATIC_CONST TQCursor & sizeVerCursor = Qt::SizeVerCursor;
// TQT_STATIC_CONST TQCursor & tqsizeHorCursor = Qt::SizeHorCursor; // TQT_STATIC_CONST TQCursor & sizeHorCursor = Qt::SizeHorCursor;
// TQT_STATIC_CONST TQCursor & tqsizeBDiagCursor = Qt::SizeBDiagCursor; // TQT_STATIC_CONST TQCursor & sizeBDiagCursor = Qt::SizeBDiagCursor;
// TQT_STATIC_CONST TQCursor & tqsizeFDiagCursor = Qt::SizeFDiagCursor; // TQT_STATIC_CONST TQCursor & sizeFDiagCursor = Qt::SizeFDiagCursor;
// TQT_STATIC_CONST TQCursor & tqsizeAllCursor = Qt::SizeAllCursor; // TQT_STATIC_CONST TQCursor & sizeAllCursor = Qt::SizeAllCursor;
// TQT_STATIC_CONST TQCursor & blankCursor = Qt::BlankCursor; // TQT_STATIC_CONST TQCursor & blankCursor = Qt::BlankCursor;
// TQT_STATIC_CONST TQCursor & splitVCursor = Qt::SplitVCursor; // TQT_STATIC_CONST TQCursor & splitVCursor = Qt::SplitVCursor;
// TQT_STATIC_CONST TQCursor & splitHCursor = Qt::SplitHCursor; // 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::crossCursor = Qt::CrossCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = Qt::WaitCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = Qt::WaitCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = Qt::IBeamCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = Qt::IBeamCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeVerCursor = Qt::SizeVerCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = Qt::SizeVerCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeHorCursor = Qt::SizeHorCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = Qt::SizeHorCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeBDiagCursor = Qt::SizeBDiagCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = Qt::SizeBDiagCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeFDiagCursor = Qt::SizeFDiagCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = Qt::SizeFDiagCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeAllCursor = Qt::SizeAllCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = Qt::SizeAllCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = Qt::BlankCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = Qt::BlankCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = Qt::SplitVCursor; // TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = Qt::SplitVCursor;
// TQT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = Qt::SplitHCursor; // 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::crossCursor = cursorTable[2];
TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3]; TQT_STATIC_CONST_IMPL TQCursor & TQt::waitCursor = cursorTable[3];
TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4]; TQT_STATIC_CONST_IMPL TQCursor & TQt::ibeamCursor = cursorTable[4];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeVerCursor = cursorTable[5]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeVerCursor = cursorTable[5];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeHorCursor = cursorTable[6]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeHorCursor = cursorTable[6];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeBDiagCursor = cursorTable[7]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeBDiagCursor = cursorTable[7];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeFDiagCursor = cursorTable[8]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeFDiagCursor = cursorTable[8];
TQT_STATIC_CONST_IMPL TQCursor & TQt::tqsizeAllCursor = cursorTable[9]; TQT_STATIC_CONST_IMPL TQCursor & TQt::sizeAllCursor = cursorTable[9];
TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10]; TQT_STATIC_CONST_IMPL TQCursor & TQt::blankCursor = cursorTable[10];
TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11]; TQT_STATIC_CONST_IMPL TQCursor & TQt::splitVCursor = cursorTable[11];
TQT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = cursorTable[12]; TQT_STATIC_CONST_IMPL TQCursor & TQt::splitHCursor = cursorTable[12];

10
tqtinterface/qt4/src/kernel/tqnamespace.h
Unescape View File

@ -1009,11 +1009,11 @@ typedef Qt::Orientation Orientation;
TQT_STATIC_CONST TQCursor & crossCursor; // crosshair TQT_STATIC_CONST TQCursor & crossCursor; // crosshair
TQT_STATIC_CONST TQCursor & waitCursor; // hourglass/watch TQT_STATIC_CONST TQCursor & waitCursor; // hourglass/watch
TQT_STATIC_CONST TQCursor & ibeamCursor; // ibeam/text entry TQT_STATIC_CONST TQCursor & ibeamCursor; // ibeam/text entry
TQT_STATIC_CONST TQCursor & tqsizeVerCursor; // vertical resize TQT_STATIC_CONST TQCursor & sizeVerCursor; // vertical resize
TQT_STATIC_CONST TQCursor & tqsizeHorCursor; // horizontal resize TQT_STATIC_CONST TQCursor & sizeHorCursor; // horizontal resize
TQT_STATIC_CONST TQCursor & tqsizeBDiagCursor; // diagonal resize (/) TQT_STATIC_CONST TQCursor & sizeBDiagCursor; // diagonal resize (/)
TQT_STATIC_CONST TQCursor & tqsizeFDiagCursor; // diagonal resize (\) TQT_STATIC_CONST TQCursor & sizeFDiagCursor; // diagonal resize (\)
TQT_STATIC_CONST TQCursor & tqsizeAllCursor; // all directions resize TQT_STATIC_CONST TQCursor & sizeAllCursor; // all directions resize
TQT_STATIC_CONST TQCursor & blankCursor; // blank/invisible cursor TQT_STATIC_CONST TQCursor & blankCursor; // blank/invisible cursor
TQT_STATIC_CONST TQCursor & splitVCursor; // vertical bar with left-right TQT_STATIC_CONST TQCursor & splitVCursor; // vertical bar with left-right
// arrows // arrows

20
tqtinterface/qt4/src/kernel/tqtglobaldefines.h
Unescape View File

@ -195,11 +195,11 @@
// #define tqcrossCursor Qt::CrossCursor // #define tqcrossCursor Qt::CrossCursor
// #define tqwaitCursor Qt::WaitCursor // #define tqwaitCursor Qt::WaitCursor
// #define tqibeamCursor Qt::IBeamCursor // #define tqibeamCursor Qt::IBeamCursor
// #define tqsizeVerCursor Qt::SizeVerCursor // #define sizeVerCursor Qt::SizeVerCursor
// #define tqsizeHorCursor Qt::SizeHorCursor // #define sizeHorCursor Qt::SizeHorCursor
// #define tqsizeBDiagCursor Qt::SizeBDiagCursor // #define sizeBDiagCursor Qt::SizeBDiagCursor
// #define tqsizeFDiagCursor Qt::SizeFDiagCursor // #define sizeFDiagCursor Qt::SizeFDiagCursor
// #define tqsizeAllCursor Qt::SizeAllCursor // #define sizeAllCursor Qt::SizeAllCursor
// #define tqblankCursor Qt::BlankCursor // #define tqblankCursor Qt::BlankCursor
// #define tqsplitVCursor Qt::SplitVCursor // #define tqsplitVCursor Qt::SplitVCursor
// #define tqsplitHCursor Qt::SplitHCursor // #define tqsplitHCursor Qt::SplitHCursor
@ -213,11 +213,11 @@
#define tqcrossCursor TQt::crossCursor #define tqcrossCursor TQt::crossCursor
#define tqwaitCursor TQt::waitCursor #define tqwaitCursor TQt::waitCursor
#define tqibeamCursor TQt::ibeamCursor #define tqibeamCursor TQt::ibeamCursor
#define tqsizeVerCursor TQt::tqsizeVerCursor #define sizeVerCursor TQt::sizeVerCursor
#define tqsizeHorCursor TQt::tqsizeHorCursor #define sizeHorCursor TQt::sizeHorCursor
#define tqsizeBDiagCursor TQt::tqsizeBDiagCursor #define sizeBDiagCursor TQt::sizeBDiagCursor
#define tqsizeFDiagCursor TQt::tqsizeFDiagCursor #define sizeFDiagCursor TQt::sizeFDiagCursor
#define tqsizeAllCursor TQt::tqsizeAllCursor #define sizeAllCursor TQt::sizeAllCursor
#define tqblankCursor TQt::blankCursor #define tqblankCursor TQt::blankCursor
#define tqsplitVCursor TQt::splitVCursor #define tqsplitVCursor TQt::splitVCursor
#define tqsplitHCursor TQt::splitHCursor #define tqsplitHCursor TQt::splitHCursor

16
tqtinterface/qt4/tools/designer/designer/sizehandle.cpp
Unescape View File

@ -64,28 +64,28 @@ void SizeHandle::updateCursor()
switch ( dir ) { switch ( dir ) {
case LeftTop: case LeftTop:
setCursor( tqsizeFDiagCursor ); setCursor( sizeFDiagCursor );
break; break;
case Top: case Top:
setCursor( tqsizeVerCursor ); setCursor( sizeVerCursor );
break; break;
case RightTop: case RightTop:
setCursor( tqsizeBDiagCursor ); setCursor( sizeBDiagCursor );
break; break;
case Right: case Right:
setCursor( tqsizeHorCursor ); setCursor( sizeHorCursor );
break; break;
case RightBottom: case RightBottom:
setCursor( tqsizeFDiagCursor ); setCursor( sizeFDiagCursor );
break; break;
case Bottom: case Bottom:
setCursor( tqsizeVerCursor ); setCursor( sizeVerCursor );
break; break;
case LeftBottom: case LeftBottom:
setCursor( tqsizeBDiagCursor ); setCursor( sizeBDiagCursor );
break; break;
case Left: case Left:
setCursor( tqsizeHorCursor ); setCursor( sizeHorCursor );
break; break;
} }
} }

Write Preview
Loading…
Cancel
Save