From 831670cd1aa76b314b447cfa2d9c71603cbbf43e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 7 Dec 2023 17:17:09 +0900 Subject: Replaced various '#define' with actual strings - part 6 Signed-off-by: Michele Calgaro --- src/app/kipiinterface.cpp | 2 +- src/app/mainwindow.cpp | 86 +++++++++++++++++++------------------- src/app/treeview.cpp | 4 +- src/gvcore/cursortracker.cpp | 2 +- src/gvcore/externaltooldialog.cpp | 2 +- src/gvcore/fileoperation.cpp | 2 +- src/gvcore/filethumbnailview.cpp | 12 +++--- src/gvcore/fileviewcontroller.cpp | 78 +++++++++++++++++----------------- src/gvcore/imageview.cpp | 53 ++++++++++++----------- src/gvcore/imageviewcontroller.cpp | 4 +- 10 files changed, 122 insertions(+), 123 deletions(-) diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp index e16b0ad..8c8bab3 100644 --- a/src/app/kipiinterface.cpp +++ b/src/app/kipiinterface.cpp @@ -119,7 +119,7 @@ struct KIPIInterfacePrivate { KIPIInterface::KIPIInterface( TQWidget* parent, FileViewController* fileView) -:KIPI::Interface(TQT_TQOBJECT(parent), "Gwenview kipi interface") { +:KIPI::Interface(parent, "Gwenview kipi interface") { d=new KIPIInterfacePrivate; d->mFileView=fileView; diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index b216445..7a79bba 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -167,7 +167,7 @@ MainWindow::MainWindow() #endif { // Backend - mDocument=new Document(TQT_TQOBJECT(this)); + mDocument=new Document(this); mHistory=new History(actionCollection()); // GUI createActions(); @@ -357,7 +357,7 @@ void MainWindow::renameFile() { } else { url = mDocument->url(); } - FileOperation::rename(url, this, TQT_TQOBJECT(this), TQT_SLOT(slotRenamed(const TQString &))); + FileOperation::rename(url, this, this, TQT_SLOT(slotRenamed(const TQString &))); } @@ -478,11 +478,11 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt const KFileItemList* items = mFileViewController->currentFileView()->selectedItems(); selectionSize = items->count(); externalToolContext = - ExternalToolManager::instance()->createContext(TQT_TQOBJECT(this), items); + ExternalToolManager::instance()->createContext(this, items); } else { selectionSize = 0; externalToolContext = - ExternalToolManager::instance()->createContext(TQT_TQOBJECT(this), mFileViewController->dirURL()); + ExternalToolManager::instance()->createContext(this, mFileViewController->dirURL()); } TQPopupMenu menu(this); @@ -493,7 +493,7 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt actionCollection()->action("view_sort")->plug(&menu); mGoUp->plug(&menu); - menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), TQT_TQOBJECT(this), TQT_SLOT(makeDir())); + menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), this, TQT_SLOT(makeDir())); menu.insertSeparator(); @@ -690,7 +690,7 @@ void MainWindow::showKeyDialog() { void MainWindow::showToolBarDialog() { saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),TQT_TQOBJECT(this),TQT_SLOT(applyMainWindowSettings())); + connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(applyMainWindowSettings())); dlg.exec(); } @@ -888,7 +888,7 @@ void MainWindow::createWidgets() { mImageViewController=new ImageViewController(mImageDock, mDocument, actionCollection()); mImageDock->setWidget(mImageViewController->widget()); connect(mImageViewController, TQT_SIGNAL(requestHintDisplay(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(showHint(const TQString&)) ); + this, TQT_SLOT(showHint(const TQString&)) ); // Folder widget mFolderDock = mDockArea->createDockWidget("Folders",SmallIcon("folder_open"),NULL,i18n("Folders")); @@ -962,55 +962,55 @@ void MainWindow::createWidgets() { */ void MainWindow::createActions() { // Stack - mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode"); + mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode"); mSwitchToBrowseMode->setExclusiveGroup("centralStackMode"); mSwitchToBrowseMode->setChecked(true); - mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); + mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); mSwitchToViewMode->setExclusiveGroup("centralStackMode"); // File - KStdAction::open(TQT_TQOBJECT(this),TQT_SLOT(showFileDialog()),actionCollection() ); + KStdAction::open(this,TQT_SLOT(showFileDialog()),actionCollection() ); mSaveFile=KStdAction::save(mDocument,TQT_SLOT(save()),actionCollection() ); mSaveFileAs=KStdAction::saveAs(mDocument,TQT_SLOT(saveAs()),actionCollection() ); - mFilePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printFile()), actionCollection()); - mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,TQT_TQOBJECT(this),TQT_SLOT(renameFile()),actionCollection(),"file_rename"); - mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy"); - mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move"); - mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link"); - mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete"); - mShowFileProperties=new TDEAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties"); - KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection() ); + mFilePrint = KStdAction::print(this, TQT_SLOT(printFile()), actionCollection()); + mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,this,TQT_SLOT(renameFile()),actionCollection(),"file_rename"); + mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,this,TQT_SLOT(copyFiles()),actionCollection(),"file_copy"); + mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,this,TQT_SLOT(moveFiles()),actionCollection(),"file_move"); + mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,this,TQT_SLOT(linkFiles()),actionCollection(),"file_link"); + mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,this,TQT_SLOT(deleteFiles()),actionCollection(),"file_delete"); + mShowFileProperties=new TDEAction(i18n("Properties"),0,this,TQT_SLOT(showFileProperties()),actionCollection(),"file_properties"); + KStdAction::quit( kapp, TQT_SLOT (closeAllWindows()), actionCollection() ); // Edit - mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left"); - mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(rotateRight()),actionCollection(),"rotate_right"); - mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, TQT_TQOBJECT(this), TQT_SLOT(mirror()),actionCollection(),"mirror"); - mFlip=new TDEAction(i18n("&Flip"),"flip",0, TQT_TQOBJECT(this), TQT_SLOT(flip()),actionCollection(),"flip"); + mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, this, TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left"); + mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, this, TQT_SLOT(rotateRight()),actionCollection(),"rotate_right"); + mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, this, TQT_SLOT(mirror()),actionCollection(),"mirror"); + mFlip=new TDEAction(i18n("&Flip"),"flip",0, this, TQT_SLOT(flip()),actionCollection(),"flip"); // View mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload"); mReload->setEnabled(false); - mToggleFullScreen= KStdAction::fullScreen(TQT_TQOBJECT(this),TQT_SLOT(toggleFullScreen()),actionCollection(),0); - mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,TQT_TQOBJECT(this),TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow"); + mToggleFullScreen= KStdAction::fullScreen(this,TQT_SLOT(toggleFullScreen()),actionCollection(),0); + mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow"); mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label"); // Go - mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up"); - new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home"); + mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, this, TQT_SLOT(goUp()), actionCollection(), "go_up"); + new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQT_SLOT(goHome()), actionCollection(), "go_home"); // Window - mResetDockWidgets = new TDEAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets"); + mResetDockWidgets = new TDEAction(i18n("Reset"), 0, this, TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets"); // Settings mShowConfigDialog= - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfigDialog()), actionCollection() ); + KStdAction::preferences(this, TQT_SLOT(showConfigDialog()), actionCollection() ); mShowKeyDialog= - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showKeyDialog()), actionCollection() ); + KStdAction::keyBindings(this, TQT_SLOT(showKeyDialog()), actionCollection() ); (void)new TDEAction(i18n("Configure External Tools..."), "configure", 0, - TQT_TQOBJECT(this), TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools"); + this, TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools"); (void)KStdAction::configureToolbars( - TQT_TQOBJECT(this), TQT_SLOT(showToolBarDialog()), actionCollection() ); + this, TQT_SLOT(showToolBarDialog()), actionCollection() ); actionCollection()->readShortcutSettings(); } @@ -1060,10 +1060,10 @@ void MainWindow::createObjectInteractions() { // Make sure file actions are correctly updated connect(mFileViewController, TQT_SIGNAL(selectionChanged()), - TQT_TQOBJECT(this), TQT_SLOT(updateImageActions()) ); + this, TQT_SLOT(updateImageActions()) ); connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)), - TQT_TQOBJECT(this), TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) ); + this, TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) ); // Bookmarks TQString file = locate( "data", "tdefile/bookmarks.xml" ); @@ -1097,7 +1097,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) { caption=i18n("Show %1").arg(dock->caption()); } - TDEAction* action=new TDEAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 ); + TDEAction* action=new TDEAction(caption, 0, dock, TQT_SLOT(changeHideShowState()), (TQObject*)0 ); if (dock->icon()) { action->setIconSet( TQIconSet(*dock->icon()) ); } @@ -1132,7 +1132,7 @@ void MainWindow::createConnections() { connect(mDirViewController, TQT_SIGNAL(urlChanged(const KURL&)), mFileViewController, TQT_SLOT(setDirURL(const KURL&)) ); connect(mDirViewController, TQT_SIGNAL(urlRenamed(const KURL&, const KURL&)), - TQT_TQOBJECT(this), TQT_SLOT(slotDirRenamed(const KURL&, const KURL&)) ); + this, TQT_SLOT(slotDirRenamed(const KURL&, const KURL&)) ); // Bookmark view connections connect(mBookmarkViewController, TQT_SIGNAL(openURL(const KURL&)), @@ -1167,7 +1167,7 @@ void MainWindow::createConnections() { connect(mFileViewController,TQT_SIGNAL(shownFileItemRefreshed(const KFileItem*)), this,TQT_SLOT(slotShownFileItemRefreshed(const KFileItem*)) ); connect(mFileViewController,TQT_SIGNAL(sortingChanged()), - TQT_TQOBJECT(this), TQT_SLOT(updateStatusInfo()) ); + this, TQT_SLOT(updateStatusInfo()) ); // History connections connect(mHistory, TQT_SIGNAL(urlChanged(const KURL&)), @@ -1191,16 +1191,16 @@ void MainWindow::createConnections() { // Non configurable stop-fullscreen accel TQAccel* accel=new TQAccel(this); - accel->connectItem(accel->insertItem(Key_Escape),TQT_TQOBJECT(this),TQT_SLOT(escapePressed())); + accel->connectItem(accel->insertItem(Key_Escape),this,TQT_SLOT(escapePressed())); // Dock related connect(mDockArea->manager(), TQT_SIGNAL(change()), - TQT_TQOBJECT(this), TQT_SLOT(updateWindowActions()) ); + this, TQT_SLOT(updateWindowActions()) ); // Plugin menu TQPopupMenu *popup = static_cast( factory()->container( "plugins", this)); - connect(popup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(loadPlugins()) ); + connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(loadPlugins()) ); } @@ -1232,15 +1232,15 @@ void MainWindow::createLocationToolBar() { // Clear button (void)new TDEAction( i18n("Clear Location Bar"), TQApplication::reverseLayout()?"clear_left" : "locationbar_erase", - 0, TQT_TQOBJECT(this), TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location"); + 0, this, TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location"); // URL Label TDEToolBarLabelAction* locationAction = new TDEToolBarLabelAction(i18n("L&ocation:"), - Key_F6, TQT_TQOBJECT(this), TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label"); + Key_F6, this, TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label"); locationAction->setBuddy(mURLEdit); // Go button - (void)new TDEAction(i18n("Go"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGo()), actionCollection(), "location_go"); + (void)new TDEAction(i18n("Go"), "key_enter", 0, this, TQT_SLOT(slotGo()), actionCollection(), "location_go"); } @@ -1266,7 +1266,7 @@ void MainWindow::loadPlugins() { // Sets up the plugin interface, and load the plugins KIPIInterface* interface = new KIPIInterface(this, mFileViewController); mPluginLoader = new KIPI::PluginLoader(TQStringList(), interface ); - connect( mPluginLoader, TQT_SIGNAL( replug() ), TQT_TQOBJECT(this), TQT_SLOT( slotReplug() ) ); + connect( mPluginLoader, TQT_SIGNAL( replug() ), this, TQT_SLOT( slotReplug() ) ); mPluginLoader->loadPlugins(); } diff --git a/src/app/treeview.cpp b/src/app/treeview.cpp index c29e3c4..a15642d 100644 --- a/src/app/treeview.cpp +++ b/src/app/treeview.cpp @@ -135,7 +135,7 @@ TreeView::TreeView(TQWidget* parent) setAcceptDrops(true); connect(d->mAutoOpenTimer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(autoOpenDropTarget())); + this, TQT_SLOT(autoOpenDropTarget())); } @@ -207,7 +207,7 @@ void TreeView::createBranch(const KURL& url) { d->mBranch->root()->setOpen(true); connect(d->mBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*) ), - TQT_TQOBJECT(this), TQT_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) ); + this, TQT_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) ); } diff --git a/src/gvcore/cursortracker.cpp b/src/gvcore/cursortracker.cpp index 9c3441a..914093c 100644 --- a/src/gvcore/cursortracker.cpp +++ b/src/gvcore/cursortracker.cpp @@ -43,7 +43,7 @@ void CursorTracker::setText(const TQString& txt) { bool CursorTracker::eventFilter(TQObject* object, TQEvent* _event) { - TQWidget* widget=TQT_TQWIDGET(object); + TQWidget* widget=static_cast(object); switch (_event->type()) { case TQEvent::MouseMove: { diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp index 7e039b9..bd58298 100644 --- a/src/gvcore/externaltooldialog.cpp +++ b/src/gvcore/externaltooldialog.cpp @@ -271,7 +271,7 @@ ExternalToolDialog::ExternalToolDialog(TQWidget* parent) d->fillMimeTypeListView(); d->fillToolListView(); d->mContent->mToolListView->viewport()->installEventFilter( - new ToolListViewFilterObject(TQT_TQOBJECT(this), d)); + new ToolListViewFilterObject(this, d)); connect( d->mContent->mToolListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp index 4c693c0..d775113 100644 --- a/src/gvcore/fileoperation.cpp +++ b/src/gvcore/fileoperation.cpp @@ -90,7 +90,7 @@ void rename(const KURL& url,TQWidget* parent,TQObject* receiver,const char* slot void fillDropURLMenu(TQPopupMenu* menu, const KURL::List& urls, const KURL& target, bool* wasMoved) { - DropMenuContext* context=new DropMenuContext(TQT_TQOBJECT(menu), urls, target, wasMoved); + DropMenuContext* context=new DropMenuContext(menu, urls, target, wasMoved); menu->insertItem( SmallIcon("goto"), i18n("&Move Here"), context, TQT_SLOT(move()) ); menu->insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index ff528a7..8d883f8 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/src/gvcore/filethumbnailview.cpp @@ -109,7 +109,7 @@ public: } void updatePosition() { - FileThumbnailView* view=static_cast(TQT_TQWIDGET(parent())); + FileThumbnailView* view=static_cast(parent()); TQSize tmp=view->clipper()->size() - size(); move(tmp.width() - 2, tmp.height() - 2); } @@ -362,7 +362,7 @@ void FileThumbnailView::doStartThumbnailUpdate(const KFileItemList* list) { } if (imageList.empty()) return; - BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_THUMBNAILS ); + BusyLevelManager::instance()->setBusyLevel( this, BUSY_THUMBNAILS ); Q_ASSERT(!d->mProgressWidget); d->mProgressWidget=new ProgressWidget(this, imageList.count() ); @@ -397,7 +397,7 @@ void FileThumbnailView::slotUpdateEnded() { delete d->mProgressWidget; d->mProgressWidget=0L; - BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_NONE ); + BusyLevelManager::instance()->setBusyLevel( this, BUSY_NONE ); } @@ -681,7 +681,7 @@ void FileThumbnailView::slotCurrentChanged(TQIconViewItem* item ) { if( pos == item && pos->nextItem() != NULL ) { d->mPrefetch = ImageLoader::loader( static_cast( cur->nextItem() )->fileItem()->url(), - TQT_TQOBJECT(this), BUSY_PRELOADING ); + this, BUSY_PRELOADING ); connect( d->mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); } } @@ -756,14 +756,14 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) { if( next != NULL ) { d->mPrefetch = ImageLoader::loader( static_cast( next )->fileItem()->url(), - TQT_TQOBJECT(this), BUSY_PRELOADING ); + this, BUSY_PRELOADING ); connect( d->mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); } } void FileThumbnailView::prefetchDone() { if( d->mPrefetch != NULL ) { - d->mPrefetch->release( TQT_TQOBJECT(this) ); + d->mPrefetch->release( this ); d->mPrefetch = NULL; } } diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp index d338d32..b5c073d 100644 --- a/src/gvcore/fileviewcontroller.cpp +++ b/src/gvcore/fileviewcontroller.cpp @@ -275,36 +275,36 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act // Actions mSelectFirst=new TDEAction(i18n("&First"), TQApplication::reverseLayout() ? "2rightarrow":"2leftarrow", Key_Home, - TQT_TQOBJECT(this),TQT_SLOT(slotSelectFirst()), actionCollection, "first"); + this,TQT_SLOT(slotSelectFirst()), actionCollection, "first"); mSelectLast=new TDEAction(i18n("&Last"), TQApplication::reverseLayout() ? "2leftarrow":"2rightarrow", Key_End, - TQT_TQOBJECT(this),TQT_SLOT(slotSelectLast()), actionCollection, "last"); + this,TQT_SLOT(slotSelectLast()), actionCollection, "last"); mSelectPrevious=new TDEAction(i18n("&Previous"), TQApplication::reverseLayout() ? "1rightarrow":"1leftarrow", Key_BackSpace, - TQT_TQOBJECT(this),TQT_SLOT(slotSelectPrevious()), actionCollection, "previous"); + this,TQT_SLOT(slotSelectPrevious()), actionCollection, "previous"); mSelectNext=new TDEAction(i18n("&Next"), TQApplication::reverseLayout() ? "1leftarrow":"1rightarrow", Key_Space, - TQT_TQOBJECT(this),TQT_SLOT(slotSelectNext()), actionCollection, "next"); + this,TQT_SLOT(slotSelectNext()), actionCollection, "next"); mSelectPreviousDir=new TDEAction(i18n("&Previous Folder"), TQApplication::reverseLayout() ? "media-seek-forward":"media-seek-backward", ALT + Key_BackSpace, - TQT_TQOBJECT(this),TQT_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder"); + this,TQT_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder"); mSelectNextDir=new TDEAction(i18n("&Next Folder"), TQApplication::reverseLayout() ? "media-seek-backward":"media-seek-forward", ALT + Key_Space, - TQT_TQOBJECT(this),TQT_SLOT(slotSelectNextDir()), actionCollection, "next_folder"); + this,TQT_SLOT(slotSelectNextDir()), actionCollection, "next_folder"); mSelectFirstSubDir=new TDEAction(i18n("&First Sub Folder"), "go-down", ALT + Key_Down, - TQT_TQOBJECT(this),TQT_SLOT(slotSelectFirstSubDir()), actionCollection, "first_sub_folder"); + this,TQT_SLOT(slotSelectFirstSubDir()), actionCollection, "first_sub_folder"); - mListMode=new TDERadioAction(i18n("Details"),"view_detailed",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"list_mode"); + mListMode=new TDERadioAction(i18n("Details"),"view_detailed",0,this,TQT_SLOT(updateViewMode()),actionCollection,"list_mode"); mListMode->setExclusiveGroup("thumbnails"); - mSideThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode"); + mSideThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,this,TQT_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode"); mSideThumbnailMode->setExclusiveGroup("thumbnails"); - mBottomThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,TQT_TQOBJECT(this),TQT_SLOT(updateViewMode()),actionCollection,"bottom_thumbnail_mode"); + mBottomThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,this,TQT_SLOT(updateViewMode()),actionCollection,"bottom_thumbnail_mode"); mBottomThumbnailMode->setExclusiveGroup("thumbnails"); // Size slider @@ -315,21 +315,21 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act ThumbnailSize::LARGE/SLIDER_RESOLUTION); mSizeSlider->setValue(FileViewConfig::thumbnailSize() / SLIDER_RESOLUTION); - connect(mSizeSlider, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(updateThumbnailSize(int)) ); + connect(mSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateThumbnailSize(int)) ); connect(mListMode, TQT_SIGNAL(toggled(bool)), mSizeSlider, TQT_SLOT(setDisabled(bool)) ); TDEAction* sliderAction=new KWidgetAction(mSizeSlider, i18n("Thumbnail Size"), 0, 0, 0, actionCollection, "size_slider"); d->mSliderTracker=new TipTracker("", mSizeSlider); // /Size slider - mShowDotFiles=new TDEToggleAction(i18n("Show &Hidden Files"),CTRL + Key_H,TQT_TQOBJECT(this),TQT_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files"); + mShowDotFiles=new TDEToggleAction(i18n("Show &Hidden Files"),CTRL + Key_H,this,TQT_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files"); - d->mSortAction=new TDESelectAction(i18n("Sort"), 0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "view_sort"); + d->mSortAction=new TDESelectAction(i18n("Sort"), 0, this, TQT_SLOT(setSorting()), actionCollection, "view_sort"); TQStringList sortItems; sortItems << i18n("By Name") << i18n("By Date") << i18n("By Size"); d->mSortAction->setItems(sortItems); d->mSortAction->setCurrentItem(0); - d->mRevertSortAction=new TDEToggleAction(i18n("Descending"),0, TQT_TQOBJECT(this), TQT_SLOT(setSorting()), actionCollection, "descending"); + d->mRevertSortAction=new TDEToggleAction(i18n("Descending"),0, this, TQT_SLOT(setSorting()), actionCollection, "descending"); TQPopupMenu* sortMenu=d->mSortAction->popupMenu(); Q_ASSERT(sortMenu); sortMenu->insertSeparator(); @@ -339,25 +339,25 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act mDirLister=new DirLister; mDirLister->setMainWindow(topLevelWidget()); connect(mDirLister,TQT_SIGNAL(clear()), - TQT_TQOBJECT(this),TQT_SLOT(dirListerClear()) ); + this,TQT_SLOT(dirListerClear()) ); connect(mDirLister,TQT_SIGNAL(newItems(const KFileItemList&)), - TQT_TQOBJECT(this),TQT_SLOT(dirListerNewItems(const KFileItemList&)) ); + this,TQT_SLOT(dirListerNewItems(const KFileItemList&)) ); connect(mDirLister,TQT_SIGNAL(deleteItem(KFileItem*)), - TQT_TQOBJECT(this),TQT_SLOT(dirListerDeleteItem(KFileItem*)) ); + this,TQT_SLOT(dirListerDeleteItem(KFileItem*)) ); connect(mDirLister,TQT_SIGNAL(refreshItems(const KFileItemList&)), - TQT_TQOBJECT(this),TQT_SLOT(dirListerRefreshItems(const KFileItemList&)) ); + this,TQT_SLOT(dirListerRefreshItems(const KFileItemList&)) ); connect(mDirLister,TQT_SIGNAL(started(const KURL&)), - TQT_TQOBJECT(this),TQT_SLOT(dirListerStarted()) ); + this,TQT_SLOT(dirListerStarted()) ); connect(mDirLister,TQT_SIGNAL(completed()), - TQT_TQOBJECT(this),TQT_SLOT(dirListerCompleted()) ); + this,TQT_SLOT(dirListerCompleted()) ); connect(mDirLister,TQT_SIGNAL(canceled()), - TQT_TQOBJECT(this),TQT_SLOT(dirListerCanceled()) ); + this,TQT_SLOT(dirListerCanceled()) ); // Propagate canceled signals connect(mDirLister,TQT_SIGNAL(canceled()), @@ -369,19 +369,19 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act mFileDetailView->viewport()->installEventFilter(this); connect(mFileDetailView,TQT_SIGNAL(executed(TQListViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) ); + this,TQT_SLOT(slotViewExecuted()) ); connect(mFileDetailView,TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) ); + this,TQT_SLOT(slotViewExecuted()) ); connect(mFileDetailView,TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) ); + this,TQT_SLOT(slotViewClicked()) ); connect(mFileDetailView,TQT_SIGNAL(selectionChanged()), - TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) ); + this,TQT_SLOT(slotViewClicked()) ); connect(mFileDetailView,TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) ); + this,TQT_SLOT(slotViewClicked()) ); connect(mFileDetailView,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_TQOBJECT(this),TQT_SLOT(openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + this,TQT_SLOT(openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect(mFileDetailView,TQT_SIGNAL(dropped(TQDropEvent*,KFileItem*)), - TQT_TQOBJECT(this),TQT_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) ); + this,TQT_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) ); connect(mFileDetailView, TQT_SIGNAL(sortingChanged(TQDir::SortSpec)), this, TQT_SLOT(updateSortMenu(TQDir::SortSpec)) ); connect(mFileDetailView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), @@ -395,26 +395,26 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act mFileThumbnailView->viewport()->installEventFilter(this); connect(mFileThumbnailView,TQT_SIGNAL(executed(TQIconViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) ); + this,TQT_SLOT(slotViewExecuted()) ); connect(mFileThumbnailView,TQT_SIGNAL(returnPressed(TQIconViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewExecuted()) ); + this,TQT_SLOT(slotViewExecuted()) ); connect(mFileThumbnailView,TQT_SIGNAL(currentChanged(TQIconViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) ); + this,TQT_SLOT(slotViewClicked()) ); connect(mFileThumbnailView,TQT_SIGNAL(selectionChanged()), - TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) ); + this,TQT_SLOT(slotViewClicked()) ); connect(mFileThumbnailView,TQT_SIGNAL(clicked(TQIconViewItem*)), - TQT_TQOBJECT(this),TQT_SLOT(slotViewClicked()) ); + this,TQT_SLOT(slotViewClicked()) ); connect(mFileThumbnailView,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_TQOBJECT(this),TQT_SLOT(openContextMenu(TQIconViewItem*,const TQPoint&)) ); + this,TQT_SLOT(openContextMenu(TQIconViewItem*,const TQPoint&)) ); connect(mFileThumbnailView,TQT_SIGNAL(dropped(TQDropEvent*,KFileItem*)), - TQT_TQOBJECT(this),TQT_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) ); + this,TQT_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) ); connect(mFileThumbnailView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), this, TQT_SLOT(slotViewDoubleClicked()) ); connect(mFileThumbnailView, TQT_SIGNAL(selectionChanged()), this, TQT_SIGNAL(selectionChanged()) ); // Thumbnail details dialog - TDEAction* thumbnailDetailsDialogAction=new TDEAction(i18n("Edit Thumbnail Details..."), "configure", 0, TQT_TQOBJECT(mFileThumbnailView), TQT_SLOT(showThumbnailDetailsDialog()), actionCollection, "thumbnail_details_dialog"); + TDEAction* thumbnailDetailsDialogAction=new TDEAction(i18n("Edit Thumbnail Details..."), "configure", 0, mFileThumbnailView, TQT_SLOT(showThumbnailDetailsDialog()), actionCollection, "thumbnail_details_dialog"); connect(mBottomThumbnailMode, TQT_SIGNAL(toggled(bool)), thumbnailDetailsDialogAction, TQT_SLOT(setEnabled(bool)) ); @@ -542,13 +542,13 @@ void FileViewController::setFileNameToSelect(const TQString& fileName) { void FileViewController::prefetch( KFileItem* item ) { prefetchDone(); if( item == NULL ) return; - mPrefetch = ImageLoader::loader( item->url(), TQT_TQOBJECT(this), BUSY_PRELOADING ); + mPrefetch = ImageLoader::loader( item->url(), this, BUSY_PRELOADING ); connect( mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); } void FileViewController::prefetchDone() { if( mPrefetch != NULL ) { - mPrefetch->release( TQT_TQOBJECT(this) ); + mPrefetch->release( this ); mPrefetch = NULL; } } @@ -1088,7 +1088,7 @@ void FileViewController::dirListerCompleted() { LOG(""); // Delay the code to be executed when the dir lister has completed its job // to avoid crash in KDirLister (see bug #57991) - TQTimer::singleShot(0,TQT_TQOBJECT(this),TQT_SLOT(delayedDirListerCompleted())); + TQTimer::singleShot(0,this,TQT_SLOT(delayedDirListerCompleted())); } diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index 3f1db66..2525b7b 100644 --- a/src/gvcore/imageview.cpp +++ b/src/gvcore/imageview.cpp @@ -279,8 +279,7 @@ public: case TQEvent::KeyPress: case TQEvent::KeyRelease: case TQEvent::AccelOverride: - return static_cast< ImageView* >( TQT_TQWIDGET(parent())) - ->viewportKeyEvent(static_cast(event)); + return static_cast< ImageView* >(parent())->viewportKeyEvent(static_cast(event)); default: break; } @@ -326,31 +325,31 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a // Create actions d->mZoomToFit=new TDEToggleAction(i18n("Fit to &Window"),"zoom-fit-best",0,d->mActionCollection,"view_zoom_to_fit"); connect(d->mZoomToFit,TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(setZoomToFit(bool)) ); + this, TQT_SLOT(setZoomToFit(bool)) ); d->mZoomToWidth=new TDEToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width"); connect(d->mZoomToWidth,TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(setZoomToWidth(bool)) ); + this, TQT_SLOT(setZoomToWidth(bool)) ); d->mZoomToHeight=new TDEToggleAction(i18n("Fit to &Height"),0,0,d->mActionCollection,"view_zoom_to_height"); connect(d->mZoomToHeight,TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(setZoomToHeight(bool)) ); + this, TQT_SLOT(setZoomToHeight(bool)) ); - d->mZoomIn=KStdAction::zoomIn(TQT_TQOBJECT(this),TQT_SLOT(slotZoomIn()),d->mActionCollection); + d->mZoomIn=KStdAction::zoomIn(this,TQT_SLOT(slotZoomIn()),d->mActionCollection); - d->mZoomOut=KStdAction::zoomOut(TQT_TQOBJECT(this),TQT_SLOT(slotZoomOut()),d->mActionCollection); + d->mZoomOut=KStdAction::zoomOut(this,TQT_SLOT(slotZoomOut()),d->mActionCollection); - d->mResetZoom=KStdAction::actualSize(TQT_TQOBJECT(this),TQT_SLOT(slotResetZoom()),d->mActionCollection); + d->mResetZoom=KStdAction::actualSize(this,TQT_SLOT(slotResetZoom()),d->mActionCollection); d->mResetZoom->setIcon("zoom-original"); d->mLockZoom=new TDEToggleAction(i18n("&Lock Zoom"),"system-lock-screen",0,d->mActionCollection,"view_zoom_lock"); d->mLockZoom->setChecked(ImageViewConfig::lockZoom()); connect(d->mLockZoom,TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(setLockZoom(bool)) ); + this, TQT_SLOT(setLockZoom(bool)) ); d->mZoomCombo=new TQComboBox(true); // Avoid stealing focus d->mZoomCombo->setFocusPolicy(TQWidget::ClickFocus); connect(d->mZoomCombo, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotSelectZoom()) ); + this, TQT_SLOT(slotSelectZoom()) ); d->mZoomComboAction=new KWidgetAction(d->mZoomCombo, i18n("Zoom"), 0, 0, 0, d->mActionCollection, "view_zoom_to"); @@ -363,41 +362,41 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a d->initZoomCombo(); d->mAdjustBCG=new TDEAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0, - TQT_TQOBJECT(this), TQT_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg"); + this, TQT_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg"); d->mIncreaseGamma=new TDEAction(i18n("Increase Gamma"),0,CTRL+Key_G, - TQT_TQOBJECT(this), TQT_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma"); + this, TQT_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma"); d->mDecreaseGamma=new TDEAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G, - TQT_TQOBJECT(this), TQT_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma"); + this, TQT_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma"); d->mIncreaseBrightness=new TDEAction(i18n("Increase Brightness" ),0,CTRL+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness"); + this, TQT_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness"); d->mDecreaseBrightness=new TDEAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B, - TQT_TQOBJECT(this), TQT_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness"); + this, TQT_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness"); d->mIncreaseContrast=new TDEAction(i18n("Increase Contrast" ),0,CTRL+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast"); + this, TQT_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast"); d->mDecreaseContrast=new TDEAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C, - TQT_TQOBJECT(this), TQT_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast"); + this, TQT_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast"); // Connect to some interesting signals connect(d->mDocument,TQT_SIGNAL(loaded(const KURL&)), - TQT_TQOBJECT(this), TQT_SLOT(slotLoaded()) ); + this, TQT_SLOT(slotLoaded()) ); connect(d->mDocument,TQT_SIGNAL(loading()), - TQT_TQOBJECT(this), TQT_SLOT( loadingStarted()) ); + this, TQT_SLOT( loadingStarted()) ); connect(d->mDocument,TQT_SIGNAL(modified()), - TQT_TQOBJECT(this), TQT_SLOT(slotModified()) ); + this, TQT_SLOT(slotModified()) ); connect(d->mDocument, TQT_SIGNAL(sizeUpdated()), - TQT_TQOBJECT(this), TQT_SLOT(slotImageSizeUpdated()) ); + this, TQT_SLOT(slotImageSizeUpdated()) ); connect(d->mDocument, TQT_SIGNAL(rectUpdated(const TQRect&)), - TQT_TQOBJECT(this), TQT_SLOT(slotImageRectUpdated(const TQRect&)) ); + this, TQT_SLOT(slotImageRectUpdated(const TQRect&)) ); connect(&d->mPendingPaintTimer,TQT_SIGNAL(timeout()), - TQT_TQOBJECT(this), TQT_SLOT(checkPendingOperations()) ); + this, TQT_SLOT(checkPendingOperations()) ); connect(BusyLevelManager::instance(),TQT_SIGNAL(busyLevelChanged(BusyLevel)), - TQT_TQOBJECT(this), TQT_SLOT(slotBusyLevelChanged(BusyLevel) )); + this, TQT_SLOT(slotBusyLevelChanged(BusyLevel) )); // This event filter is here to make sure the pixmap view is aware of the changes // in the keyboard modifiers, even if it isn't focused. However, making this widget @@ -749,12 +748,12 @@ void ImageView::scheduleOperation( Operation operation ) void ImageView::updateBusyLevels() { if( !d->mPendingPaintTimer.isActive()) { - BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_NONE ); + BusyLevelManager::instance()->setBusyLevel( this, BUSY_NONE ); } else if( !d->mPendingPaints.isEmpty() && !(*d->mPendingPaints.begin()).smooth ) { - BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_PAINTING ); + BusyLevelManager::instance()->setBusyLevel( this, BUSY_PAINTING ); } else if(( d->mPendingOperations & SMOOTH_PASS ) || ( !d->mPendingPaints.isEmpty() && (*d->mPendingPaints.begin()).smooth )) { - BusyLevelManager::instance()->setBusyLevel( TQT_TQOBJECT(this), BUSY_SMOOTHING ); + BusyLevelManager::instance()->setBusyLevel( this, BUSY_SMOOTHING ); } else { assert( false ); } diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 008b3d4..03e81dc 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -153,7 +153,7 @@ struct ImageViewController::Private { TQString library=service->library(); Q_ASSERT(!library.isNull()); LOG("Library:" << library); - mPlayerPart = KParts::ComponentFactory::createPartInstanceFromService(service, TQT_TQWIDGET(mStack), 0, TQT_TQOBJECT(mStack), 0); + mPlayerPart = KParts::ComponentFactory::createPartInstanceFromService(service, mStack, 0, mStack, 0); if (!mPlayerPart) { kdWarning() << "Failed to instantiate KPart from library " << library << endl; return; @@ -394,7 +394,7 @@ void ImageViewController::slotAutoHide() { } // Only hide cursor if we are not over a dialog - TQWidget* widget = TQT_TQWIDGET(TDEApplication::kApplication()->activeWindow()); + TQWidget* widget = TDEApplication::kApplication()->activeWindow(); if (!widget || !widget->inherits("TQDialog")) { TQApplication::setOverrideCursor(blankCursor); d->mCursorHidden=true; -- cgit v1.2.3