diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:07 -0600 |
| commit | fb758f679005d3eb923888302ade9b6e4dda15bb (patch) | |
| tree | 60658c27bd33523266b992b1e50774ca76b965a1 /kturtle | |
| parent | 9f2c757e1a1694373c11427a00502c2ff4c2d403 (diff) | |
| download | tdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.tar.gz tdeedu-fb758f679005d3eb923888302ade9b6e4dda15bb.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kturtle')
| -rw-r--r-- | kturtle/file.txt | 2 | ||||
| -rw-r--r-- | kturtle/src/Makefile.am | 4 | ||||
| -rw-r--r-- | kturtle/src/kturtle.cpp | 20 | ||||
| -rw-r--r-- | kturtle/src/kturtle.h | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/kturtle/file.txt b/kturtle/file.txt index 0037b68a..8203dad7 100644 --- a/kturtle/file.txt +++ b/kturtle/file.txt @@ -18,7 +18,7 @@ The following packages will be REMOVED: tdelibs4 tdelibs4-doc tdepim tdepim-kfile-plugins tdepim-libs tdeprint kdesktop tdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole - kontact korganizer korn kpager kpersonalizer kpilot kscreensaver ksmserver + kontact korganizer korn kpager kpersonalizer kpilot tdescreensaver ksmserver ksplash ksync ksysguard ksysguardd ktip ktnef twin libarts1 libarts1-dev libartsc0 libkcal2 libtdenetwork2 libkgantt0 libkonq4 libmimelib1 x-window-system-core xlibmesa-dri xlibmesa-gl xlibmesa-glu diff --git a/kturtle/src/Makefile.am b/kturtle/src/Makefile.am index 4aa312d8..48282292 100644 --- a/kturtle/src/Makefile.am +++ b/kturtle/src/Makefile.am @@ -4,9 +4,9 @@ INCLUDES = $(all_includes) SUBDIRS = pics # added from kjots -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kturtle_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces KDE_ICON = kturtle diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 06f72c53..587c6020 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -41,16 +41,16 @@ #include <ksavefile.h> #include <kstatusbar.h> -#include <ktexteditor/clipboardinterface.h> -#include <ktexteditor/cursorinterface.h> -#include <ktexteditor/editorchooser.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/highlightinginterface.h> -#include <ktexteditor/printinterface.h> -#include <ktexteditor/selectioninterface.h> -#include <ktexteditor/undointerface.h> -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/encodinginterface.h> +#include <tdetexteditor/clipboardinterface.h> +#include <tdetexteditor/cursorinterface.h> +#include <tdetexteditor/editorchooser.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/highlightinginterface.h> +#include <tdetexteditor/printinterface.h> +#include <tdetexteditor/selectioninterface.h> +#include <tdetexteditor/undointerface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/encodinginterface.h> #include "lexer.h" #include "settings.h" diff --git a/kturtle/src/kturtle.h b/kturtle/src/kturtle.h index 1cd77f55..6961fcc1 100644 --- a/kturtle/src/kturtle.h +++ b/kturtle/src/kturtle.h @@ -30,9 +30,9 @@ #include <klineedit.h> #include <knuminput.h> -#include <kparts/mainwindow.h> -#include <ktexteditor/editinterface.h> -#include <ktexteditor/view.h> +#include <tdeparts/mainwindow.h> +#include <tdetexteditor/editinterface.h> +#include <tdetexteditor/view.h> #include "canvas.h" #include "dialogs.h" |