diff options
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/bookmarkdialog.cpp | 12 | ||||
| -rw-r--r-- | src/app/bookmarkviewcontroller.cpp | 34 | ||||
| -rw-r--r-- | src/app/configdialog.cpp | 10 | ||||
| -rw-r--r-- | src/app/dirviewcontroller.cpp | 18 | ||||
| -rw-r--r-- | src/app/history.cpp | 22 | ||||
| -rw-r--r-- | src/app/kipiinterface.cpp | 10 | ||||
| -rw-r--r-- | src/app/mainwindow.cpp | 224 | ||||
| -rw-r--r-- | src/app/metaedit.cpp | 12 | ||||
| -rw-r--r-- | src/app/treeview.cpp | 8 | ||||
| -rw-r--r-- | src/app/vtabwidget.cpp | 4 |
10 files changed, 177 insertions, 177 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); |