summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/viewplugins
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/plugins/viewplugins
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/plugins/viewplugins')
-rw-r--r--chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc2
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshot.cpp4
-rw-r--r--chalk/plugins/viewplugins/scripting/scripting.cc2
-rw-r--r--chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc2
4 files changed, 5 insertions, 5 deletions
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
index f95fba85..cdc06ace 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 b10dc873..ad92dc92 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 5cbbb85d..1394c521 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 3315177c..b01d3e31 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>