diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-22 18:45:07 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-26 21:26:32 +0900 |
commit | c4a6487c827add9382001ff1892b8fb3bfa94682 (patch) | |
tree | ec6c8a691a15099df946531b66355a76ca02b2db /konqueror | |
parent | 7c724a49212a9ffdf42381d99648f15457867787 (diff) | |
download | tdebase-c4a6487c827add9382001ff1892b8fb3bfa94682.tar.gz tdebase-c4a6487c827add9382001ff1892b8fb3bfa94682.zip |
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'konqueror')
-rw-r--r-- | konqueror/KonqMainWindowIface.cpp | 6 | ||||
-rw-r--r-- | konqueror/keditbookmarks/actionsimpl.cpp | 86 | ||||
-rw-r--r-- | konqueror/keditbookmarks/favicons.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_extensionmanager.cpp | 4 | ||||
-rw-r--r-- | konqueror/konq_factory.cpp | 4 | ||||
-rw-r--r-- | konqueror/konq_frame.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_guiclients.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_mainwindow.cpp | 174 | ||||
-rw-r--r-- | konqueror/konq_view.cpp | 2 | ||||
-rw-r--r-- | konqueror/listview/konq_infolistviewwidget.cpp | 2 | ||||
-rw-r--r-- | konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 8 | ||||
-rw-r--r-- | konqueror/sidebar/konqsidebar.cpp | 4 | ||||
-rw-r--r-- | konqueror/sidebar/sidebar_widget.cpp | 4 | ||||
-rw-r--r-- | konqueror/sidebar/trees/konq_sidebartree.cpp | 16 |
14 files changed, 158 insertions, 158 deletions
diff --git a/konqueror/KonqMainWindowIface.cpp b/konqueror/KonqMainWindowIface.cpp index a18301a2f..5f3cbd14f 100644 --- a/konqueror/KonqMainWindowIface.cpp +++ b/konqueror/KonqMainWindowIface.cpp @@ -153,13 +153,13 @@ TQMap<TQCString,DCOPRef> KonqMainWindowIface::actionMap() QCStringList KonqMainWindowIface::functionsDynamic() { - return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( TQT_TQOBJECT(m_pMainWindow) ); + return DCOPObject::functionsDynamic() + KDCOPPropertyProxy::functions( m_pMainWindow ); } bool KonqMainWindowIface::processDynamic( const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData ) { - if ( KDCOPPropertyProxy::isPropertyRequest( fun, TQT_TQOBJECT(m_pMainWindow) ) ) - return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, TQT_TQOBJECT(m_pMainWindow) ); + if ( KDCOPPropertyProxy::isPropertyRequest( fun, m_pMainWindow ) ) + return KDCOPPropertyProxy::processPropertyRequest( fun, data, replyType, replyData, m_pMainWindow ); return DCOPObject::processDynamic( fun, data, replyType, replyData ); } diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index aedf4a74d..9e4480d0b 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -78,136 +78,136 @@ void KEBApp::createActions() { // save and quit should probably not be in the toplevel??? (void) KStdAction::quit( - TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); + this, TQT_SLOT( close() ), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); (void) KStdAction::configureToolbars( - TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection()); + this, TQT_SLOT( slotConfigureToolbars() ), actionCollection()); if (m_browser) { (void) KStdAction::open( - TQT_TQOBJECT(actn), TQT_SLOT( slotLoad() ), actionCollection()); + actn, TQT_SLOT( slotLoad() ), actionCollection()); (void) KStdAction::saveAs( - TQT_TQOBJECT(actn), TQT_SLOT( slotSaveAs() ), actionCollection()); + actn, TQT_SLOT( slotSaveAs() ), actionCollection()); } - (void) KStdAction::cut(TQT_TQOBJECT(actn), TQT_SLOT( slotCut() ), actionCollection()); - (void) KStdAction::copy(TQT_TQOBJECT(actn), TQT_SLOT( slotCopy() ), actionCollection()); - (void) KStdAction::paste(TQT_TQOBJECT(actn), TQT_SLOT( slotPaste() ), actionCollection()); - (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection()); + (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection()); + (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection()); + (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection()); + (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection()); // settings menu (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(), + actn, TQT_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions (void) new TDEAction( i18n("&Delete"), "edit-delete", Key_Delete, - TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete"); + actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete"); (void) new TDEAction( i18n("Rename"), "text", Key_F2, - TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename"); + actn, TQT_SLOT( slotRename() ), actionCollection(), "rename"); (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); + actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); + actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); + actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); (void) new TDEAction( i18n("Update Favicon"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); + actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); (void) new TDEAction( i18n("Recursive Sort"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); + actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); (void) new TDEAction( i18n("&New Folder..."), "folder-new", CTRL+Key_N, - TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); + actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); (void) new TDEAction( i18n("&New Bookmark"), "www", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); + actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, - TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(), + actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); (void) new TDEAction( i18n("&Sort Alphabetically"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort"); + actn, TQT_SLOT( slotSort() ), actionCollection(), "sort"); (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); + actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); + actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); + actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); (void) new TDEAction( i18n("&Expand All Folders"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); + actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); (void) new TDEAction( i18n("Collapse &All Folders"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); + actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); (void) new TDEAction( i18n("&Open in Konqueror"), "document-open", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); + actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); + actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new TDEAction( i18n("Check Status: &All"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); + actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new TDEAction( i18n("Update All &Favicons"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), + actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); (void) new TDEAction( i18n("Cancel &Checks"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); + actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), + actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS"); (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new TDEAction( i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE"); (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); + actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); + actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); + actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "text-html", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); + actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); + actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, - TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); + actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } void ActionsImpl::slotLoad() { diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index a1ea018b1..6013187bb 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -83,7 +83,7 @@ void FavIconsItr::doAction() { // kdDebug() << "FavIconsItr::doAction()" << endl; curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { - m_updater = new FavIconUpdater(TQT_TQOBJECT(kapp), "FavIconUpdater"); + m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); connect(m_updater, TQT_SIGNAL( done(bool) ), this, TQT_SLOT( slotDone(bool) ) ); } diff --git a/konqueror/konq_extensionmanager.cpp b/konqueror/konq_extensionmanager.cpp index b00522252..d60caeeb1 100644 --- a/konqueror/konq_extensionmanager.cpp +++ b/konqueror/konq_extensionmanager.cpp @@ -100,8 +100,8 @@ void KonqExtensionManager::apply() setChanged(false); if( d->mainWindow ) { - KParts::Plugin::loadPlugins(TQT_TQOBJECT(d->mainWindow), d->mainWindow, TDEGlobal::instance()); - TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(TQT_TQOBJECT(d->mainWindow)); + KParts::Plugin::loadPlugins(d->mainWindow, d->mainWindow, TDEGlobal::instance()); + TQPtrList<KParts::Plugin> plugins = KParts::Plugin::pluginObjects(d->mainWindow); TQPtrListIterator<KParts::Plugin> it(plugins); KParts::Plugin *plugin; while((plugin = it.current()) != 0) diff --git a/konqueror/konq_factory.cpp b/konqueror/konq_factory.cpp index e35f5b7c7..0a69c1c8c 100644 --- a/konqueror/konq_factory.cpp +++ b/konqueror/konq_factory.cpp @@ -64,10 +64,10 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha else { if ( m_createBrowser ) - obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "Browser/View", m_args ); + obj = m_factory->create( parentWidget, name, "Browser/View", m_args ); if ( !obj ) - obj = m_factory->create( TQT_TQOBJECT(parentWidget), name, "KParts::ReadOnlyPart", m_args ); + obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args ); } if ( !obj->inherits( "KParts::ReadOnlyPart" ) ) diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index cf0960f4d..93f465a13 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, TQT_TQOBJECT(m_pParentKonqFrame), TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); + TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() ); actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() ); diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp index fd7a1c29d..0e014e70a 100644 --- a/konqueror/konq_guiclients.cpp +++ b/konqueror/konq_guiclients.cpp @@ -157,7 +157,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const action.setAttribute( "group", "preview" ); (void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); + m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index ab8d56c77..f5a34925a 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -192,7 +192,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con // init history-manager, load history, get completion object if ( !s_pCompletion ) { - KonqHistoryManager *mgr = new KonqHistoryManager( TQT_TQOBJECT(kapp), "history mgr" ); + KonqHistoryManager *mgr = new KonqHistoryManager( kapp, "history mgr" ); s_pCompletion = mgr->completionObject(); @@ -360,7 +360,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T m_bookmarkBarActionCollection = new TDEActionCollection( this ); m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); - DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res ); connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) ); } } @@ -370,12 +370,12 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T void KonqMainWindow::initBookmarkBar() { - TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); + TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) ); if (!bar) return; delete m_paBookmarkBar; - m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, TQT_TQOBJECT(this) ); + m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this ); connect( m_paBookmarkBar, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); @@ -1060,7 +1060,7 @@ void KonqMainWindow::openURL( KonqView *childView, const KURL &url, const KParts TQObject *KonqMainWindow::lastFrame( KonqView *view ) { TQObject *nextFrame, *viewFrame; - nextFrame = TQT_TQOBJECT(view->frame()); + nextFrame = view->frame(); viewFrame = 0; while ( nextFrame != 0 && ! nextFrame->inherits( "TQWidgetStack" ) ) { viewFrame = nextFrame; @@ -3315,7 +3315,7 @@ void KonqMainWindow::initCombo() if ( !bookmarkCompletionInitialized ) { bookmarkCompletionInitialized = true; - DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, TQT_TQOBJECT(m_combo->lineEdit()) ); + DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() ); connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) ); } } @@ -3820,72 +3820,72 @@ void KonqMainWindow::initActions() (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); + (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); + (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); if (kapp->authorize("shell_access")) { - (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); - (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); + (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" ); - m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); + m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); + m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); + m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpAboutToShow() ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotUpActivated( int ) ) ); + connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) ); + connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) ); TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotBackAboutToShow() ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotBackActivated( int ) ) ); + connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) ); + connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) ); m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardAboutToShow() ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotForwardActivated( int ) ) ); + connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) ); + connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) ); m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" ); - connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) ); - connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) ); + connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) ); + connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) ); m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); - (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); + (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); + (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); + (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); + (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); + (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new TDEAction( i18n( "Autostart" ), "launch", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); + (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" ); connect( mostOften, TQT_SIGNAL( activated( const KURL& )), TQT_SLOT( slotOpenURL( const KURL& ))); - (void) new TDEAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + (void) new TDEAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); + m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); m_configureModules << "tde-filebehavior.desktop" << "tde-fileappearance.desktop" << @@ -3900,38 +3900,38 @@ void KonqMainWindow::initActions() if (!kapp->authorizeControlModules(configModules()).isEmpty()) - KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotConfigure()), actionCollection() ); + KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); + m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), TQT_TQOBJECT(this), TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); + m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); + m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); + m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); + m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); + m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); + m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); + m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); + m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); + + m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); + m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new TDEAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname); + new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); + (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); @@ -3943,14 +3943,14 @@ void KonqMainWindow::initActions() TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); fullScreenShortcut.append( KKey( Key_F11 ) ); m_ptaFullScreen->setShortcut( fullScreenShortcut ); - connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, TQT_TQOBJECT(this), TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); + m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); - m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); @@ -3965,24 +3965,24 @@ void KonqMainWindow::initActions() m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); m_paRename = new TDEAction( i18n( "&Rename" ), "edit_rename", Key_F2, actionCollection(), "rename" ); m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" ); // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default. - m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); // This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff. - m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); - m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); + m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); + m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); // Location bar m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") ); - (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, TQT_TQOBJECT(this), TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); + (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); m_locationLabel->setBuddy( m_combo ); KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, @@ -4023,11 +4023,11 @@ void KonqMainWindow::initActions() if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); - m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() ); + m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" ); + TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go<p>" "Goes to the page that has been entered into the location bar." ) ); @@ -4701,7 +4701,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa popupMenuCollection.insert( m_paDelete ); // The pasteto action is used when clicking on a dir, to paste into it. - TDEAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + TDEAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4774,10 +4774,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if (doTabHandling) { if (_args.forcesNewWindow()) { - actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); + actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront @@ -4788,12 +4788,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa else tab_new_x = "tab_new_bg" ; - TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); + TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) ); - TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); + TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) ); - actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); - actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); + actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) ); actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) ); doTabHandling = true; @@ -4851,7 +4851,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileNewAboutToShow()) ); - TQGuardedPtr<TQObject> guard(TQT_TQOBJECT(this)); // #149736 + TQGuardedPtr<TQObject> guard(this); // #149736 pPopupMenu->exec( _global ); delete pPopupMenu; @@ -5099,7 +5099,7 @@ void KonqMainWindow::updateViewModeActions() if ( services.count() <= 1 ) return; - m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) ); + m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), this ); // a temporary map, just like the m_viewModeToolBarServices map, but // mapping to a KonqViewModeAction object. It's just temporary as we @@ -5132,9 +5132,9 @@ void KonqMainWindow::updateViewModeActions() TQString icon = (*it)->icon(); if ( icon != TQString::fromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) - action = new TDERadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() ); else - action = new TDERadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, 0, this, (*it)->desktopEntryName().ascii() ); action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); @@ -5186,7 +5186,7 @@ void KonqMainWindow::updateViewModeActions() KonqViewModeAction *tbAction = new KonqViewModeAction( text, icon, - TQT_TQOBJECT(this), + this, name ); tbAction->setExclusiveGroup( "KonqMainWindow_ToolBarViewModes" ); @@ -5278,7 +5278,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject() void KonqMainWindow::updateBookmarkBar() { - TDEToolBar * bar = static_cast<TDEToolBar *>( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); + TDEToolBar * bar = static_cast<TDEToolBar *>( child( "bookmarkToolBar", "TDEToolBar" ) ); if (!bar) return; @@ -5812,7 +5812,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window ) if( window == NULL ) return; window->viewManager()->clear(); - TDEIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) ); + TDEIO::Scheduler::unregisterWindow( window ); } // used by preloading - this KonqMainWindow will be reused, reset everything diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 0bacb9c5b..89f4a2e07 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -1271,7 +1271,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me ev->source() != m_pPart->widget() && children && - children->findRef( TQT_TQOBJECT(ev->source()) ) == -1 ) + children->findRef( ev->source() ) == -1 ) ev->acceptAction(); delete children; diff --git a/konqueror/listview/konq_infolistviewwidget.cpp b/konqueror/listview/konq_infolistviewwidget.cpp index e835f1cb3..4698365e6 100644 --- a/konqueror/listview/konq_infolistviewwidget.cpp +++ b/konqueror/listview/konq_infolistviewwidget.cpp @@ -37,7 +37,7 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, { m_metaInfoJob = 0; - m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), + m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this, TQT_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index e5e8dabe4..228db9a36 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -84,11 +84,11 @@ int KShellCommandExecutor::exec() return 0; } - m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, TQT_TQOBJECT(this)); - m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, TQT_TQOBJECT(this)); + m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this); + m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this); m_writeNotifier->setEnabled(false); - connect (m_readNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(readDataFromShell())); - connect (m_writeNotifier, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this),TQT_SLOT(writeDataToShell())); + connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell())); + connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell())); return 1; } diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index bfff3c8e7..774ad8509 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -37,8 +37,8 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); - TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); - setWidget(TQT_TQWIDGET(m_widget)); + TDEAcceleratorManager::setNoAccel(m_widget); + setWidget(m_widget); } TDEInstance *KonqSidebar::getInstance() diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 2e741b2f9..8fe85f512 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -834,7 +834,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) { m_buttonBar->appendTab(SmallIcon(icon), lastbtn, name); ButtonInfo *bi = new ButtonInfo(desktoppath, ((KonqSidebar*)m_partParent),0, url, lib, name, - icon, TQT_TQOBJECT(this)); + icon, this); /*int id=*/m_buttons.insert(lastbtn, bi); KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn); tab->installEventFilter(this); @@ -1323,7 +1323,7 @@ TQSplitter *Sidebar_Widget::splitter() const TQObject *p = parent(); if (!p) return 0; p = p->parent(); - return static_cast<TQSplitter*>(TQT_TQWIDGET(p)); + return static_cast<TQSplitter*>(p); } void Sidebar_Widget::userMovedSplitter() diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index aa318826a..77e4f640b 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -908,21 +908,21 @@ void KonqSidebarTree::showToplevelContextMenu() if (!m_collection) { m_collection = new TDEActionCollection( this, "bookmark actions" ); - (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this, TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Rename"), 0, this, TQT_SLOT( slotRename() ), m_collection, "rename"); - (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this, TQT_SLOT( slotDelete() ), m_collection, "delete_link"); - (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Properties"), "edit", 0, this, TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } |