diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdeutils/ksettings | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdeutils/ksettings')
| -rw-r--r-- | tdeutils/ksettings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeutils/ksettings/componentsdialog.cpp | 2 | ||||
| -rw-r--r-- | tdeutils/ksettings/dispatcher.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tdeutils/ksettings/CMakeLists.txt b/tdeutils/ksettings/CMakeLists.txt index 7a1d5034d..b495c90db 100644 --- a/tdeutils/ksettings/CMakeLists.txt +++ b/tdeutils/ksettings/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) ##### headers ################################### diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp index 097d1f6d7..89a5e2cd7 100644 --- a/tdeutils/ksettings/componentsdialog.cpp +++ b/tdeutils/ksettings/componentsdialog.cpp @@ -26,7 +26,7 @@ #include <kplugininfo.h> #include <kiconloader.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kseparator.h> namespace KSettings diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp index 590ca7e3c..3a423422f 100644 --- a/tdeutils/ksettings/dispatcher.cpp +++ b/tdeutils/ksettings/dispatcher.cpp @@ -23,7 +23,7 @@ #include <kstaticdeleter.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <assert.h> namespace KSettings |