Replace various tq* strings with TQt::* equivalents

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 100f977221)
pull/478/head
Michele Calgaro 10 months ago
parent 4a6f4a1732
commit 7272c289be
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -156,7 +156,7 @@ void Toplevel :: slotUser1()
m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData()); m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData());
if (i == KMessageBox::Yes) { if (i == KMessageBox::Yes) {
TQApplication::setOverrideCursor ( tqwaitCursor ); TQApplication::setOverrideCursor ( TQt::waitCursor );
// generate the backtrace // generate the backtrace
BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
@ -195,7 +195,7 @@ void Toplevel :: slotNewDebuggingApp(const TQString& launchName)
void Toplevel :: slotUser3() void Toplevel :: slotUser3()
{ {
enableButton(User3, false); enableButton(User3, false);
TQApplication::setOverrideCursor ( tqwaitCursor ); TQApplication::setOverrideCursor ( TQt::waitCursor );
// generate the backtrace // generate the backtrace
BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));

@ -163,7 +163,7 @@ void DockContainer::setBaseWidget(TQWidget *widget)
ProxyWidget* DockContainer::loadModule( ConfigModule *module ) ProxyWidget* DockContainer::loadModule( ConfigModule *module )
{ {
TQApplication::setOverrideCursor( tqwaitCursor ); TQApplication::setOverrideCursor( TQt::waitCursor );
ProxyWidget *widget = _modulew->load( module ); ProxyWidget *widget = _modulew->load( module );

@ -161,7 +161,7 @@ void LogView::updateList()
TQFile logFile(logFileName.url()); TQFile logFile(logFileName.url());
if (logFile.open(IO_ReadOnly)) if (logFile.open(IO_ReadOnly))
{ {
TQApplication::setOverrideCursor(tqwaitCursor); TQApplication::setOverrideCursor(TQt::waitCursor);
viewHistory.clear(); viewHistory.clear();
filesCount=0; filesCount=0;
connectionsCount=0; connectionsCount=0;

@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec
void StatisticsView::calculate() void StatisticsView::calculate()
{ {
if (dataList==0) return; if (dataList==0) return;
TQApplication::setOverrideCursor(tqwaitCursor); TQApplication::setOverrideCursor(TQt::waitCursor);
int connCount(0); int connCount(0);
if (eventCb->currentText()==i18n("Connection")) if (eventCb->currentText()==i18n("Connection"))
connCount=1; connCount=1;

@ -158,7 +158,7 @@ DCOPBrowserApplicationItem::setOpen(bool o)
void void
DCOPBrowserApplicationItem::populate() DCOPBrowserApplicationItem::populate()
{ {
TDEApplication::setOverrideCursor(tqwaitCursor); TDEApplication::setOverrideCursor(TQt::waitCursor);
bool ok = false; bool ok = false;
bool isDefault = false; bool isDefault = false;
@ -241,7 +241,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o)
void void
DCOPBrowserInterfaceItem::populate() DCOPBrowserInterfaceItem::populate()
{ {
TDEApplication::setOverrideCursor(tqwaitCursor); TDEApplication::setOverrideCursor(TQt::waitCursor);
bool ok = false; bool ok = false;
@ -892,7 +892,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
void KDCOPWindow::slotFillApplications() void KDCOPWindow::slotFillApplications()
{ {
TDEApplication::setOverrideCursor(tqwaitCursor); TDEApplication::setOverrideCursor(TQt::waitCursor);
QCStringList apps = dcopClient->registeredApplications(); QCStringList apps = dcopClient->registeredApplications();
TQCString appId = dcopClient->appId(); TQCString appId = dcopClient->appId();

@ -661,7 +661,7 @@ void LockProcess::startSecureDialog()
mBusy = true; mBusy = true;
trinity_desktop_lock_forced = true; trinity_desktop_lock_forced = true;
// Make sure the cursor is not showing busy status // Make sure the cursor is not showing busy status
setCursor( tqarrowCursor ); setCursor( TQt::arrowCursor );
if (startLock()) if (startLock())
{ {
if (trinity_desktop_lock_delay_screensaver_start) { if (trinity_desktop_lock_delay_screensaver_start) {
@ -1243,10 +1243,10 @@ bool LockProcess::grabMouse()
{ {
HANDLE cursorHandle; HANDLE cursorHandle;
if (mHackActive) { if (mHackActive) {
cursorHandle = TQCursor(tqblankCursor).handle(); cursorHandle = TQCursor(TQt::blankCursor).handle();
} }
else { else {
cursorHandle = TQCursor(tqbusyCursor).handle(); cursorHandle = TQCursor(TQt::busyCursor).handle();
} }
int rv = XGrabPointer( tqt_xdisplay(), TQApplication::desktop()->winId(), int rv = XGrabPointer( tqt_xdisplay(), TQApplication::desktop()->winId(),
True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None, True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
@ -1602,8 +1602,8 @@ bool LockProcess::startHack()
return false; return false;
} }
setCursor( tqblankCursor ); setCursor( TQt::blankCursor );
XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime); XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
if (mSaverExec.isEmpty()) { if (mSaverExec.isEmpty()) {
return false; return false;
@ -1659,7 +1659,7 @@ bool LockProcess::startHack()
mSuspended = false; mSuspended = false;
} }
XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime); XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
if (mHackProc.start() == true) { if (mHackProc.start() == true) {
#ifdef HAVE_SETPRIORITY #ifdef HAVE_SETPRIORITY
setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority); setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority);
@ -1733,7 +1733,7 @@ void LockProcess::stopHack()
mHackProc.kill(SIGKILL); mHackProc.kill(SIGKILL);
} }
} }
setCursor( tqarrowCursor ); setCursor( TQt::arrowCursor );
mHackActive = FALSE; mHackActive = FALSE;
} }
@ -1989,7 +1989,7 @@ int LockProcess::execDialog( TQDialog *dlg )
if (mDialogs.isEmpty()) { if (mDialogs.isEmpty()) {
suspend(); suspend();
XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime); XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
} }
mDialogs.prepend( dlg ); mDialogs.prepend( dlg );
fakeFocusIn( dlg->winId()); fakeFocusIn( dlg->winId());
@ -2016,10 +2016,10 @@ int LockProcess::execDialog( TQDialog *dlg )
if( mDialogs.isEmpty() ) { if( mDialogs.isEmpty() ) {
HANDLE cursorHandle; HANDLE cursorHandle;
if (mHackActive) { if (mHackActive) {
cursorHandle = TQCursor(tqblankCursor).handle(); cursorHandle = TQCursor(TQt::blankCursor).handle();
} }
else { else {
cursorHandle = TQCursor(tqbusyCursor).handle(); cursorHandle = TQCursor(TQt::busyCursor).handle();
} }
XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, cursorHandle, CurrentTime); XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, cursorHandle, CurrentTime);
if (trinity_desktop_lock_use_system_modal_dialogs) { if (trinity_desktop_lock_use_system_modal_dialogs) {
@ -2695,7 +2695,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
m_dialogPrevY = oldPoint.y(); m_dialogPrevY = oldPoint.y();
m_mousePrevX = be->x_root; m_mousePrevX = be->x_root;
m_mousePrevY = be->y_root; m_mousePrevY = be->y_root;
XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqsizeAllCursor).handle(), CurrentTime); XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::sizeAllCursor).handle(), CurrentTime);
} }
} }
@ -2715,7 +2715,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
if (event->type == ButtonRelease) { if (event->type == ButtonRelease) {
m_mouseDown = 0; m_mouseDown = 0;
XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime); XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
} }
} }

@ -556,7 +556,7 @@ void Navigator::slotSearch()
// disable search Button during searches // disable search Button during searches
mSearchButton->setEnabled(false); mSearchButton->setEnabled(false);
TQApplication::setOverrideCursor(tqwaitCursor); TQApplication::setOverrideCursor(TQt::waitCursor);
if ( !mSearchEngine->search( words, method, pages, scope ) ) { if ( !mSearchEngine->search( words, method, pages, scope ) ) {
slotSearchFinished(); slotSearchFinished();

@ -34,7 +34,7 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P )
void WindowSelector::select() void WindowSelector::select()
{ {
kapp->desktop()->grabMouse( TQCursor( tqcrossCursor )); kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor ));
kapp->installX11EventFilter( TQT_TQWIDGET(this) ); kapp->installX11EventFilter( TQT_TQWIDGET(this) );
} }

@ -47,7 +47,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const
, _opMnu(0) , _opMnu(0)
, _appletOpMnu(appletOpMenu) , _appletOpMnu(appletOpMenu)
{ {
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
} }
BaseContainer::~BaseContainer() BaseContainer::~BaseContainer()

@ -2202,7 +2202,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
} }
else else
{ {
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
} }
} }
else if (pos == KPanelExtension::Right) else if (pos == KPanelExtension::Right)
@ -2213,29 +2213,29 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
} }
else else
{ {
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
} }
} }
else if (pos == KPanelExtension::Top) else if (pos == KPanelExtension::Top)
{ {
if (inResizeArea(me->pos())) if (inResizeArea(me->pos()))
{ {
setCursor(tqsizeVerCursor); setCursor(TQt::sizeVerCursor);
} }
else else
{ {
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
} }
} }
else else
{ {
if (inResizeArea(me->pos())) if (inResizeArea(me->pos()))
{ {
setCursor(tqsizeVerCursor); setCursor(TQt::sizeVerCursor);
} }
else else
{ {
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
} }
} }
} }

@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a)
KickerTip::enableTipping(false); KickerTip::enableTipping(false);
emit maintainFocus(true); emit maintainFocus(true);
setMouseTracking(true); setMouseTracking(true);
grabMouse(tqsizeAllCursor); grabMouse(TQt::sizeAllCursor);
m_layout->setStretchEnabled(false); m_layout->setStretchEnabled(false);
a->raise(); a->raise();
@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *)
// so we need to complete the move here // so we need to complete the move here
_autoScrollTimer.stop(); _autoScrollTimer.stop();
releaseMouse(); releaseMouse();
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
setMouseTracking(false); setMouseTracking(false);
_moveAC->completeMoveOperation(); _moveAC->completeMoveOperation();
@ -967,7 +967,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
// leaveEvent() doesn't work, while grabbing the mouse // leaveEvent() doesn't work, while grabbing the mouse
_autoScrollTimer.stop(); _autoScrollTimer.stop();
releaseMouse(); releaseMouse();
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
setMouseTracking(false); setMouseTracking(false);
_moveAC->completeMoveOperation(); _moveAC->completeMoveOperation();

@ -46,7 +46,7 @@ UserSizeSel::UserSizeSel(const TQRect& rect, const KPanelExtension::Position pos
} }
if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom)) if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom))
{ {
setCursor(tqsizeVerCursor); setCursor(TQt::sizeVerCursor);
} }
setGeometry(-10, -10, 2, 2); setGeometry(-10, -10, 2, 2);

@ -1752,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation)
m_orientation=orientation; m_orientation=orientation;
m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor); m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor);
TQPixmap pix; TQPixmap pix;
if ( m_orientation == BottomUp ) if ( m_orientation == BottomUp )

@ -414,7 +414,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name)
this, TQT_SLOT(onClearSelection()) ); this, TQT_SLOT(onClearSelection()) );
scrollbar = new TQScrollBar(this); scrollbar = new TQScrollBar(this);
scrollbar->setCursor( tqarrowCursor ); scrollbar->setCursor( TQt::arrowCursor );
connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int)));
blinkT = new TQTimer(this); blinkT = new TQTimer(this);
@ -1830,7 +1830,7 @@ void TEWidget::setWordCharacters(TQString wc)
void TEWidget::setMouseMarks(bool on) void TEWidget::setMouseMarks(bool on)
{ {
mouse_marks = on; mouse_marks = on;
setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor ); setCursor( mouse_marks ? TQt::ibeamCursor : TQt::arrowCursor );
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */

@ -2707,25 +2707,25 @@ void Client::setCursor( Position m )
{ {
case PositionTopLeft: case PositionTopLeft:
case PositionBottomRight: case PositionBottomRight:
setCursor( tqsizeFDiagCursor ); setCursor( TQt::sizeFDiagCursor );
break; break;
case PositionBottomLeft: case PositionBottomLeft:
case PositionTopRight: case PositionTopRight:
setCursor( tqsizeBDiagCursor ); setCursor( TQt::sizeBDiagCursor );
break; break;
case PositionTop: case PositionTop:
case PositionBottom: case PositionBottom:
setCursor( tqsizeVerCursor ); setCursor( TQt::sizeVerCursor );
break; break;
case PositionLeft: case PositionLeft:
case PositionRight: case PositionRight:
setCursor( tqsizeHorCursor ); setCursor( TQt::sizeHorCursor );
break; break;
default: default:
if( buttonDown && isMovable()) if( buttonDown && isMovable())
setCursor( tqsizeAllCursor ); setCursor( TQt::sizeAllCursor );
else else
setCursor( tqarrowCursor ); setCursor( TQt::arrowCursor );
break; break;
} }
} }

@ -1213,7 +1213,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent,
: TQButton(parent, 0), hover(false) : TQButton(parent, 0), hover(false)
{ {
setBackgroundMode(NoBackground); setBackgroundMode(NoBackground);
setCursor(tqarrowCursor); setCursor(TQt::arrowCursor);
realizeButtons = realizeBtns; realizeButtons = realizeBtns;
client = _client; client = _client;
useMiniIcon = false; useMiniIcon = false;

@ -765,7 +765,7 @@ KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, co
TQToolTip::add( this, tip ); // FRAME TQToolTip::add( this, tip ); // FRAME
setBackgroundMode( NoBackground ); setBackgroundMode( NoBackground );
setCursor( tqarrowCursor ); setCursor( TQt::arrowCursor );
int size = clientHandler->roundButton()->height(); int size = clientHandler->roundButton()->height();
setFixedSize( size, size ); setFixedSize( size, size );

@ -22,7 +22,7 @@ void Decoration::init()
{ {
button = new TQPushButton( widget()); button = new TQPushButton( widget());
button->show(); button->show();
button->setCursor( tqarrowCursor ); button->setCursor( TQt::arrowCursor );
button->move( 0, 0 ); button->move( 0, 0 );
connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow())); connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow()));
TQToolTip::add( button, "Zelva Mana" ); TQToolTip::add( button, "Zelva Mana" );

@ -924,7 +924,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
if ( !buttonDown ) if ( !buttonDown )
{ {
mode = PositionCenter; mode = PositionCenter;
setCursor( tqarrowCursor ); setCursor( TQt::arrowCursor );
} }
bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) ); bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) );
// 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations

@ -164,7 +164,7 @@ void DetectDialog::selectWindow()
grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM ); grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM );
grabber->move( -1000, -1000 ); grabber->move( -1000, -1000 );
grabber->show(); grabber->show();
grabber->grabMouse( tqcrossCursor ); grabber->grabMouse( TQt::crossCursor );
grabber->installEventFilter( this ); grabber->installEventFilter( this );
} }

@ -577,9 +577,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr )
attr.depth, InputOutput, attr.visual, attr.depth, InputOutput, attr.visual,
CWColormap | CWBackPixmap | CWBorderPixel, &swa ); CWColormap | CWBackPixmap | CWBorderPixel, &swa );
XDefineCursor( tqt_xdisplay(), frame, tqarrowCursor.handle()); XDefineCursor( tqt_xdisplay(), frame, TQt::arrowCursor.handle());
// some apps are stupid and don't define their own cursor - set the arrow one for them // some apps are stupid and don't define their own cursor - set the arrow one for them
XDefineCursor( tqt_xdisplay(), wrapper, tqarrowCursor.handle()); XDefineCursor( tqt_xdisplay(), wrapper, TQt::arrowCursor.handle());
XReparentWindow( tqt_xdisplay(), client, wrapper, 0, 0 ); XReparentWindow( tqt_xdisplay(), client, wrapper, 0, 0 );
XSelectInput( tqt_xdisplay(), frame, XSelectInput( tqt_xdisplay(), frame,
KeyPressMask | KeyReleaseMask | KeyPressMask | KeyReleaseMask |

Loading…
Cancel
Save