From 1180b5831d0f935503569f5a97ec62e9a34b2f6a Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 30 Jul 2012 20:10:35 +0200
Subject: [PATCH] rename locale.h in locale_p.h

locale.h seems reserved in newer GCC
---
 declarativeimports/locale/calendarsystem.h         | 2 +-
 declarativeimports/locale/locale.cpp               | 2 +-
 declarativeimports/locale/{locale.h => locale_p.h} | 0
 declarativeimports/locale/localebindingsplugin.cpp | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename declarativeimports/locale/{locale.h => locale_p.h} (100%)

diff --git a/declarativeimports/locale/calendarsystem.h b/declarativeimports/locale/calendarsystem.h
index 3f25f0f8a..7efca9120 100644
--- 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>
diff --git a/declarativeimports/locale/locale.cpp b/declarativeimports/locale/locale.cpp
index 95eb7661e..f8490b5e8 100644
--- 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>
diff --git a/declarativeimports/locale/locale.h b/declarativeimports/locale/locale_p.h
similarity index 100%
rename from declarativeimports/locale/locale.h
rename to declarativeimports/locale/locale_p.h
diff --git a/declarativeimports/locale/localebindingsplugin.cpp b/declarativeimports/locale/localebindingsplugin.cpp
index bee644682..731fbfb06 100644
--- 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)