From 100f977221b7319815eb9617f56a067cb0383853 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 21 Nov 2023 11:41:53 +0900 Subject: [PATCH] Replace various tq* strings with TQt::* equivalents Signed-off-by: Michele Calgaro --- drkonqi/toplevel.cpp | 4 ++-- kcontrol/kcontrol/dockcontainer.cpp | 2 +- kcontrol/samba/kcmsambalog.cpp | 2 +- kcontrol/samba/kcmsambastatistics.cpp | 2 +- kdcop/kdcopwindow.cpp | 6 +++--- kdesktop/lock/lockprocess.cpp | 24 +++++++++++----------- khelpcenter/navigator.cpp | 2 +- khotkeys/kcontrol/windowselector.cpp | 2 +- kicker/kicker/core/container_base.cpp | 2 +- kicker/kicker/core/container_extension.cpp | 12 +++++------ kicker/kicker/core/containerarea.cpp | 6 +++--- kicker/kicker/core/usersizesel.cpp | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 2 +- konsole/konsole/TEWidget.cpp | 4 ++-- twin/client.cpp | 12 +++++------ twin/clients/b2/b2client.cpp | 2 +- twin/clients/keramik/keramik.cpp | 2 +- twin/clients/test/test.cpp | 2 +- twin/events.cpp | 2 +- twin/kcmtwin/twinrules/detectwidget.cpp | 2 +- twin/manage.cpp | 4 ++-- 21 files changed, 49 insertions(+), 49 deletions(-) diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index a4ad27603..297181d89 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -156,7 +156,7 @@ void Toplevel :: slotUser1() m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData()); if (i == KMessageBox::Yes) { - TQApplication::setOverrideCursor ( tqwaitCursor ); + TQApplication::setOverrideCursor ( TQt::waitCursor ); // generate the backtrace BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); @@ -195,7 +195,7 @@ void Toplevel :: slotNewDebuggingApp(const TQString& launchName) void Toplevel :: slotUser3() { enableButton(User3, false); - TQApplication::setOverrideCursor ( tqwaitCursor ); + TQApplication::setOverrideCursor ( TQt::waitCursor ); // generate the backtrace BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this)); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index dd1835e9d..be3ede802 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -163,7 +163,7 @@ void DockContainer::setBaseWidget(TQWidget *widget) ProxyWidget* DockContainer::loadModule( ConfigModule *module ) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); ProxyWidget *widget = _modulew->load( module ); diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index cb6b40c99..4ba0ceb74 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -161,7 +161,7 @@ void LogView::updateList() TQFile logFile(logFileName.url()); if (logFile.open(IO_ReadOnly)) { - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); viewHistory.clear(); filesCount=0; connectionsCount=0; diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index f86891ec6..34de75d9b 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -134,7 +134,7 @@ void StatisticsView::setListInfo(TQListView *list, int nrOfFiles, int nrOfConnec void StatisticsView::calculate() { if (dataList==0) return; - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); int connCount(0); if (eventCb->currentText()==i18n("Connection")) connCount=1; diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index e1c047a8c..059fa2125 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -158,7 +158,7 @@ DCOPBrowserApplicationItem::setOpen(bool o) void DCOPBrowserApplicationItem::populate() { - TDEApplication::setOverrideCursor(tqwaitCursor); + TDEApplication::setOverrideCursor(TQt::waitCursor); bool ok = false; bool isDefault = false; @@ -241,7 +241,7 @@ DCOPBrowserInterfaceItem::setOpen(bool o) void DCOPBrowserInterfaceItem::populate() { - TDEApplication::setOverrideCursor(tqwaitCursor); + TDEApplication::setOverrideCursor(TQt::waitCursor); bool ok = false; @@ -892,7 +892,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) void KDCOPWindow::slotFillApplications() { - TDEApplication::setOverrideCursor(tqwaitCursor); + TDEApplication::setOverrideCursor(TQt::waitCursor); QCStringList apps = dcopClient->registeredApplications(); TQCString appId = dcopClient->appId(); diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index bbb6d3175..d9fae24f1 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -661,7 +661,7 @@ void LockProcess::startSecureDialog() mBusy = true; trinity_desktop_lock_forced = true; // Make sure the cursor is not showing busy status - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); if (startLock()) { if (trinity_desktop_lock_delay_screensaver_start) { @@ -1243,10 +1243,10 @@ bool LockProcess::grabMouse() { HANDLE cursorHandle; if (mHackActive) { - cursorHandle = TQCursor(tqblankCursor).handle(); + cursorHandle = TQCursor(TQt::blankCursor).handle(); } else { - cursorHandle = TQCursor(tqbusyCursor).handle(); + cursorHandle = TQCursor(TQt::busyCursor).handle(); } int rv = XGrabPointer( tqt_xdisplay(), TQApplication::desktop()->winId(), True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None, @@ -1602,8 +1602,8 @@ bool LockProcess::startHack() return false; } - setCursor( tqblankCursor ); - XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime); + setCursor( TQt::blankCursor ); + XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime); if (mSaverExec.isEmpty()) { return false; @@ -1659,7 +1659,7 @@ bool LockProcess::startHack() mSuspended = false; } - XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime); + XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime); if (mHackProc.start() == true) { #ifdef HAVE_SETPRIORITY setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority); @@ -1733,7 +1733,7 @@ void LockProcess::stopHack() mHackProc.kill(SIGKILL); } } - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); mHackActive = FALSE; } @@ -1989,7 +1989,7 @@ int LockProcess::execDialog( TQDialog *dlg ) if (mDialogs.isEmpty()) { suspend(); - XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime); + XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime); } mDialogs.prepend( dlg ); fakeFocusIn( dlg->winId()); @@ -2016,10 +2016,10 @@ int LockProcess::execDialog( TQDialog *dlg ) if( mDialogs.isEmpty() ) { HANDLE cursorHandle; if (mHackActive) { - cursorHandle = TQCursor(tqblankCursor).handle(); + cursorHandle = TQCursor(TQt::blankCursor).handle(); } else { - cursorHandle = TQCursor(tqbusyCursor).handle(); + cursorHandle = TQCursor(TQt::busyCursor).handle(); } XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, cursorHandle, CurrentTime); if (trinity_desktop_lock_use_system_modal_dialogs) { @@ -2695,7 +2695,7 @@ void LockProcess::slotMouseActivity(XEvent *event) m_dialogPrevY = oldPoint.y(); m_mousePrevX = be->x_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) { m_mouseDown = 0; - XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime); + XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime); } } diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 4a691240d..05bd68129 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -556,7 +556,7 @@ void Navigator::slotSearch() // disable search Button during searches mSearchButton->setEnabled(false); - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); if ( !mSearchEngine->search( words, method, pages, scope ) ) { slotSearchFinished(); diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index d1cbe8f5f..745f85682 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/khotkeys/kcontrol/windowselector.cpp @@ -34,7 +34,7 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P ) void WindowSelector::select() { - kapp->desktop()->grabMouse( TQCursor( tqcrossCursor )); + kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor )); kapp->installX11EventFilter( TQT_TQWIDGET(this) ); } diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index 8a7cd6d3c..64886f436 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -47,7 +47,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const , _opMnu(0) , _appletOpMnu(appletOpMenu) { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } BaseContainer::~BaseContainer() diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 4378e5a48..c5cb5b732 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -2202,7 +2202,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Right) @@ -2213,29 +2213,29 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e) } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else if (pos == KPanelExtension::Top) { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } else { if (inResizeArea(me->pos())) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } else { - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); } } } diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 589b512e1..2e4ed66a9 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -923,7 +923,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) KickerTip::enableTipping(false); emit maintainFocus(true); setMouseTracking(true); - grabMouse(tqsizeAllCursor); + grabMouse(TQt::sizeAllCursor); m_layout->setStretchEnabled(false); a->raise(); @@ -940,7 +940,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) // so we need to complete the move here _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); @@ -967,7 +967,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); releaseMouse(); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); setMouseTracking(false); _moveAC->completeMoveOperation(); diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp index de18e7fe4..654114d90 100644 --- a/kicker/kicker/core/usersizesel.cpp +++ b/kicker/kicker/core/usersizesel.cpp @@ -46,7 +46,7 @@ UserSizeSel::UserSizeSel(const TQRect& rect, const KPanelExtension::Position pos } if ((pos == KPanelExtension::Top) || (pos == KPanelExtension::Bottom)) { - setCursor(tqsizeVerCursor); + setCursor(TQt::sizeVerCursor); } setGeometry(-10, -10, 2, 2); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 07a2817af..25f3a3246 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1752,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation) m_orientation=orientation; - m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor); + m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor); TQPixmap pix; if ( m_orientation == BottomUp ) diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index fb6d951ce..e04c9fa4a 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -414,7 +414,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) this, TQT_SLOT(onClearSelection()) ); scrollbar = new TQScrollBar(this); - scrollbar->setCursor( tqarrowCursor ); + scrollbar->setCursor( TQt::arrowCursor ); connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); blinkT = new TQTimer(this); @@ -1830,7 +1830,7 @@ void TEWidget::setWordCharacters(TQString wc) void TEWidget::setMouseMarks(bool on) { mouse_marks = on; - setCursor( mouse_marks ? tqibeamCursor : tqarrowCursor ); + setCursor( mouse_marks ? TQt::ibeamCursor : TQt::arrowCursor ); } /* ------------------------------------------------------------------------- */ diff --git a/twin/client.cpp b/twin/client.cpp index 044d89208..c4916bef7 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -2707,25 +2707,25 @@ void Client::setCursor( Position m ) { case PositionTopLeft: case PositionBottomRight: - setCursor( tqsizeFDiagCursor ); + setCursor( TQt::sizeFDiagCursor ); break; case PositionBottomLeft: case PositionTopRight: - setCursor( tqsizeBDiagCursor ); + setCursor( TQt::sizeBDiagCursor ); break; case PositionTop: case PositionBottom: - setCursor( tqsizeVerCursor ); + setCursor( TQt::sizeVerCursor ); break; case PositionLeft: case PositionRight: - setCursor( tqsizeHorCursor ); + setCursor( TQt::sizeHorCursor ); break; default: if( buttonDown && isMovable()) - setCursor( tqsizeAllCursor ); + setCursor( TQt::sizeAllCursor ); else - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); break; } } diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 49391e923..afef7799f 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -1213,7 +1213,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, : TQButton(parent, 0), hover(false) { setBackgroundMode(NoBackground); - setCursor(tqarrowCursor); + setCursor(TQt::arrowCursor); realizeButtons = realizeBtns; client = _client; useMiniIcon = false; diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 446199fa7..73bc859fc 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -765,7 +765,7 @@ KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, co TQToolTip::add( this, tip ); // FRAME setBackgroundMode( NoBackground ); - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); int size = clientHandler->roundButton()->height(); setFixedSize( size, size ); diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index ebfb00df1..4b38692d1 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -22,7 +22,7 @@ void Decoration::init() { button = new TQPushButton( widget()); button->show(); - button->setCursor( tqarrowCursor ); + button->setCursor( TQt::arrowCursor ); button->move( 0, 0 ); connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow())); TQToolTip::add( button, "Zelva Mana" ); diff --git a/twin/events.cpp b/twin/events.cpp index e2e6b8d60..a56cc9ddd 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -924,7 +924,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e ) if ( !buttonDown ) { mode = PositionCenter; - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); } bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) ); // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp index 9dbb29441..546db66db 100644 --- a/twin/kcmtwin/twinrules/detectwidget.cpp +++ b/twin/kcmtwin/twinrules/detectwidget.cpp @@ -164,7 +164,7 @@ void DetectDialog::selectWindow() grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM ); grabber->move( -1000, -1000 ); grabber->show(); - grabber->grabMouse( tqcrossCursor ); + grabber->grabMouse( TQt::crossCursor ); grabber->installEventFilter( this ); } diff --git a/twin/manage.cpp b/twin/manage.cpp index ec6a5d675..a129488cc 100644 --- a/twin/manage.cpp +++ b/twin/manage.cpp @@ -577,9 +577,9 @@ void Client::embedClient( Window w, const XWindowAttributes &attr ) attr.depth, InputOutput, attr.visual, 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 - XDefineCursor( tqt_xdisplay(), wrapper, tqarrowCursor.handle()); + XDefineCursor( tqt_xdisplay(), wrapper, TQt::arrowCursor.handle()); XReparentWindow( tqt_xdisplay(), client, wrapper, 0, 0 ); XSelectInput( tqt_xdisplay(), frame, KeyPressMask | KeyReleaseMask |