diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kexi/plugins/macros/kexiactions | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi/plugins/macros/kexiactions')
7 files changed, 8 insertions, 8 deletions
diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index 4e211a53..6fa700c4 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -27,7 +27,7 @@ #include <core/keximainwindow.h> #include <core/kexiinternalpart.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp index 7383b9a8..f34ca89c 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.cpp +++ b/kexi/plugins/macros/kexiactions/executeaction.cpp @@ -27,7 +27,7 @@ #include <core/kexipart.h> #include <core/keximainwindow.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/messageaction.cpp b/kexi/plugins/macros/kexiactions/messageaction.cpp index f421abb5..bb588dee 100644 --- a/kexi/plugins/macros/kexiactions/messageaction.cpp +++ b/kexi/plugins/macros/kexiactions/messageaction.cpp @@ -22,8 +22,8 @@ #include <core/keximainwindow.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp index 336039ae..5f10bd1a 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.cpp +++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp @@ -31,7 +31,7 @@ #include <widget/kexidataawareview.h> #include <widget/tableview/kexidataawareobjectiface.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index 03545f69..da94c8c5 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -30,7 +30,7 @@ #include <core/kexipartmanager.h> #include <core/kexipartinfo.h> -#include <klocale.h> +#include <tdelocale.h> namespace KexiMacro { diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h index 65def3aa..0fb2dd4d 100644 --- a/kexi/plugins/macros/kexiactions/objectvariable.h +++ b/kexi/plugins/macros/kexiactions/objectvariable.h @@ -31,7 +31,7 @@ #include <core/kexipartmanager.h> #include <core/kexipartinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KexiMacro { diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index f5206ff5..0a41b644 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -27,7 +27,7 @@ #include <core/kexipart.h> #include <core/keximainwindow.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; |