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 /kexi/widget | |
| 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/widget')
| -rw-r--r-- | kexi/widget/kexibrowser.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/kexifieldcombobox.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/kexifieldlistview.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/pixmapcollection.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/relations/kexirelationviewtable.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/tableview/kexiblobtableedit.cpp | 4 | ||||
| -rw-r--r-- | kexi/widget/utils/kexicontextmenuutils.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 96a50350..472dd25c 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -38,7 +38,7 @@ #include <kmessagebox.h> #include <klineedit.h> #include <kimageeffect.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kexi.h> #include <kexipart.h> diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index c490111e..404bc746 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdeversion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 7316caeb..07a3f4ab 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdeversion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index c03d16e2..f3224c7e 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcombobox.h> #include <kicondialog.h> #include <klineedit.h> diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 426edf71..a3ad0d5d 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdeversion.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <kexidb/tableschema.h> diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 3502e15d..43ff7331 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -48,8 +48,8 @@ #include <kurl.h> #include <karrowbutton.h> #include <klocale.h> -#include <kfiledialog.h> -#include <kio/job.h> +#include <tdefiledialog.h> +#include <tdeio/job.h> #include <kglobal.h> #include <kiconloader.h> #include <kpopupmenu.h> diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index aeeec86d..30ecab17 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -22,7 +22,7 @@ #include <kactioncollection.h> #include <klocale.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> #include <kdebug.h> #include <kmessagebox.h> |