diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:12:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:12:54 -0600 |
| commit | ce06c80f9a59a53c86caeeffe1447e968d284b39 (patch) | |
| tree | 8d9b351dd1535f22ab4ac1768b8d3de4b50a8006 | |
| parent | 8c0ea4fa2a208ba5079da31ba8e1c86980946752 (diff) | |
| download | kvirc-ce06c80f9a59a53c86caeeffe1447e968d284b39.tar.gz kvirc-ce06c80f9a59a53c86caeeffe1447e968d284b39.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | src/modules/term/libkviterm.cpp | 4 | ||||
| -rw-r--r-- | src/modules/term/termwidget.cpp | 4 | ||||
| -rw-r--r-- | src/modules/term/termwidget.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 15869676..771625a7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2522,7 +2522,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG], SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" - SS_LIBLINK="-ltdecore -ltdeui -lkparts -lDCOP -ltdefx -lkio $SS_LIBLINK" + SS_LIBLINK="-ltdecore -ltdeui -ltdeparts -lDCOP -ltdefx -lkio $SS_LIBLINK" AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support]) AC_DEFINE_UNQUOTED([TDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support]) AC_DEFINE_UNQUOTED([TDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support]) diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp index ee2ab448..be9389fc 100644 --- a/src/modules/term/libkviterm.cpp +++ b/src/modules/term/libkviterm.cpp @@ -38,8 +38,8 @@ #include "ktrader.h" -// #include "kparts/part.h" -// #include "kparts/factory.h" +// #include "tdeparts/part.h" +// #include "tdeparts/factory.h" // #include "klibloader.h" #endif diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index 16bd8efd..b5e0eb14 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -36,8 +36,8 @@ #ifdef COMPILE_TDE_SUPPORT #include "klibloader.h" -#include "kparts/part.h" -#include "kparts/factory.h" +#include "tdeparts/part.h" +#include "tdeparts/factory.h" extern KviModule * g_pTermModule; extern KviPointerList<KviTermWidget> * g_pTermWidgetList; diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h index 6f30f753..cf139a6a 100644 --- a/src/modules/term/termwidget.h +++ b/src/modules/term/termwidget.h @@ -31,7 +31,7 @@ #include <tqpushbutton.h> #include "kvi_tal_hbox.h" -#include "kparts/part.h" +#include "tdeparts/part.h" class KviFrame; |