Use tdeinstance.h

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit cfca5c012fea24d82a4fc93aa96feb464a58bf94)

71 files changed, 71 insertions, 71 deletions

diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
index 4195ff225..5989d185e 100644
--- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
+++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
@@ -19,7 +19,7 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
index 588e286cd..4447029a6 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
@@ -20,7 +20,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp b/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
index 7c1896f94..4c8625c34 100644
--- a/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
+++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
@@ -19,7 +19,7 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cpp b/chalk/colorspaces/gray_u8/gray_plugin.cpp
index 7f177eea1..43b37fe39 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.cpp
+++ b/chalk/colorspaces/gray_u8/gray_plugin.cpp
@@ -19,7 +19,7 @@
  */
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp b/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
index 2c83ccd6c..4dd99f05a 100644
--- a/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
+++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
@@ -21,7 +21,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
index 32505bc88..16012ef53 100644
--- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
+++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
index adc540ac0..a521ae43c 100644
--- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
+++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
index da6e6e427..8fb195bce 100644
--- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
+++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
@@ -19,7 +19,7 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cpp b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
index 33f18b17f..bc7964e2a 100644
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/colorspaces/wet/wet_plugin.cpp b/chalk/colorspaces/wet/wet_plugin.cpp
index 896ef2a6d..083567179 100644
--- a/chalk/colorspaces/wet/wet_plugin.cpp
+++ b/chalk/colorspaces/wet/wet_plugin.cpp
@@ -31,7 +31,7 @@
 #include <tdeactionclasses.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
index 97c892b2b..4fb4f60d0 100644
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
@@ -19,7 +19,7 @@
  */
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
index c53f6ea08..a48ebc95a 100644
--- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
+++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
@@ -26,7 +26,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
index e56e4cc88..cd2c0d196 100644
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
@@ -19,7 +19,7 @@
  */
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
index 4371a20a4..5b52489d7 100644
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
index 6c3ac2437..1f2b845d3 100644
--- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
+++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
@@ -20,7 +20,7 @@
 
 #include "ycbcr_u8_plugin.h"
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
diff --git a/chalk/core/kis_paintop_registry.cpp b/chalk/core/kis_paintop_registry.cpp
index d549c3ad5..21459f3d6 100644
--- a/chalk/core/kis_paintop_registry.cpp
+++ b/chalk/core/kis_paintop_registry.cpp
@@ -19,7 +19,7 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kstandarddirs.h>
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cpp b/chalk/plugins/filters/bumpmap/bumpmap.cpp
index de2bc4ffb..c8d61c784 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cpp
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cpp
@@ -43,7 +43,7 @@
 #include <knuminput.h>
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cpp b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
index c8be0a6f6..caa4a303a 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
index 332cb67f5..0c74f93a1 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
index 89a20500a..6ce0c35fa 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 
 #include <kis_convolution_painter.h>
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
index 1eb2984ef..bbae22e56 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
index 0d6974e0c..e6a39f4f1 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/example/example.cpp b/chalk/plugins/filters/example/example.cpp
index a9ade7249..62cd095a5 100644
--- a/chalk/plugins/filters/example/example.cpp
+++ b/chalk/plugins/filters/example/example.cpp
@@ -23,7 +23,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
index cb7153c1d..878af6dd9 100644
--- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
+++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
index 6b26ab11a..05f8d6ff7 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cpp b/chalk/plugins/filters/levelfilter/levelfilter.cpp
index 891143783..0f043131a 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.cpp
+++ b/chalk/plugins/filters/levelfilter/levelfilter.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cpp b/chalk/plugins/filters/noisefilter/noisefilter.cpp
index d8609ba2b..7e02c1245 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.cpp
+++ b/chalk/plugins/filters/noisefilter/noisefilter.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
index de869a424..4ecdde482 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
index a6b77df76..b37cbdf40 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
index acb8c2e17..a912d52fe 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cpp b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
index 74368802a..d4a5e79be 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kgenericfactory.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
index 698961a82..b88a34933 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
index a0cf20f17..52fd9ab5b 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
index 623fc690b..4d2f1b38d 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/threadtest/threadtest.cpp b/chalk/plugins/filters/threadtest/threadtest.cpp
index 8477c09c7..694c8e521 100644
--- a/chalk/plugins/filters/threadtest/threadtest.cpp
+++ b/chalk/plugins/filters/threadtest/threadtest.cpp
@@ -25,7 +25,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cpp b/chalk/plugins/filters/wavefilter/wavefilter.cpp
index 9f9777bf6..648c21cdd 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cpp
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
index 6e1d3f754..fc6902902 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
@@ -19,7 +19,7 @@
  */
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cpp b/chalk/plugins/tools/defaulttools/default_tools.cpp
index 6f1bedbbf..ee5436730 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cpp
+++ b/chalk/plugins/tools/defaulttools/default_tools.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cpp b/chalk/plugins/tools/selectiontools/selection_tools.cpp
index f34a3b34c..2d33bd15d 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cpp
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cpp b/chalk/plugins/tools/tool_crop/tool_crop.cpp
index 30df11ec3..d12237121 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cpp
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cpp b/chalk/plugins/tools/tool_curves/tool_curves.cpp
index 28f65604a..c2e783e0e 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cpp
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cpp
@@ -25,7 +25,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cpp b/chalk/plugins/tools/tool_filter/tool_filter.cpp
index 484a7d9f3..96155d285 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cpp
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
index 2f326965b..147267bad 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
index 73705264b..6bbc898c1 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cpp b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
index f903551fb..23277a22d 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cpp b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
index d6abff71a..b762fe29f 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
index af8070171..893234e9f 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
@@ -26,7 +26,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/tools/tool_star/tool_star.cpp b/chalk/plugins/tools/tool_star/tool_star.cpp
index 7309e8a1a..1d9bcd005 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cpp
+++ b/chalk/plugins/tools/tool_star/tool_star.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cpp b/chalk/plugins/tools/tool_transform/tool_transform.cpp
index 0f0dde27d..835066e25 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cpp
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cpp b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
index 722467d21..82f9ef87f 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cpp
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
@@ -28,7 +28,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
index 50702d80f..ffb7a9924 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
index 97c2c17ed..11f5b6dbc 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
index 5f79231ae..feaf2536e 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
@@ -20,7 +20,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cpp b/chalk/plugins/viewplugins/histogram/histogram.cpp
index d8b95640e..7fb40521e 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cpp
+++ b/chalk/plugins/viewplugins/histogram/histogram.cpp
@@ -28,7 +28,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
index 0ba11d4ab..2ad1f6611 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
@@ -21,7 +21,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cpp b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
index 85e4df406..24fef3022 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.cpp
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
@@ -20,7 +20,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cpp b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index 644592b2e..a3e12c579 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cpp
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
@@ -29,7 +29,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
index 89ccd171d..9e00d8da1 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
@@ -28,7 +28,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cpp b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index b3fdcb445..83214cb23 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cpp
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cpp
@@ -32,7 +32,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index 47bec8d91..fca28d892 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
@@ -28,7 +28,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index c0a1a4d75..158f9edee 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -22,7 +22,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp
index dff94b36a..e7848468b 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cpp
+++ b/chalk/plugins/viewplugins/scripting/scripting.cpp
@@ -28,7 +28,7 @@
 #include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
index b3ed5cf51..8cc18d272 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
@@ -28,7 +28,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
index ba8c6b84a..3b9563ef1 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
@@ -27,7 +27,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
index ecf98d373..67e0fd8dc 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
@@ -20,7 +20,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cpp b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index dca6a45d0..5a31601bf 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cpp
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
@@ -28,7 +28,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cpp b/chalk/plugins/viewplugins/substrate/substrate.cpp
index 9b6411d4c..deb7cf1aa 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cpp
+++ b/chalk/plugins/viewplugins/substrate/substrate.cpp
@@ -24,7 +24,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/plugins/viewplugins/variations/variations.cpp b/chalk/plugins/viewplugins/variations/variations.cpp
index 4a4e06d62..f0aeb412d 100644
--- a/chalk/plugins/viewplugins/variations/variations.cpp
+++ b/chalk/plugins/viewplugins/variations/variations.cpp
@@ -28,7 +28,7 @@
 
 #include <tdelocale.h>
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdetempfile.h>
diff --git a/chalk/ui/kis_factory.cpp b/chalk/ui/kis_factory.cpp
index e9e51e487..21d4ccecc 100644
--- a/chalk/ui/kis_factory.cpp
+++ b/chalk/ui/kis_factory.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <kstandarddirs.h>
diff --git a/chalk/ui/kis_itemchooser.cpp b/chalk/ui/kis_itemchooser.cpp
index 661ef284d..00d94ba28 100644
--- a/chalk/ui/kis_itemchooser.cpp
+++ b/chalk/ui/kis_itemchooser.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqvbox.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <koIconChooser.h>
diff --git a/chalk/ui/kis_resourceserver.cpp b/chalk/ui/kis_resourceserver.cpp
index 333bccd1d..6fd5b29ae 100644
--- a/chalk/ui/kis_resourceserver.cpp
+++ b/chalk/ui/kis_resourceserver.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 #include "kis_resource.h"
 #include "kis_factory.h"