diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
| commit | 038b18b2df1da40baab30d62171766048a948095 (patch) | |
| tree | ba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /chalk/core | |
| parent | d0baf2961c379b31587c6542625018c6177474d0 (diff) | |
| download | koffice-038b18b2df1da40baab30d62171766048a948095.tar.gz koffice-038b18b2df1da40baab30d62171766048a948095.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'chalk/core')
| -rw-r--r-- | chalk/core/kis_brush.h | 2 | ||||
| -rw-r--r-- | chalk/core/kis_gradient.h | 2 | ||||
| -rw-r--r-- | chalk/core/kis_imagepipe_brush.h | 2 | ||||
| -rw-r--r-- | chalk/core/kis_palette.h | 2 | ||||
| -rw-r--r-- | chalk/core/kis_pattern.h | 2 | ||||
| -rw-r--r-- | chalk/core/kis_thread_pool.cc | 2 | ||||
| -rw-r--r-- | chalk/core/tiles/kis_tilemanager.cc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/chalk/core/kis_brush.h b/chalk/core/kis_brush.h index 5ee21881..9e29c232 100644 --- a/chalk/core/kis_brush.h +++ b/chalk/core/kis_brush.h @@ -26,7 +26,7 @@ #include <tqimage.h> #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_resource.h" #include "kis_types.h" diff --git a/chalk/core/kis_gradient.h b/chalk/core/kis_gradient.h index cbb2eb00..1fff95da 100644 --- a/chalk/core/kis_gradient.h +++ b/chalk/core/kis_gradient.h @@ -27,7 +27,7 @@ #include <tqvaluevector.h> #include <tqcolor.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_resource.h" #include "kis_global.h" diff --git a/chalk/core/kis_imagepipe_brush.h b/chalk/core/kis_imagepipe_brush.h index b43b950a..075071b9 100644 --- a/chalk/core/kis_imagepipe_brush.h +++ b/chalk/core/kis_imagepipe_brush.h @@ -25,7 +25,7 @@ #include <tqmap.h> #include <tqstring.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_resource.h" #include "kis_brush.h" diff --git a/chalk/core/kis_palette.h b/chalk/core/kis_palette.h index 4528c2bc..2e842b52 100644 --- a/chalk/core/kis_palette.h +++ b/chalk/core/kis_palette.h @@ -22,7 +22,7 @@ #include <tqcolor.h> #include <tqvaluevector.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kpalette.h> #include "kis_types.h" diff --git a/chalk/core/kis_pattern.h b/chalk/core/kis_pattern.h index 6209a432..5c76d6c6 100644 --- a/chalk/core/kis_pattern.h +++ b/chalk/core/kis_pattern.h @@ -21,7 +21,7 @@ #ifndef __kis_pattern_h__ #define __kis_pattern_h__ -#include <kio/job.h> +#include <tdeio/job.h> #include "kis_debug_areas.h" #include "kis_resource.h" diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc index 9295915c..dad56a3a 100644 --- a/chalk/core/kis_thread_pool.cc +++ b/chalk/core/kis_thread_pool.cc @@ -18,7 +18,7 @@ #include "kis_thread_pool.h" #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> KisThreadPool * KisThreadPool::m_singleton = 0; diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc index 8f793d4a..d8064615 100644 --- a/chalk/core/tiles/kis_tilemanager.cc +++ b/chalk/core/tiles/kis_tilemanager.cc @@ -31,7 +31,7 @@ #include <kstaticdeleter.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kis_tileddatamanager.h" #include "kis_tile.h" |