summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/CMakeLists.txt2
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/catalog/Makefile.am2
-rw-r--r--lib/cppparser/Makefile.am2
-rw-r--r--lib/interfaces/Makefile.am4
-rw-r--r--lib/interfaces/extensions/Makefile.am2
-rw-r--r--lib/interfaces/external/CMakeLists.txt2
-rw-r--r--lib/interfaces/external/Makefile.am2
-rw-r--r--lib/interfaces/external/designer.h2
-rw-r--r--lib/interfaces/extras/Makefile.am2
-rw-r--r--lib/interfaces/kdevpartcontroller.h2
-rw-r--r--lib/util/CMakeLists.txt4
-rw-r--r--lib/util/Makefile.am6
-rw-r--r--lib/util/kdeveditorutil.cpp10
-rw-r--r--lib/util/kdevshellwidget.cpp2
-rw-r--r--lib/util/tdescriptactionmanager.cpp (renamed from lib/util/kscriptactionmanager.cpp)8
-rw-r--r--lib/util/tdescriptactionmanager.h (renamed from lib/util/kscriptactionmanager.h)0
-rw-r--r--lib/widgets/CMakeLists.txt2
-rw-r--r--lib/widgets/Makefile.am2
-rw-r--r--lib/widgets/kdevhtmlpart.cpp4
-rw-r--r--lib/widgets/kdevhtmlpart.h2
-rw-r--r--lib/widgets/propeditor/Makefile.am2
22 files changed, 33 insertions, 33 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 025e1819..0398ddf0 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -34,6 +34,6 @@ tde_add_library( tdevelop SHARED
EMBED kdevutil-static kdevinterfaces-static
LINK
kdevpropertyeditor-shared
- kscript-shared kparts-shared ktexteditor-shared
+ tdescript-shared tdeparts-shared tdetexteditor-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4e722350..2314d6e7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,7 +11,7 @@ libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \
# $(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la \
# $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \
-# -lktexteditor $(LIB_KPARTS) $(LIB_KIO) -lkscript
+# -ltdetexteditor $(LIB_KPARTS) $(LIB_KIO) -ltdescript
libtdevelop_la_SOURCES = dummy.cpp
diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am
index f9c81448..1aaa40ef 100644
--- a/lib/catalog/Makefile.am
+++ b/lib/catalog/Makefile.am
@@ -7,7 +7,7 @@ libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT)
kdevcatalogincludedir = $(includedir)/tdevelop/catalog
kdevcataloginclude_HEADERS = catalog.h tag.h
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = TDevelop Catalog Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am
diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am
index a40c5518..414fea6f 100644
--- a/lib/cppparser/Makefile.am
+++ b/lib/cppparser/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
AM_CXXFLAGS = -DKDEVELOP_BGPARSER
lib_LTLIBRARIES = libkdevcppparser.la
libkdevcppparser_la_LDFLAGS = $(all_libraries)
-libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) -lktexteditor $(LIB_KIO) -lkscript
+libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) -ltdetexteditor $(LIB_KIO) -ltdescript
libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \
lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp
diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am
index 3e8cbc7c..21deec16 100644
--- a/lib/interfaces/Makefile.am
+++ b/lib/interfaces/Makefile.am
@@ -14,7 +14,7 @@ libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \
libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries)
libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \
$(top_builddir)/lib/util/libkdevutil.la \
- $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -lktexteditor -lkscript -lDCOP
+ $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -ltdetexteditor -ltdescript -lDCOP
tdevelopincludedir = $(includedir)/tdevelop/interfaces
tdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \
@@ -33,7 +33,7 @@ METASOURCES = AUTO
SUBDIRS = extensions external extras
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
DOXYGEN_PROJECTNAME = TDevelop Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am
diff --git a/lib/interfaces/extensions/Makefile.am b/lib/interfaces/extensions/Makefile.am
index 29ab44e4..211439b0 100644
--- a/lib/interfaces/extensions/Makefile.am
+++ b/lib/interfaces/extensions/Makefile.am
@@ -16,7 +16,7 @@ libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp
INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
METASOURCES = AUTO
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../../Doxyfile.am
diff --git a/lib/interfaces/external/CMakeLists.txt b/lib/interfaces/external/CMakeLists.txt
index cee645d0..353721fd 100644
--- a/lib/interfaces/external/CMakeLists.txt
+++ b/lib/interfaces/external/CMakeLists.txt
@@ -27,7 +27,7 @@ install( FILES
tde_add_library( kinterfacedesigner SHARED AUTOMOC
SOURCES designer.cpp
- LINK kparts-shared tdeui-shared
+ LINK tdeparts-shared tdeui-shared
VERSION 0.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/lib/interfaces/external/Makefile.am b/lib/interfaces/external/Makefile.am
index 63e15465..8d022993 100644
--- a/lib/interfaces/external/Makefile.am
+++ b/lib/interfaces/external/Makefile.am
@@ -10,6 +10,6 @@ libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDEUI)
libkinterfacedesigner_la_LDFLAGS = $(all_libraries)
libkinterfacedesigner_la_SOURCES = designer.cpp
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = KInterfaceDesigner Library
include ../../../Doxyfile.am
diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h
index 4396c1ab..b84e2268 100644
--- a/lib/interfaces/external/designer.h
+++ b/lib/interfaces/external/designer.h
@@ -19,7 +19,7 @@
#ifndef KINTERFACEDESIGNER_FORMEDITOR_H
#define KINTERFACEDESIGNER_FORMEDITOR_H
-#include <kparts/part.h>
+#include <tdeparts/part.h>
/**Contains KInterfaceDesigner classes.*/
namespace KInterfaceDesigner{
diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am
index 49107f8f..a554ad30 100644
--- a/lib/interfaces/extras/Makefile.am
+++ b/lib/interfaces/extras/Makefile.am
@@ -12,7 +12,7 @@ libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp
servicetype_DATA = tdevelopcompileroptions.desktop \
tdevelopvcsintegrator.desktop
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../../Doxyfile.am
diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h
index 8c237bf3..0e24c8fc 100644
--- a/lib/interfaces/kdevpartcontroller.h
+++ b/lib/interfaces/kdevpartcontroller.h
@@ -26,7 +26,7 @@
#define KDEV_PARTCONTROLLER_H
#include <kurl.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include <ktrader.h>
/**
diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
index 378c4dca..1eb17f35 100644
--- a/lib/util/CMakeLists.txt
+++ b/lib/util/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
install( FILES
domutil.h execcommand.h filetemplate.h urlutil.h
- configwidgetproxy.h rurl.h kscriptactionmanager.h
+ configwidgetproxy.h rurl.h tdescriptactionmanager.h
DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util )
@@ -33,6 +33,6 @@ tde_add_library( kdevutil STATIC_PIC AUTOMOC
blockingkprocess.cpp configwidgetproxy.cpp
domutil.cpp execcommand.cpp filetemplate.cpp
kdeveditorutil.cpp kdevjobtimer.cpp
- kdevshellwidget.cpp kscriptactionmanager.cpp
+ kdevshellwidget.cpp tdescriptactionmanager.cpp
rurl.cpp settings.cpp urlutil.cpp
)
diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am
index 3a31f258..4dbaa33b 100644
--- a/lib/util/Makefile.am
+++ b/lib/util/Makefile.am
@@ -4,15 +4,15 @@ noinst_LTLIBRARIES = libkdevutil.la
libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \
- kdevshellwidget.cpp kscriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
+ kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
METASOURCES = AUTO
tdevelopincludedir = $(includedir)/tdevelop/util
tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \
- configwidgetproxy.h rurl.h kscriptactionmanager.h
+ configwidgetproxy.h rurl.h tdescriptactionmanager.h
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevextensions kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevextensions kdevinterfaces
DOXYGEN_PROJECTNAME = KDevelop Utility Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am
diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp
index 3c01f780..198e9a42 100644
--- a/lib/util/kdeveditorutil.cpp
+++ b/lib/util/kdeveditorutil.cpp
@@ -11,11 +11,11 @@
#include "kdeveditorutil.h"
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
{
diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index b85bea80..b9220250 100644
--- a/lib/util/kdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -13,7 +13,7 @@
#include <tqframe.h>
#include <kdebug.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include <klibloader.h>
#include <kde_terminal_interface.h>
#include <kprocess.h>
diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 28756841..3b0aa8ac 100644
--- a/lib/util/kscriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -17,9 +17,9 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "kscriptactionmanager.h"
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include "tdescriptactionmanager.h"
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
#include <kapplication.h>
#include <kdesktopfile.h>
#include <kstandarddirs.h>
@@ -174,4 +174,4 @@ bool KScriptAction::isValid( ) const
return m_isValid;
}
-#include "kscriptactionmanager.moc"
+#include "tdescriptactionmanager.moc"
diff --git a/lib/util/kscriptactionmanager.h b/lib/util/tdescriptactionmanager.h
index c2e43238..c2e43238 100644
--- a/lib/util/kscriptactionmanager.h
+++ b/lib/util/tdescriptactionmanager.h
diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
index b819bc91..d7e92092 100644
--- a/lib/widgets/CMakeLists.txt
+++ b/lib/widgets/CMakeLists.txt
@@ -47,6 +47,6 @@ tde_add_library( kdevwidgets SHARED AUTOMOC
processlinemaker.cpp processwidget.cpp ksavealldialog.cpp
fancylistviewitem.cpp
VERSION 0.0.0
- LINK kio-shared khtml-shared
+ LINK kio-shared tdehtml-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index f42447e7..ecf57f7f 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -24,7 +24,7 @@ rcdir = $(kde_datadir)/tdevelop
rc_DATA = kdevhtml_partui.rc
-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 Widgets Library
DOXYGEN_DOCDIRPREFIX = kdev
include ../../Doxyfile.am
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index abbeebbc..85990989 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -10,8 +10,8 @@
#include <kpopupmenu.h>
#include <kiconloader.h>
#include <kmainwindow.h>
-#include <khtmlview.h>
-#include <khtml_settings.h>
+#include <tdehtmlview.h>
+#include <tdehtml_settings.h>
#include <kconfig.h>
#include <kdevmainwindow.h>
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index 805134a0..13f155a5 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -5,7 +5,7 @@
#include <tqdatetime.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
/**
@file kdevhtmlpart.h
diff --git a/lib/widgets/propeditor/Makefile.am b/lib/widgets/propeditor/Makefile.am
index 00bc07ca..0c037873 100644
--- a/lib/widgets/propeditor/Makefile.am
+++ b/lib/widgets/propeditor/Makefile.am
@@ -13,6 +13,6 @@ pcolorcombo.cpp pdoublenuminput.cpp ppixmapedit.cpp propertylist.cpp ps
kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor
kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
DOXYGEN_PROJECTNAME = KDevelop Property Editing Library
include ../../../Doxyfile.am
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 04:34:59 +0000