summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am8
-rw-r--r--src/core.h2
-rw-r--r--src/editorproxy.cpp22
-rw-r--r--src/editorproxy.h6
-rw-r--r--src/kconf_update/Makefile.am2
-rw-r--r--src/mainwindowshare.cpp10
-rw-r--r--src/multibuffer.cpp10
-rw-r--r--src/newui/CMakeLists.txt2
-rw-r--r--src/newui/dmainwindow.h2
-rw-r--r--src/partcontroller.cpp18
-rw-r--r--src/plugincontroller.cpp2
-rw-r--r--src/profileengine/lib/Makefile.am2
-rw-r--r--src/projectmanager.cpp2
-rw-r--r--src/projectsession.cpp8
-rw-r--r--src/simplemainwindow.cpp6
-rw-r--r--src/statusbar.cpp6
16 files changed, 54 insertions, 54 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 701fcbb1..4cf58098 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/in
libkdevshell_la_LIBADD = \
$(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \
$(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \
- $(top_builddir)/src/newui/libd.la $(LIB_KHTML) -lktexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
+ $(top_builddir)/src/newui/libd.la $(LIB_KHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner
libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \
editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \
mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \
@@ -24,7 +24,7 @@ bin_PROGRAMS = tdevelop kdevassistant
tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui
tdevelop_METASOURCES = AUTO
-tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
+tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
tdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
rcdir = $(kde_datadir)/tdevelop
@@ -35,7 +35,7 @@ tdevelopdatadir = $(kde_confdir)
tdevelopdata_DATA = tdeveloprc kdevassistantrc
SUBDIRS = profiles profileengine newui kconf_update
-kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
+kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner
kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp
kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner
@@ -48,7 +48,7 @@ shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \
statusbar.h toplevel.h generalinfowidgetbase.h mimewarningdialog.h settingswidget.h \
simplemainwindow.h multibuffer.h
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions
DOXYGEN_PROJECTNAME = KDevelop Generic Shell
DOXYGEN_DOCDIRPREFIX = kdevshell
include ../Doxyfile.am
diff --git a/src/core.h b/src/core.h
index 2588e232..b30549ca 100644
--- a/src/core.h
+++ b/src/core.h
@@ -4,7 +4,7 @@
#include <tqregexp.h>
#include <kxmlguiclient.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include "kdevcore.h"
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index 34860c26..55861014 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -7,15 +7,15 @@
#include <kconfig.h>
#include <kapplication.h>
-#include <kparts/part.h>
-
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/view.h>
+#include <tdeparts/part.h>
+
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/view.h>
#include <kxmlguiclient.h>
#include <kxmlguifactory.h>
#include <kmainwindow.h>
@@ -115,7 +115,7 @@ void EditorProxy::installPopup( KParts::Part * part )
{
KTextEditor::View * view = static_cast<KTextEditor::View*>( part->widget() );
- TQPopupMenu * popup = static_cast<TQPopupMenu*>( part->factory()->container("ktexteditor_popup", view ) );
+ TQPopupMenu * popup = static_cast<TQPopupMenu*>( part->factory()->container("tdetexteditor_popup", view ) );
if (!popup)
{
@@ -225,7 +225,7 @@ void EditorProxy::showPopup( )
if ( iface )
{
KTextEditor::View * view = static_cast<KTextEditor::View*>( part->widget() );
- TQPopupMenu * popup = static_cast<TQPopupMenu*>( view->factory()->container("ktexteditor_popup", view ) );
+ TQPopupMenu * popup = static_cast<TQPopupMenu*>( view->factory()->container("tdetexteditor_popup", view ) );
if ( popup )
{
diff --git a/src/editorproxy.h b/src/editorproxy.h
index d71d4cda..7cbd9ec9 100644
--- a/src/editorproxy.h
+++ b/src/editorproxy.h
@@ -10,10 +10,10 @@ class TQPopupMenu;
class MultiBuffer;
class TQTimer;
-#include <kparts/part.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/markinterface.h>
#include <tdeversion.h>
-# include <ktexteditor/markinterfaceextension.h>
+# include <tdetexteditor/markinterfaceextension.h>
class EditorProxy : public TQObject
{
diff --git a/src/kconf_update/Makefile.am b/src/kconf_update/Makefile.am
index 7b072c71..e7317f2b 100644
--- a/src/kconf_update/Makefile.am
+++ b/src/kconf_update/Makefile.am
@@ -11,7 +11,7 @@ kconf_PROGRAMS = kdev-gen-settings-kconf_update
kconfdir = $(libdir)/kconf_update_bin
kdev_gen_settings_kconf_update_SOURCES = kdev-gen-settings-kconf_update.cpp
-kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kdev_gen_settings_kconf_update_LDADD = $(LIB_QT)
# vim: set noet:
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 1d67217b..d03fffed 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -29,7 +29,7 @@
#include <kapplication.h>
#include <klocale.h>
#include <kstatusbar.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
#include <kdialogbase.h>
#include <kconfig.h>
#include <kkeydialog.h>
@@ -40,10 +40,10 @@
#include <kpopupmenu.h>
#include <kiconloader.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/configinterface.h>
-#include <kparts/partmanager.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdeparts/partmanager.h>
#include <tdeversion.h>
#include <kdebug.h>
#include <knotifydialog.h>
diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp
index 87707e84..403eee1a 100644
--- a/src/multibuffer.cpp
+++ b/src/multibuffer.cpp
@@ -23,7 +23,7 @@
// doesn't need to be rearchitected for multiple views before the lazy view
// creation can go in
#define protected public
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#undef protected
#include "multibuffer.h"
@@ -39,11 +39,11 @@
#include <kmainwindow.h>
#include <kapplication.h>
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
MultiBuffer::MultiBuffer( TQWidget *parent )
: TQSplitter( parent, "MultiBuffer" ),
diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt
index 046c2c7f..b1f89a56 100644
--- a/src/newui/CMakeLists.txt
+++ b/src/newui/CMakeLists.txt
@@ -22,7 +22,7 @@ tde_add_library( d SHARED AUTOMOC
SOURCES
dmainwindow.cpp buttonbar.cpp button.cpp ddockwindow.cpp
docksplitter.cpp dtabwidget.cpp
- LINK kparts-shared tdecore-shared tdeui-shared
+ LINK tdeparts-shared tdecore-shared tdeui-shared
VERSION 0.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h
index 2f1c2ed5..37caa50d 100644
--- a/src/newui/dmainwindow.h
+++ b/src/newui/dmainwindow.h
@@ -21,7 +21,7 @@
#define DMAINWINDOW_H
#include <kxmlguiclient.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
#include "ddockwindow.h"
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index 0bd2e404..ab13eff5 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -19,16 +19,16 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/partmanager.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/browserextension.h>
#include <kfiledialog.h>
#include <kmainwindow.h>
#include <kaction.h>
#include <kmessagebox.h>
#include <kstatusbar.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
#include <kpopupmenu.h>
#include <kio/netaccess.h>
#include <kdialogbase.h>
@@ -42,10 +42,10 @@
#include <kencodingfiledialog.h>
#include <ksqueezedtextlabel.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/encodinginterface.h>
#include "toplevel.h"
#include "api.h"
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index e598b456..18440daa 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -10,7 +10,7 @@
#include <kconfig.h>
#include <klocale.h>
#include <kmainwindow.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <assert.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/src/profileengine/lib/Makefile.am b/src/profileengine/lib/Makefile.am
index 4bbdbbf5..5a37fdf5 100644
--- a/src/profileengine/lib/Makefile.am
+++ b/src/profileengine/lib/Makefile.am
@@ -10,7 +10,7 @@ libprofileengine_la_SOURCES = profileengine.cpp profile.cpp
profileincludedir = $(includedir)/tdevelop/shell/profileengine
profileinclude_HEADERS = profileengine.h profile.h
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Shell Profiles Library
DOXYGEN_DOCDIRPREFIX = kdevprofiles
include ../../../Doxyfile.am
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index bd4ee23e..dffe9b92 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -17,7 +17,7 @@ class TQDomDocument;
#include <ktrader.h>
#include <kfiledialog.h>
#include <kmainwindow.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
#include <kaction.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index 84626536..0448521c 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -20,14 +20,14 @@
#include <tqfile.h>
#include <tqtimer.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include <kurl.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kinstance.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/encodinginterface.h>
#include "api.h"
#include "partcontroller.h"
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 6c733c5e..3f685c3c 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -23,15 +23,15 @@
#include <kaction.h>
#include <kstdaction.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include <kpopupmenu.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kiconloader.h>
#include <kedittoolbar.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
#include <kapplication.h>
#include <kurldrag.h>
#include <kconfig.h>
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index ff1502bc..08a5cab2 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -18,11 +18,11 @@
#include <kdebug.h>
#include <kglobalsettings.h>
#include <klocale.h>
-#include <kparts/part.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
#include <tdeversion.h>
-#include <ktexteditor/viewstatusmsginterface.h>
+#include <tdetexteditor/viewstatusmsginterface.h>
#include "statusbar.h"
#include "partcontroller.h"