rename locale.h in locale_p.h

locale.h seems reserved in newer GCC
2012-07-30 20:10:35 +02:00 · 2012-07-30 20:10:35 +02:00 · 1180b5831d
commit 1180b5831d
parent b14b2ed86d
4 changed files with 3 additions and 3 deletions
--- a/declarativeimports/locale/calendarsystem.h
+++ b/declarativeimports/locale/calendarsystem.h
@ -22,7 +22,7 @@
 #define CALENDARSYSTEM_H

 //own
-#include "locale.h"  // needed for enums
+#include "locale_p.h"  // needed for enums

 //Qt
 #include <QtCore/QDate>
--- a/declarativeimports/locale/locale.cpp
+++ b/declarativeimports/locale/locale.cpp
@ -19,7 +19,7 @@
 */

 //own
-#include "locale.h"
+#include "locale_p.h"

 //KDE
 #include <KGlobal>
--- a/declarativeimports/locale/locale_p.h
+++ b/declarativeimports/locale/locale_p.h
--- a/declarativeimports/locale/localebindingsplugin.cpp
+++ b/declarativeimports/locale/localebindingsplugin.cpp
@ -20,7 +20,7 @@

 #include "localebindingsplugin.h"
 #include <QtDeclarative/qdeclarative.h>
-#include "locale.h"
+#include "locale_p.h"
 #include "calendarsystem.h"

 void LocaleBindingsPlugin::registerTypes(const char *uri)