summaryrefslogtreecommitdiffstats
path: root/chalk/chalkcolor
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 00:54:22 -0600
committerTimothy Pearson <[email protected]>2013-01-27 00:54:22 -0600
commit038b18b2df1da40baab30d62171766048a948095 (patch)
treeba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /chalk/chalkcolor
parentd0baf2961c379b31587c6542625018c6177474d0 (diff)
downloadkoffice-038b18b2df1da40baab30d62171766048a948095.tar.gz
koffice-038b18b2df1da40baab30d62171766048a948095.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'chalk/chalkcolor')
-rw-r--r--chalk/chalkcolor/kis_abstract_colorspace.cc2
-rw-r--r--chalk/chalkcolor/kis_profile.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc
index c0dbde97..7bc7ec1c 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.cc
+++ b/chalk/chalkcolor/kis_abstract_colorspace.cc
@@ -19,7 +19,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "kis_abstract_colorspace.h"
#include "kis_global.h"
diff --git a/chalk/chalkcolor/kis_profile.h b/chalk/chalkcolor/kis_profile.h
index 5f732188..e17c36f8 100644
--- a/chalk/chalkcolor/kis_profile.h
+++ b/chalk/chalkcolor/kis_profile.h
@@ -29,7 +29,7 @@
#include <tqvaluevector.h>
#include <tqcstring.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kis_annotation.h>