summaryrefslogtreecommitdiffstats
path: root/parts/abbrev
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-25 15:37:31 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-25 15:37:31 +0900
commit6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch)
treeab69e390f7962b7e7dda1a3a64f035c61c751cf4 /parts/abbrev
parentaba2788b428dc53243407902e9ccbb20b97a69fd (diff)
downloadtdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz
tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/abbrev')
-rw-r--r--parts/abbrev/CMakeLists.txt10
-rw-r--r--parts/abbrev/Makefile.am16
-rw-r--r--parts/abbrev/abbrevpart.cpp26
-rw-r--r--parts/abbrev/abbrevpart.h4
-rw-r--r--parts/abbrev/kdevabbrev.desktop (renamed from parts/abbrev/tdevabbrev.desktop)2
-rw-r--r--parts/abbrev/kdevabbrev.rc (renamed from parts/abbrev/tdevabbrev.rc)0
6 files changed, 29 insertions, 29 deletions
diff --git a/parts/abbrev/CMakeLists.txt b/parts/abbrev/CMakeLists.txt
index 6a61f9d8..219ad73d 100644
--- a/parts/abbrev/CMakeLists.txt
+++ b/parts/abbrev/CMakeLists.txt
@@ -26,14 +26,14 @@ link_directories(
##### other data ################################
-install( FILES tdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/sources )
-install( FILES tdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev )
+install( FILES kdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/sources )
+install( FILES kdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev )
-##### libtdevabbrev (module) ####################
+##### libkdevabbrev (module) ####################
-tde_add_kpart( libtdevabbrev AUTOMOC
+tde_add_kpart( libkdevabbrev AUTOMOC
SOURCES
abbrevpart.cpp abbrevconfigwidget.cpp
abbrevconfigwidgetbase.ui addtemplatedlg.cpp
diff --git a/parts/abbrev/Makefile.am b/parts/abbrev/Makefile.am
index 1c4f559c..f5c3ec2e 100644
--- a/parts/abbrev/Makefile.am
+++ b/parts/abbrev/Makefile.am
@@ -2,19 +2,19 @@
INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes)
-kde_module_LTLIBRARIES = libtdevabbrev.la
-libtdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevabbrev.la
+libkdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
-libtdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui
+libkdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevabbrev.desktop
+service_DATA = kdevabbrev.desktop
-sourcesdir = $(kde_datadir)/tdevabbrev/sources
+sourcesdir = $(kde_datadir)/kdevabbrev/sources
sources_DATA = qt_classes cpp_keywords
-rcdir = $(kde_datadir)/tdevabbrev
-rc_DATA = tdevabbrev.rc
+rcdir = $(kde_datadir)/kdevabbrev
+rc_DATA = kdevabbrev.rc
diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp
index 87e44e23..80d26599 100644
--- a/parts/abbrev/abbrevpart.cpp
+++ b/parts/abbrev/abbrevpart.cpp
@@ -24,35 +24,35 @@
#include <tdelocale.h>
#include <tdeparts/part.h>
#include <kstandarddirs.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
#include <tdeaction.h>
#include <tdeconfig.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
#include <tdetexteditor/document.h>
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/codecompletioninterface.h>
-#include "tdevcore.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevpartcontroller.h"
#include "abbrevconfigwidget.h"
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
-static const TDevPluginInfo data("tdevabbrev");
+static const KDevPluginInfo data("kdevabbrev");
-class AbbrevFactory : public TDevGenericFactory<AbbrevPart>
+class AbbrevFactory : public KDevGenericFactory<AbbrevPart>
{
public:
AbbrevFactory()
- : TDevGenericFactory<AbbrevPart>( data )
+ : KDevGenericFactory<AbbrevPart>( data )
{ }
virtual TDEInstance *createInstance()
{
- TDEInstance *instance = TDevGenericFactory<AbbrevPart>::createInstance();
+ TDEInstance *instance = KDevGenericFactory<AbbrevPart>::createInstance();
TDEStandardDirs *dirs = instance->dirs();
dirs->addResourceType( "codetemplates",
TDEStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" );
@@ -63,13 +63,13 @@ public:
}
};
-K_EXPORT_COMPONENT_FACTORY( libtdevabbrev, AbbrevFactory )
+K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory )
AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &)
- : TDevPlugin(&data, parent, name ? name : "AbbrevPart")
+ : KDevPlugin(&data, parent, name ? name : "AbbrevPart")
{
setInstance(AbbrevFactory::instance());
- setXMLFile("tdevabbrev.rc");
+ setXMLFile("kdevabbrev.rc");
connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)),
this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) );
@@ -235,7 +235,7 @@ void AbbrevPart::save()
TQString AbbrevPart::currentWord() const
{
- return TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ return KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
}
diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h
index cbb60e50..2b602088 100644
--- a/parts/abbrev/abbrevpart.h
+++ b/parts/abbrev/abbrevpart.h
@@ -18,7 +18,7 @@
#include <tqmap.h>
#include <tqptrlist.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
#include <tdetexteditor/codecompletioninterface.h>
@@ -60,7 +60,7 @@ private:
TQStringList m_suffixes;
};
-class AbbrevPart : public TDevPlugin
+class AbbrevPart : public KDevPlugin
{
Q_OBJECT
diff --git a/parts/abbrev/tdevabbrev.desktop b/parts/abbrev/kdevabbrev.desktop
index f06bf2eb..5c230dd4 100644
--- a/parts/abbrev/tdevabbrev.desktop
+++ b/parts/abbrev/kdevabbrev.desktop
@@ -77,7 +77,7 @@ GenericName[zh_CN]=缩写扩展
GenericName[zh_TW]=縮寫擴展
ServiceTypes=TDevelop/Plugin
Icon=fontsizeup
-X-TDE-Library=libtdevabbrev
+X-TDE-Library=libkdevabbrev
X-TDevelop-Version=5
X-TDevelop-Scope=Global
X-TDevelop-Properties=CodeEditing
diff --git a/parts/abbrev/tdevabbrev.rc b/parts/abbrev/kdevabbrev.rc
index e994ee76..e994ee76 100644
--- a/parts/abbrev/tdevabbrev.rc
+++ b/parts/abbrev/kdevabbrev.rc