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/fullscreen | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/fullscreen')
-rw-r--r-- | parts/fullscreen/CMakeLists.txt | 8 | ||||
-rw-r--r-- | parts/fullscreen/Makefile.am | 14 | ||||
-rw-r--r-- | parts/fullscreen/fullscreen_part.cpp | 20 | ||||
-rw-r--r-- | parts/fullscreen/fullscreen_part.h | 8 | ||||
-rw-r--r-- | parts/fullscreen/kdevfullscreen.desktop (renamed from parts/fullscreen/tdevfullscreen.desktop) | 2 | ||||
-rw-r--r-- | parts/fullscreen/kdevpart_fullscreen.rc (renamed from parts/fullscreen/tdevpart_fullscreen.rc) | 0 |
6 files changed, 26 insertions, 26 deletions
diff --git a/parts/fullscreen/CMakeLists.txt b/parts/fullscreen/CMakeLists.txt index 548e4f40..84b45df9 100644 --- a/parts/fullscreen/CMakeLists.txt +++ b/parts/fullscreen/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfullscreen ) +install( FILES kdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfullscreen ) -##### libtdevfullscreen (module) ################ +##### libkdevfullscreen (module) ################ -tde_add_kpart( libtdevfullscreen AUTOMOC +tde_add_kpart( libkdevfullscreen AUTOMOC SOURCES fullscreen_part.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/fullscreen/Makefile.am b/parts/fullscreen/Makefile.am index a05b0bd1..3f039ef6 100644 --- a/parts/fullscreen/Makefile.am +++ b/parts/fullscreen/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevfullscreen.la -libtdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfullscreen.la +libkdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfullscreen_la_SOURCES = fullscreen_part.cpp +libkdevfullscreen_la_SOURCES = fullscreen_part.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfullscreen.desktop +service_DATA = kdevfullscreen.desktop -rcdir = $(kde_datadir)/tdevfullscreen -rc_DATA = tdevpart_fullscreen.rc +rcdir = $(kde_datadir)/kdevfullscreen +rc_DATA = kdevpart_fullscreen.rc diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index a73f33f1..22cecb42 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -11,32 +11,32 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kstdaction.h> #include <tdemainwindow.h> #include <tdemenubar.h> -#include <tdevcore.h> -#include <tdevmainwindow.h> -#include <tdevplugininfo.h> +#include <kdevcore.h> +#include <kdevmainwindow.h> +#include <kdevplugininfo.h> #include "fullscreen_part.h" -static const TDevPluginInfo data("tdevfullscreen"); +static const KDevPluginInfo data("kdevfullscreen"); -typedef TDevGenericFactory<FullScreenPart> FullScreenFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevfullscreen, FullScreenFactory( data ) ) +typedef KDevGenericFactory<FullScreenPart> FullScreenFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin(&data, parent, name ? name : "FullScreenPart" ) + : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); // const TDEAboutData &abdata1 = *(info()); // kdDebug() << abdata1.appName() << endl; - const TDevPluginInfo &_info = *info(); + const KDevPluginInfo &_info = *info(); const TDEAboutData *abdata = _info; kdDebug() << abdata->appName() << endl; - setXMLFile("tdevpart_fullscreen.rc"); + setXMLFile("kdevpart_fullscreen.rc"); m_bFullScreen = false; diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index 2964b5d9..fcb566e8 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -9,15 +9,15 @@ * * ***************************************************************************/ -#ifndef __TDEVPART_FULLSCREEN_H__ -#define __TDEVPART_FULLSCREEN_H__ +#ifndef __KDEVPART_FULLSCREEN_H__ +#define __KDEVPART_FULLSCREEN_H__ #include <tqguardedptr.h> -#include <tdevplugin.h> +#include <kdevplugin.h> class TDEAction; -class FullScreenPart : public TDevPlugin +class FullScreenPart : public KDevPlugin { Q_OBJECT diff --git a/parts/fullscreen/tdevfullscreen.desktop b/parts/fullscreen/kdevfullscreen.desktop index 4974af20..6f935c85 100644 --- a/parts/fullscreen/tdevfullscreen.desktop +++ b/parts/fullscreen/kdevfullscreen.desktop @@ -81,6 +81,6 @@ GenericName[zh_TW]=全螢幕 Icon=tdevelop ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Core -X-TDE-Library=libtdevfullscreen +X-TDE-Library=libkdevfullscreen X-TDevelop-Version=5 X-TDevelop-Properties=ViewManagement diff --git a/parts/fullscreen/tdevpart_fullscreen.rc b/parts/fullscreen/kdevpart_fullscreen.rc index 3bd67c9d..3bd67c9d 100644 --- a/parts/fullscreen/tdevpart_fullscreen.rc +++ b/parts/fullscreen/kdevpart_fullscreen.rc |