diff options
author | Timothy Pearson <[email protected]> | 2013-01-27 00:54:22 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-27 00:54:22 -0600 |
commit | 038b18b2df1da40baab30d62171766048a948095 (patch) | |
tree | ba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /chalk | |
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')
-rw-r--r-- | chalk/chalkcolor/kis_abstract_colorspace.cc | 2 | ||||
-rw-r--r-- | chalk/chalkcolor/kis_profile.h | 2 | ||||
-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 | ||||
-rw-r--r-- | chalk/doc/selections | 2 | ||||
-rw-r--r-- | chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc | 2 | ||||
-rw-r--r-- | chalk/plugins/viewplugins/screenshot/ksnapshot.cpp | 4 | ||||
-rw-r--r-- | chalk/plugins/viewplugins/scripting/scripting.cc | 2 | ||||
-rw-r--r-- | chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc | 2 | ||||
-rw-r--r-- | chalk/ui/kis_config.cc | 2 | ||||
-rw-r--r-- | chalk/ui/kis_dlg_preferences.cc | 2 | ||||
-rw-r--r-- | chalk/ui/kis_doc.cc | 2 | ||||
-rw-r--r-- | chalk/ui/kis_paintop_box.cc | 2 | ||||
-rw-r--r-- | chalk/ui/kis_palette_view.cc | 2 | ||||
-rw-r--r-- | chalk/ui/kis_palette_widget.cc | 2 | ||||
-rw-r--r-- | chalk/ui/kis_view.cc | 2 |
21 files changed, 22 insertions, 22 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> 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" diff --git a/chalk/doc/selections b/chalk/doc/selections index 37d78702..ad2c30db 100644 --- a/chalk/doc/selections +++ b/chalk/doc/selections @@ -37,7 +37,7 @@ particular rect is rendered as a separate step in KisImage::renderToProjection. I like the mask type rendering, but someone else might want to provide an optional marque-rendering. -TODO: * enable kconfig option to select between renderings. +TODO: * enable tdeconfig option to select between renderings. Selected pixels can be mangled -- for instance, filled with a gradient, moved, made brighter, lighter or sprightlier, cut and 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> diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc index 91d31d5b..375b16ee 100644 --- a/chalk/ui/kis_config.cc +++ b/chalk/ui/kis_config.cc @@ -18,7 +18,7 @@ #include <limits.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> #include <config.h> diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index c876ab77..1314e0e6 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -43,7 +43,7 @@ #include <kcolorbutton.h> #include <kcombobox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <klineedit.h> #include <klocale.h> diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index ee8c65a7..2cb2a606 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -35,7 +35,7 @@ #include <kcommand.h> #include <kdebug.h> #include <kimageio.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kmimetype.h> #include <knotifyclient.h> diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 95a99bd5..8997af11 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -31,7 +31,7 @@ #include <klocale.h> #include <kglobalsettings.h> #include <kaccelmanager.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kis_paintop_registry.h> diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index 42c15aca..398c3b8a 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -38,7 +38,7 @@ #include <tqtimer.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 5511ae09..2719fab2 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -35,7 +35,7 @@ #include <tqtimer.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index de34e26a..db24209b 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -48,7 +48,7 @@ #include <kaction.h> #include <kcolordialog.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kmessagebox.h> #include <knotifyclient.h> |