diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /parts/snippet | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/snippet')
-rw-r--r-- | parts/snippet/CMakeLists.txt | 8 | ||||
-rw-r--r-- | parts/snippet/Makefile.am | 14 | ||||
-rw-r--r-- | parts/snippet/kdevpart_snippet.rc (renamed from parts/snippet/tdevpart_snippet.rc) | 2 | ||||
-rw-r--r-- | parts/snippet/kdevsnippet.desktop (renamed from parts/snippet/tdevsnippet.desktop) | 2 | ||||
-rw-r--r-- | parts/snippet/snippet_part.cpp | 20 | ||||
-rw-r--r-- | parts/snippet/snippet_part.h | 10 | ||||
-rw-r--r-- | parts/snippet/snippet_widget.cpp | 8 | ||||
-rw-r--r-- | parts/snippet/snippet_widget.h | 2 |
8 files changed, 33 insertions, 33 deletions
diff --git a/parts/snippet/CMakeLists.txt b/parts/snippet/CMakeLists.txt index 43776bf0..704ec3e9 100644 --- a/parts/snippet/CMakeLists.txt +++ b/parts/snippet/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsnippet ) +install( FILES kdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsnippet ) -##### libtdevsnippet (module) ################### +##### libkdevsnippet (module) ################### -tde_add_kpart( libtdevsnippet AUTOMOC +tde_add_kpart( libkdevsnippet AUTOMOC SOURCES snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp diff --git a/parts/snippet/Makefile.am b/parts/snippet/Makefile.am index d2429963..e2c207a4 100644 --- a/parts/snippet/Makefile.am +++ b/parts/snippet/Makefile.am @@ -1,17 +1,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevsnippet.la -libtdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevsnippet.la +libkdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp +libkdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevsnippet.desktop +service_DATA = kdevsnippet.desktop -rc_DATA = tdevpart_snippet.rc -rcdir = $(kde_datadir)/tdevsnippet +rc_DATA = kdevpart_snippet.rc +rcdir = $(kde_datadir)/kdevsnippet noinst_HEADERS = snippetdlg.h snippetitem.h snippetsettingsbase.h snippetsettings.h snippetconfig.h diff --git a/parts/snippet/tdevpart_snippet.rc b/parts/snippet/kdevpart_snippet.rc index f4b9d2db..4f34ec50 100644 --- a/parts/snippet/tdevpart_snippet.rc +++ b/parts/snippet/kdevpart_snippet.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartplugin name="snippet" library="libtdevsnippet" version="3"> +<kpartplugin name="snippet" library="libkdevsnippet" version="3"> <MenuBar> </MenuBar> <Menu name="hidden"> diff --git a/parts/snippet/tdevsnippet.desktop b/parts/snippet/kdevsnippet.desktop index b257280c..f9ba9652 100644 --- a/parts/snippet/tdevsnippet.desktop +++ b/parts/snippet/kdevsnippet.desktop @@ -97,6 +97,6 @@ GenericName[zh_TW]=程式碼片段 Icon=editcut ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Global -X-TDE-Library=libtdevsnippet +X-TDE-Library=libkdevsnippet X-TDevelop-Version=5 X-TDevelop-Properties=CodeEditing diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index e31ebe7a..82969151 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -20,11 +20,11 @@ #include <tqbuttongroup.h> #include <ktrader.h> -#include "tdevcore.h" -#include <tdevproject.h> -#include "tdevmainwindow.h" -#include <tdevgenericfactory.h> -#include <tdevplugininfo.h> +#include "kdevcore.h" +#include <kdevproject.h> +#include "kdevmainwindow.h" +#include <kdevgenericfactory.h> +#include <kdevplugininfo.h> #include <kdebug.h> @@ -33,15 +33,15 @@ #include "snippetsettings.h" #include "snippetconfig.h" -static const TDevPluginInfo data("tdevsnippet"); -typedef TDevGenericFactory<SnippetPart> snippetFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevsnippet, snippetFactory( data ) ) +static const KDevPluginInfo data("kdevsnippet"); +typedef KDevGenericFactory<SnippetPart> snippetFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin(&data, parent, name ? name : "SnippetPart" ) + : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) { setInstance(snippetFactory::instance()); - setXMLFile("tdevpart_snippet.rc"); + setXMLFile("kdevpart_snippet.rc"); m_widget = new SnippetWidget(this); m_widget->setCaption(i18n("Code Snippets")); diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index 98a809cf..8ffd8fce 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -7,12 +7,12 @@ */ -#ifndef __TDEVPART_SNIPPET_H__ -#define __TDEVPART_SNIPPET_H__ +#ifndef __KDEVPART_SNIPPET_H__ +#define __KDEVPART_SNIPPET_H__ #include <tqguardedptr.h> -#include <tdevplugin.h> +#include <kdevplugin.h> class SnippetWidget; @@ -20,11 +20,11 @@ class TDEAboutData; class KDialogBase; /* -This is the TDevPlugin for the CodeSnippet feature +This is the KDevPlugin for the CodeSnippet feature For more info read the README.dox file @author Robert Gruber */ -class SnippetPart : public TDevPlugin +class SnippetPart : public KDevPlugin { Q_OBJECT diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 6b59f16f..9cd4ae4b 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -36,9 +36,9 @@ #include <kcombobox.h> #include <tdeversion.h> -#include <tdevcore.h> -#include <tdevproject.h> -#include <tdevpartcontroller.h> +#include <kdevcore.h> +#include <kdevproject.h> +#include <kdevpartcontroller.h> #include "snippetdlg.h" #include "snippetitem.h" @@ -418,7 +418,7 @@ void SnippetWidget::initConfigOldVersion(TDEConfig *cfg) void SnippetWidget::initConfig() { if (_cfg == NULL) - _cfg = new TDEConfig("tdevsnippetrc", false, false); + _cfg = new TDEConfig("kdevsnippetrc", false, false); _cfg->setGroup("SnippetPart"); diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 4d534802..8b6c17a1 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -19,7 +19,7 @@ #include <tdetexteditor/view.h> #include "snippetconfig.h" -class TDevProject; +class KDevProject; class SnippetPart; class TQPushButton; class TDEListView; |