diff options
| author | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /kate/plugins/kdatatool/kate_kdatatool.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kate/plugins/kdatatool/kate_kdatatool.cpp')
| -rw-r--r-- | kate/plugins/kdatatool/kate_kdatatool.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index e78bb4228..e14cd9249 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -20,20 +20,20 @@ #include "kate_kdatatool.h" #include "kate_kdatatool.moc" #include <kgenericfactory.h> -#include <kaction.h> -#include <ktexteditor/view.h> +#include <tdeaction.h> +#include <tdetexteditor/view.h> #include <kdebug.h> #include <kdatatool.h> -#include <ktexteditor/document.h> -#include <ktexteditor/selectioninterface.h> -#include <kpopupmenu.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/editinterface.h> -#include <kmessagebox.h> +#include <tdetexteditor/document.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdepopupmenu.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/editinterface.h> +#include <tdemessagebox.h> //END includes -K_EXPORT_COMPONENT_FACTORY( ktexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "ktexteditor_kdatatool" ) ) +K_EXPORT_COMPONENT_FACTORY( tdetexteditor_kdatatool, KGenericFactory<KTextEditor::KDataToolPlugin>( "tdetexteditor_kdatatool" ) ) namespace KTextEditor { @@ -75,9 +75,9 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view ) view->insertChildClient (this); setInstance( KGenericFactory<KDataToolPlugin>::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("ktexteditor_kdatatoolui.rc"); + setXMLFile("tdetexteditor_kdatatoolui.rc"); m_view = view; } @@ -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,14 +150,14 @@ 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; } } - KInstance *inst=instance(); + TDEInstance *inst=instance(); TQValueList<KDataToolInfo> tools; tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst ); @@ -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); } |