diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
| commit | 82072ef281de2d5948a42fb69ae800d47e0800be (patch) | |
| tree | be82dd63affaf693c5e0857c997fa9589d344cc2 /kommander/editor | |
| parent | 93ec82602aa008218cc1ee075ff13d65b3a317ea (diff) | |
| download | tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.tar.gz tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kommander/editor')
| -rw-r--r-- | kommander/editor/Makefile.am | 4 | ||||
| -rw-r--r-- | kommander/editor/assoctexteditorimpl.cpp | 18 | ||||
| -rw-r--r-- | kommander/editor/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | kommander/editor/mainwindow.h | 2 | ||||
| -rw-r--r-- | kommander/editor/mainwindowactions.cpp | 6 |
5 files changed, 16 insertions, 16 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> |