summaryrefslogtreecommitdiffstats
path: root/parts/grepview
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/grepview
parentaba2788b428dc53243407902e9ccbb20b97a69fd (diff)
downloadtdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz
tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/grepview')
-rw-r--r--parts/grepview/CMakeLists.txt10
-rw-r--r--parts/grepview/Makefile.am16
-rw-r--r--parts/grepview/grepdlg.cpp2
-rw-r--r--parts/grepview/grepviewpart.cpp28
-rw-r--r--parts/grepview/grepviewpart.h10
-rw-r--r--parts/grepview/grepviewwidget.cpp16
-rw-r--r--parts/grepview/grepviewwidget.h4
-rw-r--r--parts/grepview/kdevgrepview.desktop (renamed from parts/grepview/tdevgrepview.desktop)2
-rw-r--r--parts/grepview/kdevgrepview.rc (renamed from parts/grepview/tdevgrepview.rc)0
9 files changed, 44 insertions, 44 deletions
diff --git a/parts/grepview/CMakeLists.txt b/parts/grepview/CMakeLists.txt
index 96d4042b..5ad23e4f 100644
--- a/parts/grepview/CMakeLists.txt
+++ b/parts/grepview/CMakeLists.txt
@@ -27,16 +27,16 @@ link_directories(
##### other data ################################
-install( FILES tdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevgrepview )
+install( FILES kdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevgrepview )
-##### libtdevgrepview (module) ##################
+##### libkdevgrepview (module) ##################
-tde_add_kpart( libtdevgrepview AUTOMOC
+tde_add_kpart( libkdevgrepview AUTOMOC
SOURCES
grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
LINK
- tdevwidgets-shared tdevelop-shared
+ kdevwidgets-shared tdevelop-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/parts/grepview/Makefile.am b/parts/grepview/Makefile.am
index 8ae4725c..dc5f5fed 100644
--- a/parts/grepview/Makefile.am
+++ b/parts/grepview/Makefile.am
@@ -3,17 +3,17 @@
INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-I$(top_srcdir)/lib/widgets $(all_includes)
-kde_module_LTLIBRARIES = libtdevgrepview.la
-libtdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
- $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML)
+kde_module_LTLIBRARIES = libkdevgrepview.la
+libkdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+ $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML)
-libtdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
+libkdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevgrepview.desktop
+service_DATA = kdevgrepview.desktop
-rcdir = $(kde_datadir)/tdevgrepview
-rc_DATA = tdevgrepview.rc
+rcdir = $(kde_datadir)/kdevgrepview
+rc_DATA = kdevgrepview.rc
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 8e8b0eb3..6333805f 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -34,7 +34,7 @@
#include <kurlrequester.h>
#include <kstdguiitem.h>
#include <tdeparts/part.h>
-#include <tdevpartcontroller.h>
+#include <kdevpartcontroller.h>
#include <klineedit.h>
#include "grepviewpart.h"
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 9d6b08c5..92f4ebb6 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -23,26 +23,26 @@
#include <kstringhandler.h>
#include <tdetexteditor/document.h>
-#include "tdevcore.h"
-#include "tdevpartcontroller.h"
-#include "tdevmainwindow.h"
-#include "tdevplugininfo.h"
-#include "tdeveditorutil.h"
+#include "kdevcore.h"
+#include "kdevpartcontroller.h"
+#include "kdevmainwindow.h"
+#include "kdevplugininfo.h"
+#include "kdeveditorutil.h"
#include "grepviewwidget.h"
-static const TDevPluginInfo data("tdevgrepview");
+static const KDevPluginInfo data("kdevgrepview");
-K_EXPORT_COMPONENT_FACTORY(libtdevgrepview, GrepViewFactory(data))
+K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data))
GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & )
- : TDevPlugin( &data, parent, name ? name : "GrepViewPart" )
+ : KDevPlugin( &data, parent, name ? name : "GrepViewPart" )
{
setInstance(GrepViewFactory::instance());
- setXMLFile("tdevgrepview.rc");
+ setXMLFile("kdevgrepview.rc");
- connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)),
- this, TQT_SLOT(stopButtonClicked(TDevPlugin*)) );
+ connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+ this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) );
connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) );
connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) );
connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
@@ -83,7 +83,7 @@ GrepViewPart::~GrepViewPart()
}
-void GrepViewPart::stopButtonClicked(TDevPlugin* which)
+void GrepViewPart::stopButtonClicked(KDevPlugin* which)
{
if ( which != 0 && which != this )
return;
@@ -129,10 +129,10 @@ void GrepViewPart::slotGrep()
{
if ( !m_widget->isRunning() )
{
- TQString contextString = TDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ TQString contextString = KDevEditorUtil::currentSelection( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
if ( contextString.isEmpty() )
{
- contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+ contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
}
m_widget->showDialogWithPattern( contextString );
}
diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h
index 68c4a574..4ebd7638 100644
--- a/parts/grepview/grepviewpart.h
+++ b/parts/grepview/grepviewpart.h
@@ -13,8 +13,8 @@
#define _GREPVIEWPART_H_
#include <tqguardedptr.h>
-#include <tdevgenericfactory.h>
-#include "tdevplugin.h"
+#include <kdevgenericfactory.h>
+#include "kdevplugin.h"
class KDialogBase;
class TQPopupMenu;
@@ -22,7 +22,7 @@ class Context;
class GrepViewWidget;
-class GrepViewPart : public TDevPlugin
+class GrepViewPart : public KDevPlugin
{
Q_OBJECT
@@ -32,7 +32,7 @@ public:
~GrepViewPart();
private slots:
- void stopButtonClicked(TDevPlugin *which);
+ void stopButtonClicked(KDevPlugin *which);
void projectOpened();
void projectClosed();
void contextMenu(TQPopupMenu *popup, const Context *context);
@@ -46,6 +46,6 @@ private:
friend class GrepViewWidget;
};
-typedef TDevGenericFactory<GrepViewPart> GrepViewFactory;
+typedef KDevGenericFactory<GrepViewPart> GrepViewFactory;
#endif
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index edcdaa7c..1d709dff 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -27,10 +27,10 @@
#include <tdemessagebox.h>
using namespace KTextEditor;
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
#include "grepdlg.h"
#include "grepviewpart.h"
@@ -181,7 +181,7 @@ void GrepViewWidget::showDialog()
}
}
// Determine if we have a list of project files
- TDevProject *openProject = m_part->project();
+ KDevProject *openProject = m_part->project();
if (openProject)
{
grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty());
@@ -225,7 +225,7 @@ void GrepViewWidget::showDialogWithPattern(TQString pattern)
grepdlg->setPattern( pattern );
// Determine if we have a list of project files
- TDevProject *openProject = m_part->project();
+ KDevProject *openProject = m_part->project();
if (openProject)
{
grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty());
@@ -255,7 +255,7 @@ void GrepViewWidget::searchActivated()
if (grepdlg->useProjectFilesFlag())
{
- TDevProject *openProject = m_part->project();
+ KDevProject *openProject = m_part->project();
if (openProject)
{
TQString tmpFilePath;
@@ -430,7 +430,7 @@ void GrepViewProcessWidget::insertStdoutLine(const TQCString &line)
}
-void GrepViewWidget::projectChanged(TDevProject *project)
+void GrepViewWidget::projectChanged(KDevProject *project)
{
TQString dir = project? project->projectDirectory() : TQDir::homeDirPath();
grepdlg->setDirectory(dir);
diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h
index 0f05c136..3bf803b5 100644
--- a/parts/grepview/grepviewwidget.h
+++ b/parts/grepview/grepviewwidget.h
@@ -18,7 +18,7 @@
class GrepDialog;
class GrepViewPart;
-class TDevProject;
+class KDevProject;
class KTabWidget;
class TQHBoxLayout;
class TQToolButton;
@@ -66,7 +66,7 @@ public:
GrepViewWidget(GrepViewPart *part);
~GrepViewWidget();
- void projectChanged(TDevProject *project);
+ void projectChanged(KDevProject *project);
void killJob( int signo = SIGTERM );
bool isRunning() const;
diff --git a/parts/grepview/tdevgrepview.desktop b/parts/grepview/kdevgrepview.desktop
index c7b98916..0521c804 100644
--- a/parts/grepview/tdevgrepview.desktop
+++ b/parts/grepview/kdevgrepview.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=Grep 前端
GenericName[zh_TW]=Grep 前端介面
Icon=find
ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevgrepview
+X-TDE-Library=libkdevgrepview
X-TDevelop-Version=5
X-TDevelop-Scope=Global
X-TDevelop-Properties=FileSearch
diff --git a/parts/grepview/tdevgrepview.rc b/parts/grepview/kdevgrepview.rc
index 80b20389..80b20389 100644
--- a/parts/grepview/tdevgrepview.rc
+++ b/parts/grepview/kdevgrepview.rc