From 038b18b2df1da40baab30d62171766048a948095 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:54:22 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc               | 2 +-
 chalk/plugins/viewplugins/screenshot/ksnapshot.cpp                   | 4 ++--
 chalk/plugins/viewplugins/scripting/scripting.cc                     | 2 +-
 chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'chalk/plugins/viewplugins')

diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
index f95fba85a..cdc06ace1 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
@@ -29,7 +29,7 @@
 #include <tqslider.h>
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index b10dc8737..ad92dc928 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -13,12 +13,12 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kprinter.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ksavefile.h>
 #include <ktempfile.h>
 
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc
index 5cbbb85d1..1394c521a 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cc
+++ b/chalk/plugins/viewplugins/scripting/scripting.cc
@@ -25,7 +25,7 @@
 #include <tqpoint.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <kinstance.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
index 3315177c5..b01d3e314 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 
 #include <KoFilterManager.h>
-- 
cgit v1.2.3