Rename the factory functions 'create' to 'CreateProvider'

It seems that the geofence manager library has a symbol conflict issue with 'create'.
This patch fixes this symbol conflict issue.

Change-Id: I2956abcd8c96b8a4b3d810d9f96f51a96a33c7ac
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/src/activity/create.cpp b/src/activity/CreateProvider.cpp
similarity index 90%
rename from src/activity/create.cpp
rename to src/activity/CreateProvider.cpp
index caa0875..0c71287 100644 (file)
--- a/src/activity/create.cpp
+++ b/src/activity/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Activity.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_ACTIVITY_STATIONARY, StationaryActivityProvider);
        ADD_PROVIDER(SUBJ_ACTIVITY_WALKING, WalkingActivityProvider);

diff --git a/src/app-stats/create.cpp b/src/app-stats/CreateProvider.cpp
similarity index 91%
rename from src/app-stats/create.cpp
rename to src/app-stats/CreateProvider.cpp
index b5de0f6..ba00e74 100644 (file)
--- a/src/app-stats/create.cpp
+++ b/src/app-stats/CreateProvider.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "AppStatsProvider.h"
 #include "AppStatsLogger.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_APP_LOGGER, AppStatsLogger);
        ADD_PROVIDER(SUBJ_APP_RECENTLY_USED, RecentAppProvider);

diff --git a/src/call/create.cpp b/src/call/CreateProvider.cpp
similarity index 87%
rename from src/call/create.cpp
rename to src/call/CreateProvider.cpp
index 3fb4b08..47fa54a 100644 (file)
--- a/src/call/create.cpp
+++ b/src/call/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Call.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_CALL, CallStateProvider);
 

diff --git a/src/contacts/create.cpp b/src/contacts/CreateProvider.cpp
similarity index 87%
rename from src/contacts/create.cpp
rename to src/contacts/CreateProvider.cpp
index f6e08e9..ba8f28d 100644 (file)
--- a/src/contacts/create.cpp
+++ b/src/contacts/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Contacts.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_CONTACTS, ContactsChangeProvider);
 

diff --git a/src/email/create.cpp b/src/email/CreateProvider.cpp
similarity index 87%
rename from src/email/create.cpp
rename to src/email/CreateProvider.cpp
index f13a3b7..fa92951 100644 (file)
--- a/src/email/create.cpp
+++ b/src/email/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Email.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_EMAIL, EmailEventProvider);
 

diff --git a/src/geofence/create.cpp b/src/geofence/CreateProvider.cpp
similarity index 88%
rename from src/geofence/create.cpp
rename to src/geofence/CreateProvider.cpp
index 1c84abd..e91494d 100644 (file)
--- a/src/geofence/create.cpp
+++ b/src/geofence/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "PlaceGeofenceProvider.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_PLACE_GEOFENCE, PlaceGeofenceProvider);
 

diff --git a/src/headphone/create.cpp b/src/headphone/CreateProvider.cpp
similarity index 87%
rename from src/headphone/create.cpp
rename to src/headphone/CreateProvider.cpp
index a64b208..c8591d8 100644 (file)
--- a/src/headphone/create.cpp
+++ b/src/headphone/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Headphone.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_HEADPHONE, HeadphoneStateProvider);
 

diff --git a/src/media-stats/create.cpp b/src/media-stats/CreateProvider.cpp
similarity index 91%
rename from src/media-stats/create.cpp
rename to src/media-stats/CreateProvider.cpp
index 1bb7e5e..3defbf1 100644 (file)
--- a/src/media-stats/create.cpp
+++ b/src/media-stats/CreateProvider.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "MediaStatsProvider.h"
 #include "MediaStatsLogger.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_MEDIA_LOGGER, MediaStatsLogger);
        ADD_PROVIDER(SUBJ_MUSIC_PEAK_TIME, MusicPeakTimeProvider);

diff --git a/src/message/create.cpp b/src/message/CreateProvider.cpp
similarity index 87%
rename from src/message/create.cpp
rename to src/message/CreateProvider.cpp
index 751765b..bd9c48c 100644 (file)
--- a/src/message/create.cpp
+++ b/src/message/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Message.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_MESSAGE, MessageEventProvider);
 

diff --git a/src/my-place/create.cpp b/src/my-place/CreateProvider.cpp
similarity index 88%
rename from src/my-place/create.cpp
rename to src/my-place/CreateProvider.cpp
index d6947a7..60093b5 100644 (file)
--- a/src/my-place/create.cpp
+++ b/src/my-place/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "place_recognition.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_PLACE_DETECTION, PlaceRecognitionProvider);
 

diff --git a/src/shared/create.h b/src/shared/CreateProvider.h
similarity index 88%
rename from src/shared/create.h
rename to src/shared/CreateProvider.h
index dc02fa7..2c6ca41 100644 (file)
--- a/src/shared/create.h
+++ b/src/shared/CreateProvider.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef _CONTEXT_PROVIDER_CREATE_H_
+#define _CONTEXT_PROVIDER_CREATE_H_
+
 #include <new>
 #include <Types.h>
 
@@ -26,3 +29,5 @@
                } \
                return instance; \
        }
+
+#endif /* _CONTEXT_PROVIDER_CREATE_H_ */

diff --git a/src/social-stats/create.cpp b/src/social-stats/CreateProvider.cpp
similarity index 88%
rename from src/social-stats/create.cpp
rename to src/social-stats/CreateProvider.cpp
index 60a1a55..a7c9a03 100644 (file)
--- a/src/social-stats/create.cpp
+++ b/src/social-stats/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "SocialStatsProvider.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_SOCIAL_FREQ_ADDRESS, TopContactsProvider);
        ADD_PROVIDER(SUBJ_SOCIAL_FREQUENCY, ContactFreqProvider);

diff --git a/src/system/create.cpp b/src/system/CreateProvider.cpp
similarity index 90%
rename from src/system/create.cpp
rename to src/system/CreateProvider.cpp
index 59aa3c3..d95d69b 100644 (file)
--- a/src/system/create.cpp
+++ b/src/system/CreateProvider.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Battery.h"
 #include "Charger.h"
 #include "Gps.h"
@@ -23,7 +23,7 @@
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_BATTERY, BatteryStateProvider);
        ADD_PROVIDER(SUBJ_STATE_CHARGER, ChargerStateProvider);

diff --git a/src/time/create.cpp b/src/time/CreateProvider.cpp
similarity index 88%
rename from src/time/create.cpp
rename to src/time/CreateProvider.cpp
index d906a63..4849aaf 100644 (file)
--- a/src/time/create.cpp
+++ b/src/time/CreateProvider.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Alarm.h"
 #include "Time.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_ALARM, AlarmProvider);
        ADD_PROVIDER(SUBJ_STATE_TIME, TimeProvider);

diff --git a/src/wifi/create.cpp b/src/wifi/CreateProvider.cpp
similarity index 87%
rename from src/wifi/create.cpp
rename to src/wifi/CreateProvider.cpp
index cdf1db3..70646b7 100644 (file)
--- a/src/wifi/create.cpp
+++ b/src/wifi/CreateProvider.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <create.h>
+#include <CreateProvider.h>
 #include "Wifi.h"
 
 using namespace ctx;
 
-extern "C" SO_EXPORT ContextProvider* create(const char *subject)
+extern "C" SO_EXPORT ContextProvider* CreateProvider(const char *subject)
 {
        ADD_PROVIDER(SUBJ_STATE_WIFI, WifiStateProvider);