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/tipofday | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/tipofday')
-rw-r--r-- | parts/tipofday/CMakeLists.txt | 10 | ||||
-rw-r--r-- | parts/tipofday/Makefile.am | 18 | ||||
-rw-r--r-- | parts/tipofday/kdevpart_tipofday.rc (renamed from parts/tipofday/tdevpart_tipofday.rc) | 0 | ||||
-rw-r--r-- | parts/tipofday/kdevtipofday.desktop (renamed from parts/tipofday/tdevtipofday.desktop) | 2 | ||||
-rw-r--r-- | parts/tipofday/tipofday_part.cpp | 18 | ||||
-rw-r--r-- | parts/tipofday/tipofday_part.h | 8 |
6 files changed, 28 insertions, 28 deletions
diff --git a/parts/tipofday/CMakeLists.txt b/parts/tipofday/CMakeLists.txt index c3990be1..753f65e1 100644 --- a/parts/tipofday/CMakeLists.txt +++ b/parts/tipofday/CMakeLists.txt @@ -27,14 +27,14 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES tdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday ) -install( FILES tdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday ) +install( FILES kdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday ) +install( FILES kdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday ) -##### libtdevtipofday (module) ################## +##### libkdevtipofday (module) ################## -tde_add_kpart( libtdevtipofday AUTOMOC +tde_add_kpart( libkdevtipofday AUTOMOC SOURCES tipofday_part.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/tipofday/Makefile.am b/parts/tipofday/Makefile.am index 22560851..4ec54292 100644 --- a/parts/tipofday/Makefile.am +++ b/parts/tipofday/Makefile.am @@ -1,24 +1,24 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevtipofday.la -libtdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevtipofday.la +libkdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevtipofday_la_SOURCES = tipofday_part.cpp +libkdevtipofday_la_SOURCES = tipofday_part.cpp METASOURCES = AUTO KDE_ICON = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevtipofday.desktop +service_DATA = kdevtipofday.desktop tip_DATA = tips -tipdir = $(kde_datadir)/tdevtipofday +tipdir = $(kde_datadir)/kdevtipofday -rc_DATA = tdevpart_tipofday.rc -rcdir = $(kde_datadir)/tdevtipofday +rc_DATA = kdevpart_tipofday.rc +rcdir = $(kde_datadir)/kdevtipofday messages: rc.cpp $(PREPARETIPS) > tips.cc - $(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/tdevtipofday.pot + $(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/kdevtipofday.pot rm -f tips.cc diff --git a/parts/tipofday/tdevpart_tipofday.rc b/parts/tipofday/kdevpart_tipofday.rc index 43f7d1dc..43f7d1dc 100644 --- a/parts/tipofday/tdevpart_tipofday.rc +++ b/parts/tipofday/kdevpart_tipofday.rc diff --git a/parts/tipofday/tdevtipofday.desktop b/parts/tipofday/kdevtipofday.desktop index 53d6d9c9..7efdbd9f 100644 --- a/parts/tipofday/tdevtipofday.desktop +++ b/parts/tipofday/kdevtipofday.desktop @@ -88,7 +88,7 @@ GenericName[zh_CN]=日积月累 GenericName[zh_TW]=本日小提示 Icon=tdevelop ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevtipofday +X-TDE-Library=libkdevtipofday X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Properties=Documentation diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index f86ebf1f..6cd63deb 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -8,28 +8,28 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <tdevgenericfactory.h> -#include <tdevplugininfo.h> +#include <kdevgenericfactory.h> +#include <kdevplugininfo.h> #include <kiconloader.h> #include <tdelocale.h> #include <kstandarddirs.h> #include <ktextbrowser.h> #include <ktip.h> -#include "tdevapi.h" -#include "tdevcore.h" +#include "kdevapi.h" +#include "kdevcore.h" -static const TDevPluginInfo data("tdevtipofday"); +static const KDevPluginInfo data("kdevtipofday"); -typedef TDevGenericFactory<TipOfDayPart> TipOfDayFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevtipofday, TipOfDayFactory( data ) ) +typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "TipOfDayPart") + : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") { setInstance(TipOfDayFactory::instance()); - setXMLFile("tdevpart_tipofday.rc"); + setXMLFile("kdevpart_tipofday.rc"); TDEAction *action; diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h index b5aafe50..4b982800 100644 --- a/parts/tipofday/tipofday_part.h +++ b/parts/tipofday/tipofday_part.h @@ -3,14 +3,14 @@ */ -#ifndef __TDEVPART_TIPOFDAY_H__ -#define __TDEVPART_TIPOFDAY_H__ +#ifndef __KDEVPART_TIPOFDAY_H__ +#define __KDEVPART_TIPOFDAY_H__ -#include <tdevplugin.h> +#include <kdevplugin.h> -class TipOfDayPart : public TDevPlugin +class TipOfDayPart : public KDevPlugin { Q_OBJECT |