diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:56:31 -0600 |
| commit | 5ac308306a9583ca086bb3022b0c25b20feeb7d2 (patch) | |
| tree | 865e565d086274f3de5c5e3da411899be47526d3 /kjsembed/builtins | |
| parent | ccbad20c6d5a2da13adaf0a3e5e591d3aecd967b (diff) | |
| download | tdebindings-5ac308306a9583ca086bb3022b0c25b20feeb7d2.tar.gz tdebindings-5ac308306a9583ca086bb3022b0c25b20feeb7d2.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed/builtins')
| -rw-r--r-- | kjsembed/builtins/qdir_imp.cpp | 2 | ||||
| -rw-r--r-- | kjsembed/builtins/qfile_imp.cpp | 2 | ||||
| -rw-r--r-- | kjsembed/builtins/resources.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp index 6d4f674f..b2f50cba 100644 --- a/kjsembed/builtins/qdir_imp.cpp +++ b/kjsembed/builtins/qdir_imp.cpp @@ -6,7 +6,7 @@ #include <kjs/object.h> #ifndef QT_ONLY -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #endif diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp index 1c79bb35..1ead6bbf 100644 --- a/kjsembed/builtins/qfile_imp.cpp +++ b/kjsembed/builtins/qfile_imp.cpp @@ -6,7 +6,7 @@ #include <tqfont.h> #ifndef QT_ONLY -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #endif diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp index 7bf44e1b..22a6917c 100644 --- a/kjsembed/builtins/resources.cpp +++ b/kjsembed/builtins/resources.cpp @@ -19,7 +19,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <jsproxy.h> #include <jsbinding.h> |