diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
| commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
| tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /konsole | |
| parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
| download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konsole')
| -rw-r--r-- | konsole/konsole/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | konsole/konsole/Makefile.am | 2 | ||||
| -rw-r--r-- | konsole/konsole/konsole.cpp | 2 | ||||
| -rw-r--r-- | konsole/konsole/konsole_part.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt index 222583500..4992cdc43 100644 --- a/konsole/konsole/CMakeLists.txt +++ b/konsole/konsole/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am index 6139fdfe4..4f9a03d55 100644 --- a/konsole/konsole/Makefile.am +++ b/konsole/konsole/Makefile.am @@ -46,7 +46,7 @@ konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIBUTIL) $(XTESTLI # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp # kcmkonsole_LDADD = $(LIB_TDEUI) -# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \ TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \ diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index b9940e697..0e6265321 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -135,7 +135,7 @@ Time to start a requirement list. #include <kprocctrl.h> #include <ktabwidget.h> #include <kregexpeditorinterface.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kcharsets.h> #include <kcolordialog.h> #include <kio/netaccess.h> diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 981c4d6c9..fc76b565b 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -21,8 +21,8 @@ #ifndef KONSOLE_PART_H #define KONSOLE_PART_H -#include <kparts/browserextension.h> -#include <kparts/factory.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/factory.h> #include <kdialogbase.h> |