From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:11:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- konqueror/ChangeLog | 18 +- konqueror/KonqMainWindowIface.cc | 8 +- konqueror/KonqMainWindowIface.h | 2 +- konqueror/about/konq_aboutpage.cc | 2 +- konqueror/iconview/konq_iconview.cc | 48 +-- konqueror/iconview/konq_iconview.h | 40 +-- konqueror/keditbookmarks/TODO | 6 +- konqueror/keditbookmarks/actionsimpl.cpp | 72 ++--- konqueror/keditbookmarks/commands.h | 2 +- konqueror/keditbookmarks/kebsearchline.cpp | 14 +- konqueror/keditbookmarks/kebsearchline.h | 4 +- konqueror/keditbookmarks/listview.cpp | 12 +- konqueror/keditbookmarks/listview.h | 14 +- konqueror/keditbookmarks/toplevel.cpp | 16 +- konqueror/keditbookmarks/toplevel.h | 8 +- konqueror/konq_actions.cc | 58 ++-- konqueror/konq_actions.h | 8 +- konqueror/konq_combo.cc | 8 +- konqueror/konq_frame.cc | 4 +- konqueror/konq_frame.h | 2 +- konqueror/konq_guiclients.cc | 22 +- konqueror/konq_guiclients.h | 12 +- konqueror/konq_main.cc | 2 +- konqueror/konq_mainwindow.cc | 328 ++++++++++----------- konqueror/konq_mainwindow.h | 152 +++++----- konqueror/konq_profiledlg.cc | 4 +- konqueror/konq_profiledlg.h | 6 +- konqueror/konq_tabs.cc | 2 +- konqueror/konq_tabs.h | 2 +- konqueror/konq_view.cc | 2 +- konqueror/konq_viewmgr.cc | 4 +- konqueror/konq_viewmgr.h | 6 +- konqueror/kttsplugin/tdehtmlkttsd.cpp | 2 +- konqueror/listview/konq_infolistviewitem.cc | 4 +- konqueror/listview/konq_infolistviewwidget.cc | 2 +- konqueror/listview/konq_infolistviewwidget.h | 4 +- konqueror/listview/konq_listview.cc | 34 +-- konqueror/listview/konq_listview.h | 44 +-- konqueror/listview/konq_listviewitems.cc | 8 +- konqueror/listview/konq_listviewitems.h | 2 +- konqueror/listview/konq_listviewwidget.cc | 26 +- konqueror/listview/konq_listviewwidget.h | 16 +- konqueror/listview/konq_textviewitem.cc | 2 +- .../remoteencodingplugin/kremoteencodingplugin.cpp | 4 +- .../remoteencodingplugin/kremoteencodingplugin.h | 4 +- konqueror/shellcmdplugin/kshellcmdplugin.cpp | 2 +- konqueror/sidebar/konqsidebar.cpp | 2 +- konqueror/sidebar/sidebar_widget.cpp | 2 +- konqueror/sidebar/sidebar_widget.h | 2 +- .../trees/bookmark_module/bookmark_module.cpp | 28 +- .../trees/bookmark_module/bookmark_module.h | 6 +- .../trees/history_module/history_module.cpp | 16 +- .../sidebar/trees/history_module/history_module.h | 4 +- .../sidebar/trees/history_module/kcmhistory.cpp | 8 +- konqueror/sidebar/trees/konq_sidebartree.cpp | 36 +-- konqueror/sidebar/trees/konq_sidebartree.h | 12 +- konqueror/sidebar/trees/konqsidebar_tree.cpp | 2 +- konqueror/sidebar/web_module/web_module.h | 6 +- 58 files changed, 583 insertions(+), 583 deletions(-) (limited to 'konqueror') diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog index 19c0a00eb..f83f0e17c 100644 --- a/konqueror/ChangeLog +++ b/konqueror/ChangeLog @@ -20,7 +20,7 @@ 2001-04-28 Simon Hausmann * konq_actions.h (class KonqGoURLAction): new class, derived - from KAction, used for the 'go url' action. when plugging the + from TDEAction, used for the 'go url' action. when plugging the action into a toolbar make sure to align the button right. Otherwise the toolbar layout completely fucks up and QToolBar starts flickering like mad, when the window width is getting @@ -74,7 +74,7 @@ 2001-01-28 Stephan Kulow - * konq_mainwindow.cc (initActions): Plug the actions into a KAccel to + * konq_mainwindow.cc (initActions): Plug the actions into a TDEAccel to fix short cuts in full screen mode 2001-01-16 Simon Hausmann @@ -158,8 +158,8 @@ 2000-12-27 Simon Hausmann * konq_mainwindow.cc (enableAllActions): for iterating over all actions - don't use the action( int index ) method of KActionCollection but instead - retrieve a QValueList and iterate over that, as the =+(int) + don't use the action( int index ) method of TDEActionCollection but instead + retrieve a QValueList and iterate over that, as the =+(int) operator of QDictIterator isn't really fast ----- KDE 2.1 BETA 1 RELEASE ---- @@ -190,7 +190,7 @@ 2000-12-09 Simon Hausmann - * konq_actions.{cc,h}: Added KonqViewModeAction, a KRadioAction + * konq_actions.{cc,h}: Added KonqViewModeAction, a TDERadioAction with an additional delayed popupmenu * konq_mainwindow.{cc,h}: Changed the toolbar viewmode buttons to @@ -244,7 +244,7 @@ * konq_actions.cc: Accel (Alt+O in English) to give focus to location bar, shown by the label. - * konq_profiledlg.cc: Ported to KListView to fix problems with selection. + * konq_profiledlg.cc: Ported to TDEListView to fix problems with selection. 2000-11-26 David Faure @@ -258,7 +258,7 @@ * konq_mainwindow.cc : Icons for the configure submenu. - * konq_actions.cc : KonqHistoryAction turned into KToolBarPopupAction. + * konq_actions.cc : KonqHistoryAction turned into TDEToolBarPopupAction. Drag the "Location" label to start a drag with the current URL. 2000-11-25 Simon Hausmann @@ -319,7 +319,7 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer * konq_drag.cc: Export URLs as text/plain as well. - * konq_mainwindow.cc: Implemented auto-saving of toolbars (KMainWindow), + * konq_mainwindow.cc: Implemented auto-saving of toolbars (TDEMainWindow), removed "Save Settings". Fixed "clicking on directory in dirtree uses wrong view mode for dirs". * konq_iconview.cc: Added +/- buttons for changing the icon size. @@ -398,7 +398,7 @@ Sat Nov 25 17:38:27 2000 Carsten Pfeiffer * listview/konq_textviewwidget.cc: Only the Name column is now selected, and used as a drop area - like in other listviews. - This requires the fix in KListView to work properly. + This requires the fix in TDEListView to work properly. 2000-10-21 David Faure diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index 7fce12205..6010aa502 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cc @@ -35,7 +35,7 @@ KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow ) : // ARGL I hate this "virtual public DCOPObject" stuff! DCOPObject( mainWindow->name() ), - KMainWindowInterface( mainWindow ), m_pMainWindow( mainWindow ) + TDEMainWindowInterface( mainWindow ), m_pMainWindow( mainWindow ) { m_dcopActionProxy = new KDCOPActionProxy( mainWindow->actionCollection(), this ); } @@ -137,9 +137,9 @@ DCOPRef KonqMainWindowIface::action( const TQCString &name ) QCStringList KonqMainWindowIface::actions() { QCStringList res; - TQValueList lst = m_dcopActionProxy->actions(); - TQValueList::ConstIterator it = lst.begin(); - TQValueList::ConstIterator end = lst.end(); + TQValueList lst = m_dcopActionProxy->actions(); + TQValueList::ConstIterator it = lst.begin(); + TQValueList::ConstIterator end = lst.end(); for (; it != end; ++it ) res.append( (*it)->name() ); diff --git a/konqueror/KonqMainWindowIface.h b/konqueror/KonqMainWindowIface.h index fc853e536..c6ce6443d 100644 --- a/konqueror/KonqMainWindowIface.h +++ b/konqueror/KonqMainWindowIface.h @@ -32,7 +32,7 @@ class KDCOPActionProxy; /** * DCOP interface for a konqueror main window */ -class KonqMainWindowIface : public KMainWindowInterface +class KonqMainWindowIface : public TDEMainWindowInterface { K_DCOP public: diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 7b608fe7c..b9c596db9 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -438,7 +438,7 @@ KonqAboutPage::KonqAboutPage( //KonqMainWindow * else setCharset("iso-8859-1", true); // about:blah isn't a tdeioslave -> disable View source - KAction * act = actionCollection()->action("viewDocumentSource"); + TDEAction * act = actionCollection()->action("viewDocumentSource"); if ( act ) act->setEnabled( false ); } diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 7ce0752e2..ff125a916 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -209,49 +209,49 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Don't repaint on configuration changes during construction m_bInit = true; - m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), + m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files")); m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) ); - m_paDirectoryOverlays = new KToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), + m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), actionCollection(), "show_directory_overlays" ); - m_pamPreview = new KActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); + m_pamPreview = new TDEActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); - m_paEnablePreviews = new KToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); + m_paEnablePreviews = new TDEToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); m_paEnablePreviews->setCheckedState( i18n("Disable Previews") ); connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_paEnablePreviews->setIcon("thumbnail"); m_pamPreview->insert( m_paEnablePreviews ); - m_pamPreview->insert( new KActionSeparator(this) ); + m_pamPreview->insert( new TDEActionSeparator(this) ); TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" ); - TQMap< TQString, KToggleAction* > previewActions; + TQMap< TQString, TDEToggleAction* > previewActions; for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) { - if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] ) + if ( TDEToggleAction*& preview = previewActions[ ( *it )->name() ] ) preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() ); else { - preview = new KToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); + preview = new TDEToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( preview ); m_paPreviewPlugins.append( preview ); } } - KToggleAction *soundPreview = new KToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); + TDEToggleAction *soundPreview = new TDEToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( soundPreview ); m_paPreviewPlugins.append( soundPreview ); - // m_pamSort = new KActionMenu( i18n( "Sort..." ), actionCollection(), "sort" ); + // m_pamSort = new TDEActionMenu( i18n( "Sort..." ), actionCollection(), "sort" ); - KToggleAction *aSortByNameCS = new KRadioAction( i18n( "By Name (Case Sensitive)" ), 0, actionCollection(), "sort_nc" ); - KToggleAction *aSortByNameCI = new KRadioAction( i18n( "By Name (Case Insensitive)" ), 0, actionCollection(), "sort_nci" ); - KToggleAction *aSortBySize = new KRadioAction( i18n( "By Size" ), 0, actionCollection(), "sort_size" ); - KToggleAction *aSortByType = new KRadioAction( i18n( "By Type" ), 0, actionCollection(), "sort_type" ); - KToggleAction *aSortByDate = new KRadioAction( i18n( "By Date" ), 0, actionCollection(), "sort_date" ); + TDEToggleAction *aSortByNameCS = new TDERadioAction( i18n( "By Name (Case Sensitive)" ), 0, actionCollection(), "sort_nc" ); + TDEToggleAction *aSortByNameCI = new TDERadioAction( i18n( "By Name (Case Insensitive)" ), 0, actionCollection(), "sort_nci" ); + TDEToggleAction *aSortBySize = new TDERadioAction( i18n( "By Size" ), 0, actionCollection(), "sort_size" ); + TDEToggleAction *aSortByType = new TDERadioAction( i18n( "By Type" ), 0, actionCollection(), "sort_type" ); + TDEToggleAction *aSortByDate = new TDERadioAction( i18n( "By Date" ), 0, actionCollection(), "sort_date" ); aSortByNameCS->setExclusiveGroup( "sorting" ); aSortByNameCI->setExclusiveGroup( "sorting" ); @@ -273,11 +273,11 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons //enable menu item representing the saved sorting criterion TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); - KRadioAction *sort_action = tqt_dynamic_cast(actionCollection()->action(sortcrit.latin1())); + TDERadioAction *sort_action = tqt_dynamic_cast(actionCollection()->action(sortcrit.latin1())); if(sort_action!=NULL) sort_action->activate(); - m_paSortDirsFirst = new KToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" ); - KToggleAction *aSortDescending = new KToggleAction( i18n( "Descending" ), 0, actionCollection(), "sort_descend" ); + m_paSortDirsFirst = new TDEToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" ); + TDEToggleAction *aSortDescending = new TDEToggleAction( i18n( "Descending" ), 0, actionCollection(), "sort_descend" ); m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() ); @@ -302,14 +302,14 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pamSort->insert( aSortDescending ); */ - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); @@ -319,8 +319,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_paUnselectAll->setToolTip( i18n( "Unselects all selected items" ) ); m_paInvertSelection->setToolTip( i18n( "Inverts the current selection of items" ) ); - //m_paBottomText = new KToggleAction( i18n( "Text at &Bottom" ), 0, actionCollection(), "textbottom" ); - //m_paRightText = new KToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); + //m_paBottomText = new TDEToggleAction( i18n( "Text at &Bottom" ), 0, actionCollection(), "textbottom" ); + //m_paRightText = new TDEToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); //m_paBottomText->setExclusiveGroup( "TextPos" ); //m_paRightText->setExclusiveGroup( "TextPos" ); //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) ); diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 56bef37dc..c05362b9d 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -31,9 +31,9 @@ class KonqPropsView; class KFileItem; class KDirLister; -class KAction; -class KToggleAction; -class KActionMenu; +class TDEAction; +class TDEToggleAction; +class TDEActionMenu; class TQIconViewItem; class IconViewBrowserExtension; @@ -194,25 +194,25 @@ protected: SortCriterion m_eSortCriterion; - KToggleAction *m_paDotFiles; - KToggleAction *m_paDirectoryOverlays; - KToggleAction *m_paEnablePreviews; + TDEToggleAction *m_paDotFiles; + TDEToggleAction *m_paDirectoryOverlays; + TDEToggleAction *m_paEnablePreviews; TQPtrList m_paOutstandingOverlays; TQTimer *m_paOutstandingOverlaysTimer; -/* KToggleAction *m_paImagePreview; - KToggleAction *m_paTextPreview; - KToggleAction *m_paHTMLPreview;*/ - KActionMenu *m_pamPreview; - TQPtrList m_paPreviewPlugins; - KActionMenu *m_pamSort; - - KAction *m_paSelect; - KAction *m_paUnselect; - KAction *m_paSelectAll; - KAction *m_paUnselectAll; - KAction *m_paInvertSelection; - - KToggleAction *m_paSortDirsFirst; +/* TDEToggleAction *m_paImagePreview; + TDEToggleAction *m_paTextPreview; + TDEToggleAction *m_paHTMLPreview;*/ + TDEActionMenu *m_pamPreview; + TQPtrList m_paPreviewPlugins; + TDEActionMenu *m_pamSort; + + TDEAction *m_paSelect; + TDEAction *m_paUnselect; + TDEAction *m_paSelectAll; + TDEAction *m_paUnselectAll; + TDEAction *m_paInvertSelection; + + TDEToggleAction *m_paSortDirsFirst; KonqIconViewWidget *m_pIconView; diff --git a/konqueror/keditbookmarks/TODO b/konqueror/keditbookmarks/TODO index 875dea715..98e379560 100644 --- a/konqueror/keditbookmarks/TODO +++ b/konqueror/keditbookmarks/TODO @@ -64,19 +64,19 @@ on startup: ==31246== at 0x4026A4DF: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E4: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== ==31246== Conditional jump or move depends on uninitialised value(s) ==31246== at 0x4026A4E8: KEBListViewItem::paintCell(QPainter*, QColorGroup const&, int, int, int) (listview.cpp:786) ==31246== by 0x40FD9CA7: QListView::drawContentsOffset(QPainter*, int, int, int, int, int, int) (qlistview.cpp:2905) ==31246== by 0x41013A5D: QScrollView::viewportPaintEvent(QPaintEvent*) (qscrollview.cpp:1702) - ==31246== by 0x407E7051: KListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) + ==31246== by 0x407E7051: TDEListView::viewportPaintEvent(QPaintEvent*) (klistview.cpp:1872) ==31246== lots of crap when using file->open diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 23e6fe16d..81d47f07e 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -98,116 +98,116 @@ void KEBApp::createActions() { (void) KStdAction::print(TQT_TQOBJECT(actn), TQT_SLOT( slotPrint() ), actionCollection()); // settings menu - (void) new KToggleAction( + (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions - (void) new KAction( + (void) new TDEAction( i18n("&Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete"); - (void) new KAction( + (void) new TDEAction( i18n("Rename"), "text", Key_F2, TQT_TQOBJECT(actn), TQT_SLOT( slotRename() ), actionCollection(), "rename"); - (void) new KAction( + (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); - (void) new KAction( + (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); - (void) new KAction( + (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); - (void) new KAction( + (void) new TDEAction( i18n("Update Favicon"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); - (void) new KAction( + (void) new TDEAction( i18n("Recursive Sort"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); - (void) new KAction( + (void) new TDEAction( i18n("&New Folder..."), "folder_new", CTRL+Key_N, TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); - (void) new KAction( + (void) new TDEAction( i18n("&New Bookmark"), "www", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); - (void) new KAction( + (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, TQT_TQOBJECT(actn), TQT_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); - (void) new KAction( + (void) new TDEAction( i18n("&Sort Alphabetically"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotSort() ), actionCollection(), "sort"); - (void) new KAction( + (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); - (void) new KAction( + (void) new TDEAction( i18n("&Expand All Folders"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); - (void) new KAction( + (void) new TDEAction( i18n("Collapse &All Folders"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); - (void) new KAction( + (void) new TDEAction( i18n("&Open in Konqueror"), "fileopen", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); - (void) new KAction( + (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); - (void) new KAction( + (void) new TDEAction( i18n("Check Status: &All"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); - (void) new KAction( + (void) new TDEAction( i18n("Update All &Favicons"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); - (void) new KAction( + (void) new TDEAction( i18n("Cancel &Checks"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); - (void) new KAction( + (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); - (void) new KAction( + (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importNS"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); - (void) new KAction( + (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); - (void) new KAction( + (void) new TDEAction( i18n("Import &KDE2/KDE3 Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); - (void) new KAction( + (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importIE"); - (void) new KAction( + (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "html", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); - (void) new KAction( + (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, TQT_TQOBJECT(actn), TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } @@ -272,7 +272,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) { } void KEBApp::setActionsEnabled(SelcAbilities sa) { - KActionCollection * coll = actionCollection(); + TDEActionCollection * coll = actionCollection(); TQStringList toEnable; diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h index 3df5d3acf..84268a698 100644 --- a/konqueror/keditbookmarks/commands.h +++ b/konqueror/keditbookmarks/commands.h @@ -204,7 +204,7 @@ class MoveCommand : public KCommand, public IKEBCommand { public: // "Create it with itemsAlreadyMoved=true since - // "KListView moves the item before telling us about it." + // "TDEListView moves the item before telling us about it." MoveCommand(const TQString &from, const TQString &to, const TQString &name = TQString::null) : KCommand(), m_from(from), m_to(to), m_mytext(name) { ; } diff --git a/konqueror/keditbookmarks/kebsearchline.cpp b/konqueror/keditbookmarks/kebsearchline.cpp index 973f737b5..2e2a2f2c9 100644 --- a/konqueror/keditbookmarks/kebsearchline.cpp +++ b/konqueror/keditbookmarks/kebsearchline.cpp @@ -19,21 +19,21 @@ #include "kebsearchline.h" #include "kebsearchline.moc" -KEBSearchLine::KEBSearchLine(TQWidget *parent, KListView *listView, const char *name) - : KListViewSearchLine(parent, listView, name) +KEBSearchLine::KEBSearchLine(TQWidget *parent, TDEListView *listView, const char *name) + : TDEListViewSearchLine(parent, listView, name) { mmode = AND; } KEBSearchLine::KEBSearchLine(TQWidget *parent, const char *name) - :KListViewSearchLine(parent, name) + :TDEListViewSearchLine(parent, name) { mmode = AND; } void KEBSearchLine::updateSearch(const TQString &s) { - KListViewSearchLine::updateSearch(s); + TDEListViewSearchLine::updateSearch(s); emit searchUpdated(); } @@ -44,7 +44,7 @@ KEBSearchLine::~KEBSearchLine() bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) const { if(mmode == EXACTLY) - return KListViewSearchLine::itemMatches(item, s); + return TDEListViewSearchLine::itemMatches(item, s); if(lastpattern != s) { @@ -60,12 +60,12 @@ bool KEBSearchLine::itemMatches(const TQListViewItem *item, const TQString &s) c if(it == end) //Nothing to match return true; for( ; it != end; ++it) - if(KListViewSearchLine::itemMatches(item, *it)) + if(TDEListViewSearchLine::itemMatches(item, *it)) return true; } else if(mmode == AND) for( ; it != end; ++it) - if(! KListViewSearchLine::itemMatches(item, *it)) + if(! TDEListViewSearchLine::itemMatches(item, *it)) return false; return (mmode == AND); diff --git a/konqueror/keditbookmarks/kebsearchline.h b/konqueror/keditbookmarks/kebsearchline.h index cfaee61c5..b2cdfce60 100644 --- a/konqueror/keditbookmarks/kebsearchline.h +++ b/konqueror/keditbookmarks/kebsearchline.h @@ -22,11 +22,11 @@ #include #include -class KEBSearchLine : public KListViewSearchLine +class KEBSearchLine : public TDEListViewSearchLine { Q_OBJECT public: - KEBSearchLine(TQWidget *parent = 0, KListView *listView = 0, const char *name = 0); + KEBSearchLine(TQWidget *parent = 0, TDEListView *listView = 0, const char *name = 0); KEBSearchLine(TQWidget *parent, const char *name); diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 3a2b14d5e..55f28b90a 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -546,7 +546,7 @@ void ListView::slotBkInfoUpdateListViewItem() { i->setText(KEBListView::CommentColumn, commentStr); } -void ListView::handleContextMenu(KEBListView *, KListView *, TQListViewItem *qitem, const TQPoint &p) { +void ListView::handleContextMenu(KEBListView *, TDEListView *, TQListViewItem *qitem, const TQPoint &p) { KEBListViewItem *item = static_cast(qitem); const char *type = ( !item || (item == m_listView->rootItem()) @@ -716,7 +716,7 @@ void KEBListView::init() { setTabOrderedRenaming(false); setSorting(-1, false); setDragEnabled(true); - setSelectionModeExt((!m_folderList) ? KListView::Extended: KListView::Single); + setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single); setAllColumnsShowFocus(true); connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); @@ -725,8 +725,8 @@ void KEBListView::init() { void KEBListView::makeConnections() { connect(this, TQT_SIGNAL( moved() ), TQT_SLOT( slotMoved() )); - connect(this, TQT_SIGNAL( contextMenu(KListView *, TQListViewItem*, const TQPoint &) ), - TQT_SLOT( slotContextMenu(KListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), + TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), @@ -744,7 +744,7 @@ void KEBListView::readonlyFlagInit(bool readonly) { void KEBListView::slotMoved() { ListView::self()->handleMoved(this); } -void KEBListView::slotContextMenu(KListView *a, TQListViewItem *b, const TQPoint &c) +void KEBListView::slotContextMenu(TDEListView *a, TQListViewItem *b, const TQPoint &c) { ListView::self()->handleContextMenu(this, a,b,c); } void KEBListView::slotItemRenamed(TQListViewItem *a, const TQString &b, int c) { ListView::self()->handleItemRenamed(this, a,b,c); } @@ -768,7 +768,7 @@ void KEBListView::rename(TQListViewItem *qitem, int column) { ListView::startRename(column, item); KeyPressEater *keyPressEater = new KeyPressEater(this); renameLineEdit()->installEventFilter(keyPressEater); - KListView::rename(item, column); + TDEListView::rename(item, column); } KEBListViewItem* KEBListView::rootItem() const { diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 7ffe76c37..1ada9506c 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -34,7 +34,7 @@ #include "toplevel.h" class TQSplitter; -class KListViewSearchLine; +class TDEListViewSearchLine; class KEBListViewItem : public TQListViewItem { @@ -80,7 +80,7 @@ private: void boldStyle(TQPainter *); }; -class KEBListView : public KListView +class KEBListView : public TDEListView { Q_OBJECT public: @@ -92,7 +92,7 @@ public: AddressColumn = 4 }; KEBListView(TQWidget *parent, bool folderList) - : KListView(parent), m_folderList(folderList) {} + : TDEListView(parent), m_folderList(folderList) {} virtual ~KEBListView() {} void init(); @@ -111,7 +111,7 @@ public: public slots: virtual void rename(TQListViewItem *item, int c); void slotMoved(); - void slotContextMenu(KListView *, TQListViewItem *, const TQPoint &); + void slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &); void slotItemRenamed(TQListViewItem *, const TQString &, int); void slotDoubleClicked(TQListViewItem *, const TQPoint &, int); void slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*); @@ -135,7 +135,7 @@ public: void initListViews(); void updateListViewSetup(bool readOnly); void connectSignals(); - void setSearchLine(KListViewSearchLine * searchline) { m_searchline = searchline; }; + void setSearchLine(TDEListViewSearchLine * searchline) { m_searchline = searchline; }; // selected item stuff void selected(KEBListViewItem * item, bool s); @@ -179,7 +179,7 @@ public: void handleMoved(KEBListView *); void handleDropped(KEBListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *); - void handleContextMenu(KEBListView *, KListView *, TQListViewItem *, const TQPoint &); + void handleContextMenu(KEBListView *, TDEListView *, TQListViewItem *, const TQPoint &); void handleDoubleClicked(KEBListView *, TQListViewItem *, const TQPoint &, int); void handleItemRenamed(KEBListView *, TQListViewItem *, const TQString &, int); @@ -200,7 +200,7 @@ private: ListView(); KEBListView *m_listView; - KListViewSearchLine * m_searchline; + TDEListViewSearchLine * m_searchline; // Actually this is a std:set, the bool is ignored TQMap mSelectedItems; diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index eea4d8c58..24ab4fbbb 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -58,7 +58,7 @@ CmdHistory* CmdHistory::s_self = 0; -CmdHistory::CmdHistory(KActionCollection *collection) +CmdHistory::CmdHistory(TDEActionCollection *collection) : m_commandHistory(collection) { connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), TQT_SLOT( slotCommandExecuted(KCommand *) )); @@ -196,7 +196,7 @@ KEBApp *KEBApp::s_topLevel = 0; KEBApp::KEBApp( const TQString &bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption -) : KMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile), +) : TDEMainWindow(), m_dcopIface(0), m_bookmarksFilename(bookmarksFile), m_caption(caption), m_readOnly(readonly), m_browser(browser) { m_cmdHistory = new CmdHistory(actionCollection()); @@ -207,9 +207,9 @@ KEBApp::KEBApp( TQSplitter *vsplitter = new TQSplitter(this); - KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar"); + TDEToolBar *quicksearch = new TDEToolBar(vsplitter, "search toolbar"); - KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), + TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, actionCollection(), "reset_quicksearch" ); resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search
" @@ -218,7 +218,7 @@ KEBApp::KEBApp( TQLabel *lbl = new TQLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget"); - KListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "KListViewSearchLine"); + TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); @@ -226,7 +226,7 @@ KEBApp::KEBApp( ListView::createListViews(vsplitter); ListView::self()->initListViews(); - searchLineEdit->setListView(static_cast(ListView::self()->widget())); + searchLineEdit->setListView(static_cast(ListView::self()->widget())); ListView::self()->setSearchLine(searchLineEdit); m_bkinfo = new BookmarkInfoWidget(vsplitter); @@ -290,8 +290,8 @@ KEBApp::~KEBApp() { delete ListView::self(); } -KToggleAction* KEBApp::getToggleAction(const char *action) const { - return static_cast(actionCollection()->action(action)); +TDEToggleAction* KEBApp::getToggleAction(const char *action) const { + return static_cast(actionCollection()->action(action)); } void KEBApp::resetActions() { diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 7b1ec5f81..31f10a01a 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -27,7 +27,7 @@ #include class KBookmarkManager; -class KToggleAction; +class TDEToggleAction; class KBookmarkEditorIface; class ImportCommand; class BookmarkInfoWidget; @@ -48,7 +48,7 @@ struct SelcAbilities { class CmdHistory : public TQObject { Q_OBJECT public: - CmdHistory(KActionCollection *collection); + CmdHistory(TDEActionCollection *collection); virtual ~CmdHistory() { ; } void notifyDocSaved(); @@ -108,7 +108,7 @@ private: uint ignorenext; }; -class KEBApp : public KMainWindow { +class KEBApp : public TDEMainWindow { Q_OBJECT public: static KEBApp* self() { return s_topLevel; } @@ -129,7 +129,7 @@ public: return factory()->container(type, this); } - KToggleAction* getToggleAction(const char *) const; + TDEToggleAction* getToggleAction(const char *) const; TQString caption() const { return m_caption; } bool readonly() const { return m_readOnly; } diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index df25a5e6c..ed5a5002b 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -81,7 +81,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList &his /////////////////////////////// KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject* parent, const char* name ) - : KAction( text, 0, parent, name ) + : TDEAction( text, 0, parent, name ) { setShortcutConfigurable(false); m_firstIndex = 0; @@ -90,7 +90,7 @@ KonqBidiHistoryAction::KonqBidiHistoryAction ( const TQString & text, TQObject* int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; // Go menu @@ -108,7 +108,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) m_firstIndex = m_goMenu->count(); return m_goMenu->count(); // hmmm, what should this be ? } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } void KonqBidiHistoryAction::fillGoMenu( const TQPtrList & history ) @@ -169,30 +169,30 @@ void KonqBidiHistoryAction::slotActivated( int id ) /////////////////////////////// KonqLogoAction::KonqLogoAction( const TQString& text, int accel, TQObject* parent, const char* name ) - : KAction( text, accel, parent, name ) + : TDEAction( text, accel, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQString& text, int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, accel, receiver, slot, parent, name ) + : TDEAction( text, accel, receiver, slot, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name ) - : KAction( text, pix, accel, parent, name ) + : TDEAction( text, pix, accel, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQString& text, const TQIconSet& pix,int accel, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( text, pix, accel, receiver, slot, parent, name ) + : TDEAction( text, pix, accel, receiver, slot, parent, name ) { } KonqLogoAction::KonqLogoAction( const TQStringList& icons, TQObject* receiver, const char* slot, TQObject* parent, const char* name ) - : KAction( 0L, 0, receiver, slot, parent, name ) // text missing ! + : TDEAction( 0L, 0, receiver, slot, parent, name ) // text missing ! { iconList = icons; } @@ -204,9 +204,9 @@ void KonqLogoAction::start() { TQWidget *w = container( i ); - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( i ) ); + KAnimWidget *anim = ((TDEToolBar *)w)->animatedWidget( menuId( i ) ); anim->start(); } } @@ -219,9 +219,9 @@ void KonqLogoAction::stop() { TQWidget *w = container( i ); - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( i ) ); + KAnimWidget *anim = ((TDEToolBar *)w)->animatedWidget( menuId( i ) ); anim->stop(); } } @@ -231,9 +231,9 @@ void KonqLogoAction::updateIcon(int id) { TQWidget *w = container( id ); - if ( w->inherits( "KToolBar" ) ) + if ( w->inherits( "TDEToolBar" ) ) { - KAnimWidget *anim = ((KToolBar *)w)->animatedWidget( menuId( id ) ); + KAnimWidget *anim = ((TDEToolBar *)w)->animatedWidget( menuId( id ) ); anim->setIcons(icon()); } } @@ -242,22 +242,22 @@ void KonqLogoAction::updateIcon(int id) int KonqLogoAction::plug( TQWidget *widget, int index ) { - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; /* - if ( widget->inherits( "KMainWindow" ) ) + if ( widget->inherits( "TDEMainWindow" ) ) { - ((KMainWindow*)widget)->setIndicatorWidget(m_logoLabel); + ((TDEMainWindow*)widget)->setIndicatorWidget(m_logoLabel); addContainer( widget, -1 ); return containerCount() - 1; } */ - if ( widget->inherits( "KToolBar" ) ) + if ( widget->inherits( "TDEToolBar" ) ) { - KToolBar *bar = (KToolBar *)widget; + TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); @@ -271,7 +271,7 @@ int KonqLogoAction::plug( TQWidget *widget, int index ) return containerCount() - 1; } - int containerId = KAction::plug( widget, index ); + int containerId = TDEAction::plug( widget, index ); return containerId; } @@ -280,7 +280,7 @@ int KonqLogoAction::plug( TQWidget *widget, int index ) KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &icon, TQObject *parent, const char *name ) - : KRadioAction( text, icon, 0, parent, name ) + : TDERadioAction( text, icon, 0, parent, name ) { m_menu = new TQPopupMenu; @@ -299,13 +299,13 @@ KonqViewModeAction::~KonqViewModeAction() int KonqViewModeAction::plug( TQWidget *widget, int index ) { - int res = KRadioAction::plug( widget, index ); + int res = TDERadioAction::plug( widget, index ); - if ( widget->inherits( "KToolBar" ) && (res != -1) ) + if ( widget->inherits( "TDEToolBar" ) && (res != -1) ) { - KToolBar *toolBar = static_cast( widget ); + TDEToolBar *toolBar = static_cast( widget ); - KToolBarButton *button = toolBar->getButton( itemId( res ) ); + TDEToolBarButton *button = toolBar->getButton( itemId( res ) ); if ( m_menu->count() > 1 ) button->setDelayedPopup( m_menu, false ); @@ -332,12 +332,12 @@ void KonqViewModeAction::slotPopupAboutToHide() for (; i < containerCount(); ++i ) { TQWidget *widget = container( i ); - if ( !widget->inherits( "KToolBar" ) ) + if ( !widget->inherits( "TDEToolBar" ) ) continue; - KToolBar *tb = static_cast( widget ); + TDEToolBar *tb = static_cast( widget ); - KToolBarButton *button = tb->getButton( itemId( i ) ); + TDEToolBarButton *button = tb->getButton( itemId( i ) ); button->setDown( isChecked() ); } @@ -351,7 +351,7 @@ uint KonqMostOftenURLSAction::s_maxEntries = 0; KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text, TQObject *parent, const char *name ) - : KActionMenu( text, "goto", parent, name ) + : TDEActionMenu( text, "goto", parent, name ) { setDelayed( false ); diff --git a/konqueror/konq_actions.h b/konqueror/konq_actions.h index 849d45668..8b24c28a6 100644 --- a/konqueror/konq_actions.h +++ b/konqueror/konq_actions.h @@ -31,7 +31,7 @@ class TQPopupMenu; * Plug this action into a menu to get a bidirectional history * (both back and forward, including current location) */ -class KonqBidiHistoryAction : public KAction +class KonqBidiHistoryAction : public TDEAction { Q_OBJECT public: @@ -68,7 +68,7 @@ private: ///// -class KonqLogoAction : public KAction +class KonqLogoAction : public TDEAction { Q_OBJECT public: @@ -93,7 +93,7 @@ private: TQStringList iconList; }; -class KonqViewModeAction : public KRadioAction +class KonqViewModeAction : public TDERadioAction { Q_OBJECT public: @@ -124,7 +124,7 @@ protected: virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item ); }; -class KonqMostOftenURLSAction : public KActionMenu +class KonqMostOftenURLSAction : public TDEActionMenu { Q_OBJECT diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 6199b59ae..6b814a647 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -406,8 +406,8 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) return false; } - if ( KKey( e ) == KKey( int( KStdAccel::deleteWordBack() ) ) || - KKey( e ) == KKey( int( KStdAccel::deleteWordForward() ) ) || + if ( KKey( e ) == KKey( int( TDEStdAccel::deleteWordBack() ) ) || + KKey( e ) == KKey( int( TDEStdAccel::deleteWordForward() ) ) || ((e->state() & ControlButton) && (e->key() == Key_Left || e->key() == Key_Right) ) ) { selectWord(e); @@ -429,8 +429,8 @@ void KonqCombo::keyPressEvent( TQKeyEvent *e ) KHistoryCombo::keyPressEvent( e ); // we have to set it as temporary, otherwise we wouldn't get our nice // pixmap. Yes, TQComboBox still sucks. - if ( KKey( e ) == KKey( int( KStdAccel::rotateUp() ) ) || - KKey( e ) == KKey( int( KStdAccel::rotateDown() ) ) ) + if ( KKey( e ) == KKey( int( TDEStdAccel::rotateUp() ) ) || + KKey( e ) == KKey( int( TDEStdAccel::rotateDown() ) ) ) setTemporary( currentText() ); } diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 0764cf0b1..bfc37f6e1 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -151,13 +151,13 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - KAction 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, TQT_TQOBJECT(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() ); // For the rest, we borrow them from the main window // ###### might be not right for passive views ! - KActionCollection *actionColl = mw->actionCollection(); + TDEActionCollection *actionColl = mw->actionCollection(); TQPopupMenu menu; diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index 0b5ea4771..e3ae0ba2a 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -49,7 +49,7 @@ class KonqFrameTabs; class TDEConfig; class KSeparator; class KProgress; -class KAction; +class TDEAction; class KSqueezedTextLabel; namespace KParts diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 94aaf8ba1..ffd45fe89 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -134,9 +134,9 @@ PopupMenuGUIClient::~PopupMenuGUIClient() { } -KAction *PopupMenuGUIClient::action( const TQDomElement &element ) const +TDEAction *PopupMenuGUIClient::action( const TQDomElement &element ) const { - KAction *res = KXMLGUIClient::action( element ); + TDEAction *res = KXMLGUIClient::action( element ); if ( !res ) res = m_mainWindow->action( element ); @@ -156,7 +156,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const action.setAttribute( "group", "preview" ); - (void)new KAction( name, service->pixmap( KIcon::Small ), 0, + (void)new TDEAction( name, service->pixmap( KIcon::Small ), 0, TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } @@ -195,7 +195,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) TQString description = i18n( "Show %1" ).arg( (*cIt)->name() ); TQString name = (*cIt)->desktopEntryName(); //kdDebug(1202) << "ToggleViewGUIClient: name=" << name << endl; - KToggleAction *action = new KToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); + TDEToggleAction *action = new TDEToggleAction( description, 0, mainWindow->actionCollection(), name.latin1() ); action->setCheckedState( i18n( "Hide %1" ).arg( (*cIt)->name() ) ); // HACK @@ -222,11 +222,11 @@ ToggleViewGUIClient::~ToggleViewGUIClient() { } -TQPtrList ToggleViewGUIClient::actions() const +TQPtrList ToggleViewGUIClient::actions() const { - TQPtrList res; + TQPtrList res; - TQDictIterator it( m_actions ); + TQDictIterator it( m_actions ); for (; it.current(); ++it ) res.append( it.current() ); @@ -322,11 +322,11 @@ void ToggleViewGUIClient::slotViewAdded( KonqView *view ) { TQString name = view->service()->desktopEntryName(); - KAction *action = m_actions[ name ]; + TDEAction *action = m_actions[ name ]; if ( action ) { - static_cast( action )->setChecked( true ); + static_cast( action )->setChecked( true ); saveConfig( true, name ); // KonqView::isToggleView() is not set yet.. so just check for the orientation @@ -351,11 +351,11 @@ void ToggleViewGUIClient::slotViewRemoved( KonqView *view ) { TQString name = view->service()->desktopEntryName(); - KAction *action = m_actions[ name ]; + TDEAction *action = m_actions[ name ]; if ( action ) { - static_cast( action )->setChecked( false ); + static_cast( action )->setChecked( false ); saveConfig( false, name ); } } diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h index 238153371..73d9b9a60 100644 --- a/konqueror/konq_guiclients.h +++ b/konqueror/konq_guiclients.h @@ -25,8 +25,8 @@ #include #include -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class KonqMainWindow; class KonqView; @@ -59,7 +59,7 @@ public: bool isIntoTrash, bool doTabHandling ); virtual ~PopupMenuGUIClient(); - virtual KAction *action( const TQDomElement &element ) const; + virtual TDEAction *action( const TQDomElement &element ) const; private: void addEmbeddingService( TQDomElement &menu, int idx, const TQString &name, const KService::Ptr &service ); @@ -78,8 +78,8 @@ public: bool empty() const { return m_empty; } - TQPtrList actions() const; - KAction *action( const TQString &name ) { return m_actions[ name ]; } + TQPtrList actions() const; + TDEAction *action( const TQString &name ) { return m_actions[ name ]; } void saveConfig( bool add, const TQString &serviceName ); @@ -89,7 +89,7 @@ private slots: void slotViewRemoved( KonqView *view ); private: KonqMainWindow *m_mainWindow; - TQDict m_actions; + TQDict m_actions; bool m_empty; TQMap m_mapOrientation; }; diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 9be0b538d..9edb00a1b 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -75,7 +75,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) int n = 1; while ( KonqMainWindow::canBeRestored( n ) ) { - TQString className = KMainWindow::classNameOfToplevel( n ); + TQString className = TDEMainWindow::classNameOfToplevel( n ); if( className == TQString::fromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 0f3aeeb5e..afe4f8c5a 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -119,7 +119,7 @@ #include template class TQPtrList; -template class TQPtrList; +template class TQPtrList; TQPtrList *KonqMainWindow::s_lstViews = 0; TDEConfig * KonqMainWindow::s_comboConfig = 0; @@ -245,10 +245,10 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con // Those menus are created by konqueror.rc so their address will never change TQPopupMenu *popup = static_cast(factory()->container("edit",this)); if (popup) - KAcceleratorManager::manage(popup); + TDEAcceleratorManager::manage(popup); popup = static_cast(factory()->container("tools",this)); if (popup) - KAcceleratorManager::manage(popup); + TDEAcceleratorManager::manage(popup); m_bSaveViewPropertiesLocally = KonqSettings::saveViewPropertiesLocally(); m_bHTMLAllowed = KonqSettings::htmlAllowed(); @@ -349,8 +349,8 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T if ( res && (element.tagName() == tagToolBar) && (element.attribute( "name" ) == nameBookmarkBar) ) { - assert( res->inherits( "KToolBar" ) ); - if (!kapp->authorizeKAction("bookmarks")) + assert( res->inherits( "TDEToolBar" ) ); + if (!kapp->authorizeTDEAction("bookmarks")) { delete res; return 0; @@ -360,7 +360,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T { // The actual menu needs a different action collection, so that the bookmarks // don't appear in kedittoolbar - m_bookmarkBarActionCollection = new KActionCollection( this ); + m_bookmarkBarActionCollection = new TDEActionCollection( this ); m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, TQT_TQOBJECT(res) ); @@ -373,7 +373,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T void KonqMainWindow::initBookmarkBar() { - KToolBar * bar = static_cast( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) ); + TDEToolBar * bar = static_cast( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); if (!bar) return; @@ -398,7 +398,7 @@ void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQD if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) { - assert( container->inherits( "KToolBar" ) ); + assert( container->inherits( "TDEToolBar" ) ); if (m_paBookmarkBar) m_paBookmarkBar->clear(); } @@ -407,7 +407,7 @@ void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQD } // Detect a name filter (e.g. *.txt) in the url. -// Note that KShortURIFilter does the same, but we have no way of getting it from there +// Note that TDEShortURIFilter does the same, but we have no way of getting it from there // // Note: this removes the filter from the URL. static TQString detectNameFilter( KURL & url ) @@ -1269,7 +1269,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( !windowArgs.toolBarsVisible ) { - for ( TQPtrListIterator it( mainWindow->toolBarIterator() ); it.current(); ++it ) + for ( TQPtrListIterator it( mainWindow->toolBarIterator() ); it.current(); ++it ) { (*it)->hide(); } @@ -1520,7 +1520,7 @@ void KonqMainWindow::slotToolFind() connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); } - else if ( TQT_TQOBJECT_CONST(sender())->inherits( "KAction" ) ) // don't go there if called by the singleShot below + else if ( TQT_TQOBJECT_CONST(sender())->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below { KURL url; if ( m_currentView && m_currentView->url().isLocalFile() ) @@ -1650,7 +1650,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // quick viewmode change (iconview) -> find the iconview-konqviewmode // action and set new text,icon,etc. properties, to show the new // current viewmode - TQPtrListIterator it( m_toolBarViewModeActions ); + TQPtrListIterator it( m_toolBarViewModeActions ); for (; it.current(); ++it ) if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) { @@ -1846,14 +1846,14 @@ void KonqMainWindow::slotReloadStop() { } void KonqMainWindow::toggleReloadStopButton(bool isReload) { - //m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + //m_paStop = new TDEAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); if (isReload) { m_paReloadStop->setIcon("stop"); m_paReloadStop->setWhatsThis( i18n( "Stop loading the document

" "All network transfers will be stopped and Konqueror will display the content " "that has been received so far." ) ); m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) ); - //m_paReloadStop = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); + //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); } else { m_paReloadStop->setIcon("reload"); m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document

" @@ -1869,7 +1869,7 @@ void KonqMainWindow::slotReloadPopup() slotReload( m_pWorkingTab->activeChildView() ); } -void KonqMainWindow::slotHome(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotHome(TDEAction::ActivationReason, TQt::ButtonState state) { TQString homeURL = m_pViewManager->profileHomeURL(); @@ -1902,7 +1902,7 @@ void KonqMainWindow::slotHome(KAction::ActivationReason, TQt::ButtonState state) void KonqMainWindow::slotHome() { - slotHome(KAction::UnknownActivation, Qt::LeftButton); + slotHome(TDEAction::UnknownActivation, Qt::LeftButton); } void KonqMainWindow::slotGoSystem() @@ -1951,14 +1951,14 @@ void KonqMainWindow::slotGoAutostart() void KonqMainWindow::slotGoHistory() { - KAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); + TDEAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); if (!a) { KMessageBox::sorry(0L, i18n("Your sidebar is not functional or unavailable."), i18n("Show History Sidebar")); return; } // Show the sidebar - if (!static_cast(a)->isChecked()) { + if (!static_cast(a)->isChecked()) { a->activate(); TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory())); return; @@ -2141,8 +2141,8 @@ void KonqMainWindow::applyKonqMainWindowSettings() for ( ; togIt != togEnd ; ++togIt ) { // Find the action by name - // KAction * act = m_toggleViewGUIClient->actionCollection()->action( (*togIt).latin1() ); - KAction *act = m_toggleViewGUIClient->action( *togIt ); + // TDEAction * act = m_toggleViewGUIClient->actionCollection()->action( (*togIt).latin1() ); + TDEAction *act = m_toggleViewGUIClient->action( *togIt ); if ( act ) act->activate(); else @@ -2207,7 +2207,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) if ( oldView->part() ) { - KActionCollection *coll = oldView->part()->actionCollection(); + TDEActionCollection *coll = oldView->part()->actionCollection(); if ( coll ) disconnectActionCollection( coll ); } @@ -2242,7 +2242,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( static_cast(it.key()) ); + TDEAction * act = actionCollection()->action( static_cast(it.key()) ); Q_ASSERT(act); if (act) act->setEnabled( false ); @@ -2257,7 +2257,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) } createGUI( part ); - KActionCollection *coll = m_currentView->part()->actionCollection(); + TDEActionCollection *coll = m_currentView->part()->actionCollection(); if ( coll ) connectActionCollection( coll ); @@ -2274,7 +2274,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) // if we just toggled the view mode via the view mode actions, then // we don't need to do all the time-taking stuff below (Simon) const TQString currentServiceDesktopEntryName = m_currentView->service()->desktopEntryName(); - TQPtrListIterator it( m_viewModeActions ); + TQPtrListIterator it( m_viewModeActions ); for (; it.current(); ++it ) { if ( it.current()->name() == currentServiceDesktopEntryName ) { it.current()->setChecked( true ); @@ -2282,11 +2282,11 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) } } const TQString currentServiceLibrary = viewModeActionKey( m_currentView->service() ); - TQPtrListIterator ittb( m_toolBarViewModeActions ); + TQPtrListIterator ittb( m_toolBarViewModeActions ); for (; ittb.current(); ++ittb ) { KService::Ptr serv = KService::serviceByDesktopName( ittb.current()->name() ); if ( serv && viewModeActionKey( serv ) == currentServiceLibrary ) { - KToggleAction* ta = static_cast( ittb.current() ); + TDEToggleAction* ta = static_cast( ittb.current() ); ta->setChecked( false ); TQString servicename = m_currentView->service()->genericName(); if (servicename.isEmpty()) @@ -3110,7 +3110,7 @@ void KonqMainWindow::slotUpAboutToShow() } } -void KonqMainWindow::slotUp(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state) { m_goState = state; TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); @@ -3231,7 +3231,7 @@ void KonqMainWindow::slotBack() slotGoHistoryActivated(-1); } -void KonqMainWindow::slotBack(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotBack(TDEAction::ActivationReason, TQt::ButtonState state) { slotGoHistoryActivated( -1, state ); } @@ -3253,7 +3253,7 @@ void KonqMainWindow::slotForward() slotGoHistoryActivated( 1 ); } -void KonqMainWindow::slotForward(KAction::ActivationReason, TQt::ButtonState state) +void KonqMainWindow::slotForward(TDEAction::ActivationReason, TQt::ButtonState state) { slotGoHistoryActivated( 1, state ); } @@ -3484,7 +3484,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) // but the duplicate_window action also has Ctrl-D as accel and // prevents the lineedit from getting this event. IMHO the accel // should be disabled in favor of the focus-widget. - KAction *duplicate = actionCollection()->action("duplicate_window"); + TDEAction *duplicate = actionCollection()->action("duplicate_window"); if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( false ); @@ -3496,8 +3496,8 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); if (slotNames.contains("del()")) disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); + disconnect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); @@ -3525,7 +3525,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) // see above in FocusIn for explanation // we use new_window as reference, as it's always in the same state // as duplicate_window - KAction *duplicate = actionCollection()->action("duplicate_window"); + TDEAction *duplicate = actionCollection()->action("duplicate_window"); if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); @@ -3537,8 +3537,8 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); if (slotNames.contains("del()")) connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); @@ -3584,7 +3584,7 @@ void KonqMainWindow::slotCheckComboSelection() m_paCut->setEnabled( hasSelection ); } -void KonqMainWindow::slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState state ) +void KonqMainWindow::slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState state ) { kdDebug(1202) << "slotClearLocationBar" << endl; slotStop(); @@ -3624,7 +3624,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) bool haveFullScreenButton = false; //Walk over the toolbars and check whether there is a show fullscreen button in any of them - TQPtrListIterator barIt = toolBarIterator(); + TQPtrListIterator barIt = toolBarIterator(); for (; barIt.current(); ++barIt ) { //Are we plugged here, in a visible toolbar? @@ -3638,7 +3638,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set ) if (!haveFullScreenButton) { - TQPtrList lst; + TQPtrList lst; lst.append( m_ptaFullScreen ); plugActionList( "fullscreen", lst ); } @@ -3707,7 +3707,7 @@ void KonqMainWindow::setPageSecurity( PageSecurity pageSecurity ) void KonqMainWindow::showPageSecurity() { if ( m_currentView && m_currentView->part() ) { - KAction *act = m_currentView->part()->action( "security" ); + TDEAction *act = m_currentView->part()->action( "security" ); if ( act ) act->activate(); } @@ -3803,44 +3803,44 @@ void KonqMainWindow::initActions() TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileNewAboutToShow()) ); - (void) new KAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); - (void) new KAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new KAction( i18n( "New &Window" ), "window_new", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new KAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new KAction( i18n( "Send &Link Address..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new KAction( i18n( "S&end File..." ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (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" ); if (kapp->authorize("shell_access")) { - (void) new KAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new KAction( i18n( "&Open Location..." ), "fileopen", KStdAccel::shortcut(KStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new TDEAction( i18n( "&Open Location..." ), "fileopen", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new KToggleAction( i18n( "&Find File..." ), "filefind", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(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" ); - m_ptaUseHTML = new KToggleAction( i18n( "&Use index.html" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new KToggleAction( i18n( "Lock to Current Location"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new KToggleAction( i18n( "Lin&k View"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); + 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" ); // Go menu - m_paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", KStdAccel::shortcut(KStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotUp(KAction::ActivationReason, TQt::ButtonState) ) ); + m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); + connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(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 ) ) ); TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); - m_paBack = new KToolBarPopupAction( backForward.first, KStdAccel::shortcut(KStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotBack(KAction::ActivationReason, TQt::ButtonState) ) ); + 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), + 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 ) ) ); - m_paForward = new KToolBarPopupAction( backForward.second, KStdAccel::shortcut(KStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotForward(KAction::ActivationReason, TQt::ButtonState) ) ); + 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), + 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 ) ) ); @@ -3848,29 +3848,29 @@ void KonqMainWindow::initActions() 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 ) ) ); - m_paHome = new KAction( i18n( "Home" ), "gohome", KStdAccel::shortcut(KStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), - TQT_SLOT( slotHome(KAction::ActivationReason, TQt::ButtonState) ) ); - - (void) new KAction( i18n( "S&ystem" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new KAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new KAction( i18n( "&Storage Media" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new KAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new KAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); - //(void) new KAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new KAction( i18n( "Trash" ), "trashcan_full", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new KAction( i18n( "Autostart" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + m_paHome = new TDEAction( i18n( "Home" ), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" ); + connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this), + TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); + + (void) new TDEAction( i18n( "S&ystem" ), "system", 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" ), "system", 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( "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" ), 0, TQT_TQOBJECT(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 KAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + (void) new TDEAction( i18n( "History" ), "history", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new KAction( i18n( "&Save View Profile..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new KToggleAction( i18n( "Save View Changes per &Folder" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + 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" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" << @@ -3890,52 +3890,52 @@ void KonqMainWindow::initActions() KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new KAction( i18n("Configure Extensions..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new KAction( i18n("Configure Spell Checking..."), "spellcheck", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + 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..."), "spellcheck", 0,TQT_TQOBJECT(this), TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new KAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new KAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new KAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new KAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new KAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(this), TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new KAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new KAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new KAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new KAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(), TQT_TQOBJECT(this), TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new KAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::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, 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" ); TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new KAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname); + new TDEAction(i18n("Activate Tab %1").arg(i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new KAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new KAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), 0 , CTRL+SHIFT+Key_Left,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), 0 , CTRL+SHIFT+Key_Right,TQT_TQOBJECT(this), TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new KAction( 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, TQT_TQOBJECT(this), TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif - m_paSaveRemoveViewProfile = new KAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); - m_pamLoadViewProfile = new KActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); + m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); + m_pamLoadViewProfile = new TDEActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); m_pViewManager->setProfiles( m_pamLoadViewProfile ); m_ptaFullScreen = KStdAction::fullScreen( 0, 0, actionCollection(), this ); - KShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); + 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 ))); - KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); + TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new KAction( 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, 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_paReloadStop = new KAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); @@ -3944,20 +3944,20 @@ void KonqMainWindow::initActions() // Those are connected to the browserextension directly m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" ); - KShortcut cutShortCut = m_paCut->shortcut(); + TDEShortcut cutShortCut = m_paCut->shortcut(); cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files m_paCut->setShortcut( cutShortCut ); m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new KAction( i18n( "&Stop" ), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new TDEAction( i18n( "&Stop" ), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); - m_paRename = new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" ); - m_paTrash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); - connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); + m_paRename = new TDEAction( i18n( "&Rename" ), /*"editrename",*/ 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 ) ) ); - m_paDelete = new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" ); + m_paDelete = new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" ); m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); @@ -3974,21 +3974,21 @@ void KonqMainWindow::initActions() TQWhatsThis::add( m_combo, i18n( "Location Bar

" "Enter a web address or search term." ) ); - KAction *clearLocation = new KAction( i18n( "Clear Location Bar" ), + TDEAction *clearLocation = new TDEAction( i18n( "Clear Location Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, actionCollection(), "clear_location" ); - connect( clearLocation, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), - TQT_SLOT( slotClearLocationBar( KAction::ActivationReason, TQt::ButtonState ) ) ); + connect( clearLocation, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + TQT_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); clearLocation->setWhatsThis( i18n( "Clear Location bar

" "Clears the content of the location bar." ) ); // Bookmarks menu - m_pamBookmarks = new KActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); + m_pamBookmarks = new TDEActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); m_pamBookmarks->setDelayed( false ); // The actual menu needs a different action collection, so that the bookmarks // don't appear in kedittoolbar - m_bookmarksActionCollection = new KActionCollection( this ); + m_bookmarksActionCollection = new TDEActionCollection( this ); m_bookmarksActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarksActionCollection ); @@ -4000,15 +4000,15 @@ void KonqMainWindow::initActions() TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); - KAction *addBookmark = actionCollection()->action("add_bookmark"); + TDEAction *addBookmark = actionCollection()->action("add_bookmark"); if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); m_paShowMenuBar = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new KAction( i18n( "Kon&queror Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new TDEAction( i18n( "Kon&queror Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - KAction *goUrl = new KAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" ); + TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go

" "Goes to the page that has been entered into the location bar." ) ); @@ -4276,15 +4276,15 @@ void KonqMainWindow::updateViewActions() { // 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 KAction( i18n("Copy &Files..."), Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new KAction( i18n("M&ove Files..."), Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), Key_F8, TQT_TQOBJECT(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 KAction( i18n("Create Folder..." ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), + m_paNewDir = new TDEAction( i18n("Create Folder..." ), Key_F10, TQT_TQOBJECT(this), TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); - TQPtrList lst; + TQPtrList lst; lst.append( m_paCopyFiles ); lst.append( m_paMoveFiles ); m_paCopyFiles->setEnabled( false ); @@ -4339,7 +4339,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( static_cast(it.key()) ); + TDEAction * act = actionCollection()->action( static_cast(it.key()) ); //kdDebug(1202) << it.key() << endl; if ( act ) { @@ -4373,7 +4373,7 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) for ( ; it != itEnd ; ++it ) { - KAction * act = actionCollection()->action( static_cast(it.key()) ); + TDEAction * act = actionCollection()->action( static_cast(it.key()) ); //kdDebug(1202) << it.key() << endl; if ( act && slotNames.contains( it.key()+"()" ) ) { @@ -4383,11 +4383,11 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) } } -void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ) +void KonqMainWindow::slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state ) { if ( !m_currentView ) return; - if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) + if ( reason == TDEAction::PopupMenuActivation && ( state & TQt::ShiftButton ) ) m_currentView->callExtensionMethod( "del()" ); else m_currentView->callExtensionMethod( "trash()" ); @@ -4395,7 +4395,7 @@ void KonqMainWindow::slotTrashActivated( KAction::ActivationReason reason, TQt:: void KonqMainWindow::enableAction( const char * name, bool enabled ) { - KAction * act = actionCollection()->action( name ); + TDEAction * act = actionCollection()->action( name ); if (!act) kdWarning(1202) << "Unknown action " << name << " - can't enable" << endl; else @@ -4421,7 +4421,7 @@ void KonqMainWindow::enableAction( const char * name, bool enabled ) void KonqMainWindow::setActionText( const char * name, const TQString& text ) { - KAction * act = actionCollection()->action( name ); + TDEAction * act = actionCollection()->action( name ); if (!act) kdWarning(1202) << "Unknown action " << name << " - can't enable" << endl; else @@ -4444,12 +4444,12 @@ void KonqMainWindow::enableAllActions( bool enable ) kdDebug(1202) << "KonqMainWindow::enableAllActions " << enable << endl; KParts::BrowserExtension::ActionSlotMap * actionSlotMap = KParts::BrowserExtension::actionSlotMapPtr(); - TQValueList actions = actionCollection()->actions(); - TQValueList::Iterator it = actions.begin(); - TQValueList::Iterator end = actions.end(); + TQValueList actions = actionCollection()->actions(); + TQValueList::Iterator it = actions.begin(); + TQValueList::Iterator end = actions.end(); for (; it != end; ++it ) { - KAction *act = *it; + TDEAction *act = *it; if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */ && ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */ act->setEnabled( enable ); @@ -4476,8 +4476,8 @@ void KonqMainWindow::enableAllActions( bool enable ) if (m_toggleViewGUIClient) { - TQPtrList actions = m_toggleViewGUIClient->actions(); - for ( KAction * it = actions.first(); it ; it = actions.next() ) + TQPtrList actions = m_toggleViewGUIClient->actions(); + for ( TDEAction * it = actions.first(); it ; it = actions.next() ) it->setEnabled( true ); } @@ -4503,8 +4503,8 @@ void KonqMainWindow::disableActionsNoView() m_paLinkView->setEnabled( false ); if (m_toggleViewGUIClient) { - TQPtrList actions = m_toggleViewGUIClient->actions(); - for ( KAction * it = actions.first(); it ; it = actions.next() ) + TQPtrList actions = m_toggleViewGUIClient->actions(); + for ( TDEAction * it = actions.first(); it ; it = actions.next() ) it->setEnabled( false ); } // There are things we can do, though : bookmarks, view profile, location bar, new window, @@ -4518,7 +4518,7 @@ void KonqMainWindow::disableActionsNoView() "go_url", "go_media", "go_history", "options_configure_extensions", 0 }; for ( int i = 0 ; s_enActions[i] ; ++i ) { - KAction * act = action(s_enActions[i]); + TDEAction * act = action(s_enActions[i]); if (act) act->setEnabled( true ); } @@ -4684,9 +4684,9 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa //kdDebug(1202) << "KonqMainWindow::slotPopupMenu( " << client << "...)" << " current view=" << m_currentView << " " << m_currentView->part()->className() << endl; // This action collection is used to pass actions to KonqPopupMenu. - // It has to be a KActionCollection instead of a KActionPtrList because we need + // It has to be a TDEActionCollection instead of a TDEActionPtrList because we need // the actionStatusText signal... - KActionCollection popupMenuCollection( (TQWidget*)0 ); + TDEActionCollection popupMenuCollection( (TQWidget*)0 ); popupMenuCollection.insert( m_paBack ); popupMenuCollection.insert( m_paForward ); popupMenuCollection.insert( m_paUp ); @@ -4703,7 +4703,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. - KAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + TDEAction *actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4772,14 +4772,14 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa // Those actions go into the PopupMenuGUIClient, since that's the one defining them. - KAction *actNewWindow = 0L, *actNewTab = 0L; + TDEAction *actNewWindow = 0L, *actNewTab = 0L; if( doTabHandling ) { if (_args.forcesNewWindow()) { - actNewWindow = new KAction( 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, TQT_TQOBJECT(this), TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new KAction( 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, TQT_TQOBJECT(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 @@ -4790,12 +4790,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa else tab_new_x = "tab_new_bg" ; - KAction *actNewTab = new KAction( 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, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) ); - KAction *actNewTabFront = new KAction( 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, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) ); - actNewTab = new KAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, TQT_TQOBJECT(this), TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); - actNewTabFront = new KAction( 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, 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->setToolTip( i18n( "Open the document in a new background tab" ) ); actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) ); doTabHandling = true; @@ -4853,11 +4853,11 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa delete pPopupMenu; - // We're sort of misusing KActionCollection here, but we need it for the actionStatusText signal... - // Anyway. If the action belonged to the view, and the view got deleted, we don't want ~KActionCollection + // We're sort of misusing TDEActionCollection here, but we need it for the actionStatusText signal... + // Anyway. If the action belonged to the view, and the view got deleted, we don't want ~TDEActionCollection // to iterate over those deleted actions - KActionPtrList lst = popupMenuCollection.actions(); - KActionPtrList::iterator it = lst.begin(); + TDEActionPtrList lst = popupMenuCollection.actions(); + TDEActionPtrList::iterator it = lst.begin(); for ( ; it != lst.end() ; ++it ) popupMenuCollection.take( *it ); @@ -5029,7 +5029,7 @@ void KonqMainWindow::updateOpenWithActions() m_openWithActions.clear(); - if (!kapp->authorizeKAction("openwith")) + if (!kapp->authorizeTDEAction("openwith")) return; const TDETrader::OfferList & services = m_currentView->appServiceOffers(); @@ -5037,7 +5037,7 @@ void KonqMainWindow::updateOpenWithActions() TDETrader::OfferList::ConstIterator end = services.end(); for (; it != end; ++it ) { - KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); + TDEAction *action = new TDEAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); action->setIcon( (*it)->icon() ); connect( action, TQT_SIGNAL( activated() ), @@ -5047,7 +5047,7 @@ void KonqMainWindow::updateOpenWithActions() } if ( services.count() > 0 ) { - m_openWithActions.append( new KActionSeparator ); + m_openWithActions.append( new TDEActionSeparator ); plugActionList( "openwith", m_openWithActions ); } } @@ -5067,7 +5067,7 @@ void KonqMainWindow::updateViewModeActions() unplugViewModeActions(); if ( m_viewModeMenu ) { - TQPtrListIterator it( m_viewModeActions ); + TQPtrListIterator it( m_viewModeActions ); for (; it.current(); ++it ) it.current()->unplugAll(); delete m_viewModeMenu; @@ -5094,7 +5094,7 @@ void KonqMainWindow::updateViewModeActions() if ( services.count() <= 1 ) return; - m_viewModeMenu = new KActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) ); + m_viewModeMenu = new TDEActionMenu( i18n( "&View Mode" ), TQT_TQOBJECT(this) ); // a temporary map, just like the m_viewModeToolBarServices map, but // mapping to a KonqViewModeAction object. It's just temporary as we @@ -5118,7 +5118,7 @@ void KonqMainWindow::updateViewModeActions() if ( prop.isValid() && prop.toBool() ) // No toggable views in view mode continue; - KRadioAction *action; + TDERadioAction *action; TQString itname = (*it)->genericName(); if (itname.isEmpty()) @@ -5127,9 +5127,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 KRadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); else - action = new KRadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); + action = new TDERadioAction( itname, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); @@ -5252,7 +5252,7 @@ void KonqMainWindow::saveToolBarServicesMap() void KonqMainWindow::plugViewModeActions() { - TQPtrList lst; + TQPtrList lst; lst.append( m_viewModeMenu ); plugActionList( "viewmode", lst ); // display the toolbar viewmode icons only for inode/directory, as here we have dedicated icons @@ -5273,7 +5273,7 @@ KonqMainWindowIface* KonqMainWindow::dcopObject() void KonqMainWindow::updateBookmarkBar() { - KToolBar * bar = static_cast( TQT_TQWIDGET(child( "bookmarkToolBar", "KToolBar" )) ); + TDEToolBar * bar = static_cast( TQT_TQWIDGET(child( "bookmarkToolBar", "TDEToolBar" )) ); if (!bar) return; @@ -5436,8 +5436,8 @@ void KonqMainWindow::slotOpenURL( const KURL& url ) bool KonqMainWindow::sidebarVisible() const { -KAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); -return (a && static_cast(a)->isChecked()); +TDEAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); +return (a && static_cast(a)->isChecked()); } void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) @@ -5447,7 +5447,7 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) kdDebug(1202) << "Requested to add URL " << url << " [" << name << "] to the sidebar!" << endl; - KAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); + TDEAction *a = m_toggleViewGUIClient->action("konq_sidebartng"); if (!a) { KMessageBox::sorry(0L, i18n("Your sidebar is not functional or unavailable. A new entry cannot be added."), i18n("Web Sidebar")); return; @@ -5460,7 +5460,7 @@ void KonqMainWindow::slotAddWebSideBar(const KURL& url, const TQString& name) if (rc == KMessageBox::Yes) { // Show the sidebar - if (!static_cast(a)->isChecked()) { + if (!static_cast(a)->isChecked()) { a->activate(); } @@ -5511,7 +5511,7 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) } } -void KonqMainWindow::connectActionCollection( KActionCollection *coll ) +void KonqMainWindow::connectActionCollection( TDEActionCollection *coll ) { connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); @@ -5519,7 +5519,7 @@ void KonqMainWindow::connectActionCollection( KActionCollection *coll ) this, TQT_SLOT( slotClearStatusText() ) ); } -void KonqMainWindow::disconnectActionCollection( KActionCollection *coll ) +void KonqMainWindow::disconnectActionCollection( TDEActionCollection *coll ) { disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index 026f150c8..8b19f5fd0 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -43,16 +43,16 @@ #include "konq_frame.h" class TQFile; -class KAction; -class KActionCollection; -class KActionMenu; +class TDEAction; +class TDEActionCollection; +class TDEActionMenu; class KBookmarkMenu; class KCMultiDialog; class KHistoryCombo; class KNewMenu; class KProgress; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KonqBidiHistoryAction; class KBookmarkBar; class KonqView; @@ -61,7 +61,7 @@ class KonqFrame; class KonqFrameBase; class KonqFrameContainerBase; class KonqFrameContainer; -class KToolBarPopupAction; +class TDEToolBarPopupAction; class KonqLogoAction; class KonqViewModeAction; class KonqPart; @@ -187,7 +187,7 @@ public: virtual void customEvent( TQCustomEvent *event ); - /// Overloaded of KMainWindow + /// Overloaded of TDEMainWindow virtual void setCaption( const TQString &caption ); /** @@ -234,7 +234,7 @@ public: /** * @return the "link view" action, for checking/unchecking from KonqView */ - KToggleAction * linkViewAction()const { return m_paLinkView; } + TDEToggleAction * linkViewAction()const { return m_paLinkView; } void enableAction( const char * name, bool enabled ); void setActionText( const char * name, const TQString& text ); @@ -381,14 +381,14 @@ public slots: // Go menu void slotUp(); - void slotUp(KAction::ActivationReason, TQt::ButtonState state); + void slotUp(TDEAction::ActivationReason, TQt::ButtonState state); void slotUpDelayed(); void slotBack(); - void slotBack(KAction::ActivationReason, TQt::ButtonState state); + void slotBack(TDEAction::ActivationReason, TQt::ButtonState state); void slotForward(); - void slotForward(KAction::ActivationReason, TQt::ButtonState state); + void slotForward(TDEAction::ActivationReason, TQt::ButtonState state); void slotHome(); - void slotHome(KAction::ActivationReason, TQt::ButtonState state); + void slotHome(TDEAction::ActivationReason, TQt::ButtonState state); void slotGoSystem(); void slotGoApplications(); void slotGoMedia(); @@ -410,7 +410,7 @@ public slots: void slotPartChanged( KonqView *childView, KParts::ReadOnlyPart *oldPart, KParts::ReadOnlyPart *newPart ); void slotRunFinished(); - void slotClearLocationBar( KAction::ActivationReason reason, TQt::ButtonState state ); + void slotClearLocationBar( TDEAction::ActivationReason reason, TQt::ButtonState state ); // reimplement from KParts::MainWindow virtual void slotSetStatusBarText( const TQString &text ); @@ -557,7 +557,7 @@ private slots: void bookmarksIntoCompletion(); void initBookmarkBar(); - void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state ); + void slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state ); void showPageSecurity(); @@ -603,8 +603,8 @@ private: void unplugViewModeActions(); static TQString viewModeActionKey( KService::Ptr service ); - void connectActionCollection( KActionCollection *coll ); - void disconnectActionCollection( KActionCollection *coll ); + void connectActionCollection( TDEActionCollection *coll ); + void disconnectActionCollection( TDEActionCollection *coll ); bool stayPreloaded(); bool checkPreloadResourceUsage(); @@ -613,72 +613,72 @@ private: KNewMenu * m_pMenuNew; - KAction *m_paPrint; + TDEAction *m_paPrint; - KActionMenu *m_pamBookmarks; + TDEActionMenu *m_pamBookmarks; - KToolBarPopupAction *m_paUp; - KToolBarPopupAction *m_paBack; - KToolBarPopupAction *m_paForward; - KAction *m_paHome; + TDEToolBarPopupAction *m_paUp; + TDEToolBarPopupAction *m_paBack; + TDEToolBarPopupAction *m_paForward; + TDEAction *m_paHome; KonqBidiHistoryAction *m_paHistory; - KAction *m_paSaveViewProfile; - KToggleAction *m_paSaveViewPropertiesLocally; - KAction *m_paRemoveLocalProperties; - - KAction *m_paSplitViewHor; - KAction *m_paSplitViewVer; - KAction *m_paAddTab; - KAction *m_paDuplicateTab; - KAction *m_paBreakOffTab; - KAction *m_paRemoveView; - KAction *m_paRemoveTab; - KAction *m_paRemoveOtherTabs; - KAction *m_paActivateNextTab; - KAction *m_paActivatePrevTab; - - KAction *m_paSaveRemoveViewProfile; - KActionMenu *m_pamLoadViewProfile; - - KToggleAction *m_paLockView; - KToggleAction *m_paLinkView; - KAction *m_paReload; - KAction *m_paReloadAllTabs; - KAction *m_paUndo; - KAction *m_paCut; - KAction *m_paCopy; - KAction *m_paPaste; - KAction *m_paStop; - KAction *m_paRename; - - KAction *m_paReloadStop; - - KAction *m_paTrash; - KAction *m_paDelete; - - KAction *m_paCopyFiles; - KAction *m_paMoveFiles; - KAction *m_paNewDir; - - KAction *m_paMoveTabLeft; - KAction *m_paMoveTabRight; - - KAction *m_paConfigureExtensions; - KAction *m_paConfigureSpellChecking; + TDEAction *m_paSaveViewProfile; + TDEToggleAction *m_paSaveViewPropertiesLocally; + TDEAction *m_paRemoveLocalProperties; + + TDEAction *m_paSplitViewHor; + TDEAction *m_paSplitViewVer; + TDEAction *m_paAddTab; + TDEAction *m_paDuplicateTab; + TDEAction *m_paBreakOffTab; + TDEAction *m_paRemoveView; + TDEAction *m_paRemoveTab; + TDEAction *m_paRemoveOtherTabs; + TDEAction *m_paActivateNextTab; + TDEAction *m_paActivatePrevTab; + + TDEAction *m_paSaveRemoveViewProfile; + TDEActionMenu *m_pamLoadViewProfile; + + TDEToggleAction *m_paLockView; + TDEToggleAction *m_paLinkView; + TDEAction *m_paReload; + TDEAction *m_paReloadAllTabs; + TDEAction *m_paUndo; + TDEAction *m_paCut; + TDEAction *m_paCopy; + TDEAction *m_paPaste; + TDEAction *m_paStop; + TDEAction *m_paRename; + + TDEAction *m_paReloadStop; + + TDEAction *m_paTrash; + TDEAction *m_paDelete; + + TDEAction *m_paCopyFiles; + TDEAction *m_paMoveFiles; + TDEAction *m_paNewDir; + + TDEAction *m_paMoveTabLeft; + TDEAction *m_paMoveTabRight; + + TDEAction *m_paConfigureExtensions; + TDEAction *m_paConfigureSpellChecking; KonqLogoAction *m_paAnimatedLogo; KBookmarkBar *m_paBookmarkBar; - KToggleAction * m_paFindFiles; - KToggleAction *m_ptaUseHTML; + TDEToggleAction * m_paFindFiles; + TDEToggleAction *m_ptaUseHTML; - KToggleAction *m_paShowMenuBar; - KToggleAction *m_paShowStatusBar; + TDEToggleAction *m_paShowMenuBar; + TDEToggleAction *m_paShowStatusBar; - KToggleFullScreenAction *m_ptaFullScreen; + TDEToggleFullScreenAction *m_ptaFullScreen; uint m_bLocationBarConnected:1; uint m_bURLEnterLock:1; @@ -698,8 +698,8 @@ private: KBookmarkMenu* m_pBookmarkMenu; KonqExtendedBookmarkOwner *m_pBookmarksOwner; - KActionCollection* m_bookmarksActionCollection; - KActionCollection* m_bookmarkBarActionCollection; + TDEActionCollection* m_bookmarksActionCollection; + TDEActionCollection* m_bookmarkBarActionCollection; KonqViewManager *m_pViewManager; KonqFrameBase* m_pChildFrame; @@ -741,11 +741,11 @@ private: TQString m_initialFrameName; - TQPtrList m_openWithActions; - KActionMenu *m_viewModeMenu; - TQPtrList m_toolBarViewModeActions; // basically holds two KonqViewActions, one of + TQPtrList m_openWithActions; + TDEActionMenu *m_viewModeMenu; + TQPtrList m_toolBarViewModeActions; // basically holds two KonqViewActions, one of // iconview and one for listview - TQPtrList m_viewModeActions; + TQPtrList m_viewModeActions; TQMap m_viewModeToolBarServices; // similar to m_toolBarViewModeActions // it holds a map library name (libkonqiconview/libkonqlistview) ==> service (service for // iconview, multicolumnview, treeview, etc .) diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index 5ca6c426f..453762c38 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -63,7 +63,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles() return mapProfiles; } -KonqProfileItem::KonqProfileItem( KListView *parent, const TQString & text ) +KonqProfileItem::KonqProfileItem( TDEListView *parent, const TQString & text ) : TQListViewItem( parent, text ), m_profileName( text ) { } @@ -92,7 +92,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese lblName->setBuddy( m_pProfileNameLineEdit ); - m_pListView = new KListView( box ); + m_pListView = new TDEListView( box ); m_pListView->setAllColumnsShowFocus(true); m_pListView->header()->hide(); m_pListView->addColumn(""); diff --git a/konqueror/konq_profiledlg.h b/konqueror/konq_profiledlg.h index ffdd3d513..e0f98a589 100644 --- a/konqueror/konq_profiledlg.h +++ b/konqueror/konq_profiledlg.h @@ -31,14 +31,14 @@ class TQGridLayout; class TQCheckBox; class TQLineEdit; class KPushButton; -class KListView; +class TDEListView; typedef TQMap KonqProfileMap; class KonqProfileItem : public TQListViewItem { public: - KonqProfileItem( KListView *, const TQString & ); + KonqProfileItem( TDEListView *, const TQString & ); ~KonqProfileItem() {} TQString m_profileName; @@ -77,7 +77,7 @@ private: TQCheckBox *m_cbSaveURLs; TQCheckBox *m_cbSaveSize; - KListView *m_pListView; + TDEListView *m_pListView; }; #endif diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index eca93d7c6..6e8d08fe7 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -60,7 +60,7 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon : KTabWidget(parent, name), m_rightWidget(0), m_leftWidget(0), m_alwaysTabBar(false), m_closeOtherTabsId(0) { - KAcceleratorManager::setNoAccel(this); + TDEAcceleratorManager::setNoAccel(this); TQWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it " "active. The option to show a close button instead of the website icon in the left " diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h index d07948149..4c84bd2f9 100644 --- a/konqueror/konq_tabs.h +++ b/konqueror/konq_tabs.h @@ -39,7 +39,7 @@ class KonqFrameContainer; class TDEConfig; class KSeparator; class KProgress; -class KAction; +class TDEAction; class KonqFrameTabs : public KTabWidget, public KonqFrameContainerBase { diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 023b1e19f..2c4a1a5b5 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -240,7 +240,7 @@ void KonqView::switchView( KonqViewFactory &viewFactory ) KParts::ReadOnlyPart *oldPart = m_pPart; m_pPart = m_pKonqFrame->attach( viewFactory ); // creates the part - // Set the statusbar in the BE asap to avoid a KMainWindow statusbar being created. + // Set the statusbar in the BE asap to avoid a TDEMainWindow statusbar being created. KParts::StatusBarExtension* sbext = statusBarExtension(); if ( sbext ) sbext->setStatusBar( frame()->statusbar() ); diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index f570322dc..a556ac529 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -1661,7 +1661,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: end" << name << endl; } -void KonqViewManager::setProfiles( KActionMenu *profiles ) +void KonqViewManager::setProfiles( TDEActionMenu *profiles ) { m_pamProfiles = profiles; @@ -1735,7 +1735,7 @@ void KonqViewManager::slotProfileListAboutToShow() // Generate accelerators TQStringList accel_strings; - KAccelGen::generateFromKeys(m_mapProfileNames, accel_strings); + TDEAccelGen::generateFromKeys(m_mapProfileNames, accel_strings); // Store menu items TQValueListIterator iter = accel_strings.begin(); diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index a7dbf939c..d41628ae2 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -43,7 +43,7 @@ class KonqFrameContainerBase; class KonqFrameTabs; class KonqView; class BrowserView; -class KActionMenu; +class TDEActionMenu; namespace KParts { @@ -248,7 +248,7 @@ public: */ void viewCountChanged(); - void setProfiles( KActionMenu *profiles ); + void setProfiles( TDEActionMenu *profiles ); void profileListDirty( bool broadcast = true ); @@ -352,7 +352,7 @@ private: KonqFrameBase *m_pDocContainer; - TQGuardedPtr m_pamProfiles; + TQGuardedPtr m_pamProfiles; bool m_bProfileListDirty; bool m_bLoadingProfile; TQString m_currentProfile; diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index e642918d4..b17b16b75 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -40,7 +40,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); if (offers.count() > 0) { - (void) new KAction( i18n("&Speak Text"), + (void) new TDEAction( i18n("&Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 42b9222ae..79e0ead82 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -217,7 +217,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); - KListView *lv = static_cast< KListView* >( listView() ); + TDEListView *lv = static_cast< TDEListView* >( listView() ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { @@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 9a87baa17..60a3ec2b0 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -37,7 +37,7 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, { m_metaInfoJob = 0; - m_mtSelector = new KSelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), + m_mtSelector = new TDESelectAction(i18n("View &As"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index c4dcf5076..258a20090 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -27,7 +27,7 @@ namespace TDEIO {class MetaInfoJob;} class KonqListView; -class KSelectAction; +class TDESelectAction; /** * The info list view @@ -81,7 +81,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget KonqILVMimeType m_favorite; - KSelectAction* m_mtSelector; + TDESelectAction* m_mtSelector; TDEIO::MetaInfoJob* m_metaInfoJob; KFileItemList m_metaInfoTodo; }; diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index a1f522bf6..43a6468fc 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -643,37 +643,37 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new KToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new KToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new KToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new KToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new KToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new KToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new KToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new KToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new KToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new KToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new KToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); - m_paShowDot = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new KToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); newIconSize( KIcon::SizeSmall /* default size */ ); } diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 127ecc3b2..5b175e13a 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -34,8 +34,8 @@ #include #include "konq_listviewwidget.h" -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class ListViewBrowserExtension; class KonqListViewFactory : public KParts::Factory @@ -147,26 +147,26 @@ private: KMimeTypeResolver *m_mimeTypeResolver; TQTimer *m_headerTimer; - KAction *m_paSelect; - KAction *m_paUnselect; - KAction *m_paSelectAll; - KAction *m_paUnselectAll; - KAction *m_paInvertSelection; - - KToggleAction *m_paCaseInsensitive; - - KToggleAction *m_paShowDot; - KToggleAction *m_paShowTime; - KToggleAction *m_paShowType; - KToggleAction *m_paShowMimeType; - KToggleAction *m_paShowAccessTime; - KToggleAction *m_paShowCreateTime; - KToggleAction *m_paShowLinkDest; - KToggleAction *m_paShowSize; - KToggleAction *m_paShowOwner; - KToggleAction *m_paShowGroup; - KToggleAction *m_paShowPermissions; - KToggleAction *m_paShowURL; + TDEAction *m_paSelect; + TDEAction *m_paUnselect; + TDEAction *m_paSelectAll; + TDEAction *m_paUnselectAll; + TDEAction *m_paInvertSelection; + + TDEToggleAction *m_paCaseInsensitive; + + TDEToggleAction *m_paShowDot; + TDEToggleAction *m_paShowTime; + TDEToggleAction *m_paShowType; + TDEToggleAction *m_paShowMimeType; + TDEToggleAction *m_paShowAccessTime; + TDEToggleAction *m_paShowCreateTime; + TDEToggleAction *m_paShowLinkDest; + TDEToggleAction *m_paShowSize; + TDEToggleAction *m_paShowOwner; + TDEToggleAction *m_paShowGroup; + TDEToggleAction *m_paShowPermissions; + TDEToggleAction *m_paShowURL; }; class ListViewBrowserExtension : public KonqDirPartBrowserExtension diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 925f33f8f..cebf7d5be 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -305,7 +305,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, cg.setColor( TQColorGroup::Text, m_pListViewWidget->itemColor() ); - KListView *lv = static_cast< KListView* >( listView() ); + TDEListView *lv = static_cast< TDEListView* >( listView() ); const TQPixmap *pm = TQT_TQPIXMAP_CONST(lv->viewport()->paletteBackgroundPixmap()); if ( _column == 0 && isSelected() && !lv->allColumnsShowFocus() ) { @@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) @@ -391,7 +391,7 @@ const char* KonqBaseListViewItem::makeAccessString( const mode_t mode) } KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidget, KFileItem* _fileitem) -:KListViewItem(_listViewWidget) +:TDEListViewItem(_listViewWidget) ,sortChar(0) ,m_bDisabled(false) ,m_bActive(false) @@ -400,7 +400,7 @@ KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidg {} KonqBaseListViewItem::KonqBaseListViewItem(KonqBaseListViewWidget *_listViewWidget, KonqBaseListViewItem *_parent, KFileItem* _fileitem) -:KListViewItem(_parent) +:TDEListViewItem(_parent) ,sortChar(0) ,m_bDisabled(false) ,m_bActive(false) diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index b54f1c2db..c96bff5a0 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -36,7 +36,7 @@ class KFileItem; class KonqBaseListViewWidget; -class KonqBaseListViewItem : public KListViewItem +class KonqBaseListViewItem : public TDEListViewItem { public: KonqBaseListViewItem( KonqBaseListViewWidget *_listViewWidget, diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index bd26db191..af7058748 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -58,7 +58,7 @@ ColumnInfo::ColumnInfo() void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, - KToggleAction* someAction, int theWidth) + TDEToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -71,7 +71,7 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio } void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kioUds, - TQVariant::Type t, KToggleAction* someAction, int theWidth) + TQVariant::Type t, TDEToggleAction* someAction, int theWidth) { displayInColumn=-1; name=n; @@ -85,7 +85,7 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget) - : KListView(parentWidget) + : TDEListView(parentWidget) ,sortedByColumn(0) ,m_pBrowserView(parent) ,m_dirLister(new KDirLister( true /*m_showIcons==false*/)) @@ -111,7 +111,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * m_bTopLevelComplete = true; - //Adjust KListView behaviour + //Adjust TDEListView behaviour setMultiSelection(true); setSelectionModeExt( FileManager ); setDragEnabled(true); @@ -421,7 +421,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) static_cast( itemAt( vp ) ) : 0L; if ( item ) { - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); } else { if ( e->button() == Qt::LeftButton ) @@ -461,7 +461,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) } delete m_selected; m_selected = 0; - KListView::contentsMouseReleaseEvent( e ); + TDEListView::contentsMouseReleaseEvent( e ); } void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) @@ -505,7 +505,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) } } - KListView::contentsMouseMoveEvent( e ); + TDEListView::contentsMouseMoveEvent( e ); } void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) @@ -521,7 +521,7 @@ void KonqBaseListViewWidget::contentsWheelEvent( TQWheelEvent *e ) reportItemCounts(); m_pBrowserView->emitMouseOver( 0 ); - KListView::contentsWheelEvent( e ); + TDEListView::contentsWheelEvent( e ); } void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) @@ -537,7 +537,7 @@ void KonqBaseListViewWidget::leaveEvent( TQEvent *e ) m_fileTip->setItem( 0 ); - KListView::leaveEvent( e ); + TDEListView::leaveEvent( e ); } void KonqBaseListViewWidget::drawRubber( TQPainter *p ) @@ -742,7 +742,7 @@ void KonqBaseListViewWidget::slotAutoScroll() void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) { - KListView::viewportPaintEvent( e ); + TDEListView::viewportPaintEvent( e ); TQPainter p( viewport() ); drawRubber( &p ); @@ -751,7 +751,7 @@ void KonqBaseListViewWidget::viewportPaintEvent( TQPaintEvent *e ) void KonqBaseListViewWidget::viewportResizeEvent(TQResizeEvent * e) { - KListView::viewportResizeEvent(e); + TDEListView::viewportResizeEvent(e); emit viewportAdjusted(); } @@ -861,7 +861,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri Q_ASSERT( item != 0 ); // The correct behavior is to show the old name until the rename has successfully - // completed. Unfortunately, KListView forces us to allow the text to be changed + // completed. Unfortunately, TDEListView forces us to allow the text to be changed // before we try the rename, so set it back to the pre-rename state. KonqBaseListViewItem *renamedItem = static_cast(item); renamedItem->updateContents(); @@ -873,7 +873,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri KonqOperations::rename( this, renamedItem->item()->url(), TDEIO::encodeFileName( name ) ); } - // When the KListViewLineEdit loses focus, focus tends to go to the location bar... + // When the TDEListViewLineEdit loses focus, focus tends to go to the location bar... setFocus(); } diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index cbfcc446b..1fc8b0eb7 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -37,7 +37,7 @@ class TQRect; class KDirLister; class KonqFMSettings; class ListViewPropertiesExtension; -class KToggleAction; +class TDEToggleAction; class KonqListView; class KonqFileTip; class ListViewBrowserExtension; @@ -56,24 +56,24 @@ class ColumnInfo public: ColumnInfo(); void setData( const TQString& n, const TQString& desktopName, int kioUds, - KToggleAction *someAction, int theWith = -1 ); + TDEToggleAction *someAction, int theWith = -1 ); void setData( const TQString& n, const TQString& desktopName, int kioUds /* UDS_EXTRA */, - TQVariant::Type type, KToggleAction *someAction, int theWith = -1 ); + TQVariant::Type type, TDEToggleAction *someAction, int theWith = -1 ); int displayInColumn; TQString name; TQString desktopFileName; int udsId; TQVariant::Type type; // only used if udsId == UDS_EXTRA bool displayThisOne; - KToggleAction *toggleThisOne; + TDEToggleAction *toggleThisOne; int width; }; /** - * The tree view widget (based on KListView). + * The tree view widget (based on TDEListView). * Most of the functionality is here. */ -class KonqBaseListViewWidget : public KListView +class KonqBaseListViewWidget : public TDEListView { friend class KonqBaseListViewItem; friend class KonqListView; @@ -154,7 +154,7 @@ signals: public slots: //virtual void slotOnItem( KonqBaseListViewItem* _item ); - // The '2' was added to differentiate it from KListView::slotMouseButtonClicked() + // The '2' was added to differentiate it from TDEListView::slotMouseButtonClicked() void slotMouseButtonClicked2( int _button, TQListViewItem *_item, const TQPoint& pos, int ); virtual void slotExecuted( TQListViewItem *_item ); void slotItemRenamed( TQListViewItem *, const TQString &, int ); @@ -222,7 +222,7 @@ protected: //so the position of the mouse pointer doesn't matter when using keyboard, aleXXX virtual void popupMenu( const TQPoint& _global, bool alwaysForSelectedFiles = false ); - //this one is called only by KListView, and this is friend anyways (Alex) + //this one is called only by TDEListView, and this is friend anyways (Alex) //KDirLister *dirLister() const { return m_dirLister; } protected: diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 4b989a9e7..ac63cd443 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, // cg.setColor(TQColorGroup::HighlightedText, static_cast(listView())->highlight[type]); // cg.setColor(TQColorGroup::Highlight, Qt::darkGray); - KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); + TDEListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index b4de7a003..5e669972b 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -48,7 +48,7 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, const TQStringList &) : KParts::Plugin(parent, name), m_loaded(false), m_idDefault(0) { - m_menu = new KActionMenu(i18n("Select Remote Charset"), "charset", + m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset", actionCollection(), "changeremoteencoding"); connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow())); @@ -111,7 +111,7 @@ KRemoteEncodingPlugin::slotAboutToOpenURL() void KRemoteEncodingPlugin::fillMenu() { - KPopupMenu *menu = m_menu->popupMenu(); + TDEPopupMenu *menu = m_menu->popupMenu(); menu->clear(); TQStringList::ConstIterator it; diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index 9b80888a5..d5469cd47 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -26,7 +26,7 @@ #include #include -class KActionMenu; +class TDEActionMenu; class TDEConfig; class KonqDirPart; @@ -52,7 +52,7 @@ private: void updateMenu(); KonqDirPart *m_part; - KActionMenu *m_menu; + TDEActionMenu *m_menu; TQStringList m_encodingDescriptions; KURL m_currentURL; diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index efd95a88b..d55243d6d 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -33,7 +33,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, if (!kapp->authorize("shell_access")) return; - new KAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this, + new TDEAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this, TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); } diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index db0421c52..8558b71ba 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -37,7 +37,7 @@ 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&))); - KAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); + TDEAcceleratorManager::setNoAccel(TQT_TQWIDGET(m_widget)); setWidget(TQT_TQWIDGET(m_widget)); } diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8dc49bb5c..4638d0bad 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -854,7 +854,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) { if (!m_buttonPopup) { - m_buttonPopup=new KPopupMenu(this, "Sidebar_Widget::ButtonPopup"); + m_buttonPopup=new TDEPopupMenu(this, "Sidebar_Widget::ButtonPopup"); m_buttonPopup->insertTitle(SmallIcon("unknown"), "", 50); m_buttonPopup->insertItem(SmallIconSet("text"), i18n("Set Name..."),4); // Item to open a dialog to change the name of the sidebar item (by Pupeno) m_buttonPopup->insertItem(SmallIconSet("www"), i18n("Set URL..."),2); diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index c5ee75a8a..4457d12e2 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -186,7 +186,7 @@ private: KMultiTabBar *m_buttonBar; TQPtrVector m_buttons; TQHBoxLayout *m_layout; - KPopupMenu *m_buttonPopup; + TDEPopupMenu *m_buttonPopup; TQPopupMenu *m_menu; TQGuardedPtr m_activeModule; TQGuardedPtr m_currentButton; diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 64a8fb9c6..5b170b102 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -47,30 +47,30 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(dropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotOpenChange(TQListViewItem*))); connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), this, TQT_SLOT(slotOpenChange(TQListViewItem*))); - m_collection = new KActionCollection( this, "bookmark actions" ); - (void) new KAction( i18n("&Create New Folder"), "folder_new", 0, this, + m_collection = new TDEActionCollection( this, "bookmark actions" ); + (void) new TDEAction( i18n("&Create New Folder"), "folder_new", 0, this, TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new KAction( i18n("Delete Folder"), "editdelete", 0, this, + (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, this, TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new KAction( i18n("Delete Bookmark"), "editdelete", 0, this, + (void) new TDEAction( i18n("Delete Bookmark"), "editdelete", 0, this, TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); - (void) new KAction( i18n("Properties"), "edit", 0, this, + (void) new TDEAction( i18n("Properties"), "edit", 0, this, TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new KAction( i18n("Open in New Window"), "window_new", 0, this, + (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, this, TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, this, + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new KAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, + (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); - (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, this, + (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, this, TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), @@ -159,7 +159,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ KBookmarkGroup oldParentGroup = bookmark.parentGroup(); KBookmarkGroup parentGroup; - // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)... + // try to get the parent group (assume that the TQListViewItem has been reparented by TDEListView)... // if anything goes wrong, use the root. if (item->parent()) { bool error = false; @@ -178,7 +178,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ parentGroup = KonqBookmarkManager::self()->root(); } else { // No parent! This means the user dropped it before the top level item - // And KListView has moved the item there, we need to correct it + // And TDEListView has moved the item there, we need to correct it tree()->moveItem(item, m_topLevelItem, 0L); parentGroup = KonqBookmarkManager::self()->root(); } @@ -223,7 +223,7 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ } } -void KonqSidebarBookmarkModule::slotDropped(KListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after) +void KonqSidebarBookmarkModule::slotDropped(TDEListView *, TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after) { if (!KBookmarkDrag::canDecode(e)) return; diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h index 738bd7566..ba78a2b96 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.h +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.h @@ -26,7 +26,7 @@ #include class KonqSidebarBookmarkItem; -class KActionCollection; +class TDEActionCollection; class KLineEdit; /** @@ -49,7 +49,7 @@ public: protected slots: void slotBookmarksChanged( const TQString & ); void slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*); - void slotDropped(KListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*); + void slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*); void slotCreateFolder(); void slotDelete(); void slotProperties(KonqSidebarBookmarkItem *bi = 0); @@ -69,7 +69,7 @@ private: KonqSidebarTreeTopLevelItem * m_topLevelItem; KonqSidebarBookmarkItem * m_rootItem; - KActionCollection *m_collection; + TDEActionCollection *m_collection; bool m_ignoreOpenChange; TQMap m_folderOpenState; diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index fa7f8ba39..5d27e010f 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -74,23 +74,23 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), TQT_SLOT( slotItemExpanded( TQListViewItem * ))); - m_collection = new KActionCollection( this, "history actions" ); - (void) new KAction( i18n("New &Window"), "window_new", 0, this, + m_collection = new TDEActionCollection( this, "history actions" ); + (void) new TDEAction( i18n("New &Window"), "window_new", 0, this, TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); - (void) new KAction( i18n("&Remove Entry"), "editdelete", 0, this, + (void) new TDEAction( i18n("&Remove Entry"), "editdelete", 0, this, TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); - (void) new KAction( i18n("C&lear History"), "history_clear", 0, this, + (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, TQT_SLOT( slotClearHistory() ), m_collection, "clear"); - (void) new KAction( i18n("&Preferences..."), "configure", 0, this, + (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, TQT_SLOT( slotPreferences()), m_collection, "preferences"); - KRadioAction *sort; - sort = new KRadioAction( i18n("By &Name"), 0, this, + TDERadioAction *sort; + sort = new TDERadioAction( i18n("By &Name"), 0, this, TQT_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); - sort = new KRadioAction( i18n("By &Date"), 0, this, + sort = new TDERadioAction( i18n("By &Date"), 0, this, TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); diff --git a/konqueror/sidebar/trees/history_module/history_module.h b/konqueror/sidebar/trees/history_module/history_module.h index cbba40262..5c114a164 100644 --- a/konqueror/sidebar/trees/history_module/history_module.h +++ b/konqueror/sidebar/trees/history_module/history_module.h @@ -30,7 +30,7 @@ #include "history_item.h" -class KActionCollection; +class TDEActionCollection; class KDialogBase; class KonqSidebarHistorySettings; class KonqSidebarTree; @@ -94,7 +94,7 @@ private: KonqSidebarTreeTopLevelItem * m_topLevelItem; - KActionCollection *m_collection; + TDEActionCollection *m_collection; KDialogBase *m_dlg; TQPixmap m_folderClosed; diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index b2e92c6fd..813ece3df 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -243,15 +243,15 @@ void HistorySidebarConfig::slotOlderChanged( int value ) void HistorySidebarConfig::slotGetFontNewer() { - int result = KFontDialog::getFont( m_fontNewer, false, this ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( m_fontNewer, false, this ); + if ( result == TDEFontDialog::Accepted ) configChanged(); } void HistorySidebarConfig::slotGetFontOlder() { - int result = KFontDialog::getFont( m_fontOlder, false, this ); - if ( result == KFontDialog::Accepted ) + int result = TDEFontDialog::getFont( m_fontOlder, false, this ); + if ( result == TDEFontDialog::Accepted ) configChanged(); } diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 01bdc1d7a..028a531fa 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -115,7 +115,7 @@ public: KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ) - : KListView( parentWidget ), + : TDEListView( parentWidget ), m_currentTopLevelItem( 0 ), m_toolTip( this ), m_scrollingLocked( false ), @@ -303,8 +303,8 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e ) m_autoOpenTimer->start( autoOpenTimeout ); } } else { - d->m_dropMode = KListViewMode; - KListView::contentsDragMoveEvent(e); + d->m_dropMode = TDEListViewMode; + TDEListView::contentsDragMoveEvent(e); } } @@ -319,8 +319,8 @@ void KonqSidebarTree::contentsDragLeaveEvent( TQDragLeaveEvent *ev ) m_dropItem = 0; m_lstDropFormats.clear(); - if (d->m_dropMode == KListViewMode) { - KListView::contentsDragLeaveEvent(ev); + if (d->m_dropMode == TDEListViewMode) { + TDEListView::contentsDragLeaveEvent(ev); } } @@ -348,7 +348,7 @@ void KonqSidebarTree::contentsDropEvent( TQDropEvent *ev ) selection->drop( ev ); } } else { - KListView::contentsDropEvent(ev); + TDEListView::contentsDropEvent(ev); } } @@ -415,7 +415,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const { - // for KListViewMode... + // for TDEListViewMode... for( int i = 0; e->format( i ); i++ ) if ( d->m_dropFormats.contains(e->format( i ) ) ) return true; @@ -441,7 +441,7 @@ TQDragObject* KonqSidebarTree::dragObject() void KonqSidebarTree::leaveEvent( TQEvent *e ) { - KListView::leaveEvent( e ); + TDEListView::leaveEvent( e ); // emitStatusBarText( TQString::null ); } @@ -855,7 +855,7 @@ KonqSidebarTreeItem * KonqSidebarTree::currentItem() const void KonqSidebarTree::setContentsPos( int x, int y ) { if ( !m_scrollingLocked ) - KListView::setContentsPos( x, y ); + TDEListView::setContentsPos( x, y ); } void KonqSidebarTree::slotItemRenamed(TQListViewItem* item, const TQString &name, int col) @@ -906,22 +906,22 @@ void KonqSidebarTree::showToplevelContextMenu() if (!m_collection) { - m_collection = new KActionCollection( this, "bookmark actions" ); - (void) new KAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), + m_collection = new TDEActionCollection( this, "bookmark actions" ); + (void) new TDEAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); - (void) new KAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); - (void) new KAction( i18n("Rename"), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), m_collection, "rename"); - (void) new KAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), m_collection, "delete_link"); - (void) new KAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), m_collection, "item_properties"); - (void) new KAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Open in New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); - (void) new KAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); - (void) new KAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index a8e2ad075..f8626298c 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -31,7 +31,7 @@ class KonqSidebarTreeModule; class KonqSidebarTreeItem; -class KActionCollection; +class TDEActionCollection; class TQTimer; @@ -64,7 +64,7 @@ private: typedef enum { SidebarTreeMode, // used if the drop is accepted by a KonqSidebarTreeItem. otherwise - KListViewMode // use KListView's dnd implementation. accepts mime types set with setDropFormats() + TDEListViewMode // use TDEListView's dnd implementation. accepts mime types set with setDropFormats() } DropAcceptType; /** @@ -73,7 +73,7 @@ typedef enum { * a toplevel item, and creates the modules that will handle the contents * of those items. */ -class KonqSidebarTree : public KListView, public KDirNotify +class KonqSidebarTree : public TDEListView, public KDirNotify { Q_OBJECT public: @@ -106,7 +106,7 @@ public: void itemDestructed( KonqSidebarTreeItem *item ); - void setDropFormats( const TQStringList &formats ); // used in KListView mode + void setDropFormats( const TQStringList &formats ); // used in TDEListView mode // Show context menu for toplevel items void showToplevelContextMenu(); @@ -125,7 +125,7 @@ protected: virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); virtual void contentsDropEvent( TQDropEvent *ev ); - virtual bool acceptDrag(TQDropEvent* e) const; // used in KListView mode + virtual bool acceptDrag(TQDropEvent* e) const; // used in TDEListView mode virtual void leaveEvent( TQEvent * ); @@ -205,7 +205,7 @@ private: TQMap pluginFactories; bool m_bOpeningFirstChild; - KActionCollection *m_collection; + TDEActionCollection *m_collection; KonqSidebarTree_Internal *d; diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 900d25e03..04454ecb1 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -32,7 +32,7 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg clearSearch->setTextLabel(i18n("Clear Search"), true); clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); - KListViewSearchLine* listViewSearch = new KListViewSearchLine(searchline,tree); + TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 3a43a54d0..65566c4c3 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -47,7 +47,7 @@ class TDEHTMLSideBar : public TDEHTMLPart ); - _linkMenu = new KPopupMenu(widget(), + _linkMenu = new TDEPopupMenu(widget(), "link context menu"); if (!universal) { _linkMenu->insertItem(i18n("&Open Link"), @@ -58,7 +58,7 @@ class TDEHTMLSideBar : public TDEHTMLPart _linkMenu->insertItem(i18n("Open in New &Window"), this, TQT_SLOT(loadPage())); } - _menu = new KPopupMenu(widget(), "context menu"); + _menu = new TDEPopupMenu(widget(), "context menu"); _menu->insertItem(SmallIcon("reload"), i18n("&Reload"), this, TQT_SIGNAL(reload())); _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload())); @@ -156,7 +156,7 @@ class TDEHTMLSideBar : public TDEHTMLPart } } private: - KPopupMenu *_menu, *_linkMenu; + TDEPopupMenu *_menu, *_linkMenu; TQString _lastUrl; }; -- cgit v1.2.1