projects
/
platform
/
core
/
context
/
context-provider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Rename the class Json to avoid symbol conflicts with Jsoncpp
[platform/core/context/context-provider.git]
/
src
/
battery-stats
/
BatteryUsage.cpp
diff --git
a/src/battery-stats/BatteryUsage.cpp
b/src/battery-stats/BatteryUsage.cpp
index
532234c
..
91ae8c8
100644
(file)
--- a/
src/battery-stats/BatteryUsage.cpp
+++ b/
src/battery-stats/BatteryUsage.cpp
@@
-30,7
+30,7
@@
BatteryUsageProvider::~BatteryUsageProvider()
{
}
-int BatteryUsageProvider::read(
Json option, Json
*requestResult)
+int BatteryUsageProvider::read(
CtxJson1 option, CtxJson1
*requestResult)
{
BatteryMonitor::getInstance()->prepareData();