summaryrefslogtreecommitdiffstats
path: root/parts/quickopen
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/quickopen
parentaba2788b428dc53243407902e9ccbb20b97a69fd (diff)
downloadtdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz
tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/quickopen')
-rw-r--r--parts/quickopen/CMakeLists.txt8
-rw-r--r--parts/quickopen/Makefile.am14
-rw-r--r--parts/quickopen/kdevpart_quickopen.rc (renamed from parts/quickopen/tdevpart_quickopen.rc)0
-rw-r--r--parts/quickopen/kdevquickopen.desktop (renamed from parts/quickopen/tdevquickopen.desktop)2
-rw-r--r--parts/quickopen/quickopen_part.cpp28
-rw-r--r--parts/quickopen/quickopen_part.h6
-rw-r--r--parts/quickopen/quickopenclassdialog.cpp6
-rw-r--r--parts/quickopen/quickopenfiledialog.cpp4
-rw-r--r--parts/quickopen/quickopenfunctiondialog.cpp8
9 files changed, 38 insertions, 38 deletions
diff --git a/parts/quickopen/CMakeLists.txt b/parts/quickopen/CMakeLists.txt
index ad6fa926..cb82433f 100644
--- a/parts/quickopen/CMakeLists.txt
+++ b/parts/quickopen/CMakeLists.txt
@@ -28,13 +28,13 @@ link_directories(
##### other data ################################
-install( FILES tdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevquickopen )
+install( FILES kdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevquickopen )
-##### libtdevquickopen (module) #################
+##### libkdevquickopen (module) #################
-tde_add_kpart( libtdevquickopen AUTOMOC
+tde_add_kpart( libkdevquickopen AUTOMOC
SOURCES
quickopen_part.cpp quickopendialog.cpp
quickopenclassdialog.cpp quickopenbase.ui
diff --git a/parts/quickopen/Makefile.am b/parts/quickopen/Makefile.am
index cce44ae3..ca7ed3dd 100644
--- a/parts/quickopen/Makefile.am
+++ b/parts/quickopen/Makefile.am
@@ -1,17 +1,17 @@
INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \
-I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes)
-kde_module_LTLIBRARIES = libtdevquickopen.la
-libtdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libkdevquickopen.la
+libkdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
-libtdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp
+libkdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevquickopen.desktop
+service_DATA = kdevquickopen.desktop
-rcdir = $(kde_datadir)/tdevquickopen
-rc_DATA = tdevpart_quickopen.rc
+rcdir = $(kde_datadir)/kdevquickopen
+rc_DATA = kdevpart_quickopen.rc
noinst_HEADERS = quickopendialog.h quickopenclassdialog.h quickopenfiledialog.h quickopenfunctiondialog.h quickopenfunctionchooseform.h
diff --git a/parts/quickopen/tdevpart_quickopen.rc b/parts/quickopen/kdevpart_quickopen.rc
index 6a50fc22..6a50fc22 100644
--- a/parts/quickopen/tdevpart_quickopen.rc
+++ b/parts/quickopen/kdevpart_quickopen.rc
diff --git a/parts/quickopen/tdevquickopen.desktop b/parts/quickopen/kdevquickopen.desktop
index ed500ad4..42a8e8ff 100644
--- a/parts/quickopen/tdevquickopen.desktop
+++ b/parts/quickopen/kdevquickopen.desktop
@@ -75,6 +75,6 @@ GenericName[zh_TW]=快速開啟
Icon=tdevelop
ServiceTypes=TDevelop/QuickOpen
X-TDevelop-Scope=Project
-X-TDE-Library=libtdevquickopen
+X-TDE-Library=libkdevquickopen
X-TDevelop-Version=5
X-TDevelop-Properties=CodeNavigation
diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp
index 3a8a10c4..4d316e68 100644
--- a/parts/quickopen/quickopen_part.cpp
+++ b/parts/quickopen/quickopen_part.cpp
@@ -27,25 +27,25 @@
#include <kiconloader.h>
#include <tdelocale.h>
#include <klineedit.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
#include <tdemainwindow.h>
#include <tdeparts/part.h>
#include <tdetexteditor/document.h>
-#include <tdevmainwindow.h>
-#include <tdevcore.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
+#include <kdevmainwindow.h>
+#include <kdevcore.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
#include <codebrowserfrontend.h>
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
-typedef TDevGenericFactory<QuickOpenPart> QuickOpenFactory;
-static const TDevPluginInfo data("tdevquickopen");
-K_EXPORT_COMPONENT_FACTORY( libtdevquickopen, QuickOpenFactory( data ) )
+typedef KDevGenericFactory<QuickOpenPart> QuickOpenFactory;
+static const KDevPluginInfo data("kdevquickopen");
+K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) )
using namespace KTextEditor;
@@ -53,7 +53,7 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL
: KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" )
{
setInstance(QuickOpenFactory::instance());
- setXMLFile("tdevpart_quickopen.rc");
+ setXMLFile("kdevpart_quickopen.rc");
m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O,
this, TQT_SLOT(slotQuickFileOpen()),
@@ -100,14 +100,14 @@ void QuickOpenPart::slotQuickFileOpen( )
void QuickOpenPart::slotQuickOpenClass( )
{
QuickOpenClassDialog dlg( this, mainWindow()->main() );
- dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
+ dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
dlg.exec();
}
void QuickOpenPart::slotQuickOpenFunction()
{
QuickOpenFunctionDialog dlg( this, mainWindow()->main() );
- dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
+ dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) );
dlg.exec();
}
@@ -119,7 +119,7 @@ void QuickOpenPart::slotSwitchTo()
void QuickOpenPart::selectItem( ItemDom item )
{
- Extensions::TDevCodeBrowserFrontend* f = extension< Extensions::TDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
+ Extensions::KDevCodeBrowserFrontend* f = extension< Extensions::KDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" );
if(f != 0) {
ItemDom itemDom( &(*item) );
diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h
index aff0d4f6..fa1d85e3 100644
--- a/parts/quickopen/quickopen_part.h
+++ b/parts/quickopen/quickopen_part.h
@@ -18,11 +18,11 @@
*
*/
-#ifndef __TDEVPART_QUICKOPEN_H__
-#define __TDEVPART_QUICKOPEN_H__
+#ifndef __KDEVPART_QUICKOPEN_H__
+#define __KDEVPART_QUICKOPEN_H__
#include <tqguardedptr.h>
-#include <tdevquickopen.h>
+#include <kdevquickopen.h>
#include <codemodel.h>
class TDEAction;
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index 7dcfd48b..37987166 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -18,9 +18,9 @@
*
*/
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
-#include <tdevlanguagesupport.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
+#include <kdevlanguagesupport.h>
#include <tdelistbox.h>
#include <tdelocale.h>
diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp
index fc8da49a..18f15974 100644
--- a/parts/quickopen/quickopenfiledialog.cpp
+++ b/parts/quickopen/quickopenfiledialog.cpp
@@ -18,8 +18,8 @@
*
*/
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
#include <tdelistbox.h>
diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp
index 14f7a984..bbcab7e4 100644
--- a/parts/quickopen/quickopenfunctiondialog.cpp
+++ b/parts/quickopen/quickopenfunctiondialog.cpp
@@ -28,11 +28,11 @@
#include <tdemessagebox.h>
#include <klineedit.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
#include <codemodel_utils.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
-#include <tdevlanguagesupport.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
+#include <kdevlanguagesupport.h>
#include <tqregexp.h>