summaryrefslogtreecommitdiffstats
path: root/parts/konsole
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/konsole
parentaba2788b428dc53243407902e9ccbb20b97a69fd (diff)
downloadtdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz
tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/konsole')
-rw-r--r--parts/konsole/CMakeLists.txt6
-rw-r--r--parts/konsole/Makefile.am12
-rw-r--r--parts/konsole/kdevkonsoleview.desktop (renamed from parts/konsole/tdevkonsoleview.desktop)2
-rw-r--r--parts/konsole/konsoleviewpart.cpp22
-rw-r--r--parts/konsole/konsoleviewpart.h8
-rw-r--r--parts/konsole/konsoleviewwidget.cpp6
-rw-r--r--parts/konsole/konsoleviewwidget.h2
7 files changed, 29 insertions, 29 deletions
diff --git a/parts/konsole/CMakeLists.txt b/parts/konsole/CMakeLists.txt
index 37cd0687..e6b51296 100644
--- a/parts/konsole/CMakeLists.txt
+++ b/parts/konsole/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
##### other data ################################
-install( FILES tdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-##### libtdevkonsoleview (module) ###############
+##### libkdevkonsoleview (module) ###############
-tde_add_kpart( libtdevkonsoleview AUTOMOC
+tde_add_kpart( libkdevkonsoleview AUTOMOC
SOURCES konsoleviewpart.cpp
LINK tdevelop-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/konsole/Makefile.am b/parts/konsole/Makefile.am
index 1cc781d4..085f8e7a 100644
--- a/parts/konsole/Makefile.am
+++ b/parts/konsole/Makefile.am
@@ -2,15 +2,15 @@
INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
-kde_module_LTLIBRARIES = libtdevkonsoleview.la
-libtdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
- $(top_builddir)/lib/util/libtdevutil.la
+kde_module_LTLIBRARIES = libkdevkonsoleview.la
+libkdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+ $(top_builddir)/lib/util/libkdevutil.la
-libtdevkonsoleview_la_SOURCES = konsoleviewpart.cpp
+libkdevkonsoleview_la_SOURCES = konsoleviewpart.cpp
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevkonsoleview.desktop
+service_DATA = kdevkonsoleview.desktop
diff --git a/parts/konsole/tdevkonsoleview.desktop b/parts/konsole/kdevkonsoleview.desktop
index edc9018f..4a9fa14e 100644
--- a/parts/konsole/tdevkonsoleview.desktop
+++ b/parts/konsole/kdevkonsoleview.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=嵌入的 Konsole
GenericName[zh_TW]=嵌入式主控台
Icon=konsole
ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevkonsoleview
+X-TDE-Library=libkdevkonsoleview
X-TDevelop-Version=5
X-TDevelop-Scope=Global
X-TDevelop-Properties=Console
diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp
index 63f720d9..873ab790 100644
--- a/parts/konsole/konsoleviewpart.cpp
+++ b/parts/konsole/konsoleviewpart.cpp
@@ -13,27 +13,27 @@
#include <tqwhatsthis.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
#include <kiconloader.h>
#include <tdelocale.h>
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevplugininfo.h"
-#include "tdevshellwidget.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevplugininfo.h"
+#include "kdevshellwidget.h"
-typedef TDevGenericFactory<KonsoleViewPart> KonsoleViewFactory;
-static const TDevPluginInfo data("tdevkonsoleview");
-K_EXPORT_COMPONENT_FACTORY(libtdevkonsoleview, KonsoleViewFactory(data))
+typedef KDevGenericFactory<KonsoleViewPart> KonsoleViewFactory;
+static const KDevPluginInfo data("kdevkonsoleview");
+K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data))
KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &)
- : TDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
+ : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart")
{
setInstance( KonsoleViewFactory::instance() );
- m_widget = new TDevShellWidget( 0, "konsole widget" );
+ m_widget = new KDevShellWidget( 0, "konsole widget" );
TQWhatsThis::add(m_widget, i18n("<b>Konsole</b><p>"
"This window contains an embedded konsole window. It will try to follow you when "
diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h
index 912e00b4..9bcecb38 100644
--- a/parts/konsole/konsoleviewpart.h
+++ b/parts/konsole/konsoleviewpart.h
@@ -14,12 +14,12 @@
#include <tqguardedptr.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
-class TDevShellWidget;
+class KDevShellWidget;
-class KonsoleViewPart : public TDevPlugin
+class KonsoleViewPart : public KDevPlugin
{
Q_OBJECT
@@ -31,7 +31,7 @@ private slots:
void projectOpened();
private:
- TQGuardedPtr<TDevShellWidget> m_widget;
+ TQGuardedPtr<KDevShellWidget> m_widget;
};
#endif
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 26ac9e29..7c21cab2 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -20,10 +20,10 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include "tdevcore.h"
-#include "tdevproject.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
#include "konsoleviewpart.h"
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
#include "konsoleviewwidget.h"
diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h
index 6a7f6a9f..2bf3160a 100644
--- a/parts/konsole/konsoleviewwidget.h
+++ b/parts/konsole/konsoleviewwidget.h
@@ -17,7 +17,7 @@
#include <tqstring.h>
-class TDevProject;
+class KDevProject;
class KonsoleWidgetPrivate;
class KonsoleViewPart;
namespace KParts {