diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 8d716b215..396aef97a 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -1584,7 +1584,7 @@ void TDEApplication::startKdeinit() if (srv.isEmpty()) return; if (kapp && (Tty != kapp->type())) - setOverrideCursor( tqwaitCursor ); + setOverrideCursor( TQt::waitCursor ); my_system(TQFile::encodeName(srv)+" --suicide"+" --new-startup"); if (kapp && (Tty != kapp->type())) restoreOverrideCursor(); diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 47f48bfb6..3518ea1b5 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -5733,7 +5733,7 @@ void TDEHTMLPart::setZoomFactor (int percent) d->m_zoomFactor = percent; if(d->m_doc) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); if (d->m_doc->styleSelector()) d->m_doc->styleSelector()->computeFontSizes(d->m_doc->paintDeviceMetrics(), d->m_zoomFactor); d->m_doc->recalcStyle( NodeImpl::Force ); @@ -5879,7 +5879,7 @@ void TDEHTMLPart::reparseConfiguration() delete d->m_settings; d->m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings()); - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); tdehtml::CSSStyleSelector::reparseConfiguration(); if(d->m_doc) d->m_doc->updateStyleSelector(); TQApplication::restoreOverrideCursor(); diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 324119805..c791f054e 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -2781,7 +2781,7 @@ void TDEHTMLView::print(bool quick) if ( !docname.isEmpty() ) docname = KStringHandler::csqueeze(docname, 80); if(quick || printer->setup(this, i18n("Print %1").arg(docname))) { - viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs + viewport()->setCursor( TQt::waitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs // set up KPrinter printer->setFullPage(false); printer->setCreator(TQString("TDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)); diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp index 9f38aeb7b..15090b237 100644 --- a/tdeio/tdefile/kicondialog.cpp +++ b/tdeio/tdefile/kicondialog.cpp @@ -119,7 +119,7 @@ void TDEIconCanvas::loadFiles(const TQStringList& files) void TDEIconCanvas::slotLoadFiles() { setResizeMode(Fixed); - TQApplication::setOverrideCursor(tqwaitCursor); + TQApplication::setOverrideCursor(TQt::waitCursor); // disable updates to not trigger paint events when adding child items setUpdatesEnabled( false ); diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index f803cf1b7..c59a6ebff 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -719,7 +719,7 @@ void KDirOperator::pathChanged() TQApplication::restoreOverrideCursor(); // when TDEIO::Job emits finished, the slot will restore the cursor - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); if ( !isReadable( currUrl )) { KMessageBox::error(viewWidget(), @@ -1071,7 +1071,7 @@ void KDirOperator::connectView(KFileView *view) m_fileView->widget()->show(); if ( listDir ) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); openURL( currUrl ); } else diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp index 6bf5d69f5..0dc3036fa 100644 --- a/tdemdi/tdemdichildfrm.cpp +++ b/tdemdi/tdemdichildfrm.cpp @@ -238,19 +238,19 @@ void KMdiChildFrm::setResizeCursor( int resizeCorner ) break; case KMDI_RESIZE_LEFT: case KMDI_RESIZE_RIGHT: - TQApplication::setOverrideCursor( tqsizeHorCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeHorCursor, true ); break; case KMDI_RESIZE_TOP: case KMDI_RESIZE_BOTTOM: - TQApplication::setOverrideCursor( tqsizeVerCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeVerCursor, true ); break; case KMDI_RESIZE_TOPLEFT: case KMDI_RESIZE_BOTTOMRIGHT: - TQApplication::setOverrideCursor( tqsizeFDiagCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeFDiagCursor, true ); break; case KMDI_RESIZE_BOTTOMLEFT: case KMDI_RESIZE_TOPRIGHT: - TQApplication::setOverrideCursor( tqsizeBDiagCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeBDiagCursor, true ); break; } } diff --git a/tdemdi/tdemdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp index b7ec51bdc..0d75619d6 100644 --- a/tdemdi/tdemdichildfrmcaption.cpp +++ b/tdemdi/tdemdichildfrmcaption.cpp @@ -90,7 +90,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) setMouseTracking( false ); if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) { - TQApplication::setOverrideCursor( tqsizeAllCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeAllCursor, true ); } m_pParent->m_bDragging = true; m_offset = mapToParent( e->pos() ); @@ -313,7 +313,7 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu() grabMouse(); if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) - TQApplication::setOverrideCursor( tqsizeAllCursor, true ); + TQApplication::setOverrideCursor( TQt::sizeAllCursor, true ); m_pParent->m_bDragging = true; m_offset = mapFromGlobal( TQCursor::pos() ); diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index 9eb28b07f..5a6a6093a 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -1507,7 +1507,7 @@ KColorDialog::slotColorPicker() d->oldfilter = tqt_set_x11_event_filter(kde_color_dlg_handler); #endif kde_color_dlg_widget = this; - grabMouse( tqcrossCursor ); + grabMouse( TQt::crossCursor ); grabKeyboard(); } diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 43390d6a2..8b004e339 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -145,72 +145,72 @@ TQCursor KCursor::workingCursor() */ TQCursor KCursor::arrowCursor() { - return tqarrowCursor; + return TQt::arrowCursor; } TQCursor KCursor::upArrowCursor() { - return tqupArrowCursor; + return TQt::upArrowCursor; } TQCursor KCursor::crossCursor() { - return tqcrossCursor; + return TQt::crossCursor; } TQCursor KCursor::waitCursor() { - return tqwaitCursor; + return TQt::waitCursor; } TQCursor KCursor::ibeamCursor() { - return tqibeamCursor; + return TQt::ibeamCursor; } TQCursor KCursor::sizeVerCursor() { - return tqsizeVerCursor; + return TQt::sizeVerCursor; } TQCursor KCursor::sizeHorCursor() { - return tqsizeHorCursor; + return TQt::sizeHorCursor; } TQCursor KCursor::sizeBDiagCursor() { - return tqsizeBDiagCursor; + return TQt::sizeBDiagCursor; } TQCursor KCursor::sizeFDiagCursor() { - return tqsizeFDiagCursor; + return TQt::sizeFDiagCursor; } TQCursor KCursor::sizeAllCursor() { - return tqsizeAllCursor; + return TQt::sizeAllCursor; } TQCursor KCursor::blankCursor() { - return tqblankCursor; + return TQt::blankCursor; } TQCursor KCursor::whatsThisCursor() { - return tqwhatsThisCursor; + return TQt::whatsThisCursor; } // auto-hide cursor stuff diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 6e9fa0559..d423ea161 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -1957,7 +1957,7 @@ void KDockManager::startDrag( KDockWidget* w ) curPos = KDockWidget::DockDesktop; dragging = true; - TQApplication::setOverrideCursor(TQCursor(tqsizeAllCursor)); + TQApplication::setOverrideCursor(TQCursor(TQt::sizeAllCursor)); } void KDockManager::dragMove( KDockWidget* dw, TQPoint pos ) diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp index 0741129ff..13e5a7ea6 100644 --- a/tdeui/kdockwidget_private.cpp +++ b/tdeui/kdockwidget_private.cpp @@ -62,9 +62,9 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->raise(); if (m_orientation == TQt::Horizontal) - divider->setCursor(TQCursor(tqsizeVerCursor)); + divider->setCursor(TQCursor(TQt::sizeVerCursor)); else - divider->setCursor(TQCursor(tqsizeHorCursor)); + divider->setCursor(TQCursor(TQt::sizeHorCursor)); divider->installEventFilter(this); initialised= true; diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 290e97410..01b228247 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -144,7 +144,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) TQTab *tab = selectTab( e->pos() ); if( tab && mTabReorderingEnabled ) { mReorderStartTab = indexOf( tab->identifier() ); - grabMouse( tqsizeAllCursor ); + grabMouse( TQt::sizeAllCursor ); return; } } @@ -240,7 +240,7 @@ void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) } else { releaseMouse(); - setCursor( tqarrowCursor ); + setCursor( TQt::arrowCursor ); mReorderStartTab=-1; mReorderPreviousTab=-1; }