summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'src/app')
-rw-r--r--src/app/kipiinterface.cpp2
-rw-r--r--src/app/mainwindow.cpp86
-rw-r--r--src/app/treeview.cpp4
3 files changed, 46 insertions, 46 deletions
diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
index e16b0ad..8c8bab3 100644
--- a/src/app/kipiinterface.cpp
+++ b/src/app/kipiinterface.cpp
@@ -119,7 +119,7 @@ struct KIPIInterfacePrivate {
KIPIInterface::KIPIInterface( TQWidget* parent, FileViewController* fileView)
-:KIPI::Interface(TQT_TQOBJECT(parent), "Gwenview kipi interface") {
+:KIPI::Interface(parent, "Gwenview kipi interface") {
d=new KIPIInterfacePrivate;
d->mFileView=fileView;
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index b216445..7a79bba 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -167,7 +167,7 @@ MainWindow::MainWindow()
#endif
{
// Backend
- mDocument=new Document(TQT_TQOBJECT(this));
+ mDocument=new Document(this);
mHistory=new History(actionCollection());
// GUI
createActions();
@@ -357,7 +357,7 @@ void MainWindow::renameFile() {
} else {
url = mDocument->url();
}
- FileOperation::rename(url, this, TQT_TQOBJECT(this), TQT_SLOT(slotRenamed(const TQString &)));
+ FileOperation::rename(url, this, this, TQT_SLOT(slotRenamed(const TQString &)));
}
@@ -478,11 +478,11 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt
const KFileItemList* items = mFileViewController->currentFileView()->selectedItems();
selectionSize = items->count();
externalToolContext =
- ExternalToolManager::instance()->createContext(TQT_TQOBJECT(this), items);
+ ExternalToolManager::instance()->createContext(this, items);
} else {
selectionSize = 0;
externalToolContext =
- ExternalToolManager::instance()->createContext(TQT_TQOBJECT(this), mFileViewController->dirURL());
+ ExternalToolManager::instance()->createContext(this, mFileViewController->dirURL());
}
TQPopupMenu menu(this);
@@ -493,7 +493,7 @@ void MainWindow::openFileViewControllerContextMenu(const TQPoint& pos, bool onIt
actionCollection()->action("view_sort")->plug(&menu);
mGoUp->plug(&menu);
- menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), TQT_TQOBJECT(this), TQT_SLOT(makeDir()));
+ menu.insertItem(SmallIcon("folder-new"), i18n("New Folder..."), this, TQT_SLOT(makeDir()));
menu.insertSeparator();
@@ -690,7 +690,7 @@ void MainWindow::showKeyDialog() {
void MainWindow::showToolBarDialog() {
saveMainWindowSettings(TDEGlobal::config(), "MainWindow");
KEditToolbar dlg(actionCollection());
- connect(&dlg,TQT_SIGNAL(newToolbarConfig()),TQT_TQOBJECT(this),TQT_SLOT(applyMainWindowSettings()));
+ connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(applyMainWindowSettings()));
dlg.exec();
}
@@ -888,7 +888,7 @@ void MainWindow::createWidgets() {
mImageViewController=new ImageViewController(mImageDock, mDocument, actionCollection());
mImageDock->setWidget(mImageViewController->widget());
connect(mImageViewController, TQT_SIGNAL(requestHintDisplay(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(showHint(const TQString&)) );
+ this, TQT_SLOT(showHint(const TQString&)) );
// Folder widget
mFolderDock = mDockArea->createDockWidget("Folders",SmallIcon("folder_open"),NULL,i18n("Folders"));
@@ -962,55 +962,55 @@ void MainWindow::createWidgets() {
*/
void MainWindow::createActions() {
// Stack
- mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
+ mSwitchToBrowseMode=new TDERadioAction(i18n("Browse"), "folder_image", CTRL + Key_Return, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_browse_mode");
mSwitchToBrowseMode->setExclusiveGroup("centralStackMode");
mSwitchToBrowseMode->setChecked(true);
- mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
+ mSwitchToViewMode=new TDERadioAction(i18n("View Image"), "image-x-generic", 0, this, TQT_SLOT(slotToggleCentralStack()), actionCollection(), "switch_to_view_mode");
mSwitchToViewMode->setExclusiveGroup("centralStackMode");
// File
- KStdAction::open(TQT_TQOBJECT(this),TQT_SLOT(showFileDialog()),actionCollection() );
+ KStdAction::open(this,TQT_SLOT(showFileDialog()),actionCollection() );
mSaveFile=KStdAction::save(mDocument,TQT_SLOT(save()),actionCollection() );
mSaveFileAs=KStdAction::saveAs(mDocument,TQT_SLOT(saveAs()),actionCollection() );
- mFilePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printFile()), actionCollection());
- mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,TQT_TQOBJECT(this),TQT_SLOT(renameFile()),actionCollection(),"file_rename");
- mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,TQT_TQOBJECT(this),TQT_SLOT(copyFiles()),actionCollection(),"file_copy");
- mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,TQT_TQOBJECT(this),TQT_SLOT(moveFiles()),actionCollection(),"file_move");
- mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,TQT_TQOBJECT(this),TQT_SLOT(linkFiles()),actionCollection(),"file_link");
- mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
- mShowFileProperties=new TDEAction(i18n("Properties"),0,TQT_TQOBJECT(this),TQT_SLOT(showFileProperties()),actionCollection(),"file_properties");
- KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection() );
+ mFilePrint = KStdAction::print(this, TQT_SLOT(printFile()), actionCollection());
+ mRenameFile=new TDEAction(i18n("&Rename..."),Key_F2,this,TQT_SLOT(renameFile()),actionCollection(),"file_rename");
+ mCopyFiles=new TDEAction(i18n("&Copy To..."),Key_F7,this,TQT_SLOT(copyFiles()),actionCollection(),"file_copy");
+ mMoveFiles=new TDEAction(i18n("&Move To..."),Key_F8,this,TQT_SLOT(moveFiles()),actionCollection(),"file_move");
+ mLinkFiles=new TDEAction(i18n("&Link To..."),Key_F9,this,TQT_SLOT(linkFiles()),actionCollection(),"file_link");
+ mDeleteFiles=new TDEAction(i18n("&Delete"),"edit-delete",Key_Delete,this,TQT_SLOT(deleteFiles()),actionCollection(),"file_delete");
+ mShowFileProperties=new TDEAction(i18n("Properties"),0,this,TQT_SLOT(showFileProperties()),actionCollection(),"file_properties");
+ KStdAction::quit( kapp, TQT_SLOT (closeAllWindows()), actionCollection() );
// Edit
- mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left");
- mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(rotateRight()),actionCollection(),"rotate_right");
- mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, TQT_TQOBJECT(this), TQT_SLOT(mirror()),actionCollection(),"mirror");
- mFlip=new TDEAction(i18n("&Flip"),"flip",0, TQT_TQOBJECT(this), TQT_SLOT(flip()),actionCollection(),"flip");
+ mRotateLeft=new TDEAction(i18n("Rotate &Left"),"rotate_left",CTRL + Key_L, this, TQT_SLOT(rotateLeft()),actionCollection(),"rotate_left");
+ mRotateRight=new TDEAction(i18n("Rotate &Right"),"rotate_right",CTRL + Key_R, this, TQT_SLOT(rotateRight()),actionCollection(),"rotate_right");
+ mMirror=new TDEAction(i18n("&Mirror"),"mirror",0, this, TQT_SLOT(mirror()),actionCollection(),"mirror");
+ mFlip=new TDEAction(i18n("&Flip"),"flip",0, this, TQT_SLOT(flip()),actionCollection(),"flip");
// View
mReload=new TDEAction(i18n("Reload"), "reload", Key_F5, mDocument, TQT_SLOT(reload()), actionCollection(), "reload");
mReload->setEnabled(false);
- mToggleFullScreen= KStdAction::fullScreen(TQT_TQOBJECT(this),TQT_SLOT(toggleFullScreen()),actionCollection(),0);
- mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,TQT_TQOBJECT(this),TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
+ mToggleFullScreen= KStdAction::fullScreen(this,TQT_SLOT(toggleFullScreen()),actionCollection(),0);
+ mToggleSlideShow=new TDEAction(i18n("Slide Show"),"slideshow_play",0,this,TQT_SLOT(toggleSlideShow()),actionCollection(),"slideshow");
mFullScreenLabelAction=new TDEToolBarLabelAction("", 0, 0, 0, actionCollection(), "fullscreen_label");
// Go
- mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(goUp()), actionCollection(), "go_up");
- new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), TQT_TQOBJECT(this), TQT_SLOT(goHome()), actionCollection(), "go_home");
+ mGoUp=new TDEToolBarPopupAction(i18n("Up"), "go-up", ALT + Key_Up, this, TQT_SLOT(goUp()), actionCollection(), "go_up");
+ new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQT_SLOT(goHome()), actionCollection(), "go_home");
// Window
- mResetDockWidgets = new TDEAction(i18n("Reset"), 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
+ mResetDockWidgets = new TDEAction(i18n("Reset"), 0, this, TQT_SLOT(resetDockWidgets()), actionCollection(), "reset_dock_widgets");
// Settings
mShowConfigDialog=
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfigDialog()), actionCollection() );
+ KStdAction::preferences(this, TQT_SLOT(showConfigDialog()), actionCollection() );
mShowKeyDialog=
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showKeyDialog()), actionCollection() );
+ KStdAction::keyBindings(this, TQT_SLOT(showKeyDialog()), actionCollection() );
(void)new TDEAction(i18n("Configure External Tools..."), "configure", 0,
- TQT_TQOBJECT(this), TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools");
+ this, TQT_SLOT(showExternalToolDialog()), actionCollection(), "configure_tools");
(void)KStdAction::configureToolbars(
- TQT_TQOBJECT(this), TQT_SLOT(showToolBarDialog()), actionCollection() );
+ this, TQT_SLOT(showToolBarDialog()), actionCollection() );
actionCollection()->readShortcutSettings();
}
@@ -1060,10 +1060,10 @@ void MainWindow::createObjectInteractions() {
// Make sure file actions are correctly updated
connect(mFileViewController, TQT_SIGNAL(selectionChanged()),
- TQT_TQOBJECT(this), TQT_SLOT(updateImageActions()) );
+ this, TQT_SLOT(updateImageActions()) );
connect(mFileViewController, TQT_SIGNAL(requestContextMenu(const TQPoint&, bool)),
- TQT_TQOBJECT(this), TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
+ this, TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
// Bookmarks
TQString file = locate( "data", "tdefile/bookmarks.xml" );
@@ -1097,7 +1097,7 @@ void MainWindow::createHideShowAction(KDockWidget* dock) {
caption=i18n("Show %1").arg(dock->caption());
}
- TDEAction* action=new TDEAction(caption, 0, TQT_TQOBJECT(dock), TQT_SLOT(changeHideShowState()), (TQObject*)0 );
+ TDEAction* action=new TDEAction(caption, 0, dock, TQT_SLOT(changeHideShowState()), (TQObject*)0 );
if (dock->icon()) {
action->setIconSet( TQIconSet(*dock->icon()) );
}
@@ -1132,7 +1132,7 @@ void MainWindow::createConnections() {
connect(mDirViewController, TQT_SIGNAL(urlChanged(const KURL&)),
mFileViewController, TQT_SLOT(setDirURL(const KURL&)) );
connect(mDirViewController, TQT_SIGNAL(urlRenamed(const KURL&, const KURL&)),
- TQT_TQOBJECT(this), TQT_SLOT(slotDirRenamed(const KURL&, const KURL&)) );
+ this, TQT_SLOT(slotDirRenamed(const KURL&, const KURL&)) );
// Bookmark view connections
connect(mBookmarkViewController, TQT_SIGNAL(openURL(const KURL&)),
@@ -1167,7 +1167,7 @@ void MainWindow::createConnections() {
connect(mFileViewController,TQT_SIGNAL(shownFileItemRefreshed(const KFileItem*)),
this,TQT_SLOT(slotShownFileItemRefreshed(const KFileItem*)) );
connect(mFileViewController,TQT_SIGNAL(sortingChanged()),
- TQT_TQOBJECT(this), TQT_SLOT(updateStatusInfo()) );
+ this, TQT_SLOT(updateStatusInfo()) );
// History connections
connect(mHistory, TQT_SIGNAL(urlChanged(const KURL&)),
@@ -1191,16 +1191,16 @@ void MainWindow::createConnections() {
// Non configurable stop-fullscreen accel
TQAccel* accel=new TQAccel(this);
- accel->connectItem(accel->insertItem(Key_Escape),TQT_TQOBJECT(this),TQT_SLOT(escapePressed()));
+ accel->connectItem(accel->insertItem(Key_Escape),this,TQT_SLOT(escapePressed()));
// Dock related
connect(mDockArea->manager(), TQT_SIGNAL(change()),
- TQT_TQOBJECT(this), TQT_SLOT(updateWindowActions()) );
+ this, TQT_SLOT(updateWindowActions()) );
// Plugin menu
TQPopupMenu *popup = static_cast<TQPopupMenu*>(
factory()->container( "plugins", this));
- connect(popup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(loadPlugins()) );
+ connect(popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(loadPlugins()) );
}
@@ -1232,15 +1232,15 @@ void MainWindow::createLocationToolBar() {
// Clear button
(void)new TDEAction( i18n("Clear Location Bar"),
TQApplication::reverseLayout()?"clear_left" : "locationbar_erase",
- 0, TQT_TQOBJECT(this), TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location");
+ 0, this, TQT_SLOT(clearLocationLabel()), actionCollection(), "clear_location");
// URL Label
TDEToolBarLabelAction* locationAction = new TDEToolBarLabelAction(i18n("L&ocation:"),
- Key_F6, TQT_TQOBJECT(this), TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label");
+ Key_F6, this, TQT_SLOT( activateLocationLabel()), actionCollection(), "location_label");
locationAction->setBuddy(mURLEdit);
// Go button
- (void)new TDEAction(i18n("Go"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGo()), actionCollection(), "location_go");
+ (void)new TDEAction(i18n("Go"), "key_enter", 0, this, TQT_SLOT(slotGo()), actionCollection(), "location_go");
}
@@ -1266,7 +1266,7 @@ void MainWindow::loadPlugins() {
// Sets up the plugin interface, and load the plugins
KIPIInterface* interface = new KIPIInterface(this, mFileViewController);
mPluginLoader = new KIPI::PluginLoader(TQStringList(), interface );
- connect( mPluginLoader, TQT_SIGNAL( replug() ), TQT_TQOBJECT(this), TQT_SLOT( slotReplug() ) );
+ connect( mPluginLoader, TQT_SIGNAL( replug() ), this, TQT_SLOT( slotReplug() ) );
mPluginLoader->loadPlugins();
}
diff --git a/src/app/treeview.cpp b/src/app/treeview.cpp
index c29e3c4..a15642d 100644
--- a/src/app/treeview.cpp
+++ b/src/app/treeview.cpp
@@ -135,7 +135,7 @@ TreeView::TreeView(TQWidget* parent)
setAcceptDrops(true);
connect(d->mAutoOpenTimer, TQT_SIGNAL(timeout()),
- TQT_TQOBJECT(this), TQT_SLOT(autoOpenDropTarget()));
+ this, TQT_SLOT(autoOpenDropTarget()));
}
@@ -207,7 +207,7 @@ void TreeView::createBranch(const KURL& url) {
d->mBranch->root()->setOpen(true);
connect(d->mBranch, TQT_SIGNAL(populateFinished(KFileTreeViewItem*) ),
- TQT_TQOBJECT(this), TQT_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) );
+ this, TQT_SLOT(slotTreeViewPopulateFinished(KFileTreeViewItem*)) );
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-12 19:53:03 +0000