diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-30 16:28:59 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-31 22:26:22 +0900 |
| commit | f476b77d1dda2e0e45cdf065b1907215c90fccd6 (patch) | |
| tree | dec65915640fe8ca8f67f9c490575d939b89d5df | |
| parent | 5eb453b778dba31ee1c5956ca9c9d6483c1cd620 (diff) | |
| download | gwenview-f476b77d1dda2e0e45cdf065b1907215c90fccd6.tar.gz gwenview-f476b77d1dda2e0e45cdf065b1907215c90fccd6.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 97ea83f8b23cc80320874b97b671c736a83c378a)
38 files changed, 495 insertions, 495 deletions
diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp index d64793f..a644862 100644 --- a/src/app/bookmarkdialog.cpp +++ b/src/app/bookmarkdialog.cpp @@ -50,17 +50,17 @@ BookmarkDialog::BookmarkDialog(TQWidget* parent, BookmarkDialog::Mode mode) d->mContent->mUrl->setMode(KFile::Directory); d->mContent->mIcon->setIcon("folder"); - connect(d->mContent->mTitle,TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateOk())); - connect(d->mContent->mIcon,TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(updateOk())); + connect(d->mContent->mTitle,TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateOk())); + connect(d->mContent->mIcon,TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(updateOk())); if (mode==BOOKMARK_GROUP) { d->mContent->mUrlLabel->hide(); d->mContent->mUrl->hide(); } else { - connect(d->mContent->mUrl,TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateOk())); + connect(d->mContent->mUrl,TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateOk())); } switch (mode) { diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp index c703340..d5fc718 100644 --- a/src/app/bookmarkviewcontroller.cpp +++ b/src/app/bookmarkviewcontroller.cpp @@ -192,24 +192,24 @@ BookmarkViewController::BookmarkViewController(TQWidget* parent) d->mListView->setShowToolTips(false); d->mListView->setFullWidth(true); - connect(d->mListView, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotOpenBookmark(TQListViewItem*)) ); - connect(d->mListView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotOpenBookmark(TQListViewItem*)) ); - connect(d->mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotContextMenu(TQListViewItem*)) ); - connect(d->mListView, TQT_SIGNAL(urlDropped(TQDropEvent*, const KURL::List&)), - this, TQT_SLOT(slotURLDropped(TQDropEvent*, const KURL::List&)) ); + connect(d->mListView, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotOpenBookmark(TQListViewItem*)) ); + connect(d->mListView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotOpenBookmark(TQListViewItem*)) ); + connect(d->mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotContextMenu(TQListViewItem*)) ); + connect(d->mListView, TQ_SIGNAL(urlDropped(TQDropEvent*, const KURL::List&)), + this, TQ_SLOT(slotURLDropped(TQDropEvent*, const KURL::List&)) ); // Init toolbar TDEToolBar* toolbar=new TDEToolBar(d->mBox, "", true); TDEAction* action; toolbar->setIconText(TDEToolBar::IconTextRight); action=new TDEAction(i18n("Add a bookmark (keep it short)", "Add"), "bookmark_add", 0, - this, TQT_SLOT(bookmarkCurrentURL()), d->mActionCollection); + this, TQ_SLOT(bookmarkCurrentURL()), d->mActionCollection); action->plug(toolbar); action=new TDEAction(i18n("Remove a bookmark (keep it short)", "Remove"), "edit-delete", 0, - this, TQT_SLOT(deleteCurrentBookmark()), d->mActionCollection); + this, TQ_SLOT(deleteCurrentBookmark()), d->mActionCollection); action->plug(toolbar); } @@ -225,8 +225,8 @@ void BookmarkViewController::init(KBookmarkManager* manager) { d->mManager=manager; // For now, we ignore the caller parameter and just refresh the full list on update - connect(d->mManager, TQT_SIGNAL(changed(const TQString&, const TQString&)), - this, TQT_SLOT(fill()) ); + connect(d->mManager, TQ_SIGNAL(changed(const TQString&, const TQString&)), + this, TQ_SLOT(fill()) ); fill(); } @@ -256,7 +256,7 @@ void BookmarkViewController::slotURLDropped(TQDropEvent* event, const KURL::List TQPopupMenu menu(lst); int addBookmarkID=menu.insertItem( SmallIcon("bookmark_add"), i18n("&Add Bookmark"), - this, TQT_SLOT(slotBookmarkDroppedURL()) ); + this, TQ_SLOT(slotBookmarkDroppedURL()) ); if (urls.count()==1) { d->mDroppedURL=*urls.begin(); } else { @@ -293,16 +293,16 @@ void BookmarkViewController::slotContextMenu(TQListViewItem* item_) { BookmarkItem* item=static_cast<BookmarkItem*>(item_); TQPopupMenu menu(d->mListView); menu.insertItem(SmallIcon("bookmark_add"), i18n("Add Bookmark..."), - this, TQT_SLOT(bookmarkCurrentURL())); + this, TQ_SLOT(bookmarkCurrentURL())); menu.insertItem(SmallIcon("bookmark_folder"), i18n("Add Bookmark Folder..."), - this, TQT_SLOT(addBookmarkGroup())); + this, TQ_SLOT(addBookmarkGroup())); if (item) { menu.insertSeparator(); menu.insertItem(SmallIcon("edit"), i18n("Edit..."), - this, TQT_SLOT(editCurrentBookmark())); + this, TQ_SLOT(editCurrentBookmark())); menu.insertItem(SmallIcon("edit-delete"), i18n("Delete"), - this, TQT_SLOT(deleteCurrentBookmark())); + this, TQ_SLOT(deleteCurrentBookmark())); } menu.exec(TQCursor::pos()); } diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp index 887d6fe..6b2e0a4 100644 --- a/src/app/configdialog.cpp +++ b/src/app/configdialog.cpp @@ -161,10 +161,10 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader) d->mImageListPage->mShowFileSize->setChecked(details & FileThumbnailView::FILESIZE); d->mImageListPage->mShowImageSize->setChecked(details & FileThumbnailView::IMAGESIZE); - connect(d->mImageListPage->mCalculateCacheSize,TQT_SIGNAL(clicked()), - this,TQT_SLOT(calculateCacheSize())); - connect(d->mImageListPage->mEmptyCache,TQT_SIGNAL(clicked()), - this,TQT_SLOT(emptyCache())); + connect(d->mImageListPage->mCalculateCacheSize,TQ_SIGNAL(clicked()), + this,TQ_SLOT(calculateCacheSize())); + connect(d->mImageListPage->mEmptyCache,TQ_SIGNAL(clicked()), + this,TQ_SLOT(emptyCache())); // Image View tab d->mImageViewPage->mMouseWheelGroup->setButton(ImageViewConfig::mouseWheelScroll()?1:0); @@ -172,7 +172,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader) // Full Screen tab TQTextEdit* edit=d->mFullScreenPage->kcfg_osdFormat; edit->setMaximumHeight(edit->fontMetrics().height()*3); - connect(edit, TQT_SIGNAL(textChanged()), TQT_SLOT(updateOSDPreview()) ); + connect(edit, TQ_SIGNAL(textChanged()), TQ_SLOT(updateOSDPreview()) ); // File Operations tab d->mFileOperationsPage->kcfg_destDir->fileDialog()->setMode( diff --git a/src/app/dirviewcontroller.cpp b/src/app/dirviewcontroller.cpp index c93dc0b..0597fc4 100644 --- a/src/app/dirviewcontroller.cpp +++ b/src/app/dirviewcontroller.cpp @@ -58,11 +58,11 @@ DirViewController::DirViewController(TQWidget* parent) d->mTreeView=new TreeView(parent); - connect(d->mTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotTreeViewSelectionChanged(TQListViewItem*)) ); + connect(d->mTreeView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotTreeViewSelectionChanged(TQListViewItem*)) ); - connect(d->mTreeView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect(d->mTreeView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } @@ -90,12 +90,12 @@ void DirViewController::slotTreeViewSelectionChanged(TQListViewItem* item) { void DirViewController::slotTreeViewContextMenu(TDEListView*, TQListViewItem*, const TQPoint& pos) { TQPopupMenu menu(d->mTreeView); - menu.insertItem(SmallIcon("folder-new"),i18n("New Folder..."),this,TQT_SLOT(makeDir())); + menu.insertItem(SmallIcon("folder-new"),i18n("New Folder..."),this,TQ_SLOT(makeDir())); menu.insertSeparator(); - menu.insertItem(i18n("Rename..."),this,TQT_SLOT(renameDir())); - menu.insertItem(SmallIcon("edit-delete"),i18n("Delete"),this,TQT_SLOT(removeDir())); + menu.insertItem(i18n("Rename..."),this,TQ_SLOT(renameDir())); + menu.insertItem(SmallIcon("edit-delete"),i18n("Delete"),this,TQ_SLOT(removeDir())); menu.insertSeparator(); - menu.insertItem(i18n("Properties"),this,TQT_SLOT(showPropertiesDialog())); + menu.insertItem(i18n("Properties"),this,TQ_SLOT(showPropertiesDialog())); menu.exec(pos); } @@ -103,7 +103,7 @@ void DirViewController::slotTreeViewContextMenu(TDEListView*, TQListViewItem*, c void DirViewController::makeDir() { if (!d->mTreeView->currentItem()) return; - FileOperation::makeDir(d->mTreeView->currentURL(), d->mTreeView, this, TQT_SLOT(slotDirMade()) ); + FileOperation::makeDir(d->mTreeView->currentURL(), d->mTreeView, this, TQ_SLOT(slotDirMade()) ); } diff --git a/src/app/history.cpp b/src/app/history.cpp index 5eb7783..91a129f 100644 --- a/src/app/history.cpp +++ b/src/app/history.cpp @@ -42,21 +42,21 @@ History::History(TDEActionCollection* actionCollection) { TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward(); mGoBack=new TDEToolBarPopupAction(backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), - this, TQT_SLOT(goBack()), actionCollection, "go_back"); + this, TQ_SLOT(goBack()), actionCollection, "go_back"); mGoForward=new TDEToolBarPopupAction(backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), - this, TQT_SLOT(goForward()), actionCollection, "go_forward"); + this, TQ_SLOT(goForward()), actionCollection, "go_forward"); // Connections - connect(mGoBack->popupMenu(),TQT_SIGNAL(activated(int)), - this,TQT_SLOT(goBackTo(int)) ); - connect(mGoForward->popupMenu(),TQT_SIGNAL(activated(int)), - this,TQT_SLOT(goForwardTo(int)) ); - - connect(mGoBack->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(fillGoBackMenu()) ); - connect(mGoForward->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(fillGoForwardMenu()) ); + connect(mGoBack->popupMenu(),TQ_SIGNAL(activated(int)), + this,TQ_SLOT(goBackTo(int)) ); + connect(mGoForward->popupMenu(),TQ_SIGNAL(activated(int)), + this,TQ_SLOT(goForwardTo(int)) ); + + connect(mGoBack->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(fillGoBackMenu()) ); + connect(mGoForward->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(fillGoForwardMenu()) ); } diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp index 8c8bab3..456129e 100644 --- a/src/app/kipiinterface.cpp +++ b/src/app/kipiinterface.cpp @@ -123,13 +123,13 @@ KIPIInterface::KIPIInterface( TQWidget* parent, FileViewController* fileView) d=new KIPIInterfacePrivate; d->mFileView=fileView; - connect(d->mFileView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect(d->mFileView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); - connect(d->mFileView, TQT_SIGNAL(completed()), - this, TQT_SLOT(slotDirectoryChanged()) ); + connect(d->mFileView, TQ_SIGNAL(completed()), + this, TQ_SLOT(slotDirectoryChanged()) ); // delay a bit, so that it's called after loadPlugins() - TQTimer::singleShot( 0, this, TQT_SLOT( init())); + TQTimer::singleShot( 0, this, TQ_SLOT( init())); } diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 7a79bba..78cd0ed 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -357,7 +357,7 @@ void MainWindow::renameFile() { } else { url = mDocument->url(); } - FileOperation::rename(url, this, this, TQT_SLOT(slotRenamed(const TQString &))); + FileOperation::rename(url, this, this, TQ_SLOT(slotRenamed(const TQString &))); } @@ -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..."), this, TQT_SLOT(makeDir())); + menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), this, TQ_SLOT(makeDir())); menu.insertSeparator(); @@ -664,12 +664,12 @@ void MainWindow::showConfigDialog() { #else ConfigDialog dialog(this, 0); #endif - connect(&dialog, TQT_SIGNAL(settingsChanged()), - mSlideShow, TQT_SLOT(slotSettingsChanged()) ); - connect(&dialog, TQT_SIGNAL(settingsChanged()), - mImageViewController, TQT_SLOT(updateFromSettings()) ); - connect(&dialog, TQT_SIGNAL(settingsChanged()), - mFileViewController, TQT_SLOT(updateFromSettings()) ); + connect(&dialog, TQ_SIGNAL(settingsChanged()), + mSlideShow, TQ_SLOT(slotSettingsChanged()) ); + connect(&dialog, TQ_SIGNAL(settingsChanged()), + mImageViewController, TQ_SLOT(updateFromSettings()) ); + connect(&dialog, TQ_SIGNAL(settingsChanged()), + mFileViewController, TQ_SLOT(updateFromSettings()) ); dialog.exec(); } @@ -690,7 +690,7 @@ void MainWindow::showKeyDialog() { void MainWindow::showToolBarDialog() { saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(applyMainWindowSettings())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(applyMainWindowSettings())); dlg.exec(); } @@ -880,15 +880,15 @@ void MainWindow::createWidgets() { statusBar()->addWidget(mSBDetailLabel, 0); statusBar()->addWidget(mSBHintLabel, 1); mHintTimer=new TQTimer(this); - connect(mHintTimer, TQT_SIGNAL(timeout()), - mSBHintLabel, TQT_SLOT(clear()) ); + connect(mHintTimer, TQ_SIGNAL(timeout()), + mSBHintLabel, TQ_SLOT(clear()) ); // Pixmap widget mImageDock = mDockArea->createDockWidget("Image",SmallIcon("gwenview"),NULL,i18n("Image")); mImageViewController=new ImageViewController(mImageDock, mDocument, actionCollection()); mImageDock->setWidget(mImageViewController->widget()); - connect(mImageViewController, TQT_SIGNAL(requestHintDisplay(const TQString&)), - this, TQT_SLOT(showHint(const TQString&)) ); + connect(mImageViewController, TQ_SIGNAL(requestHintDisplay(const TQString&)), + this, TQ_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, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode"); + mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, this, TQ_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode"); mSwitchToBrowseMode->setExclusiveGroup("centralStackMode"); mSwitchToBrowseMode->setChecked(true); - mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); + mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, this, TQ_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode"); mSwitchToViewMode->setExclusiveGroup("centralStackMode"); // File - 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(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() ); + KStdAction::open(this,TQ_SLOT(showFileDialog()),actionCollection() ); + mSaveFile=KStdAction::save(mDocument,TQ_SLOT(save()),actionCollection() ); + mSaveFileAs=KStdAction::saveAs(mDocument,TQ_SLOT(saveAs()),actionCollection() ); + mFilePrint = KStdAction::print(this, TQ_SLOT(printFile()), actionCollection()); + mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,this,TQ_SLOT(renameFile()),actionCollection(),"file_rename"); + mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,this,TQ_SLOT(copyFiles()),actionCollection(),"file_copy"); + mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,this,TQ_SLOT(moveFiles()),actionCollection(),"file_move"); + mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,this,TQ_SLOT(linkFiles()),actionCollection(),"file_link"); + mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,this,TQ_SLOT(deleteFiles()),actionCollection(),"file_delete"); + mShowFileProperties=new TDEAction(i18n("Properties"),0,this,TQ_SLOT(showFileProperties()),actionCollection(),"file_properties"); + KStdAction::quit( kapp, TQ_SLOT (closeAllWindows()), actionCollection() ); // Edit - 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"); + mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, this, TQ_SLOT(rotateLeft()),actionCollection(),"rotate_left"); + mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, this, TQ_SLOT(rotateRight()),actionCollection(),"rotate_right"); + mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, this, TQ_SLOT(mirror()),actionCollection(),"mirror"); + mFlip=new TDEAction(i18n("&Flip"),"flip",0, this, TQ_SLOT(flip()),actionCollection(),"flip"); // View - mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload"); + mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQ_SLOT(reload()), actionCollection(), "reload"); mReload->setEnabled(false); - mToggleFullScreen= KStdAction::fullScreen(this,TQT_SLOT(toggleFullScreen()),actionCollection(),0); - mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow"); + mToggleFullScreen= KStdAction::fullScreen(this,TQ_SLOT(toggleFullScreen()),actionCollection(),0); + mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQ_SLOT(toggleSlideShow()),actionCollection(),"slideshow"); mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label"); // Go - 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"); + mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, this, TQ_SLOT(goUp()), actionCollection(), "go_up"); + new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQ_SLOT(goHome()), actionCollection(), "go_home"); // Window - mResetDockWidgets = new TDEAction(i18n("Reset"), 0, this, TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets"); + mResetDockWidgets = new TDEAction(i18n("Reset"), 0, this, TQ_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets"); // Settings mShowConfigDialog= - KStdAction::preferences(this, TQT_SLOT(showConfigDialog()), actionCollection() ); + KStdAction::preferences(this, TQ_SLOT(showConfigDialog()), actionCollection() ); mShowKeyDialog= - KStdAction::keyBindings(this, TQT_SLOT(showKeyDialog()), actionCollection() ); + KStdAction::keyBindings(this, TQ_SLOT(showKeyDialog()), actionCollection() ); (void)new TDEAction(i18n("Configure External Tools..."), "configure", 0, - this, TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools"); + this, TQ_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools"); (void)KStdAction::configureToolbars( - this, TQT_SLOT(showToolBarDialog()), actionCollection() ); + this, TQ_SLOT(showToolBarDialog()), actionCollection() ); actionCollection()->readShortcutSettings(); } @@ -1059,11 +1059,11 @@ void MainWindow::createObjectInteractions() { } // Make sure file actions are correctly updated - connect(mFileViewController, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(updateImageActions()) ); + connect(mFileViewController, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(updateImageActions()) ); - connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)), - this, TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) ); + connect(mFileViewController, TQ_SIGNAL(requestContextMenu(const TQPoint&, bool)), + this, TQ_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) ); // Bookmarks TQString file = locate( "data", "tdefile/bookmarks.xml" ); @@ -1081,11 +1081,11 @@ void MainWindow::createObjectInteractions() { TDEActionMenu* bookmark=new TDEActionMenu(i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); new KBookmarkMenu(manager, bookmarkOwner, bookmark->popupMenu(), 0, true); - connect(bookmarkOwner,TQT_SIGNAL(openURL(const KURL&)), - mFileViewController,TQT_SLOT(setDirURL(const KURL&)) ); + connect(bookmarkOwner,TQ_SIGNAL(openURL(const KURL&)), + mFileViewController,TQ_SLOT(setDirURL(const KURL&)) ); - connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)), - bookmarkOwner,TQT_SLOT(setURL(const KURL&)) ); + connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)), + bookmarkOwner,TQ_SLOT(setURL(const KURL&)) ); } @@ -1097,7 +1097,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) { caption=i18n("Show %1").arg(dock->caption()); } - TDEAction* action=new TDEAction(caption, 0, dock, TQT_SLOT(changeHideShowState()), (TQObject*)0 ); + TDEAction* action=new TDEAction(caption, 0, dock, TQ_SLOT(changeHideShowState()), (TQObject*)0 ); if (dock->icon()) { action->setIconSet( TQIconSet(*dock->icon()) ); } @@ -1116,91 +1116,91 @@ void MainWindow::updateWindowActions() { void MainWindow::createConnections() { - connect(mGoUp->popupMenu(), TQT_SIGNAL(aboutToShow()), - this,TQT_SLOT(fillGoUpMenu())); + connect(mGoUp->popupMenu(), TQ_SIGNAL(aboutToShow()), + this,TQ_SLOT(fillGoUpMenu())); - connect(mGoUp->popupMenu(), TQT_SIGNAL(activated(int)), - this,TQT_SLOT(goUpTo(int))); + connect(mGoUp->popupMenu(), TQ_SIGNAL(activated(int)), + this,TQ_SLOT(goUpTo(int))); // Slideshow connections - connect( mSlideShow, TQT_SIGNAL(nextURL(const KURL&)), - TQT_SLOT( openURL(const KURL&)) ); - connect( mSlideShow, TQT_SIGNAL( stateChanged(bool)), - TQT_SLOT( slotSlideShowChanged(bool)) ); + connect( mSlideShow, TQ_SIGNAL(nextURL(const KURL&)), + TQ_SLOT( openURL(const KURL&)) ); + connect( mSlideShow, TQ_SIGNAL( stateChanged(bool)), + TQ_SLOT( slotSlideShowChanged(bool)) ); // Dir view connections - connect(mDirViewController, TQT_SIGNAL(urlChanged(const KURL&)), - mFileViewController, TQT_SLOT(setDirURL(const KURL&)) ); - connect(mDirViewController, TQT_SIGNAL(urlRenamed(const KURL&, const KURL&)), - this, TQT_SLOT(slotDirRenamed(const KURL&, const KURL&)) ); + connect(mDirViewController, TQ_SIGNAL(urlChanged(const KURL&)), + mFileViewController, TQ_SLOT(setDirURL(const KURL&)) ); + connect(mDirViewController, TQ_SIGNAL(urlRenamed(const KURL&, const KURL&)), + this, TQ_SLOT(slotDirRenamed(const KURL&, const KURL&)) ); // Bookmark view connections - connect(mBookmarkViewController, TQT_SIGNAL(openURL(const KURL&)), - mFileViewController,TQT_SLOT(setDirURL(const KURL&)) ); - connect(mFileViewController, TQT_SIGNAL(directoryChanged(const KURL&)), - mBookmarkViewController, TQT_SLOT(setURL(const KURL&)) ); + connect(mBookmarkViewController, TQ_SIGNAL(openURL(const KURL&)), + mFileViewController,TQ_SLOT(setDirURL(const KURL&)) ); + connect(mFileViewController, TQ_SIGNAL(directoryChanged(const KURL&)), + mBookmarkViewController, TQ_SLOT(setURL(const KURL&)) ); // Pixmap view connections - connect(mImageViewController, TQT_SIGNAL(selectPrevious()), - mFileViewController, TQT_SLOT(slotSelectPrevious()) ); - connect(mImageViewController, TQT_SIGNAL(selectNext()), - mFileViewController, TQT_SLOT(slotSelectNext()) ); - connect(mImageViewController, TQT_SIGNAL(doubleClicked()), - mToggleFullScreen, TQT_SLOT(activate()) ); + connect(mImageViewController, TQ_SIGNAL(selectPrevious()), + mFileViewController, TQ_SLOT(slotSelectPrevious()) ); + connect(mImageViewController, TQ_SIGNAL(selectNext()), + mFileViewController, TQ_SLOT(slotSelectNext()) ); + connect(mImageViewController, TQ_SIGNAL(doubleClicked()), + mToggleFullScreen, TQ_SLOT(activate()) ); // File view connections - connect(mFileViewController,TQT_SIGNAL(urlChanged(const KURL&)), - mDocument,TQT_SLOT(setURL(const KURL&)) ); - connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)), - this,TQT_SLOT(slotDirURLChanged(const KURL&)) ); - connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)), - mDirViewController,TQT_SLOT(setURL(const KURL&)) ); - connect(mFileViewController,TQT_SIGNAL(directoryChanged(const KURL&)), - mHistory,TQT_SLOT(addURLToHistory(const KURL&)) ); - - connect(mFileViewController,TQT_SIGNAL(completed()), - this,TQT_SLOT(updateStatusInfo()) ); - connect(mFileViewController,TQT_SIGNAL(canceled()), - this,TQT_SLOT(updateStatusInfo()) ); - connect(mFileViewController,TQT_SIGNAL(imageDoubleClicked()), - mToggleFullScreen,TQT_SLOT(activate()) ); - connect(mFileViewController,TQT_SIGNAL(shownFileItemRefreshed(const KFileItem*)), - this,TQT_SLOT(slotShownFileItemRefreshed(const KFileItem*)) ); - connect(mFileViewController,TQT_SIGNAL(sortingChanged()), - this, TQT_SLOT(updateStatusInfo()) ); + connect(mFileViewController,TQ_SIGNAL(urlChanged(const KURL&)), + mDocument,TQ_SLOT(setURL(const KURL&)) ); + connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)), + this,TQ_SLOT(slotDirURLChanged(const KURL&)) ); + connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)), + mDirViewController,TQ_SLOT(setURL(const KURL&)) ); + connect(mFileViewController,TQ_SIGNAL(directoryChanged(const KURL&)), + mHistory,TQ_SLOT(addURLToHistory(const KURL&)) ); + + connect(mFileViewController,TQ_SIGNAL(completed()), + this,TQ_SLOT(updateStatusInfo()) ); + connect(mFileViewController,TQ_SIGNAL(canceled()), + this,TQ_SLOT(updateStatusInfo()) ); + connect(mFileViewController,TQ_SIGNAL(imageDoubleClicked()), + mToggleFullScreen,TQ_SLOT(activate()) ); + connect(mFileViewController,TQ_SIGNAL(shownFileItemRefreshed(const KFileItem*)), + this,TQ_SLOT(slotShownFileItemRefreshed(const KFileItem*)) ); + connect(mFileViewController,TQ_SIGNAL(sortingChanged()), + this, TQ_SLOT(updateStatusInfo()) ); // History connections - connect(mHistory, TQT_SIGNAL(urlChanged(const KURL&)), - mFileViewController, TQT_SLOT(setDirURL(const KURL&)) ); + connect(mHistory, TQ_SIGNAL(urlChanged(const KURL&)), + mFileViewController, TQ_SLOT(setDirURL(const KURL&)) ); // Document connections - connect(mDocument,TQT_SIGNAL(loading()), - this,TQT_SLOT(slotImageLoading()) ); - connect(mDocument,TQT_SIGNAL(loaded(const KURL&)), - this,TQT_SLOT(slotImageLoaded()) ); - connect(mDocument,TQT_SIGNAL(saved(const KURL&)), - mFileViewController,TQT_SLOT(updateThumbnail(const KURL&)) ); - connect(mDocument,TQT_SIGNAL(reloaded(const KURL&)), - mFileViewController,TQT_SLOT(updateThumbnail(const KURL&)) ); + connect(mDocument,TQ_SIGNAL(loading()), + this,TQ_SLOT(slotImageLoading()) ); + connect(mDocument,TQ_SIGNAL(loaded(const KURL&)), + this,TQ_SLOT(slotImageLoaded()) ); + connect(mDocument,TQ_SIGNAL(saved(const KURL&)), + mFileViewController,TQ_SLOT(updateThumbnail(const KURL&)) ); + connect(mDocument,TQ_SIGNAL(reloaded(const KURL&)), + mFileViewController,TQ_SLOT(updateThumbnail(const KURL&)) ); // Location bar - connect(mURLEdit, TQT_SIGNAL(activated(const TQString &)), - this,TQT_SLOT(slotGo()) ); - connect(mURLEdit, TQT_SIGNAL(returnPressed()), - this,TQT_SLOT(slotGo()) ); + connect(mURLEdit, TQ_SIGNAL(activated(const TQString &)), + this,TQ_SLOT(slotGo()) ); + connect(mURLEdit, TQ_SIGNAL(returnPressed()), + this,TQ_SLOT(slotGo()) ); // Non configurable stop-fullscreen accel TQAccel* accel=new TQAccel(this); - accel->connectItem(accel->insertItem(Key_Escape),this,TQT_SLOT(escapePressed())); + accel->connectItem(accel->insertItem(Key_Escape),this,TQ_SLOT(escapePressed())); // Dock related - connect(mDockArea->manager(), TQT_SIGNAL(change()), - this, TQT_SLOT(updateWindowActions()) ); + connect(mDockArea->manager(), TQ_SIGNAL(change()), + this, TQ_SLOT(updateWindowActions()) ); // Plugin menu TQPopupMenu *popup = static_cast<TQPopupMenu*>( factory()->container( "plugins", this)); - connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(loadPlugins()) ); + connect(popup, TQ_SIGNAL(aboutToShow()), this, TQ_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, this, TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location"); + 0, this, TQ_SLOT(clearLocationLabel()), actionCollection(), "clear_location"); // URL Label TDEToolBarLabelAction* locationAction = new TDEToolBarLabelAction(i18n("L&ocation:"), - Key_F6, this, TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label"); + Key_F6, this, TQ_SLOT( activateLocationLabel()), actionCollection(), "location_label"); locationAction->setBuddy(mURLEdit); // Go button - (void)new TDEAction(i18n("Go"), "key_enter", 0, this, TQT_SLOT(slotGo()), actionCollection(), "location_go"); + (void)new TDEAction(i18n("Go"), "key_enter", 0, this, TQ_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() ), this, TQT_SLOT( slotReplug() ) ); + connect( mPluginLoader, TQ_SIGNAL( replug() ), this, TQ_SLOT( slotReplug() ) ); mPluginLoader->loadPlugins(); } diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp index d757ad5..e7da66e 100644 --- a/src/app/metaedit.cpp +++ b/src/app/metaedit.cpp @@ -38,12 +38,12 @@ MetaEdit::MetaEdit(TQWidget *parent, Document *gvp, const char *name) { mCommentEdit=new TQTextEdit(this); mCommentEdit->installEventFilter(this); - connect(mCommentEdit, TQT_SIGNAL(modificationChanged(bool)), - this, TQT_SLOT(setModified(bool))); - connect(mDocument,TQT_SIGNAL(loaded(const KURL&)), - this,TQT_SLOT(updateContent()) ); - connect(mCommentEdit, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(updateDoc()) ); + connect(mCommentEdit, TQ_SIGNAL(modificationChanged(bool)), + this, TQ_SLOT(setModified(bool))); + connect(mDocument,TQ_SIGNAL(loaded(const KURL&)), + this,TQ_SLOT(updateContent()) ); + connect(mCommentEdit, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(updateDoc()) ); updateContent(); mCommentEdit->setMinimumHeight(int (mCommentEdit->fontMetrics().height() * 1.5) ); } diff --git a/src/app/treeview.cpp b/src/app/treeview.cpp index a15642d..77a44f8 100644 --- a/src/app/treeview.cpp +++ b/src/app/treeview.cpp @@ -134,8 +134,8 @@ TreeView::TreeView(TQWidget* parent) setDropHighlighter(true); setAcceptDrops(true); - connect(d->mAutoOpenTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(autoOpenDropTarget())); + connect(d->mAutoOpenTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(autoOpenDropTarget())); } @@ -206,8 +206,8 @@ void TreeView::createBranch(const KURL& url) { d->mBranch->setChildRecurse(false); d->mBranch->root()->setOpen(true); - connect(d->mBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*) ), - this, TQT_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) ); + connect(d->mBranch, TQ_SIGNAL(populateFinished(KFileTreeViewItem*) ), + this, TQ_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) ); } diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp index a0f6e55..704f0ee 100644 --- a/src/app/vtabwidget.cpp +++ b/src/app/vtabwidget.cpp @@ -59,8 +59,8 @@ VTabWidget::~VTabWidget() { void VTabWidget::addTab(TQWidget* child, const TQPixmap& pix, const TQString& label) { int id=d->mStack->addWidget(child); d->mTabBar->appendTab(pix, id, label); - connect(d->mTabBar->tab(id), TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotClicked(int)) ); + connect(d->mTabBar->tab(id), TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotClicked(int)) ); if (d->mEmpty) { d->mTabBar->tab(id)->setOn(true); diff --git a/src/gvcore/bcgdialog.cpp b/src/gvcore/bcgdialog.cpp index c05869b..ccecdfb 100644 --- a/src/gvcore/bcgdialog.cpp +++ b/src/gvcore/bcgdialog.cpp @@ -48,15 +48,15 @@ BCGDialog::BCGDialog(ImageView* view) d->mView=view; d->mContent=new BCGDialogBase(this); setMainWidget(d->mContent); - connect(d->mContent->mBSlider, TQT_SIGNAL(valueChanged(int)), - view, TQT_SLOT(setBrightness(int)) ); - connect(d->mContent->mCSlider, TQT_SIGNAL(valueChanged(int)), - view, TQT_SLOT(setContrast(int)) ); - connect(d->mContent->mGSlider, TQT_SIGNAL(valueChanged(int)), - view, TQT_SLOT(setGamma(int)) ); + connect(d->mContent->mBSlider, TQ_SIGNAL(valueChanged(int)), + view, TQ_SLOT(setBrightness(int)) ); + connect(d->mContent->mCSlider, TQ_SIGNAL(valueChanged(int)), + view, TQ_SLOT(setContrast(int)) ); + connect(d->mContent->mGSlider, TQ_SIGNAL(valueChanged(int)), + view, TQ_SLOT(setGamma(int)) ); - connect(view, TQT_SIGNAL(bcgChanged()), - this, TQT_SLOT(updateFromImageView()) ); + connect(view, TQ_SIGNAL(bcgChanged()), + this, TQ_SLOT(updateFromImageView()) ); } diff --git a/src/gvcore/busylevelmanager.cpp b/src/gvcore/busylevelmanager.cpp index 319c863..09716f4 100644 --- a/src/gvcore/busylevelmanager.cpp +++ b/src/gvcore/busylevelmanager.cpp @@ -40,8 +40,8 @@ namespace Gwenview { BusyLevelManager::BusyLevelManager() : mCurrentBusyLevel( BUSY_NONE ) { - connect( &mDelayedBusyLevelTimer, TQT_SIGNAL( timeout()), - this, TQT_SLOT( delayedBusyLevelChanged())); + connect( &mDelayedBusyLevelTimer, TQ_SIGNAL( timeout()), + this, TQ_SLOT( delayedBusyLevelChanged())); } BusyLevelManager* BusyLevelManager::instance() { @@ -68,12 +68,12 @@ void BusyLevelManager::setBusyLevel( TQObject* obj, BusyLevel level ) { if( level > BUSY_NONE ) { if( mBusyLevels.contains( obj ) && mBusyLevels[ obj ] == level ) return; if( !mBusyLevels.contains( obj )) { - connect( obj, TQT_SIGNAL( destroyed( TQObject* )), this, TQT_SLOT( objectDestroyed( TQObject* ))); + connect( obj, TQ_SIGNAL( destroyed( TQObject* )), this, TQ_SLOT( objectDestroyed( TQObject* ))); } mBusyLevels[ obj ] = level; } else { mBusyLevels.remove( obj ); - disconnect( obj, TQT_SIGNAL( destroyed( TQObject* )), this, TQT_SLOT( objectDestroyed( TQObject* ))); + disconnect( obj, TQ_SIGNAL( destroyed( TQObject* )), this, TQ_SLOT( objectDestroyed( TQObject* ))); } mDelayedBusyLevelTimer.start( 0, true ); } diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp index 3bedf12..7cf30e5 100644 --- a/src/gvcore/deletedialog.cpp +++ b/src/gvcore/deletedialog.cpp @@ -55,7 +55,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) : bool deleteInstead = ! FileOperationConfig::deleteToTrash(); m_widget->ddShouldDelete->setChecked(deleteInstead); - connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateUI())); + connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateUI())); } void DeleteDialog::setURLList(const KURL::List &files) diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp index c718e1d..9174a0f 100644 --- a/src/gvcore/document.cpp +++ b/src/gvcore/document.cpp @@ -124,10 +124,10 @@ Document::Document(TQObject* parent) static Gwenview::XCursorFormatType sXCursorFormatType; } - connect( this, TQT_SIGNAL( loading()), - this, TQT_SLOT( slotLoading())); - connect( this, TQT_SIGNAL( loaded(const KURL&)), - this, TQT_SLOT( slotLoaded())); + connect( this, TQ_SIGNAL( loading()), + this, TQ_SLOT( slotLoading())); + connect( this, TQ_SIGNAL( loaded(const KURL&)), + this, TQ_SLOT( slotLoaded())); } @@ -196,8 +196,8 @@ void Document::setURL(const KURL& paramURL) { d->mURL = localURL; // this may be fixed after stat() is complete, but set at least something d->mStatJob = TDEIO::stat( localURL, !localURL.isLocalFile() ); d->mStatJob->setWindow(TDEApplication::kApplication()->mainWidget()); - connect( d->mStatJob, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotStatResult (TDEIO::Job *) ) ); + connect( d->mStatJob, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotStatResult (TDEIO::Job *) ) ); } @@ -560,12 +560,12 @@ void Document::switchToImpl(DocumentImpl* impl) { delete d->mImpl; d->mImpl=impl; - connect(d->mImpl, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotFinished(bool)) ); - connect(d->mImpl, TQT_SIGNAL(sizeUpdated()), - this, TQT_SIGNAL(sizeUpdated()) ); - connect(d->mImpl, TQT_SIGNAL(rectUpdated(const TQRect&)), - this, TQT_SIGNAL(rectUpdated(const TQRect&)) ); + connect(d->mImpl, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotFinished(bool)) ); + connect(d->mImpl, TQ_SIGNAL(sizeUpdated()), + this, TQ_SIGNAL(sizeUpdated()) ); + connect(d->mImpl, TQ_SIGNAL(rectUpdated(const TQRect&)), + this, TQ_SIGNAL(rectUpdated(const TQRect&)) ); d->mImpl->init(); } diff --git a/src/gvcore/documentanimatedloadedimpl.cpp b/src/gvcore/documentanimatedloadedimpl.cpp index cff373c..e8f625c 100644 --- a/src/gvcore/documentanimatedloadedimpl.cpp +++ b/src/gvcore/documentanimatedloadedimpl.cpp @@ -54,7 +54,7 @@ DocumentAnimatedLoadedImpl::DocumentAnimatedLoadedImpl(Document* document, const d=new DocumentAnimatedLoadedImplPrivate; d->mFrames = frames; d->mCurrentFrame = -1; - connect( &d->mFrameTimer, TQT_SIGNAL( timeout()), TQT_SLOT( nextFrame())); + connect( &d->mFrameTimer, TQ_SIGNAL( timeout()), TQ_SLOT( nextFrame())); } void DocumentAnimatedLoadedImpl::init() { diff --git a/src/gvcore/documentloadingimpl.cpp b/src/gvcore/documentloadingimpl.cpp index 1b29fe1..091982a 100644 --- a/src/gvcore/documentloadingimpl.cpp +++ b/src/gvcore/documentloadingimpl.cpp @@ -85,10 +85,10 @@ void DocumentLoadingImpl::init() { switchToImpl(new DocumentOtherLoadedImpl(mDocument)); return; } - connect( d->mLoader, TQT_SIGNAL( urlKindDetermined()), TQT_SLOT( slotURLKindDetermined() )); - connect( d->mLoader, TQT_SIGNAL( sizeLoaded( int, int )), TQT_SLOT( sizeLoaded( int, int ))); - connect( d->mLoader, TQT_SIGNAL( imageChanged( const TQRect& )), TQT_SLOT( imageChanged( const TQRect& ))); - connect( d->mLoader, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( imageLoaded( bool ))); + connect( d->mLoader, TQ_SIGNAL( urlKindDetermined()), TQ_SLOT( slotURLKindDetermined() )); + connect( d->mLoader, TQ_SIGNAL( sizeLoaded( int, int )), TQ_SLOT( sizeLoaded( int, int ))); + connect( d->mLoader, TQ_SIGNAL( imageChanged( const TQRect& )), TQ_SLOT( imageChanged( const TQRect& ))); + connect( d->mLoader, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( imageLoaded( bool ))); // it's possible the loader already has the whole or at least part of the image loaded TQImage image = d->mLoader->processedImage(); diff --git a/src/gvcore/externaltoolaction.cpp b/src/gvcore/externaltoolaction.cpp index f123516..27be02b 100644 --- a/src/gvcore/externaltoolaction.cpp +++ b/src/gvcore/externaltoolaction.cpp @@ -38,8 +38,8 @@ ExternalToolAction::ExternalToolAction( { setText(service->name()); setIcon(service->icon()); - connect(this, TQT_SIGNAL(activated()), - this, TQT_SLOT(openExternalTool()) ); + connect(this, TQ_SIGNAL(activated()), + this, TQ_SLOT(openExternalTool()) ); } diff --git a/src/gvcore/externaltoolcontext.cpp b/src/gvcore/externaltoolcontext.cpp index 8b68726..1ccc2aa 100644 --- a/src/gvcore/externaltoolcontext.cpp +++ b/src/gvcore/externaltoolcontext.cpp @@ -67,11 +67,11 @@ TQPopupMenu* ExternalToolContext::popupMenu() { menu->insertSeparator(); menu->insertItem(i18n("Other..."), - this, TQT_SLOT(showOpenWithDialog()) ); + this, TQ_SLOT(showOpenWithDialog()) ); menu->insertItem( SmallIcon("configure"), i18n("Configure External Tools..."), - this, TQT_SLOT(showExternalToolDialog()) ); + this, TQ_SLOT(showExternalToolDialog()) ); return menu; } diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp index bd58298..5ccc277 100644 --- a/src/gvcore/externaltooldialog.cpp +++ b/src/gvcore/externaltooldialog.cpp @@ -273,16 +273,16 @@ ExternalToolDialog::ExternalToolDialog(TQWidget* parent) d->mContent->mToolListView->viewport()->installEventFilter( new ToolListViewFilterObject(this, d)); - connect( d->mContent->mToolListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( d->mContent->mAddButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addTool()) ); - connect( d->mContent->mDeleteButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(deleteTool()) ); - connect( d->mContent->mHelp, TQT_SIGNAL(leftClickedURL()), - this, TQT_SLOT(showCommandHelp()) ); - connect( d->mContent->mMoreTools, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(openURL(const TQString&)) ); + connect( d->mContent->mToolListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->mContent->mAddButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addTool()) ); + connect( d->mContent->mDeleteButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(deleteTool()) ); + connect( d->mContent->mHelp, TQ_SIGNAL(leftClickedURL()), + this, TQ_SLOT(showCommandHelp()) ); + connect( d->mContent->mMoreTools, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(openURL(const TQString&)) ); TDEListView* view=d->mContent->mToolListView; if (view->firstChild()) { diff --git a/src/gvcore/filedetailview.cpp b/src/gvcore/filedetailview.cpp index b965ee3..50d2b3f 100644 --- a/src/gvcore/filedetailview.cpp +++ b/src/gvcore/filedetailview.cpp @@ -87,29 +87,29 @@ FileDetailView::FileDetailView(TQWidget *parent, const char *name) setShowSortIndicator( TRUE ); setAllColumnsShowFocus( TRUE ); - connect( header(), TQT_SIGNAL( sectionClicked(int)), - TQT_SLOT(slotSortingChanged(int) )); + connect( header(), TQ_SIGNAL( sectionClicked(int)), + TQ_SLOT(slotSortingChanged(int) )); - connect( this, TQT_SIGNAL( returnPressed(TQListViewItem *) ), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQListViewItem *) ), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( selected( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( selected( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); + this, TQ_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); TQListView::setSelectionMode( TQListView::Extended ); - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); // FileViewStack need to be aware of sort changes, to update the sort menu - connect( sig, TQT_SIGNAL(sortingChanged(TQDir::SortSpec)), - this, TQT_SIGNAL(sortingChanged(TQDir::SortSpec)) ); + connect( sig, TQ_SIGNAL(sortingChanged(TQDir::SortSpec)), + this, TQ_SIGNAL(sortingChanged(TQDir::SortSpec)) ); setSorting( sorting() ); diff --git a/src/gvcore/fileoperation.cpp b/src/gvcore/fileoperation.cpp index d775113..cd26ade 100644 --- a/src/gvcore/fileoperation.cpp +++ b/src/gvcore/fileoperation.cpp @@ -51,40 +51,40 @@ void linkTo(const KURL::List& srcURL,TQWidget* parent) { void moveTo(const KURL::List& srcURL,TQWidget* parent,TQObject* receiver,const char* slot) { FileOpObject* op=new FileOpMoveToObject(srcURL,parent); - if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot); + if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot); (*op)(); } void makeDir(const KURL& parentURL, TQWidget* parent, TQObject* receiver, const char* slot) { FileOpObject* op=new FileOpMakeDirObject(parentURL, parent); - if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot); + if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot); (*op)(); } void del(const KURL::List& url,TQWidget* parent,TQObject* receiver,const char* slot) { FileOpObject* op = new FileOpDelObject(url,parent); - if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot); + if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot); (*op)(); } void trash(const KURL::List& url, TQWidget* parent, TQObject* receiver, const char* slot) { FileOpObject* op = new FileOpTrashObject(url,parent); - if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot); + if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot); (*op)(); } void realDelete(const KURL::List& url, TQWidget* parent, TQObject* receiver, const char* slot) { FileOpObject* op = new FileOpRealDeleteObject(url,parent); - if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(success()),receiver,slot); + if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(success()),receiver,slot); (*op)(); } void rename(const KURL& url,TQWidget* parent,TQObject* receiver,const char* slot) { FileOpObject* op=new FileOpRenameObject(url,parent); - if (receiver && slot) TQObject::connect(op,TQT_SIGNAL(renamed(const TQString&)),receiver,slot); + if (receiver && slot) TQObject::connect(op,TQ_SIGNAL(renamed(const TQString&)),receiver,slot); (*op)(); } @@ -92,11 +92,11 @@ 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(menu, urls, target, wasMoved); menu->insertItem( SmallIcon("goto"), i18n("&Move Here"), - context, TQT_SLOT(move()) ); + context, TQ_SLOT(move()) ); menu->insertItem( SmallIcon("edit-copy"), i18n("&Copy Here"), - context, TQT_SLOT(copy()) ); + context, TQ_SLOT(copy()) ); menu->insertItem( SmallIcon("www"), i18n("&Link Here"), - context, TQT_SLOT(link()) ); + context, TQ_SLOT(link()) ); } diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp index 9257af9..6e567d3 100644 --- a/src/gvcore/fileopobject.cpp +++ b/src/gvcore/fileopobject.cpp @@ -89,8 +89,8 @@ void FileOpObject::slotResult(TDEIO::Job* job) { void FileOpObject::polishJob(TDEIO::Job* job) { job->setWindow(mParent->topLevelWidget()); - connect( job, TQT_SIGNAL( result(TDEIO::Job*) ), - this, TQT_SLOT( slotResult(TDEIO::Job*) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job*) ), + this, TQ_SLOT( slotResult(TDEIO::Job*) ) ); } diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp index 8d883f8..b0c47b2 100644 --- a/src/gvcore/filethumbnailview.cpp +++ b/src/gvcore/filethumbnailview.cpp @@ -186,25 +186,25 @@ FileThumbnailView::FileThumbnailView(TQWidget* parent) // item is unselected after being clicked, so we use TDEIconView::Select mode // and emit the execute() signal with slotClicked() ourself. setMode(TDEIconView::Select); - connect(this, TQT_SIGNAL(clicked(TQIconViewItem*)), - this, TQT_SLOT(slotClicked(TQIconViewItem*)) ); - connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), - this, TQT_SLOT(slotDoubleClicked(TQIconViewItem*)) ); - - connect(this, TQT_SIGNAL(dropped(TQDropEvent*,const TQValueList<TQIconDragItem>&)), - this, TQT_SLOT(slotDropped(TQDropEvent*)) ); - connect(this, TQT_SIGNAL( contentsMoving( int, int )), - this, TQT_SLOT( slotContentsMoving( int, int ))); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQIconViewItem*)) ); + connect(this, TQ_SIGNAL(clicked(TQIconViewItem*)), + this, TQ_SLOT(slotClicked(TQIconViewItem*)) ); + connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), + this, TQ_SLOT(slotDoubleClicked(TQIconViewItem*)) ); + + connect(this, TQ_SIGNAL(dropped(TQDropEvent*,const TQValueList<TQIconDragItem>&)), + this, TQ_SLOT(slotDropped(TQDropEvent*)) ); + connect(this, TQ_SIGNAL( contentsMoving( int, int )), + this, TQ_SLOT( slotContentsMoving( int, int ))); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQIconViewItem*)) ); TQIconView::setSelectionMode(Extended); - connect(BusyLevelManager::instance(), TQT_SIGNAL(busyLevelChanged(BusyLevel)), - this, TQT_SLOT( slotBusyLevelChanged(BusyLevel))); + connect(BusyLevelManager::instance(), TQ_SIGNAL(busyLevelChanged(BusyLevel)), + this, TQ_SLOT( slotBusyLevelChanged(BusyLevel))); - connect(d->mThumbnailUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT( startThumbnailUpdate()) ); + connect(d->mThumbnailUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT( startThumbnailUpdate()) ); } @@ -367,16 +367,16 @@ void FileThumbnailView::doStartThumbnailUpdate(const KFileItemList* list) { Q_ASSERT(!d->mProgressWidget); d->mProgressWidget=new ProgressWidget(this, imageList.count() ); - connect(d->mProgressWidget->stopButton(), TQT_SIGNAL(clicked()), - this, TQT_SLOT(stopThumbnailUpdate()) ); + connect(d->mProgressWidget->stopButton(), TQ_SIGNAL(clicked()), + this, TQ_SLOT(stopThumbnailUpdate()) ); d->mProgressWidget->show(); d->mThumbnailLoadJob = new ThumbnailLoadJob(&imageList, d->mThumbnailSize); - connect(d->mThumbnailLoadJob, TQT_SIGNAL(thumbnailLoaded(const KFileItem*, const TQPixmap&, const TQSize&)), - this, TQT_SLOT(setThumbnailPixmap(const KFileItem*,const TQPixmap&, const TQSize&)) ); - connect(d->mThumbnailLoadJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotUpdateEnded()) ); + connect(d->mThumbnailLoadJob, TQ_SIGNAL(thumbnailLoaded(const KFileItem*, const TQPixmap&, const TQSize&)), + this, TQ_SLOT(setThumbnailPixmap(const KFileItem*,const TQPixmap&, const TQSize&)) ); + connect(d->mThumbnailLoadJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotUpdateEnded()) ); slotBusyLevelChanged( BusyLevelManager::instance()->busyLevel()); // start updating at visible position @@ -587,7 +587,7 @@ void FileThumbnailView::showEvent(TQShowEvent* event) { if (!d->mUpdateThumbnailsOnNextShow) return; d->mUpdateThumbnailsOnNextShow=false; - TQTimer::singleShot(0, this, TQT_SLOT(startThumbnailUpdate())); + TQTimer::singleShot(0, this, TQ_SLOT(startThumbnailUpdate())); } @@ -682,7 +682,7 @@ void FileThumbnailView::slotCurrentChanged(TQIconViewItem* item ) { d->mPrefetch = ImageLoader::loader( static_cast<const FileThumbnailViewItem*>( cur->nextItem() )->fileItem()->url(), this, BUSY_PRELOADING ); - connect( d->mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); + connect( d->mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone())); } } } @@ -757,7 +757,7 @@ void FileThumbnailView::keyPressEvent( TQKeyEvent* e ) { d->mPrefetch = ImageLoader::loader( static_cast<const FileThumbnailViewItem*>( next )->fileItem()->url(), this, BUSY_PRELOADING ); - connect( d->mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); + connect( d->mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone())); } } diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp index b5c073d..4426658 100644 --- a/src/gvcore/fileviewcontroller.cpp +++ b/src/gvcore/fileviewcontroller.cpp @@ -199,18 +199,18 @@ public: mFilterBar->mResetTo->setIconSet(resetIS); TQObject::connect( - mFilterBar->mResetNameCombo, TQT_SIGNAL(clicked()), - that, TQT_SLOT(resetNameFilter()) ); + mFilterBar->mResetNameCombo, TQ_SIGNAL(clicked()), + that, TQ_SLOT(resetNameFilter()) ); TQObject::connect( - mFilterBar->mResetFrom, TQT_SIGNAL(clicked()), - that, TQT_SLOT(resetFromFilter()) ); + mFilterBar->mResetFrom, TQ_SIGNAL(clicked()), + that, TQ_SLOT(resetFromFilter()) ); TQObject::connect( - mFilterBar->mResetTo, TQT_SIGNAL(clicked()), - that, TQT_SLOT(resetToFilter()) ); + mFilterBar->mResetTo, TQ_SIGNAL(clicked()), + that, TQ_SLOT(resetToFilter()) ); TQObject::connect( - mFilterBar->mFilterButton, TQT_SIGNAL(clicked()), - that, TQT_SLOT(applyFilter()) ); + mFilterBar->mFilterButton, TQ_SIGNAL(clicked()), + that, TQ_SLOT(applyFilter()) ); } void initFilterCombo() { @@ -223,16 +223,16 @@ public: mFilterComboBox->insertItem(i18n("Videos only"), VIDEOS_ONLY); TQObject::connect( - mFilterComboBox, TQT_SIGNAL(activated(int)), - that, TQT_SLOT(applyFilter()) ); + mFilterComboBox, TQ_SIGNAL(activated(int)), + that, TQ_SLOT(applyFilter()) ); mShowFilterBarCheckBox = new TQCheckBox(i18n("More"), mFilterHBox); TQObject::connect( - mShowFilterBarCheckBox, TQT_SIGNAL(toggled(bool)), - mFilterBar, TQT_SLOT(setShown(bool)) ); + mShowFilterBarCheckBox, TQ_SIGNAL(toggled(bool)), + mFilterBar, TQ_SLOT(setShown(bool)) ); TQObject::connect( - mShowFilterBarCheckBox, TQT_SIGNAL(toggled(bool)), - that, TQT_SLOT(applyFilter()) ); + mShowFilterBarCheckBox, TQ_SIGNAL(toggled(bool)), + that, TQ_SLOT(applyFilter()) ); } @@ -275,36 +275,36 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act // Actions mSelectFirst=new TDEAction(i18n("&First"), TQApplication::reverseLayout() ? "2rightarrow":"2leftarrow", Key_Home, - this,TQT_SLOT(slotSelectFirst()), actionCollection, "first"); + this,TQ_SLOT(slotSelectFirst()), actionCollection, "first"); mSelectLast=new TDEAction(i18n("&Last"), TQApplication::reverseLayout() ? "2leftarrow":"2rightarrow", Key_End, - this,TQT_SLOT(slotSelectLast()), actionCollection, "last"); + this,TQ_SLOT(slotSelectLast()), actionCollection, "last"); mSelectPrevious=new TDEAction(i18n("&Previous"), TQApplication::reverseLayout() ? "1rightarrow":"1leftarrow", Key_BackSpace, - this,TQT_SLOT(slotSelectPrevious()), actionCollection, "previous"); + this,TQ_SLOT(slotSelectPrevious()), actionCollection, "previous"); mSelectNext=new TDEAction(i18n("&Next"), TQApplication::reverseLayout() ? "1leftarrow":"1rightarrow", Key_Space, - this,TQT_SLOT(slotSelectNext()), actionCollection, "next"); + this,TQ_SLOT(slotSelectNext()), actionCollection, "next"); mSelectPreviousDir=new TDEAction(i18n("&Previous Folder"), TQApplication::reverseLayout() ? "media-seek-forward":"media-seek-backward", ALT + Key_BackSpace, - this,TQT_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder"); + this,TQ_SLOT(slotSelectPreviousDir()), actionCollection, "previous_folder"); mSelectNextDir=new TDEAction(i18n("&Next Folder"), TQApplication::reverseLayout() ? "media-seek-backward":"media-seek-forward", ALT + Key_Space, - this,TQT_SLOT(slotSelectNextDir()), actionCollection, "next_folder"); + this,TQ_SLOT(slotSelectNextDir()), actionCollection, "next_folder"); mSelectFirstSubDir=new TDEAction(i18n("&First Sub Folder"), "go-down", ALT + Key_Down, - this,TQT_SLOT(slotSelectFirstSubDir()), actionCollection, "first_sub_folder"); + this,TQ_SLOT(slotSelectFirstSubDir()), actionCollection, "first_sub_folder"); - mListMode=new TDERadioAction(i18n("Details"),"view_detailed",0,this,TQT_SLOT(updateViewMode()),actionCollection,"list_mode"); + mListMode=new TDERadioAction(i18n("Details"),"view_detailed",0,this,TQ_SLOT(updateViewMode()),actionCollection,"list_mode"); mListMode->setExclusiveGroup("thumbnails"); - mSideThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,this,TQT_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode"); + mSideThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Side"),"view_multicolumn",0,this,TQ_SLOT(updateViewMode()),actionCollection,"side_thumbnail_mode"); mSideThumbnailMode->setExclusiveGroup("thumbnails"); - mBottomThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,this,TQT_SLOT(updateViewMode()),actionCollection,"bottom_thumbnail_mode"); + mBottomThumbnailMode=new TDERadioAction(i18n("Thumbnails with Info on Bottom"),"view_icon",0,this,TQ_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)), this, TQT_SLOT(updateThumbnailSize(int)) ); - connect(mListMode, TQT_SIGNAL(toggled(bool)), mSizeSlider, TQT_SLOT(setDisabled(bool)) ); + connect(mSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateThumbnailSize(int)) ); + connect(mListMode, TQ_SIGNAL(toggled(bool)), mSizeSlider, TQ_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,this,TQT_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files"); + mShowDotFiles=new TDEToggleAction(i18n("Show &Hidden Files"),CTRL + Key_H,this,TQ_SLOT(toggleShowDotFiles()),actionCollection,"show_dot_files"); - d->mSortAction=new TDESelectAction(i18n("Sort"), 0, this, TQT_SLOT(setSorting()), actionCollection, "view_sort"); + d->mSortAction=new TDESelectAction(i18n("Sort"), 0, this, TQ_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, this, TQT_SLOT(setSorting()), actionCollection, "descending"); + d->mRevertSortAction=new TDEToggleAction(i18n("Descending"),0, this, TQ_SLOT(setSorting()), actionCollection, "descending"); TQPopupMenu* sortMenu=d->mSortAction->popupMenu(); Q_ASSERT(sortMenu); sortMenu->insertSeparator(); @@ -338,85 +338,85 @@ FileViewController::FileViewController(TQWidget* parent,TDEActionCollection* act // Dir lister mDirLister=new DirLister; mDirLister->setMainWindow(topLevelWidget()); - connect(mDirLister,TQT_SIGNAL(clear()), - this,TQT_SLOT(dirListerClear()) ); + connect(mDirLister,TQ_SIGNAL(clear()), + this,TQ_SLOT(dirListerClear()) ); - connect(mDirLister,TQT_SIGNAL(newItems(const KFileItemList&)), - this,TQT_SLOT(dirListerNewItems(const KFileItemList&)) ); + connect(mDirLister,TQ_SIGNAL(newItems(const KFileItemList&)), + this,TQ_SLOT(dirListerNewItems(const KFileItemList&)) ); - connect(mDirLister,TQT_SIGNAL(deleteItem(KFileItem*)), - this,TQT_SLOT(dirListerDeleteItem(KFileItem*)) ); + connect(mDirLister,TQ_SIGNAL(deleteItem(KFileItem*)), + this,TQ_SLOT(dirListerDeleteItem(KFileItem*)) ); - connect(mDirLister,TQT_SIGNAL(refreshItems(const KFileItemList&)), - this,TQT_SLOT(dirListerRefreshItems(const KFileItemList&)) ); + connect(mDirLister,TQ_SIGNAL(refreshItems(const KFileItemList&)), + this,TQ_SLOT(dirListerRefreshItems(const KFileItemList&)) ); - connect(mDirLister,TQT_SIGNAL(started(const KURL&)), - this,TQT_SLOT(dirListerStarted()) ); + connect(mDirLister,TQ_SIGNAL(started(const KURL&)), + this,TQ_SLOT(dirListerStarted()) ); - connect(mDirLister,TQT_SIGNAL(completed()), - this,TQT_SLOT(dirListerCompleted()) ); + connect(mDirLister,TQ_SIGNAL(completed()), + this,TQ_SLOT(dirListerCompleted()) ); - connect(mDirLister,TQT_SIGNAL(canceled()), - this,TQT_SLOT(dirListerCanceled()) ); + connect(mDirLister,TQ_SIGNAL(canceled()), + this,TQ_SLOT(dirListerCanceled()) ); // Propagate canceled signals - connect(mDirLister,TQT_SIGNAL(canceled()), - this,TQT_SIGNAL(canceled()) ); + connect(mDirLister,TQ_SIGNAL(canceled()), + this,TQ_SIGNAL(canceled()) ); // File detail widget mFileDetailView=new FileDetailView(d->mStack, "filedetailview"); d->mStack->addWidget(mFileDetailView,0); mFileDetailView->viewport()->installEventFilter(this); - connect(mFileDetailView,TQT_SIGNAL(executed(TQListViewItem*)), - this,TQT_SLOT(slotViewExecuted()) ); - connect(mFileDetailView,TQT_SIGNAL(returnPressed(TQListViewItem*)), - this,TQT_SLOT(slotViewExecuted()) ); - connect(mFileDetailView,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(slotViewClicked()) ); - connect(mFileDetailView,TQT_SIGNAL(selectionChanged()), - this,TQT_SLOT(slotViewClicked()) ); - connect(mFileDetailView,TQT_SIGNAL(clicked(TQListViewItem*)), - this,TQT_SLOT(slotViewClicked()) ); - connect(mFileDetailView,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this,TQT_SLOT(openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect(mFileDetailView,TQT_SIGNAL(dropped(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*)), - this, TQT_SLOT(slotViewDoubleClicked()) ); - connect(mFileDetailView, TQT_SIGNAL(selectionChanged()), - this, TQT_SIGNAL(selectionChanged()) ); + connect(mFileDetailView,TQ_SIGNAL(executed(TQListViewItem*)), + this,TQ_SLOT(slotViewExecuted()) ); + connect(mFileDetailView,TQ_SIGNAL(returnPressed(TQListViewItem*)), + this,TQ_SLOT(slotViewExecuted()) ); + connect(mFileDetailView,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(slotViewClicked()) ); + connect(mFileDetailView,TQ_SIGNAL(selectionChanged()), + this,TQ_SLOT(slotViewClicked()) ); + connect(mFileDetailView,TQ_SIGNAL(clicked(TQListViewItem*)), + this,TQ_SLOT(slotViewClicked()) ); + connect(mFileDetailView,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this,TQ_SLOT(openContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect(mFileDetailView,TQ_SIGNAL(dropped(TQDropEvent*,KFileItem*)), + this,TQ_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) ); + connect(mFileDetailView, TQ_SIGNAL(sortingChanged(TQDir::SortSpec)), + this, TQ_SLOT(updateSortMenu(TQDir::SortSpec)) ); + connect(mFileDetailView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotViewDoubleClicked()) ); + connect(mFileDetailView, TQ_SIGNAL(selectionChanged()), + this, TQ_SIGNAL(selectionChanged()) ); // Thumbnail widget mFileThumbnailView=new FileThumbnailView(d->mStack); d->mStack->addWidget(mFileThumbnailView,1); mFileThumbnailView->viewport()->installEventFilter(this); - connect(mFileThumbnailView,TQT_SIGNAL(executed(TQIconViewItem*)), - this,TQT_SLOT(slotViewExecuted()) ); - connect(mFileThumbnailView,TQT_SIGNAL(returnPressed(TQIconViewItem*)), - this,TQT_SLOT(slotViewExecuted()) ); - connect(mFileThumbnailView,TQT_SIGNAL(currentChanged(TQIconViewItem*)), - this,TQT_SLOT(slotViewClicked()) ); - connect(mFileThumbnailView,TQT_SIGNAL(selectionChanged()), - this,TQT_SLOT(slotViewClicked()) ); - connect(mFileThumbnailView,TQT_SIGNAL(clicked(TQIconViewItem*)), - this,TQT_SLOT(slotViewClicked()) ); - connect(mFileThumbnailView,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), - this,TQT_SLOT(openContextMenu(TQIconViewItem*,const TQPoint&)) ); - connect(mFileThumbnailView,TQT_SIGNAL(dropped(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()) ); + connect(mFileThumbnailView,TQ_SIGNAL(executed(TQIconViewItem*)), + this,TQ_SLOT(slotViewExecuted()) ); + connect(mFileThumbnailView,TQ_SIGNAL(returnPressed(TQIconViewItem*)), + this,TQ_SLOT(slotViewExecuted()) ); + connect(mFileThumbnailView,TQ_SIGNAL(currentChanged(TQIconViewItem*)), + this,TQ_SLOT(slotViewClicked()) ); + connect(mFileThumbnailView,TQ_SIGNAL(selectionChanged()), + this,TQ_SLOT(slotViewClicked()) ); + connect(mFileThumbnailView,TQ_SIGNAL(clicked(TQIconViewItem*)), + this,TQ_SLOT(slotViewClicked()) ); + connect(mFileThumbnailView,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), + this,TQ_SLOT(openContextMenu(TQIconViewItem*,const TQPoint&)) ); + connect(mFileThumbnailView,TQ_SIGNAL(dropped(TQDropEvent*,KFileItem*)), + this,TQ_SLOT(openDropURLMenu(TQDropEvent*, KFileItem*)) ); + connect(mFileThumbnailView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), + this, TQ_SLOT(slotViewDoubleClicked()) ); + connect(mFileThumbnailView, TQ_SIGNAL(selectionChanged()), + this, TQ_SIGNAL(selectionChanged()) ); // 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)) ); + TDEAction* thumbnailDetailsDialogAction=new TDEAction(i18n("Edit Thumbnail Details..."), "configure", 0, mFileThumbnailView, TQ_SLOT(showThumbnailDetailsDialog()), actionCollection, "thumbnail_details_dialog"); + connect(mBottomThumbnailMode, TQ_SIGNAL(toggled(bool)), + thumbnailDetailsDialogAction, TQ_SLOT(setEnabled(bool)) ); // Fill toolbar mListMode->plug(d->mToolBar); @@ -543,7 +543,7 @@ void FileViewController::prefetch( KFileItem* item ) { prefetchDone(); if( item == NULL ) return; mPrefetch = ImageLoader::loader( item->url(), this, BUSY_PRELOADING ); - connect( mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); + connect( mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone())); } void FileViewController::prefetchDone() { @@ -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,this,TQT_SLOT(delayedDirListerCompleted())); + TQTimer::singleShot(0,this,TQ_SLOT(delayedDirListerCompleted())); } diff --git a/src/gvcore/fullscreenbar.cpp b/src/gvcore/fullscreenbar.cpp index 159ce90..493dfd0 100644 --- a/src/gvcore/fullscreenbar.cpp +++ b/src/gvcore/fullscreenbar.cpp @@ -92,7 +92,7 @@ FullScreenBar::FullScreenBar(TQWidget* parent) setPalette(pal); // Timer - connect(&d->mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateSlide()) ); + connect(&d->mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateSlide()) ); } diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp index a17a7a8..406a378 100644 --- a/src/gvcore/imageloader.cpp +++ b/src/gvcore/imageloader.cpp @@ -148,7 +148,7 @@ void DecoderThread::run() { if (!ok) { LOG("failed"); - postSignal( this, TQT_SIGNAL(failed()) ); + postSignal( this, TQ_SIGNAL(failed()) ); return; } @@ -157,7 +157,7 @@ void DecoderThread::run() { } LOG("succeeded, emitting signal"); - postSignal( this, TQT_SIGNAL(succeeded()) ); + postSignal( this, TQ_SIGNAL(succeeded()) ); } @@ -288,8 +288,8 @@ public: ImageLoader::ImageLoader() { LOG(""); d = new ImageLoaderPrivate(this); - connect( BusyLevelManager::instance(), TQT_SIGNAL( busyLevelChanged(BusyLevel)), - this, TQT_SLOT( slotBusyLevelChanged(BusyLevel))); + connect( BusyLevelManager::instance(), TQ_SIGNAL( busyLevelChanged(BusyLevel)), + this, TQ_SLOT( slotBusyLevelChanged(BusyLevel))); } @@ -312,12 +312,12 @@ void ImageLoader::startLoading() { d->mTimestamp = Cache::instance()->timestamp( d->mURL ); slotBusyLevelChanged( BusyLevelManager::instance()->busyLevel()); - connect(&d->mDecoderTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(decodeChunk()) ); + connect(&d->mDecoderTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(decodeChunk()) ); - connect(&d->mDecoderThread, TQT_SIGNAL(succeeded()), - this, TQT_SLOT(slotDecoderThreadSucceeded()) ); - connect(&d->mDecoderThread, TQT_SIGNAL(failed()), - this, TQT_SLOT(slotDecoderThreadFailed()) ); + connect(&d->mDecoderThread, TQ_SIGNAL(succeeded()), + this, TQ_SLOT(slotDecoderThreadSucceeded()) ); + connect(&d->mDecoderThread, TQ_SIGNAL(failed()), + this, TQ_SLOT(slotDecoderThreadFailed()) ); checkPendingStat(); } @@ -327,8 +327,8 @@ void ImageLoader::checkPendingStat() { TDEIO::Job* job=TDEIO::stat( d->mURL, false ); job->setWindow(TDEApplication::kApplication()->mainWidget()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotStatResult(TDEIO::Job*)) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotStatResult(TDEIO::Job*)) ); d->mGetState = GET_STATING; } @@ -394,11 +394,11 @@ void ImageLoader::checkPendingGet() { TDEIO::Job* getJob=TDEIO::get( d->mURL, false, false); getJob->setWindow(TDEApplication::kApplication()->mainWidget()); - connect(getJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(slotDataReceived(TDEIO::Job*, const TQByteArray&)) ); + connect(getJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(slotDataReceived(TDEIO::Job*, const TQByteArray&)) ); - connect(getJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotGetResult(TDEIO::Job*)) ); + connect(getJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotGetResult(TDEIO::Job*)) ); d->mTimeSinceLastUpdate.start(); d->mGetState = GET_GETTING; @@ -655,7 +655,7 @@ void ImageLoader::end() { // when we return from this function we will be in decodeChunk(), after the // call to decode(), so we don't want to switch to a new impl yet, since // this means deleting "this". - TQTimer::singleShot(0, this, TQT_SLOT(callFinish()) ); + TQTimer::singleShot(0, this, TQ_SLOT(callFinish()) ); } @@ -858,7 +858,7 @@ void ImageLoader::ref( const TQObject* owner, BusyLevel priority ) { data.owner = owner; data.priority = priority; d->mOwners.append( data ); - connect( owner, TQT_SIGNAL( destroyed()), TQT_SLOT( ownerDestroyed())); + connect( owner, TQ_SIGNAL( destroyed()), TQ_SLOT( ownerDestroyed())); } void ImageLoader::deref( const TQObject* owner ) { @@ -909,7 +909,7 @@ ImageLoader* ImageLoader::loader( const KURL& url, const TQObject* owner, BusyLe // This also helps with preloading jobs, since BUSY_LOADING busy level is not entered immediately // when a new picture is selected, so preloading jobs without this delay could start working // immediately. - TQTimer::singleShot( priority >= BUSY_LOADING ? 0 : 10, loader, TQT_SLOT( startLoading())); + TQTimer::singleShot( priority >= BUSY_LOADING ? 0 : 10, loader, TQ_SLOT( startLoading())); return loader; } diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp index 20d532d..8d524f1 100644 --- a/src/gvcore/imagesavedialog.cpp +++ b/src/gvcore/imagesavedialog.cpp @@ -97,12 +97,12 @@ ImageSaveDialog::ImageSaveDialog(KURL& url, const TQCString& imageFormat, TQWidg // Tweak the filter widget filterWidget->setEditable(false); - connect(filterWidget,TQT_SIGNAL(activated(const TQString&)), - this,TQT_SLOT(updateImageFormat(const TQString&)) ); + connect(filterWidget,TQ_SIGNAL(activated(const TQString&)), + this,TQ_SLOT(updateImageFormat(const TQString&)) ); // Call slotFilterChanged() to get the list filtered by the filter we // selected. If we don't use a single shot, it leads to a crash :-/ - TQTimer::singleShot(0,this,TQT_SLOT(slotFilterChanged())); + TQTimer::singleShot(0,this,TQ_SLOT(slotFilterChanged())); } diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index 2525b7b..371eff4 100644 --- a/src/gvcore/imageview.cpp +++ b/src/gvcore/imageview.cpp @@ -324,32 +324,32 @@ 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)), - this, TQT_SLOT(setZoomToFit(bool)) ); + connect(d->mZoomToFit,TQ_SIGNAL(toggled(bool)), + this, TQ_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)), - this, TQT_SLOT(setZoomToWidth(bool)) ); + connect(d->mZoomToWidth,TQ_SIGNAL(toggled(bool)), + this, TQ_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)), - this, TQT_SLOT(setZoomToHeight(bool)) ); + connect(d->mZoomToHeight,TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setZoomToHeight(bool)) ); - d->mZoomIn=KStdAction::zoomIn(this,TQT_SLOT(slotZoomIn()),d->mActionCollection); + d->mZoomIn=KStdAction::zoomIn(this,TQ_SLOT(slotZoomIn()),d->mActionCollection); - d->mZoomOut=KStdAction::zoomOut(this,TQT_SLOT(slotZoomOut()),d->mActionCollection); + d->mZoomOut=KStdAction::zoomOut(this,TQ_SLOT(slotZoomOut()),d->mActionCollection); - d->mResetZoom=KStdAction::actualSize(this,TQT_SLOT(slotResetZoom()),d->mActionCollection); + d->mResetZoom=KStdAction::actualSize(this,TQ_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)), - this, TQT_SLOT(setLockZoom(bool)) ); + connect(d->mLockZoom,TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setLockZoom(bool)) ); d->mZoomCombo=new TQComboBox(true); // Avoid stealing focus d->mZoomCombo->setFocusPolicy(TQWidget::ClickFocus); - connect(d->mZoomCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSelectZoom()) ); + connect(d->mZoomCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSelectZoom()) ); d->mZoomComboAction=new KWidgetAction(d->mZoomCombo, i18n("Zoom"), 0, 0, 0, d->mActionCollection, "view_zoom_to"); @@ -362,41 +362,41 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a d->initZoomCombo(); d->mAdjustBCG=new TDEAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0, - this, TQT_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg"); + this, TQ_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg"); d->mIncreaseGamma=new TDEAction(i18n("Increase Gamma"),0,CTRL+Key_G, - this, TQT_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma"); + this, TQ_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma"); d->mDecreaseGamma=new TDEAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G, - this, TQT_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma"); + this, TQ_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma"); d->mIncreaseBrightness=new TDEAction(i18n("Increase Brightness" ),0,CTRL+Key_B, - this, TQT_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness"); + this, TQ_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness"); d->mDecreaseBrightness=new TDEAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B, - this, TQT_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness"); + this, TQ_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness"); d->mIncreaseContrast=new TDEAction(i18n("Increase Contrast" ),0,CTRL+Key_C, - this, TQT_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast"); + this, TQ_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast"); d->mDecreaseContrast=new TDEAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C, - this, TQT_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast"); + this, TQ_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast"); // Connect to some interesting signals - connect(d->mDocument,TQT_SIGNAL(loaded(const KURL&)), - this, TQT_SLOT(slotLoaded()) ); + connect(d->mDocument,TQ_SIGNAL(loaded(const KURL&)), + this, TQ_SLOT(slotLoaded()) ); - connect(d->mDocument,TQT_SIGNAL(loading()), - this, TQT_SLOT( loadingStarted()) ); + connect(d->mDocument,TQ_SIGNAL(loading()), + this, TQ_SLOT( loadingStarted()) ); - connect(d->mDocument,TQT_SIGNAL(modified()), - this, TQT_SLOT(slotModified()) ); + connect(d->mDocument,TQ_SIGNAL(modified()), + this, TQ_SLOT(slotModified()) ); - connect(d->mDocument, TQT_SIGNAL(sizeUpdated()), - this, TQT_SLOT(slotImageSizeUpdated()) ); + connect(d->mDocument, TQ_SIGNAL(sizeUpdated()), + this, TQ_SLOT(slotImageSizeUpdated()) ); - connect(d->mDocument, TQT_SIGNAL(rectUpdated(const TQRect&)), - this, TQT_SLOT(slotImageRectUpdated(const TQRect&)) ); + connect(d->mDocument, TQ_SIGNAL(rectUpdated(const TQRect&)), + this, TQ_SLOT(slotImageRectUpdated(const TQRect&)) ); - connect(&d->mPendingPaintTimer,TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkPendingOperations()) ); + connect(&d->mPendingPaintTimer,TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkPendingOperations()) ); - connect(BusyLevelManager::instance(),TQT_SIGNAL(busyLevelChanged(BusyLevel)), - this, TQT_SLOT(slotBusyLevelChanged(BusyLevel) )); + connect(BusyLevelManager::instance(),TQ_SIGNAL(busyLevelChanged(BusyLevel)), + this, TQ_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 diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 03e81dc..b2e9c31 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -293,22 +293,22 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, T d->mFullScreen=false; d->mFullScreenBar=0; - connect(d->mDocument,TQT_SIGNAL(loaded(const KURL&)), - this,TQT_SLOT(slotLoaded()) ); + connect(d->mDocument,TQ_SIGNAL(loaded(const KURL&)), + this,TQ_SLOT(slotLoaded()) ); - connect(d->mImageView, TQT_SIGNAL(requestContextMenu(const TQPoint&)), - this, TQT_SLOT(openImageViewContextMenu(const TQPoint&)) ); + connect(d->mImageView, TQ_SIGNAL(requestContextMenu(const TQPoint&)), + this, TQ_SLOT(openImageViewContextMenu(const TQPoint&)) ); - connect(d->mImageView, TQT_SIGNAL(requestHintDisplay(const TQString&)), - this, TQT_SIGNAL(requestHintDisplay(const TQString&)) ); + connect(d->mImageView, TQ_SIGNAL(requestHintDisplay(const TQString&)), + this, TQ_SIGNAL(requestHintDisplay(const TQString&)) ); - connect(d->mAutoHideTimer,TQT_SIGNAL(timeout()), - this,TQT_SLOT(slotAutoHide()) ); + connect(d->mAutoHideTimer,TQ_SIGNAL(timeout()), + this,TQ_SLOT(slotAutoHide()) ); // Forward Image view signals - connect(d->mImageView, TQT_SIGNAL(selectPrevious()), TQT_SIGNAL(selectPrevious()) ); - connect(d->mImageView, TQT_SIGNAL(selectNext()), TQT_SIGNAL(selectNext()) ); - connect(d->mImageView, TQT_SIGNAL(doubleClicked()), TQT_SIGNAL(doubleClicked()) ); + connect(d->mImageView, TQ_SIGNAL(selectPrevious()), TQ_SIGNAL(selectPrevious()) ); + connect(d->mImageView, TQ_SIGNAL(selectNext()), TQ_SIGNAL(selectNext()) ); + connect(d->mImageView, TQ_SIGNAL(doubleClicked()), TQ_SIGNAL(doubleClicked()) ); } diff --git a/src/gvcore/inputdialog.cpp b/src/gvcore/inputdialog.cpp index 3a08d5c..b2a64f6 100644 --- a/src/gvcore/inputdialog.cpp +++ b/src/gvcore/inputdialog.cpp @@ -48,8 +48,8 @@ InputDialog::InputDialog(TQWidget* parent) setMinimumWidth(350); - connect(d->mLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateButtons()) ); + connect(d->mLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateButtons()) ); } diff --git a/src/gvcore/printdialog.cpp b/src/gvcore/printdialog.cpp index bf3f05f..0a75b4f 100644 --- a/src/gvcore/printdialog.cpp +++ b/src/gvcore/printdialog.cpp @@ -84,10 +84,10 @@ PrintDialogPage::PrintDialogPage( Document* document, TQWidget *parent, const ch TQVBoxLayout *layout = new TQVBoxLayout( this ); layout->addWidget( mContent ); - connect(mContent->mWidth, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotWidthChanged( double ))); - connect(mContent->mHeight, TQT_SIGNAL( valueChanged( double )), TQT_SLOT( slotHeightChanged( double ))); - connect(mContent->mKeepRatio, TQT_SIGNAL( toggled( bool )), TQT_SLOT( toggleRatio( bool ))); - connect(mContent->mUnit, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(slotUnitChanged(const TQString& ))); + connect(mContent->mWidth, TQ_SIGNAL( valueChanged( double )), TQ_SLOT( slotWidthChanged( double ))); + connect(mContent->mHeight, TQ_SIGNAL( valueChanged( double )), TQ_SLOT( slotHeightChanged( double ))); + connect(mContent->mKeepRatio, TQ_SIGNAL( toggled( bool )), TQ_SLOT( toggleRatio( bool ))); + connect(mContent->mUnit, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(slotUnitChanged(const TQString& ))); mPreviousUnit = GV_MILLIMETERS; } diff --git a/src/gvcore/slideshow.cpp b/src/gvcore/slideshow.cpp index 6e3db94..e8867ad 100644 --- a/src/gvcore/slideshow.cpp +++ b/src/gvcore/slideshow.cpp @@ -50,10 +50,10 @@ namespace Gwenview { SlideShow::SlideShow(Document* document) : mDocument(document), mStarted(false), mPrefetch( NULL ) { mTimer=new TQTimer(this); - connect(mTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTimeout()) ); - connect(mDocument, TQT_SIGNAL(loaded(const KURL&)), - this, TQT_SLOT(slotLoaded()) ); + connect(mTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTimeout()) ); + connect(mDocument, TQ_SIGNAL(loaded(const KURL&)), + this, TQ_SLOT(slotLoaded()) ); } SlideShow::~SlideShow() { @@ -173,8 +173,8 @@ void SlideShow::prefetch() { if( !mPriorityURL.isEmpty()) Cache::instance()->setPriorityURL( mPriorityURL, false ); mPriorityURL = *it; Cache::instance()->setPriorityURL( mPriorityURL, true ); // make sure it will stay in the cache - connect( mPrefetch, TQT_SIGNAL( urlKindDetermined()), TQT_SLOT( slotUrlKindDetermined())); - connect( mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); + connect( mPrefetch, TQ_SIGNAL( urlKindDetermined()), TQ_SLOT( slotUrlKindDetermined())); + connect( mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone())); if (mPrefetch->urlKind()==MimeTypeUtils::KIND_FILE) { // Prefetch is already done, and this is not a raster image diff --git a/src/gvcore/threadgate.cpp b/src/gvcore/threadgate.cpp index d5907ec..098e183 100644 --- a/src/gvcore/threadgate.cpp +++ b/src/gvcore/threadgate.cpp @@ -32,8 +32,8 @@ namespace Gwenview { // there's even no need to do any locking. ThreadGate::ThreadGate() { - connect( this, TQT_SIGNAL( signalColor( TQColor&, const char* )), - this, TQT_SLOT( slotColor( TQColor&, const char* ))); + connect( this, TQ_SIGNAL( signalColor( TQColor&, const char* )), + this, TQ_SLOT( slotColor( TQColor&, const char* ))); } ThreadGate* ThreadGate::instance() { @@ -48,7 +48,7 @@ TQColor ThreadGate::color( const char* name ) { if( TSThread::currentThread() == TSThread::mainThread()) return TQColor( name ); TQColor col; - TSThread::currentThread()->emitCancellableSignal( this, TQT_SIGNAL( signalColor( TQColor&, const char* )), col, name ); + TSThread::currentThread()->emitCancellableSignal( this, TQ_SIGNAL( signalColor( TQColor&, const char* )), col, name ); return col; } diff --git a/src/gvcore/thumbnaildetailsdialog.cpp b/src/gvcore/thumbnaildetailsdialog.cpp index 87acbe5..9fa3276 100644 --- a/src/gvcore/thumbnaildetailsdialog.cpp +++ b/src/gvcore/thumbnaildetailsdialog.cpp @@ -52,10 +52,10 @@ ThumbnailDetailsDialog::ThumbnailDetailsDialog(FileThumbnailView* view) d->mContent->mShowFileSize->setChecked(details & FileThumbnailView::FILESIZE); d->mContent->mShowImageSize->setChecked(details & FileThumbnailView::IMAGESIZE); - connect(d->mContent->mShowFileName, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) ); - connect(d->mContent->mShowFileDate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) ); - connect(d->mContent->mShowFileSize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) ); - connect(d->mContent->mShowImageSize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(applyChanges()) ); + connect(d->mContent->mShowFileName, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) ); + connect(d->mContent->mShowFileDate, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) ); + connect(d->mContent->mShowFileSize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) ); + connect(d->mContent->mShowImageSize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(applyChanges()) ); } ThumbnailDetailsDialog::~ThumbnailDetailsDialog() { diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index 7969855..826d641 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/src/gvcore/thumbnailloadjob.cpp @@ -123,7 +123,7 @@ void ThumbnailThread::run() { loadThumbnail(); mPixPath = TQString(); // done, ready for next TQSize size(mOriginalWidth, mOriginalHeight); - emitCancellableSignal( this, TQT_SIGNAL( done( const TQImage&, const TQSize&)), mImage, size); + emitCancellableSignal( this, TQ_SIGNAL( done( const TQImage&, const TQSize&)), mImage, size); } } @@ -387,8 +387,8 @@ ThumbnailLoadJob::ThumbnailLoadJob(const TQValueVector<const KFileItem*>* items, tqFill( mProcessedState.begin(), mProcessedState.end(), false ); mCurrentItem = NULL; - connect(&mThumbnailThread, TQT_SIGNAL(done(const TQImage&, const TQSize&)), - TQT_SLOT(thumbnailReady(const TQImage&, const TQSize&)) ); + connect(&mThumbnailThread, TQ_SIGNAL(done(const TQImage&, const TQSize&)), + TQ_SLOT(thumbnailReady(const TQImage&, const TQSize&)) ); Cache::instance()->updateAge(); // see addThumbnail in Cache } @@ -548,7 +548,7 @@ void ThumbnailLoadJob::determineNextIcon() { KDE_struct_stat buff; if ( KDE_stat( TQFile::encodeName(mCurrentURL.path()), &buff ) == 0 ) { mOriginalTime = buff.st_mtime; - TQTimer::singleShot( 0, this, TQT_SLOT( checkThumbnail())); + TQTimer::singleShot( 0, this, TQ_SLOT( checkThumbnail())); } } if( mOriginalTime == 0 ) { // TDEIO must be used @@ -711,10 +711,10 @@ void ThumbnailLoadJob::checkThumbnail() { list.append(mCurrentItem); TDEIO::Job* job=TDEIO::filePreview(list, mThumbnailSize); job->setWindow(TDEApplication::kApplication()->mainWidget()); - connect(job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - this, TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) ); - connect(job, TQT_SIGNAL(failed(const KFileItem*)), - this, TQT_SLOT(emitThumbnailLoadingFailed()) ); + connect(job, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + this, TQ_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) ); + connect(job, TQ_SIGNAL(failed(const KFileItem*)), + this, TQ_SLOT(emitThumbnailLoadingFailed()) ); addSubjob(job); return; } diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp index d836f48..186439a 100644 --- a/src/gvdirpart/gvdirpart.cpp +++ b/src/gvdirpart/gvdirpart.cpp @@ -86,38 +86,38 @@ GVDirPart::GVDirPart(TQWidget* parentWidget, const char* /*widgetName*/, TQObjec setWidget(mSplitter); - KStdAction::saveAs( mDocument, TQT_SLOT(saveAs()), actionCollection(), "saveAs" ); - new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left"); - new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right"); + KStdAction::saveAs( mDocument, TQ_SLOT(saveAs()), actionCollection(), "saveAs" ); + new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQ_SLOT(rotateLeft()), actionCollection(), "rotate_left"); + new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQ_SLOT(rotateRight()), actionCollection(), "rotate_right"); - connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)), - mBrowserExtension, TQT_SLOT(openFileViewContextMenu(const TQPoint&, bool)) ); + connect(mFileViewController, TQ_SIGNAL(requestContextMenu(const TQPoint&, bool)), + mBrowserExtension, TQ_SLOT(openFileViewContextMenu(const TQPoint&, bool)) ); - connect(mFileViewController, TQT_SIGNAL(urlChanged(const KURL&)), - mDocument, TQT_SLOT(setURL(const KURL&)) ); + connect(mFileViewController, TQ_SIGNAL(urlChanged(const KURL&)), + mDocument, TQ_SLOT(setURL(const KURL&)) ); - connect(mFileViewController, TQT_SIGNAL(directoryChanged(const KURL&)), - this, TQT_SLOT(directoryChanged(const KURL&)) ); + connect(mFileViewController, TQ_SIGNAL(directoryChanged(const KURL&)), + this, TQ_SLOT(directoryChanged(const KURL&)) ); - connect(mFileViewController, TQT_SIGNAL(selectionChanged()), - mBrowserExtension, TQT_SLOT(updateActions()) ); + connect(mFileViewController, TQ_SIGNAL(selectionChanged()), + mBrowserExtension, TQ_SLOT(updateActions()) ); - connect(mImageView, TQT_SIGNAL(requestContextMenu(const TQPoint&)), - mBrowserExtension, TQT_SLOT(openImageViewContextMenu(const TQPoint&)) ); + connect(mImageView, TQ_SIGNAL(requestContextMenu(const TQPoint&)), + mBrowserExtension, TQ_SLOT(openImageViewContextMenu(const TQPoint&)) ); - connect(mSlideShow, TQT_SIGNAL(nextURL(const KURL&)), - this, TQT_SLOT(slotSlideShowChanged(const KURL&)) ); + connect(mSlideShow, TQ_SIGNAL(nextURL(const KURL&)), + this, TQ_SLOT(slotSlideShowChanged(const KURL&)) ); - connect(mDocument, TQT_SIGNAL(loaded(const KURL&)), - this, TQT_SLOT(loaded(const KURL&)) ); + connect(mDocument, TQ_SIGNAL(loaded(const KURL&)), + this, TQ_SLOT(loaded(const KURL&)) ); // For wheel browsing - connect(mImageView, TQT_SIGNAL(selectPrevious()), - mFileViewController, TQT_SLOT(slotSelectPrevious()) ); - connect(mImageView, TQT_SIGNAL(selectNext()), - mFileViewController, TQT_SLOT(slotSelectNext()) ); + connect(mImageView, TQ_SIGNAL(selectPrevious()), + mFileViewController, TQ_SLOT(slotSelectPrevious()) ); + connect(mImageView, TQ_SIGNAL(selectNext()), + mFileViewController, TQ_SLOT(slotSelectNext()) ); - mToggleSlideShow = new TDEToggleAction(i18n("Slide Show..."), "slideshow", 0, this, TQT_SLOT(toggleSlideShow()), actionCollection(), "slideshow"); + mToggleSlideShow = new TDEToggleAction(i18n("Slide Show..."), "slideshow", 0, this, TQ_SLOT(toggleSlideShow()), actionCollection(), "slideshow"); mToggleSlideShow->setCheckedState( i18n("Stop Slide Show" )); setXMLFile( "gvdirpart/gvdirpart.rc" ); diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp index 0988efd..134b525 100644 --- a/src/gvimagepart/gvimagepart.cpp +++ b/src/gvimagepart/gvimagepart.cpp @@ -89,35 +89,35 @@ GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQO // Create the widgets mDocument = new Document(this); - connect( mDocument, TQT_SIGNAL( loading()), TQT_SLOT( slotLoading())); - connect( mDocument, TQT_SIGNAL( loaded(const KURL&)), TQT_SLOT( slotLoaded(const KURL&))); + connect( mDocument, TQ_SIGNAL( loading()), TQ_SLOT( slotLoading())); + connect( mDocument, TQ_SIGNAL( loaded(const KURL&)), TQ_SLOT( slotLoaded(const KURL&))); mImageView = new ImageView(parentWidget, mDocument, actionCollection()); - connect( mImageView, TQT_SIGNAL(requestContextMenu(const TQPoint&)), - this, TQT_SLOT(openContextMenu(const TQPoint&)) ); + connect( mImageView, TQ_SIGNAL(requestContextMenu(const TQPoint&)), + this, TQ_SLOT(openContextMenu(const TQPoint&)) ); setWidget(mImageView); mDirLister = new KDirLister; mDirLister->setAutoErrorHandlingEnabled( false, 0 ); mDirLister->setMainWindow(TDEApplication::kApplication()->mainWidget()); - connect( mDirLister, TQT_SIGNAL( clear()), TQT_SLOT( dirListerClear())); - connect( mDirLister, TQT_SIGNAL( newItems( const KFileItemList& )), - TQT_SLOT( dirListerNewItems( const KFileItemList& ))); - connect(mDirLister,TQT_SIGNAL(deleteItem(KFileItem*)), - TQT_SLOT(dirListerDeleteItem(KFileItem*)) ); + connect( mDirLister, TQ_SIGNAL( clear()), TQ_SLOT( dirListerClear())); + connect( mDirLister, TQ_SIGNAL( newItems( const KFileItemList& )), + TQ_SLOT( dirListerNewItems( const KFileItemList& ))); + connect(mDirLister,TQ_SIGNAL(deleteItem(KFileItem*)), + TQ_SLOT(dirListerDeleteItem(KFileItem*)) ); TQStringList mimeTypes=MimeTypeUtils::rasterImageMimeTypes(); mDirLister->setMimeFilter(mimeTypes); mPreviousImage=new TDEAction(i18n("&Previous Image"), TQApplication::reverseLayout() ? "1rightarrow":"1leftarrow", Key_BackSpace, - this,TQT_SLOT(slotSelectPrevious()), actionCollection(), "previous"); + this,TQ_SLOT(slotSelectPrevious()), actionCollection(), "previous"); mNextImage=new TDEAction(i18n("&Next Image"), TQApplication::reverseLayout() ? "1leftarrow":"1rightarrow", Key_Space, - this,TQT_SLOT(slotSelectNext()), actionCollection(), "next"); + this,TQ_SLOT(slotSelectNext()), actionCollection(), "next"); updateNextPrevious(); - KStdAction::saveAs( this, TQT_SLOT(saveAs()), actionCollection(), "saveAs" ); - new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQT_SLOT(rotateLeft()), actionCollection(), "rotate_left"); - new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQT_SLOT(rotateRight()), actionCollection(), "rotate_right"); + KStdAction::saveAs( this, TQ_SLOT(saveAs()), actionCollection(), "saveAs" ); + new TDEAction(i18n("Rotate &Left"), "object-rotate-left", CTRL + Key_L, this, TQ_SLOT(rotateLeft()), actionCollection(), "rotate_left"); + new TDEAction(i18n("Rotate &Right"), "object-rotate-right", CTRL + Key_R, this, TQ_SLOT(rotateRight()), actionCollection(), "rotate_right"); setXMLFile( "gvimagepart/gvimagepart.rc" ); } @@ -201,7 +201,7 @@ void GVImagePart::slotLoaded(const KURL& url) { prefetchDone(); mPrefetch = ImageLoader::loader( mLastDirection == DirectionPrevious ? previousURL() : nextURL(), this, BUSY_PRELOADING ); - connect( mPrefetch, TQT_SIGNAL( imageLoaded( bool )), TQT_SLOT( prefetchDone())); + connect( mPrefetch, TQ_SIGNAL( imageLoaded( bool )), TQ_SLOT( prefetchDone())); } void GVImagePart::prefetchDone() { @@ -351,8 +351,8 @@ void GVImagePart::saveOriginalAs() { // We need to read the image again. Let TDEIO::copy do the work. TDEIO::Job* job = TDEIO::copy(srcURL, dstURL); job->setWindow(widget()); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(showJobError(TDEIO::Job*)) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(showJobError(TDEIO::Job*)) ); return; } @@ -388,8 +388,8 @@ DataUploader::DataUploader(TQWidget* dialogParent, const TQByteArray& data, cons tmpURL.setPath(mTempFile.name()); TDEIO::Job* job = TDEIO::copy(tmpURL, dstURL); job->setWindow(dialogParent); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotJobFinished(TDEIO::Job*)) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotJobFinished(TDEIO::Job*)) ); } @@ -418,7 +418,7 @@ void GVImagePart::openContextMenu(const TQPoint& pos) { TQString doc = KXMLGUIFactory::readConfigFile( "gvimagepartpopup.rc", true, instance() ); PopupGUIClient guiClient(instance(), doc); - KStdAction::saveAs( this, TQT_SLOT(saveAs()), guiClient.actionCollection(), "saveAs" ); + KStdAction::saveAs( this, TQ_SLOT(saveAs()), guiClient.actionCollection(), "saveAs" ); KParts::URLArgs urlArgs; urlArgs.serviceType = mDocument->mimeType(); diff --git a/src/tsthread/tsthread.h b/src/tsthread/tsthread.h index 2a53d7b..bd8e48d 100644 --- a/src/tsthread/tsthread.h +++ b/src/tsthread/tsthread.h @@ -113,7 +113,7 @@ class TSThread * in slots is valid. * Example: * \code - * emitSignal( this, TQT_SIGNAL( result( int* )), &result_data ); + * emitSignal( this, TQ_SIGNAL( result( int* )), &result_data ); * \endcode * @see postSignal * @see emitCancellableSignal |