From deac2ca49faed824fe83066080714eb6d653615b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kate/plugins/kdatatool/kate_kdatatool.cpp | 8 ++++---- kate/plugins/kdatatool/kate_kdatatool.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kate/plugins/kdatatool') diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 832ff5eb7..829a0f31f 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -75,7 +75,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view ) view->insertChildClient (this); setInstance( KGenericFactory::instance() ); - m_menu = new KActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); + m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow())); setXMLFile("tdetexteditor_kdatatoolui.rc"); @@ -96,7 +96,7 @@ void KDataToolPluginView::aboutToShow() m_wordUnderCursor = TQString::null; // unplug old actions, if any: - KAction *ac; + TDEAction *ac; for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) { m_menu->remove(ac); } @@ -150,7 +150,7 @@ void KDataToolPluginView::aboutToShow() m_singleWord = true; m_singleWord_line = line; } else { - m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this, + m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); return; @@ -172,7 +172,7 @@ void KDataToolPluginView::aboutToShow() } if( m_actionList.isEmpty() ) { - m_notAvailable = new KAction(i18n("(not available)"), TQString::null, 0, this, + m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); } diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h index ac437dd16..a217c6f27 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.h +++ b/kate/plugins/kdatatool/kate_kdatatool.h @@ -26,7 +26,7 @@ #include #include -class KActionMenu; +class TDEActionMenu; class KDataToolInfo; namespace KTextEditor @@ -62,9 +62,9 @@ private: bool m_singleWord; int m_singleWord_line, m_singleWord_start, m_singleWord_end; TQString m_wordUnderCursor; - TQPtrList m_actionList; - TQGuardedPtr m_menu; - KAction *m_notAvailable; + TQPtrList m_actionList; + TQGuardedPtr m_menu; + TDEAction *m_notAvailable; protected slots: void aboutToShow(); void slotToolActivated( const KDataToolInfo &datatoolinfo, const TQString &string ); -- cgit v1.2.1