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 /kexi/plugins/forms | |
| 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 'kexi/plugins/forms')
| -rw-r--r-- | kexi/plugins/forms/kexiformpart.cpp | 2 | ||||
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbimagebox.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 9d8017d8..911c3374 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <kcombobox.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kexiviewbase.h> #include <keximainwindow.h> diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index dd52f9f5..97d36055 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -34,7 +34,7 @@ #include <kpopupmenu.h> #include <klocale.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> |