diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:50:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:50:58 -0600 |
| commit | f0922a22683ba2688ddc96c688ca0216be8b6bd2 (patch) | |
| tree | c4a232d9d2e4d79da94738edae3ad95dd97d5705 | |
| parent | 41c46cb36cf65ab44e9b7b734cd6e3c67bd8fa6b (diff) | |
| download | abakus-f0922a22683ba2688ddc96c688ca0216be8b6bd2.tar.gz abakus-f0922a22683ba2688ddc96c688ca0216be8b6bd2.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/abakuscommon.h | 2 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4cfb9ae..a7365d2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,6 +49,6 @@ tde_add_executable( abakus AUTOMOC resultlistview.cpp resultlistviewtext.cpp rpnmuncher.cpp valuemanager.cpp dcopIface.skel ${BF_SOURCES} ${MPFR_SOURCES} - LINK kio-shared tdecore-shared tdeprint-shared tdeui-shared DCOP-shared ${MPFR_LIBRARIES} + LINK tdeio-shared tdecore-shared tdeprint-shared tdeui-shared DCOP-shared ${MPFR_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/src/abakuscommon.h b/src/abakuscommon.h index 6c97267..8c5d440 100644 --- a/src/abakuscommon.h +++ b/src/abakuscommon.h @@ -4,7 +4,7 @@ #include <kapplication.h> #include <kdebug.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <kcombobox.h> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index f3adb96..7810bf4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -25,9 +25,9 @@ #include <kstdaction.h> #include <kshortcut.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> -#include <kconfigbase.h> +#include <tdeconfigbase.h> #include <kactionclasses.h> #include <kinputdialog.h> |