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 --- kicker/menuext/konsole/konsole_mnu.cpp | 4 ++-- kicker/menuext/konsole/konsole_mnu.h | 4 ++-- kicker/menuext/konsole/konsolebookmarkhandler.cpp | 2 +- kicker/menuext/konsole/konsolebookmarkhandler.h | 6 +++--- kicker/menuext/konsole/konsolebookmarkmenu.cpp | 26 +++++++++++------------ kicker/menuext/konsole/konsolebookmarkmenu.h | 12 +++++------ 6 files changed, 27 insertions(+), 27 deletions(-) (limited to 'kicker/menuext/konsole') diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index d2fb755bb..6cdc1dbac 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -57,7 +57,7 @@ KonsoleMenu::~KonsoleMenu() TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole"); } -static void insertItemSorted(KPopupMenu *menu, +static void insertItemSorted(TDEPopupMenu *menu, const TQIconSet &iconSet, const TQString &txt, int id) { @@ -196,7 +196,7 @@ void KonsoleMenu::initialize() id = 0; delete m_profileMenu; - m_profileMenu = new KPopupMenu(this); + m_profileMenu = new TDEPopupMenu(this); TQStringList profiles = TDEGlobal::dirs()->findAllResources("data", "konsole/profiles/*", false, true ); diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h index e64c53212..4272fbaf9 100644 --- a/kicker/menuext/konsole/konsole_mnu.h +++ b/kicker/menuext/konsole/konsole_mnu.h @@ -54,8 +54,8 @@ private: TQStringList sessionList; TQStringList screenList; TQValueVector m_profiles; - KPopupMenu* m_profileMenu; - KPopupMenu* m_bookmarksSession; + TDEPopupMenu* m_profileMenu; + TDEPopupMenu* m_bookmarksSession; KonsoleBookmarkHandler *m_bookmarkHandlerSession; }; diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index 34bfb9649..314ceae10 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -21,7 +21,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) m_konsole( konsole ), m_importStream( 0L ) { - m_menu = new KPopupMenu( konsole, "bookmark menu" ); + m_menu = new TDEPopupMenu( konsole, "bookmark menu" ); TQString file = locate( "data", "konsole/bookmarks.xml" ); if ( file.isEmpty() ) diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h index 733e52442..a1d2f54de 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.h +++ b/kicker/menuext/konsole/konsolebookmarkhandler.h @@ -8,7 +8,7 @@ class TQTextStream; -class KPopupMenu; +class TDEPopupMenu; class KonsoleBookmarkMenu; class KonsoleMenu; @@ -26,7 +26,7 @@ public: { emit openURL( url, title ); } virtual TQString currentURL() const; - KPopupMenu *menu() const { return m_menu; } + TDEPopupMenu *menu() const { return m_menu; } signals: void openURL( const TQString& url, const TQString& title ); @@ -45,7 +45,7 @@ private: void importOldBookmarks( const TQString& path, const TQString& destinationPath ); KonsoleMenu *m_konsole; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; KonsoleBookmarkMenu *m_bookmarkMenu; TQTextStream *m_importStream; diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 1643195e8..3284c7a03 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -21,8 +21,8 @@ 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), @@ -47,7 +47,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() @@ -64,7 +64,7 @@ void KonsoleBookmarkMenu::refill() { //kdDebug(1203) << "KBookmarkMenu::refill()" << endl; m_lstSubMenus.clear(); - TQPtrListIterator it( m_actions ); + TQPtrListIterator it( m_actions ); for (; it.current(); ++it ) it.current()->unplug( m_parentMenu ); m_parentMenu->clear(); @@ -90,7 +90,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() { m_parentMenu->insertSeparator(); - KActionMenu * actionMenu = new KActionMenu( i18n("Netscape Bookmarks"), + TDEActionMenu * actionMenu = new TDEActionMenu( i18n("Netscape Bookmarks"), "netscape", m_actionCollection, 0L ); actionMenu->plug( m_parentMenu ); @@ -127,7 +127,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() ); @@ -140,7 +140,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 ); @@ -162,26 +162,26 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() void KonsoleBookmarkMenu::slotBookmarkSelected() { - KAction * a; + TDEAction * a; TQString b; if ( !m_pOwner ) return; // this view doesn't handle bookmarks... - a = (KAction*)sender(); + a = (TDEAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */ - ( (KAction *)sender() )->text() /* Title */ ); + ( (TDEAction *)sender() )->text() /* Title */ ); } void KonsoleBookmarkMenu::slotNSBookmarkSelected() { - KAction *a; + TDEAction *a; TQString b; TQString link(TQT_TQOBJECT_CONST(sender())->name()+8); - a = (KAction*)sender(); + a = (TDEAction*)sender(); b = a->text(); m_kOwner->openBookmarkURL( link, /*URL */ - ( (KAction *)sender() )->text() /* Title */ ); + ( (TDEAction *)sender() )->text() /* Title */ ); } #include "konsolebookmarkmenu.moc" diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h index a2325e264..103b6bc19 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.h +++ b/kicker/menuext/konsole/konsolebookmarkmenu.h @@ -13,12 +13,12 @@ class TQString; class KBookmark; -class KAction; -class KActionMenu; -class KActionCollection; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; class KBookmarkOwner; class KBookmarkMenu; -class KPopupMenu; +class TDEPopupMenu; class KonsoleBookmarkMenu; class KonsoleBookmarkMenu : public KBookmarkMenu @@ -27,8 +27,8 @@ class KonsoleBookmarkMenu : public KBookmarkMenu public: KonsoleBookmarkMenu( KBookmarkManager* mgr, - KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu, - KActionCollection *collec, bool _isRoot, + KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu, + TDEActionCollection *collec, bool _isRoot, bool _add = true, const TQString & parentAddress = ""); void fillBookmarkMenu(); -- cgit v1.2.1