diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:11:21 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:11:21 -0600 |
commit | f537c21b68e08f649b1b297bce8f3904603137e0 (patch) | |
tree | fb33065387509dea898c90022ddec9c3f8ede86d /konsole/konsole/konsolebookmarkmenu.cpp | |
parent | dc5f267664506a312203c26bfe9001a448b0bb0f (diff) | |
download | tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.tar.gz tdebase-f537c21b68e08f649b1b297bce8f3904603137e0.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'konsole/konsole/konsolebookmarkmenu.cpp')
-rw-r--r-- | konsole/konsole/konsolebookmarkmenu.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index fd2cc9f1b..0aae87d7a 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -25,8 +25,8 @@ #include "konsolebookmarkhandler.h" KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, - KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, - KActionCollection *collec, bool _isRoot, bool _add, + KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, + TDEActionCollection *collec, bool _isRoot, bool _add, const TQString & parentAddress ) : KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add, parentAddress), @@ -52,7 +52,7 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, * * Why did I do this? * - when KBookmarkMenu::fillbBookmarkMenu() creates sub-KBookmarkMenus. - * - when ... adds KActions, it uses KBookmarkMenu::slotBookmarkSelected() + * - when ... adds TDEActions, it uses KBookmarkMenu::slotBookmarkSelected() * instead of KonsoleBookmarkMenu::slotBookmarkSelected(). */ void KonsoleBookmarkMenu::slotAboutToShow2() @@ -68,7 +68,7 @@ void KonsoleBookmarkMenu::slotAboutToShow2() void KonsoleBookmarkMenu::refill() { m_lstSubMenus.clear(); - TQPtrListIterator<KAction> it( m_actions ); + TQPtrListIterator<TDEAction> it( m_actions ); for (; it.current(); ++it ) it.current()->unplug( m_parentMenu ); m_parentMenu->clear(); @@ -112,7 +112,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() { // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name - KAction * action = new KAction( text, bm.icon(), 0, + TDEAction * action = new TDEAction( text, bm.icon(), 0, this, TQT_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); @@ -125,7 +125,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() else { // kdDebug(1203) << "Creating bookmark submenu named " << bm.text() << endl; - KActionMenu * actionMenu = new KActionMenu( text, bm.icon(), + TDEActionMenu * actionMenu = new TDEActionMenu( text, bm.icon(), m_actionCollection, 0L ); actionMenu->plug( m_parentMenu ); m_actions.append( actionMenu ); @@ -150,7 +150,7 @@ void KonsoleBookmarkMenu::slotBookmarkSelected() { if ( !m_pOwner ) return; // this view doesn't handle bookmarks... m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ - ( (KAction *)sender() )->text() /* Title */ ); + ( (TDEAction *)sender() )->text() /* Title */ ); } #include "konsolebookmarkmenu.moc" |