diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
| commit | 038b18b2df1da40baab30d62171766048a948095 (patch) | |
| tree | ba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /chalk/ui | |
| 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/ui')
| -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 |
7 files changed, 7 insertions, 7 deletions
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> |