diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /khotkeys/shared | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/shared')
| -rw-r--r-- | khotkeys/shared/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | khotkeys/shared/action_data.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/actions.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/conditions.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/settings.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/triggers.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/voicesignature.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/windows.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/khotkeys/shared/CMakeLists.txt b/khotkeys/shared/CMakeLists.txt index 2a1de2e1e..27227cd2f 100644 --- a/khotkeys/shared/CMakeLists.txt +++ b/khotkeys/shared/CMakeLists.txt @@ -37,6 +37,6 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 - LINK kio-shared ${XTEST_LIBRARIES} + LINK tdeio-shared ${XTEST_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp index ff56eb99d..488a18133 100644 --- a/khotkeys/shared/action_data.cpp +++ b/khotkeys/shared/action_data.cpp @@ -16,7 +16,7 @@ #include "action_data.h" -#include <kconfig.h> +#include <tdeconfig.h> #include "actions.h" diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index 5ce1e1d5a..bc383b926 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -17,7 +17,7 @@ #include "actions.h" #include <krun.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kurifilter.h> #include <kglobal.h> diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp index 3132fa01d..6120ca875 100644 --- a/khotkeys/shared/conditions.cpp +++ b/khotkeys/shared/conditions.cpp @@ -20,7 +20,7 @@ #include <typeinfo> #endif -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <assert.h> diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index 9481ff762..16e071a1e 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -16,7 +16,7 @@ #include "settings.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kaccel.h> diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 27736ed0b..fe167789b 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -17,7 +17,7 @@ #include "triggers.h" #include <kglobalaccel.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <twinmodule.h> #include <klocale.h> diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp index 054f66827..c5d6efb53 100644 --- a/khotkeys/shared/voicesignature.cpp +++ b/khotkeys/shared/voicesignature.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "voicesignature.h" #include "sound.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <math.h> #ifdef PI diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index ddfc612e2..b27fa3a08 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -19,7 +19,7 @@ #include <assert.h> #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <twinmodule.h> #include <twin.h> |