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/formeditor | |
| 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/formeditor')
| -rw-r--r-- | kexi/formeditor/formIO.cpp | 2 | ||||
| -rw-r--r-- | kexi/formeditor/formmanager.cpp | 2 | ||||
| -rw-r--r-- | kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp | 2 | ||||
| -rw-r--r-- | kexi/formeditor/test/kfd_part.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 5fafc6ec..f90efddd 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -33,7 +33,7 @@ #include <tqlabel.h> #include <tqpainter.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kcommand.h> #include <kaccelmanager.h> diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 501d2769..f9849c35 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -39,7 +39,7 @@ #include <kxmlguiclient.h> #include <kmainwindow.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstyle.h> #include <kactionclasses.h> #include <kapplication.h> diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 64f9e800..e6c09927 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -34,7 +34,7 @@ #include <kstdaction.h> #include <kapplication.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klibloader.h> #include <kmessagebox.h> diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index eeeec6dc..a6b24574 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -34,7 +34,7 @@ #include <kstdaction.h> #include <kapplication.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klibloader.h> #include <kmessagebox.h> |