summaryrefslogtreecommitdiffstats
path: root/kommander
diff options
context:
space:
mode:
Diffstat (limited to 'kommander')
-rw-r--r--kommander/editor/Makefile.am4
-rw-r--r--kommander/editor/assoctexteditorimpl.cpp18
-rw-r--r--kommander/editor/mainwindow.cpp2
-rw-r--r--kommander/editor/mainwindow.h2
-rw-r--r--kommander/editor/mainwindowactions.cpp6
-rwxr-xr-xkommander/examples/current/editor-poc.kmdr14
-rw-r--r--kommander/executor/Makefile.am4
-rw-r--r--kommander/part/Makefile.am2
-rw-r--r--kommander/part/kommander_part.cpp2
-rw-r--r--kommander/part/kommander_part.h4
-rw-r--r--kommander/pluginmanager/Makefile.am2
-rw-r--r--kommander/widgets/Makefile.am2
-rw-r--r--kommander/working/plugintemplate/widget.h2
13 files changed, 32 insertions, 32 deletions
diff --git a/kommander/editor/Makefile.am b/kommander/editor/Makefile.am
index 65ea192b..8e03b205 100644
--- a/kommander/editor/Makefile.am
+++ b/kommander/editor/Makefile.am
@@ -7,13 +7,13 @@ bin_PROGRAMS = kmdr-editor
AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes)
# the library search path.
-kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
# the libraries to link against.
kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \
$(top_builddir)/kommander/widget/libkommanderwidget.la \
$(top_builddir)/kommander/widgets/libkommanderwidgets.la \
- $(top_builddir)/kommander/plugin/libkommanderplugin.la -lktexteditor
+ $(top_builddir)/kommander/plugin/libkommanderplugin.la -ltdetexteditor
# which sources should be compiled for kmdr_editor
kmdr_editor_SOURCES = actiondnd.cpp actioneditorimpl.cpp \
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 334fa177..4cbaeb08 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -28,15 +28,15 @@
#include <kactioncollection.h>
#include <kdebug.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/editorchooser.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/highlightinginterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/undointerface.h>
-
-#include <kparts/partmanager.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/editorchooser.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/highlightinginterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/undointerface.h>
+
+#include <tdeparts/partmanager.h>
/* QT INCLUDES */
#include <tqstringlist.h>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 36d23b04..608049ed 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -85,7 +85,7 @@
#include <kstatusbar.h>
#include <ktoolbar.h>
#include <kurl.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
#include <kio/netaccess.h>
extern TQMap<TQWidget*, TQString> *qwf_functions;
diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index 17d04063..790f33b1 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -22,7 +22,7 @@
#include "metadatabase.h"
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
#include <kdockwidget.h>
#include <tqmap.h>
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 8be705a8..749f5d3b 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -74,9 +74,9 @@
#include <kstdguiitem.h>
#include <kurl.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/configinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/configinterface.h>
#include <stdlib.h>
diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr
index 12cfe3c2..7e9c9b03 100755
--- a/kommander/examples/current/editor-poc.kmdr
+++ b/kommander/examples/current/editor-poc.kmdr
@@ -181,8 +181,8 @@ while chrs &lt; maxc do
inlink = true
lb = str_toint(str_find(a, "\"", ch)+1)
le = str_toint(str_find(a, "\"", lb))
- linkscript = str_mid(a, lb, le-lb)
- //debug("link data - "+lb+" "+le+" "+linkscript)
+ lintdescript = str_mid(a, lb, le-lb)
+ //debug("link data - "+lb+" "+le+" "+lintdescript)
elseif str_mid(a, ch, 3) == "&lt;p&gt;" then
lc = lc + 1
cc = 0
@@ -199,11 +199,11 @@ while chrs &lt; maxc do
if inlink == true then
//debug("examining link at row"+lc+" between col "+cp+" and col "+cc)
if (Self.Item(0) == lc &amp;&amp;Self.Item(1) &gt;= cp &amp;&amp; Self.Item(1) &lt;= cc) then
- debug("call "+linkscript)
- if widgetExists(linkscript) then
- linkscript.execute(Self.Item(0),Self.Item(1))
- elseif str_left(linkscript, 4) == "http" then
- exec("konqueror --profile webbrowsing "+linkscript)
+ debug("call "+lintdescript)
+ if widgetExists(lintdescript) then
+ lintdescript.execute(Self.Item(0),Self.Item(1))
+ elseif str_left(lintdescript, 4) == "http" then
+ exec("konqueror --profile webbrowsing "+lintdescript)
endif
break
endif
diff --git a/kommander/executor/Makefile.am b/kommander/executor/Makefile.am
index 5e12cf0d..2f05c16e 100644
--- a/kommander/executor/Makefile.am
+++ b/kommander/executor/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = kmdr-executor
noinst_LTLIBRARIES = libinstance.la
libinstance_la_SOURCES = instance.cpp dcopkommanderif.skel
-libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmdr_executor_SOURCES = main.cpp
@@ -20,6 +20,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/widgets
METASOURCES = AUTO
# the library search path.
-kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = dcopkommanderif.h
diff --git a/kommander/part/Makefile.am b/kommander/part/Makefile.am
index 6d44bc04..4259b3fd 100644
--- a/kommander/part/Makefile.am
+++ b/kommander/part/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/kommander/executor -I$(top_srcdir)/kommander/factory $(all_includes)
METASOURCES = AUTO
kde_module_LTLIBRARIES = libkommander_part.la
-libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin
+libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin
libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML)
kde_services_DATA = kommander_part.desktop
libkommander_part_la_SOURCES = kommander_part.cpp
diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp
index fe4d7199..49857c12 100644
--- a/kommander/part/kommander_part.cpp
+++ b/kommander/part/kommander_part.cpp
@@ -17,7 +17,7 @@
#include <kdebug.h>
#include <kinstance.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
#include <tqpoint.h>
#include <tqlayout.h>
diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h
index 017e4b35..aca36b89 100644
--- a/kommander/part/kommander_part.h
+++ b/kommander/part/kommander_part.h
@@ -15,8 +15,8 @@
#ifndef KOMMANDERPART_H
#define KOMMANDERPART_H
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
class Instance;
class TQGridLayout;
diff --git a/kommander/pluginmanager/Makefile.am b/kommander/pluginmanager/Makefile.am
index 18ec698a..1c43b4fd 100644
--- a/kommander/pluginmanager/Makefile.am
+++ b/kommander/pluginmanager/Makefile.am
@@ -13,6 +13,6 @@ INCLUDES = -I$(top_srcdir)/kommander/factory $(all_includes)
METASOURCES = AUTO
# the library search path.
-kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = mainwindow.h pluginmanager.h
diff --git a/kommander/widgets/Makefile.am b/kommander/widgets/Makefile.am
index b07890f7..d54c107e 100644
--- a/kommander/widgets/Makefile.am
+++ b/kommander/widgets/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkommanderwidgets.la
INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes)
# the library search path.
-#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
# the libraries to link against.
diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h
index bb9fb448..c07c78cf 100644
--- a/kommander/working/plugintemplate/widget.h
+++ b/kommander/working/plugintemplate/widget.h
@@ -5,7 +5,7 @@
#include <tqwidget.h>
#include <tqstring.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include <kommanderwidget.h>