From 4df699779339dff1e4360c0adbe9666ea343fc1f Mon Sep 17 00:00:00 2001
From: Pawel Sikorski
Date: Wed, 6 Feb 2013 16:11:16 +0100
Subject: [PATCH] Source code formating unification
[Issue#] N/A
[Problem] Source code was not formatted to any rules. In this situation
creating new patches or making review may become uncomfortable.
[Cause] No formatting rules/tool used.
[Solution] To make implementation and review process more comfortable,
whole plugins-common repository source code has been formatted with
uncrustify tool.
The configuration of the tool is located in the repository
(./uncrustify.cfg).
Command used (stored in uncrustify.sh):
uncrustify -c ./uncrustify.cfg --no-backup `find . -regex
"\(.*\.cpp\|.*\.h\|.*\.c\|.*\.cc\)" | grep -v
"orm.h\|orm_generator.h\|3rdparty"`
[Verification] Build the repository
Change-Id: Ic3b0427b05183ff0c18c0ee6e56928c9fa3a07ac
---
src/Commons/Base64.cpp | 8 +-
src/Commons/Base64.h | 4 +-
src/Commons/Dimension.h | 9 +-
src/Commons/Emitters.h | 10 +-
src/Commons/EventListener.h | 8 +-
src/Commons/EventReceiver.h | 48 +--
src/Commons/Exception.h | 40 +-
src/Commons/FunctionDeclaration.h | 41 +-
src/Commons/FunctionDefinition.cpp | 2 -
src/Commons/FunctionDefinition.h | 29 +-
src/Commons/IEvent.h | 28 +-
src/Commons/IExternEventCanceler.h | 5 +-
src/Commons/JSObject.h | 3 +-
src/Commons/JSObjectDeclaration.cpp | 35 +-
src/Commons/JSObjectDeclaration.h | 55 +--
src/Commons/ListenerEvent.h | 11 +-
src/Commons/ListenerEventEmitter.h | 14 +-
src/Commons/Range.h | 2 -
src/Commons/Regex.cpp | 8 +-
src/Commons/Regex.h | 19 +-
src/Commons/RegexPatterns.h | 2 -
src/Commons/RegexUtils.cpp | 8 +-
src/Commons/RegexUtils.h | 2 -
src/Commons/StaticAssert.h | 8 +-
src/Commons/StringBuilder.cpp | 12 +-
src/Commons/StringBuilder.h | 2 -
src/Commons/StringUtils.cpp | 16 +-
src/Commons/StringUtils.h | 5 +-
src/Commons/ThreadPool.cpp | 32 +-
src/Commons/ThreadPool.h | 10 +-
src/Commons/TimeUtils.cpp | 31 +-
src/Commons/TimeUtils.h | 2 -
src/Commons/TypeTraits.h | 2 -
src/Commons/TypesDeclaration.h | 11 +-
src/Commons/WrtAccess/WrtAccess.cpp | 63 ++--
src/Commons/WrtAccess/WrtAccess.h | 6 +-
src/Commons/plugin_initializer_def.h | 94 +++--
src/CommonsJavaScript/Converter.cpp | 23 +-
src/CommonsJavaScript/Converter.h | 96 ++---
src/CommonsJavaScript/DOMExceptionData.cpp | 5 +-
src/CommonsJavaScript/DOMExceptionData.h | 4 +-
src/CommonsJavaScript/JSCallbackManager.cpp | 34 +-
src/CommonsJavaScript/JSCallbackManager.h | 36 +-
src/CommonsJavaScript/JSDOMException.cpp | 29 +-
src/CommonsJavaScript/JSDOMException.h | 36 +-
src/CommonsJavaScript/JSDOMExceptionFactory.cpp | 17 +-
src/CommonsJavaScript/JSDOMExceptionFactory.h | 14 +-
src/CommonsJavaScript/JSPendingOperation.cpp | 1 -
src/CommonsJavaScript/JSPendingOperation.h | 18 +-
.../JSPendingOperationPrivateObject.h | 16 +-
src/CommonsJavaScript/JSUtils.cpp | 24 +-
src/CommonsJavaScript/JSUtils.h | 30 +-
src/CommonsJavaScript/PrivateObject.h | 42 +--
src/CommonsJavaScript/ScopedJSStringRef.cpp | 4 +-
.../Security/SecurityFunctionDeclaration.cpp | 9 +-
.../Security/SecurityFunctionDeclaration.h | 22 +-
src/CommonsJavaScript/Security/StaticDeclaration.h | 80 ++--
src/CommonsJavaScript/SecurityExceptions.h | 2 -
src/CommonsJavaScript/SupportPendingOperation.h | 15 +-
src/CommonsJavaScript/Utils.h | 10 +-
src/CommonsJavaScript/Validator.cpp | 18 +-
src/CommonsJavaScript/Validator.h | 8 +-
.../JSClass/JSSoftKeyboardChangeEvent.cpp | 83 +++--
src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.h | 40 +-
src/js-overlay/JSClass/JSStorageEvent.cpp | 95 +++--
src/js-overlay/JSClass/JSStorageEvent.h | 50 +--
src/js-overlay/JSClass/JSTizenServiceEvent.cpp | 63 ++--
src/js-overlay/JSClass/JSTizenServiceEvent.h | 26 +-
src/js-overlay/js_function_manager.cpp | 129 +++----
src/js-overlay/js_iframe_support.cpp | 23 +-
src/js-overlay/js_iframe_support.h | 3 -
src/js-overlay/js_overlay_addEventListener.cpp | 70 ++--
src/js-overlay/js_overlay_addEventListener.h | 6 +-
src/js-overlay/js_overlay_functions.cpp | 17 +-
src/js-overlay/js_overlay_functions.h | 2 +-
src/js-overlay/js_overlay_support.cpp | 59 ++-
src/js-overlay/js_overlay_support.h | 3 +-
src/js-overlay/js_overlay_types.h | 7 +-
.../DEPRACATED/AppLauncher/AppLauncherFactory.h | 4 +-
.../AppLauncher/EventGetDefaultApplication.h | 7 +-
.../AppLauncher/EventGetInstalledApplications.h | 7 +-
.../AppLauncher/EventLaunchApplication.h | 10 +-
.../DEPRACATED/AppLauncher/IAppLauncherManager.cpp | 12 +-
.../DEPRACATED/AppLauncher/IAppLauncherManager.h | 7 +-
.../Device/EventClamshellStateChange.cpp | 6 +-
src/modules/API/DEPRACATED/Device/IClamshell.cpp | 3 +-
src/modules/API/DEPRACATED/Device/IClamshell.h | 4 +-
src/modules/API/DEPRACATED/Device/IKeypad.cpp | 3 +-
src/modules/API/DEPRACATED/Device/IManager.cpp | 3 +-
.../DEPRACATED/Display/EventChangeOrientation.cpp | 6 +-
.../API/DEPRACATED/Display/EventChangeState.cpp | 6 +-
src/modules/API/DEPRACATED/Display/IManager.cpp | 3 +-
src/modules/API/DEPRACATED/Display/IManager.h | 3 +-
src/modules/API/DEPRACATED/Display/IScreen.cpp | 3 +-
src/modules/API/DEPRACATED/Display/IScreen.h | 4 +-
.../DEPRACATED/FeatureLoader/EventLoadFeature.h | 7 +-
.../FeatureLoader/FeatureManagerFactory.h | 6 +-
.../DEPRACATED/FeatureLoader/IFeatureManager.cpp | 6 +-
.../API/DEPRACATED/FeatureLoader/IFeatureManager.h | 1 +
src/modules/API/DEPRACATED/Gallery/IEventClose.h | 3 +-
.../API/DEPRACATED/Gallery/IEventGetGalleries.h | 6 +-
.../DEPRACATED/Gallery/IEventGetMediaItemById.h | 3 +-
.../API/DEPRACATED/Gallery/IEventGetMediaItems.h | 5 +-
src/modules/API/DEPRACATED/Gallery/IEventOpen.h | 5 +-
src/modules/API/DEPRACATED/Gallery/IEventRefresh.h | 3 +-
src/modules/API/DEPRACATED/Gallery/IGallery.cpp | 6 +-
.../DEPRACATED/Gallery/IGalleryRequestManager.cpp | 2 +-
.../DEPRACATED/Gallery/IGalleryRequestManager.h | 10 +-
src/modules/API/DEPRACATED/Gallery/IMediaItem.h | 6 +-
.../API/DEPRACATED/Gallery/IViewProperties.cpp | 7 +-
.../Geolocation/EventGetCurrentPosition.h | 3 +-
.../DEPRACATED/Geolocation/EventPositionChanged.h | 3 +-
.../DEPRACATED/Geolocation/GeolocationFactory.cpp | 3 +-
.../API/DEPRACATED/Geolocation/IGeolocation.cpp | 6 +-
.../API/DEPRACATED/Geolocation/IGeolocation.h | 9 +-
.../DEPRACATED/Geolocation/PositionProperties.h | 3 +-
src/modules/API/DEPRACATED/Memory/IManager.cpp | 3 +-
src/modules/API/DEPRACATED/System/IDate.cpp | 3 +-
src/modules/API/DEPRACATED/System/IEnvironment.cpp | 3 +-
.../API/DEPRACATED/Telephony/IEventClearLogs.h | 10 +-
.../DEPRACATED/Telephony/IEventDeleteLogEntry.h | 10 +-
.../DEPRACATED/Telephony/IEventFindLogEntries.h | 10 +-
.../DEPRACATED/Telephony/IEventGetNumberOfLogs.h | 10 +-
.../API/DEPRACATED/Telephony/ILogManager.cpp | 6 +-
src/modules/API/DEPRACATED/Telephony/ILogManager.h | 3 +-
src/modules/API/DEPRACATED/Telephony/LogEntry.cpp | 6 +-
src/modules/API/DEPRACATED/Telephony/LogEntry.h | 3 +-
src/modules/API/DEPRACATED/Telephony/LogFilter.cpp | 6 +-
.../API/DEPRACATED/Telephony/TelephonyFactory.h | 4 +-
src/modules/API/DEPRACATED/UI/IPreferences.h | 15 +-
src/modules/API/DEPRACATED/UI/IPreferencesEvents.h | 18 +-
src/modules/API/DEPRACATED/UI/UIFactory.h | 4 +-
src/modules/API/Filesystem/Enums.h | 48 ++-
src/modules/API/Filesystem/EventCopy.cpp | 2 -
src/modules/API/Filesystem/EventCopy.h | 7 +-
src/modules/API/Filesystem/EventFind.cpp | 7 +-
src/modules/API/Filesystem/EventFind.h | 4 +-
src/modules/API/Filesystem/EventListNodes.cpp | 2 -
src/modules/API/Filesystem/EventListNodes.h | 2 -
src/modules/API/Filesystem/EventMove.cpp | 2 -
src/modules/API/Filesystem/EventMove.h | 7 +-
src/modules/API/Filesystem/EventOpen.cpp | 5 +-
src/modules/API/Filesystem/EventOpen.h | 2 -
src/modules/API/Filesystem/EventReadText.cpp | 2 -
src/modules/API/Filesystem/EventReadText.h | 2 -
src/modules/API/Filesystem/EventRemove.cpp | 2 -
src/modules/API/Filesystem/EventRemove.h | 5 +-
src/modules/API/Filesystem/EventResolve.cpp | 5 +-
src/modules/API/Filesystem/EventResolve.h | 2 -
src/modules/API/Filesystem/IManager.cpp | 8 +-
src/modules/API/Filesystem/IManager.h | 13 +-
src/modules/API/Filesystem/INode.cpp | 8 +-
src/modules/API/Filesystem/INode.h | 8 +-
src/modules/API/Filesystem/INodeTypes.h | 2 -
src/modules/API/Filesystem/IPath.cpp | 5 +-
src/modules/API/Filesystem/IPath.h | 10 +-
src/modules/API/Filesystem/IStream.cpp | 5 +-
src/modules/API/Filesystem/IStream.h | 2 -
src/modules/API/Filesystem/NodeFilter.cpp | 2 -
src/modules/API/Filesystem/NodeFilter.h | 2 -
src/modules/API/Filesystem/PathUtils.cpp | 2 -
src/modules/API/Filesystem/PathUtils.h | 2 -
src/modules/API/LocalStorage/ILocalStorage.h | 14 +-
src/modules/API/LocalStorage/LocalStorageMgr.cpp | 2 -
src/modules/API/LocalStorage/LocalStorageMgr.h | 2 -
src/modules/API/Networking/EventConnected.cpp | 3 +-
src/modules/API/Networking/EventDisconnected.cpp | 3 +-
src/modules/API/Networking/IAdapter.cpp | 3 +-
src/modules/API/Networking/IConnection.cpp | 3 +-
src/modules/API/Networking/IManager.cpp | 3 +-
src/modules/API/PluginManager/IPluginManager.h | 2 -
.../API/PluginManager/PluginManagerFactory.cpp | 15 +-
.../API/PluginManager/PluginManagerFactory.h | 7 +-
.../ISoftKeyboardChangeEvent.h | 6 +-
.../SoftKeyboardChangeEvent.cpp | 10 +-
.../SoftKeyboardChangeEvent.h | 12 +-
src/modules/API/StorageEvent/IStorageEvent.h | 6 +-
src/modules/API/StorageEvent/StorageEvent.cpp | 6 +-
src/modules/API/StorageEvent/StorageEvent.h | 10 +-
src/modules/API/StorageEvent/StorageEventMgr.cpp | 2 -
src/modules/API/StorageEvent/StorageEventMgr.h | 2 -
.../API/TizenServiceEvent/ITizenServiceEvent.h | 6 +-
.../API/TizenServiceEvent/TizenServiceEvent.cpp | 8 +-
.../API/TizenServiceEvent/TizenServiceEvent.h | 6 +-
src/modules/API/Widget/IWidget.h | 9 +-
src/modules/API/Widget/WidgetFactory.cpp | 2 -
src/modules/API/Widget/WidgetFactory.h | 5 +-
src/modules/API/WidgetDB/IWidgetDB.h | 16 +-
src/modules/API/WidgetDB/IWidgetFeature.h | 7 +-
src/modules/API/WidgetDB/WidgetDBMgr.cpp | 2 -
src/modules/API/WidgetDB/WidgetDBMgr.h | 2 -
.../DEPRACATED/AppLauncher/AppLauncherManager.cpp | 131 ++++---
.../DEPRACATED/AppLauncher/AppLauncherManager.h | 21 +-
.../tizen/DEPRACATED/Camera-Webkit/Camera.cpp | 138 +++----
.../tizen/DEPRACATED/Camera-Webkit/Camera.h | 30 +-
.../DEPRACATED/Camera-Webkit/CameraManager.cpp | 17 +-
.../tizen/DEPRACATED/Camera-Webkit/CameraManager.h | 6 +-
src/modules/tizen/DEPRACATED/Device/Manager.cpp | 6 +-
src/modules/tizen/DEPRACATED/Display/Manager.cpp | 3 +-
src/modules/tizen/DEPRACATED/Display/Screen.cpp | 19 +-
src/modules/tizen/DEPRACATED/Display/Screen.h | 17 +-
.../DEPRACATED/FeatureLoader/FeatureManager.cpp | 16 +-
.../DEPRACATED/FeatureLoader/FeatureManager.h | 20 +-
src/modules/tizen/DEPRACATED/Gallery/Gallery.cpp | 19 +-
src/modules/tizen/DEPRACATED/Gallery/Gallery.h | 9 +-
.../DEPRACATED/Gallery/GalleryRequestManager.cpp | 6 +-
.../DEPRACATED/Gallery/GalleryRequestManager.h | 8 +-
.../tizen/DEPRACATED/Geolocation/Geolocation.cpp | 24 +-
.../tizen/DEPRACATED/Geolocation/Geolocation.h | 20 +-
src/modules/tizen/DEPRACATED/Memory/Manager.cpp | 6 +-
src/modules/tizen/DEPRACATED/Memory/Manager.h | 9 +-
.../tizen/DEPRACATED/System/Environment.cpp | 6 +-
.../tizen/DEPRACATED/Telephony/LogEntryWrapper.cpp | 9 +-
.../tizen/DEPRACATED/Telephony/LogEntryWrapper.h | 1 +
.../tizen/DEPRACATED/Telephony/LogManager.cpp | 6 +-
.../tizen/DEPRACATED/Telephony/LogManager.h | 19 +-
src/modules/tizen/Filesystem/Manager.cpp | 238 ++++++------
src/modules/tizen/Filesystem/Manager.h | 12 +-
src/modules/tizen/Filesystem/Node.cpp | 173 +++++----
src/modules/tizen/Filesystem/Node.h | 6 +-
src/modules/tizen/Filesystem/NodeFilterMatcher.cpp | 20 +-
src/modules/tizen/Filesystem/NodeFilterMatcher.h | 2 -
src/modules/tizen/Filesystem/Path.cpp | 5 +-
src/modules/tizen/Filesystem/Path.h | 2 -
src/modules/tizen/Filesystem/Stream.cpp | 15 +-
src/modules/tizen/Filesystem/Stream.h | 4 +-
src/modules/tizen/Filesystem/Utils.cpp | 4 +-
src/modules/tizen/Filesystem/Utils.h | 2 -
src/modules/tizen/Networking/EthernetAdapter.cpp | 11 +-
src/modules/tizen/Networking/EthernetAdapter.h | 9 +-
src/modules/tizen/Networking/Manager.cpp | 21 +-
src/modules/tizen/Networking/WifiAdapter.cpp | 11 +-
src/modules/tizen/Networking/WifiAdapter.h | 9 +-
src/modules/tizen/PluginManager/PluginManager.cpp | 39 +-
src/modules/tizen/PluginManager/PluginManager.h | 6 +-
src/modules/tizen/Widget/Property.h | 8 +-
src/modules/tizen/Widget/Widget.cpp | 10 +-
src/modules/tizen/Widget/Widget.h | 2 -
src/modules/tizen/WidgetDB/WidgetDB.cpp | 98 ++---
src/modules/tizen/WidgetDB/WidgetDB.h | 10 +-
src/modules/tizen/WidgetDB/WidgetFeature.cpp | 4 +-
src/modules/tizen/WidgetDB/WidgetFeature.h | 8 +-
.../WidgetInterfaceDAO/WidgetInterfaceDAO.cpp | 13 +-
.../tizen/WidgetInterfaceDAO/WidgetInterfaceDAO.h | 2 -
.../widget_interface_db_sql_generator.h | 3 +-
src/plugin-loading/explorer.cpp | 206 +++++-----
src/plugin-loading/explorer.h | 9 +-
src/plugin-loading/javascript_interface.cpp | 198 +++++-----
src/plugin-loading/javascript_interface.h | 35 +-
src/plugin-loading/js_page_session.cpp | 170 ++++-----
src/plugin-loading/js_types.h | 4 +-
src/plugin-loading/plugin.cpp | 73 ++--
src/plugin-loading/plugin.h | 14 +-
src/plugin-loading/plugin_container_support.cpp | 28 +-
src/plugin-loading/plugin_container_support.h | 22 +-
src/plugin-loading/plugin_iframe_support.cpp | 15 +-
src/plugin-loading/plugin_iframe_support.h | 12 +-
src/plugin-loading/plugin_logic.cpp | 76 ++--
src/plugin-loading/plugin_logic.h | 8 +-
src/plugin-loading/plugin_model.cpp | 20 +-
src/plugin-loading/plugin_model.h | 37 +-
src/plugin-loading/plugin_property_support.cpp | 36 +-
src/plugin-loading/plugin_property_support.h | 42 +--
src/plugins-api-support/CallbackSupport.h | 30 +-
src/plugins-api-support/ExportedApi.h | 133 ++++---
src/plugins-api-support/IObject.h | 11 +-
src/plugins-api-support/IObject_cast.h | 5 +-
src/plugins-api-support/Object.cpp | 90 ++---
src/plugins-api-support/Object.h | 10 +-
src/plugins-api-support/ObjectFactory.cpp | 2 -
src/plugins-api-support/ObjectFactory.h | 33 +-
src/plugins-api-support/Plugin.cpp | 13 +-
src/plugins-api-support/Plugin.h | 9 +-
src/plugins-api-support/PluginRegistration.cpp | 9 +-
src/plugins-api-support/PluginRegistration.h | 9 +-
src/plugins-api-support/PluginRegistrationImpl.h | 15 +-
src/plugins-api-support/PluginRegistry.cpp | 52 +--
src/plugins-api-support/PluginRegistry.h | 22 +-
src/plugins-api-support/PluginSignals.h | 7 +-
src/plugins-api-support/SignalSignature.h | 13 +-
src/plugins-api-support/SignalsSupport.h | 51 ++-
src/plugins-api-support/SoFeatures.h | 1 -
src/plugins-api-support/detail/traits.h | 20 +-
src/plugins-api-support/js_types.h | 9 +-
src/plugins-api-support/traits.h | 13 +-
src/plugins-api-support/tuple.h | 8 +-
src/plugins-installer/plugin_installer.cpp | 160 ++++----
src/plugins-installer/plugin_installer.h | 6 +-
src/plugins-installer/plugin_installer_errors.h | 2 -
src/plugins-installer/plugin_metafile_reader.cpp | 3 +-
src/plugins-installer/plugin_objects.cpp | 19 +-
src/plugins-installer/plugin_objects.h | 2 +-
src/plugins-installer/plugin_utils.cpp | 22 +-
src/plugins-installer/plugin_utils.h | 2 -
src/standards/W3C/Widget/JSPreferences.cpp | 165 ++++----
src/standards/W3C/Widget/JSPreferences.h | 8 +-
src/standards/W3C/Widget/JSWidget.cpp | 173 ++++-----
src/standards/W3C/Widget/JSWidget.h | 12 +-
src/standards/W3C/Widget/plugin_config.cpp | 15 +-
src/standards/W3C/Widget/plugin_config.h | 20 +-
src/standards/W3C/Widget/plugin_initializer.cpp | 34 +-
src/wrt-popup/ace/popup-bin/Popup.cpp | 184 +++++----
src/wrt-popup/ace/popup-bin/Popup.h | 20 +-
src/wrt-popup/ace/popup-runner/popup-runner.cpp | 122 +++---
src/wrt-popup/ace/popup-runner/popup-runner.h | 21 +-
src/wrt-popup/wrt/PopupSerializer.cpp | 2 -
src/wrt-popup/wrt/PopupSerializer.h | 2 -
src/wrt-popup/wrt/popup-bin/InfoPopup.cpp | 2 -
src/wrt-popup/wrt/popup-bin/InfoPopup.h | 6 +-
src/wrt-popup/wrt/popup-bin/YesNoCheckPopup.cpp | 13 +-
src/wrt-popup/wrt/popup-bin/YesNoCheckPopup.h | 14 +-
src/wrt-popup/wrt/popup-bin/YesNoPopup.cpp | 5 +-
src/wrt-popup/wrt/popup-bin/YesNoPopup.h | 7 +-
.../wrt/popup-bin/renderer/evas_object.cpp | 54 ++-
src/wrt-popup/wrt/popup-bin/renderer/evas_object.h | 276 +++++++-------
src/wrt-popup/wrt/popup-bin/renderer/popup.h | 7 +-
.../wrt/popup-bin/renderer/popup_controller.cpp | 13 +-
.../wrt/popup-bin/renderer/popup_controller.h | 27 +-
.../wrt/popup-bin/renderer/popup_manager.cpp | 2 -
.../wrt/popup-bin/renderer/popup_manager.h | 21 +-
.../wrt/popup-bin/renderer/popup_object.h | 23 +-
.../wrt/popup-bin/renderer/popup_renderer.cpp | 59 ++-
.../wrt/popup-bin/renderer/popup_renderer.h | 8 +-
src/wrt-popup/wrt/popup-bin/wrt-popup.cpp | 15 +-
src/wrt-popup/wrt/popup-bin/wrt-popup.h | 12 +-
src/wrt-popup/wrt/popup-runner/PopupInvoker.cpp | 21 +-
src/wrt-popup/wrt/popup-runner/PopupInvoker.h | 19 +-
tests/dao/TestInit.cpp | 6 +-
tests/dao/WidgetDBTest.cpp | 415 +++++++++------------
uncrustify.cfg | 170 +++++++++
uncrustify.sh | 1 +
331 files changed, 3682 insertions(+), 4002 deletions(-)
mode change 100755 => 100644 src/Commons/ThreadPool.cpp
mode change 100755 => 100644 src/Commons/ThreadPool.h
mode change 100755 => 100644 src/Commons/plugin_initializer_def.h
mode change 100755 => 100644 src/CommonsJavaScript/SecurityExceptions.h
mode change 100755 => 100644 src/modules/tizen/Filesystem/Manager.cpp
mode change 100755 => 100644 src/modules/tizen/Filesystem/Node.cpp
mode change 100755 => 100644 src/modules/tizen/Filesystem/Stream.cpp
mode change 100755 => 100644 src/plugins-installer/plugin_utils.h
create mode 100644 uncrustify.cfg
create mode 100755 uncrustify.sh
diff --git a/src/Commons/Base64.cpp b/src/Commons/Base64.cpp
index ec8f937..94ac901 100644
--- a/src/Commons/Base64.cpp
+++ b/src/Commons/Base64.cpp
@@ -51,10 +51,9 @@
namespace WrtDeviceApis {
namespace Commons {
-
const std::string Base64::chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789+/";
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789+/";
bool Base64::is_base64(unsigned char c)
{
@@ -62,7 +61,7 @@ bool Base64::is_base64(unsigned char c)
}
std::string Base64::encode(unsigned char* data,
- std::size_t num)
+ std::size_t num)
{
std::string ret;
int i = 0;
@@ -179,6 +178,5 @@ bool Base64::is_base64_string(const std::string& str)
{
return ((str.size() % 4) == 0);
}
-
}
} //WrtDeviceApisCommon
diff --git a/src/Commons/Base64.h b/src/Commons/Base64.h
index 3a9e54f..5f42802 100644
--- a/src/Commons/Base64.h
+++ b/src/Commons/Base64.h
@@ -21,12 +21,11 @@
namespace WrtDeviceApis {
namespace Commons {
-
class Base64
{
public:
static std::string encode(unsigned char* data,
- std::size_t num);
+ std::size_t num);
static std::string decode(const std::string& str);
private:
@@ -36,7 +35,6 @@ class Base64
private:
static const std::string chars;
}; // Base64
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/Dimension.h b/src/Commons/Dimension.h
index 5c0a362..703e0c0 100644
--- a/src/Commons/Dimension.h
+++ b/src/Commons/Dimension.h
@@ -22,7 +22,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
/**
* Encapsulates width and height of a component.
*/
@@ -41,11 +40,10 @@ class Dimension
* @param height Specified height.
*/
Dimension(ValueType width,
- ValueType height) :
+ ValueType height) :
m_width(width),
m_height(height)
- {
- }
+ {}
ValueType getWidth() const
{
@@ -58,7 +56,7 @@ class Dimension
}
void setSize(ValueType width,
- ValueType height)
+ ValueType height)
{
m_width = width;
m_height = height;
@@ -68,7 +66,6 @@ class Dimension
ValueType m_width;
ValueType m_height;
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/Emitters.h b/src/Commons/Emitters.h
index b645126..7b1d8c2 100644
--- a/src/Commons/Emitters.h
+++ b/src/Commons/Emitters.h
@@ -29,7 +29,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
/**
* Manages listener events emitters.
* Template parameter should be class that derives from @see ListenerEvent.
@@ -90,7 +89,8 @@ class Emitters
}
/**
- * Emits event through those emitters that when passed to predicate result in
+ * Emits event through those emitters that when passed to predicate result
+ * in
* returning true by it.
* @param event Event to emit.
* @param pred Predicate - a callable object (function, functor) that takes
@@ -98,7 +98,7 @@ class Emitters
*/
template
void emitIf(const EventPtrType& event,
- Predicate pred)
+ Predicate pred)
{
DPL::Mutex::ScopedLock lock(&m_mtx);
for (Iterator it = m_emitters.begin(); it != m_emitters.end(); ++it) {
@@ -131,7 +131,8 @@ class Emitters
/**
* Lock this object.
- * This lock will be automatically released when out of scope (unless someone
+ * This lock will be automatically released when out of scope (unless
+ * someone
* copies it). Do not use in the same scope as other API of this class.
* @return Lock object.
* @remarks Provided to allow locking emitters in scope of some client
@@ -151,7 +152,6 @@ class Emitters
DPL::Mutex m_mtx; ///< Synchronizes operation on this object.
Map m_emitters; ///< Emitters container.
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/EventListener.h b/src/Commons/EventListener.h
index 1340396..f059082 100644
--- a/src/Commons/EventListener.h
+++ b/src/Commons/EventListener.h
@@ -22,7 +22,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
/**
* Base class for listeners.
* Object that is to act as listener should dervie from this class and implement
@@ -34,15 +33,15 @@ class EventListener : private EventReceiver
public:
EventListener(ThreadEnum::Enumeration threadType) :
EventReceiver(threadType)
- {
- }
+ {}
virtual void onAnswerReceived(const DPL::SharedPtr& event) =
0;
void postAnswer(const DPL::SharedPtr& event)
{
- DPL::Event::ControllerEventHandler >::PostEvent(
+ DPL::Event::ControllerEventHandler >::
+ PostEvent(
event);
}
@@ -52,7 +51,6 @@ class EventListener : private EventReceiver
onAnswerReceived(event);
}
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/EventReceiver.h b/src/Commons/EventReceiver.h
index 0768e05..e3873e2 100644
--- a/src/Commons/EventReceiver.h
+++ b/src/Commons/EventReceiver.h
@@ -32,16 +32,15 @@
namespace WrtDeviceApis {
namespace Commons {
-
template
class SignalEventCall : public DPL::Event::AbstractEventCall
{
DPL::SharedPtr m_event;
+
public:
SignalEventCall(const DPL::SharedPtr &event) : m_event(event)
- {
- }
+ {}
virtual void Call()
{
LogDebug("signaling in SignalEventCall");
@@ -49,13 +48,13 @@ class SignalEventCall : public DPL::Event::AbstractEventCall
}
};
-
template
class EventReceiver :
protected DPL::Event::Controller<
typename DPL::TypeListDecl >::Type>
{
DPL::Event::ThreadEventDispatcher m_threadDispatcher;
+
protected:
EventReceiver(ThreadEnum::Enumeration threadType)
@@ -92,24 +91,23 @@ class EventReceiver :
}
};
-
template
class EventRequestReceiver : private EventReceiver
{
public:
EventRequestReceiver(ThreadEnum::Enumeration threadType) : EventReceiver<
TemplateEvent>(threadType)
- {
- }
+ {}
virtual void OnRequestReceived(const DPL::SharedPtr &event)
= 0;
/*
*
- * @argument delaySeconds - event will be received not sooner than after delay (in seconds)
+ * @argument delaySeconds - event will be received not sooner than after
+ * delay (in seconds)
*/
void PostRequest(const DPL::SharedPtr &event,
- double delaySeconds = 0.0)
+ double delaySeconds = 0.0)
{
LogDebug(__FUNCTION__);
{
@@ -120,15 +118,18 @@ class EventRequestReceiver : private EventReceiver
LogDebug("state changed to STATE_REQUEST_SEND. Now posting");
if (TemplateEvent::HANDLING_SYNCHRONOUS == event->getHandlingType() &&
- !event->m_synchronousEventFlag) {
+ !event->m_synchronousEventFlag)
+ {
event->m_synchronousEventFlag = new DPL::WaitableEvent();
}
if (0.0 == delaySeconds) {
- DPL::Event::ControllerEventHandler >::
+ DPL::Event::ControllerEventHandler >
+ ::
PostEvent(event);
} else {
- DPL::Event::ControllerEventHandler >::
+ DPL::Event::ControllerEventHandler >
+ ::
PostTimedEvent(event, delaySeconds);
}
LogDebug("Event posted.");
@@ -165,7 +166,8 @@ class EventRequestReceiver : private EventReceiver
LogDebug("calling OnRequestReceived");
OnRequestReceived(event);
event->signalCancelStatusFlag();
- //After Controller ends processing it should call it to signal that work is done
+ //After Controller ends processing it should call it to signal that work
+ // is done
{
DPL::Mutex::ScopedLock lock(&event->m_stateMutex);
@@ -182,7 +184,8 @@ class EventRequestReceiver : private EventReceiver
if (TemplateEvent::HANDLING_ASYNCHRONOUS_MANUAL_ANSWER !=
event->m_handlingType &&
TemplateEvent::HANDLING_SYNCHRONOUS_MANUAL_ANSWER !=
- event->m_handlingType) {
+ event->m_handlingType)
+ {
event->m_state = TemplateEvent::STATE_ANSWER_SEND;
}
}
@@ -203,7 +206,8 @@ class EventRequestReceiver : private EventReceiver
//event->Signal();
signalEventByDispatcher(event);
break;
- //when event is in manual answer mode we do nothing - the answer will be send explicit from the code
+ //when event is in manual answer mode we do nothing - the answer will be
+ // send explicit from the code
case TemplateEvent::HANDLING_SYNCHRONOUS_MANUAL_ANSWER:
case TemplateEvent::HANDLING_ASYNCHRONOUS_MANUAL_ANSWER:
LogDebug("Manual answer is set so do nothing.");
@@ -251,15 +255,13 @@ class EventRequestReceiver : private EventReceiver
}
};
-
template
class EventAnswerReceiver : private EventReceiver
{
public:
EventAnswerReceiver(ThreadEnum::Enumeration threadType) : EventReceiver<
TemplateEvent>(threadType)
- {
- }
+ {}
virtual void OnAnswerReceived(const DPL::SharedPtr &event) =
0;
@@ -269,7 +271,8 @@ class EventAnswerReceiver : private EventReceiver
{
LogDebug(__FUNCTION__);
event->signalCancelStatusFlag();
- DPL::Event::ControllerEventHandler >::PostEvent(
+ DPL::Event::ControllerEventHandler >::
+ PostEvent(
event);
}
@@ -281,10 +284,12 @@ class EventAnswerReceiver : private EventReceiver
LogDebug("checking the state");
DPL::Mutex::ScopedLock lock(&event->m_stateMutex);
- //in case someone changed it to synchronous call, we don't process it
+ //in case someone changed it to synchronous call, we don't process
+ // it
if (TemplateEvent::STATE_CHANGED_TO_SYNCHRONOUS ==
event->m_state || TemplateEvent::STATE_ENDED ==
- event->m_state) {
+ event->m_state)
+ {
LogDebug(
"Handling probably changed to synchronous meanwhile. Will not process it..");
return;
@@ -317,7 +322,6 @@ class EventAnswerReceiver : private EventReceiver
LogDebug("leaving");
}
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/Exception.h b/src/Commons/Exception.h
index aa1f3b6..0f1db99 100644
--- a/src/Commons/Exception.h
+++ b/src/Commons/Exception.h
@@ -20,7 +20,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
#define PLUGINS_DECLARE_EXCEPTION_TYPE(BaseClass, Class) \
class Class : \
public BaseClass \
@@ -32,23 +31,23 @@ namespace Commons {
const char *function, \
int line, \
const std::string & message = std::string()) : \
- BaseClass(path, function, line, message) \
- { \
- BaseClass::m_className = # Class; \
- m_code = ExceptionCodes::Class; \
- } \
+ BaseClass(path, function, line, message) \
+ { \
+ BaseClass::m_className = #Class; \
+ m_code = ExceptionCodes::Class; \
+ } \
\
- Class(const char *path, \
- const char *function, \
- int line, \
- const DPL::Exception & reason, \
- const std::string & message = std::string()) : \
- BaseClass(path, function, line, reason, message) \
- { \
- BaseClass::m_className = # Class; \
- m_code = ExceptionCodes::Class; \
- } \
- };
+ Class(const char *path, \
+ const char *function, \
+ int line, \
+ const DPL::Exception & reason, \
+ const std::string & message = std::string()) : \
+ BaseClass(path, function, line, reason, message) \
+ { \
+ BaseClass::m_className = #Class; \
+ m_code = ExceptionCodes::Class; \
+ } \
+ };
class ExceptionCodes
{
@@ -128,7 +127,8 @@ PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, EventWrongStateException)
PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, SecurityException)
/**
- * Thrown when trying to perform action that is not supported by current platform.
+ * Thrown when trying to perform action that is not supported by current
+ * platform.
*/
PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, UnsupportedException)
@@ -149,7 +149,8 @@ PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, PendingOperationException)
PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, AlreadyInUseException)
/**
- * Thrown when unpredicted error occurs while a picture or video is being captured
+ * Thrown when unpredicted error occurs while a picture or video is being
+ * captured
* or if endRecording is called while no video is currently captured.
*/
PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, CameraCaptureException)
@@ -168,7 +169,6 @@ PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, LocalStorageValueNoModifableException)
* Thrown when object is not found.
*/
PLUGINS_DECLARE_EXCEPTION_TYPE(Exception, NotFoundException)
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/FunctionDeclaration.h b/src/Commons/FunctionDeclaration.h
index 23d3322..ee0588e 100644
--- a/src/Commons/FunctionDeclaration.h
+++ b/src/Commons/FunctionDeclaration.h
@@ -26,22 +26,21 @@
#include
#define ACE_DECLARE_FUNCTION(function_definition) \
- extern WrtDeviceApis::Commons::AceFunction ace_ ## function_definition
+ extern WrtDeviceApis::Commons::AceFunction ace_##function_definition
#define ACE_DECLARE_PARAM(param_definition) \
- extern WrtDeviceApis::Commons::AceDeviceCapParam ace_param_ ## \
+ extern WrtDeviceApis::Commons::AceDeviceCapParam ace_param_## \
param_definition
class DevCapFinder
{
public:
explicit DevCapFinder(const std::string& devcap) : m_searchFor(devcap)
- {
- }
+ {}
explicit DevCapFinder(const char* devcap) : m_searchFor(devcap)
- {
- }
- bool operator()(const WrtDeviceApis::Commons::AceDeviceCapability& dc) const
+ {}
+ bool operator()(const WrtDeviceApis::Commons::AceDeviceCapability& dc)
+ const
{
return m_searchFor == dc.devCapName;
}
@@ -72,17 +71,21 @@ class DevCapFinder
} while (0)
/*
- * Macro must be run inside plugin function. Plugin function must follow this declaration:
- * plugin_example_function(JScontextRef cotext, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef *exception);
- * where context, arguments, argumentsCount, exception are fixed and could not be change.
+ * Macro must be run inside plugin function. Plugin function must follow this
+ * declaration:
+ * plugin_example_function(JScontextRef cotext, JSObjectRef function,
+ * JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[],
+ * JSValueRef *exception);
+ * where context, arguments, argumentsCount, exception are fixed and could not
+ * be change.
* */
#define DECLARE_FUNCTION_GETTER(Plugin_Module) \
- WrtDeviceApis::Commons::AceFunction get ## Plugin_Module ## FunctionData( \
+ WrtDeviceApis::Commons::AceFunction get##Plugin_Module##FunctionData( \
const std::string & functionId);
#define DEFINE_FUNCTION_GETTER(Plugin_Module, FunctionMap) \
- WrtDeviceApis::Commons::AceFunction get ## Plugin_Module ## FunctionData( \
+ WrtDeviceApis::Commons::AceFunction get##Plugin_Module##FunctionData( \
const std::string & functionId) \
{ \
WrtDeviceApis::Commons::FunctionMapping::const_iterator it = \
@@ -96,11 +99,11 @@ class DevCapFinder
return it->second; \
}
-typedef WrtDeviceApis::Commons::AceFunction (&AceFunctionGetter)(const std::string&);
+typedef WrtDeviceApis::Commons::AceFunction (&AceFunctionGetter)(const std::
+ string&);
namespace WrtDeviceApis {
namespace Commons {
-
enum class AceSecurityStatus
{
AccessGranted,
@@ -125,17 +128,16 @@ class DefaultArgsVerifier<>
{
public:
void operator()(AceFunction& /*aceFunction*/) const
- {
- }
+ {}
};
template
AceSecurityStatus aceCheckAccess(
- const FunctionGetter& f,
- const char* functionName,
- Args && ... args)
+ const FunctionGetter& f,
+ const char* functionName,
+ Args && ... args)
{
using namespace WrtDeviceApis::Commons;
@@ -152,7 +154,6 @@ AceSecurityStatus aceCheckAccess(
return AceSecurityStatus::AccessGranted;
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/FunctionDefinition.cpp b/src/Commons/FunctionDefinition.cpp
index 76c0c51..4209994 100644
--- a/src/Commons/FunctionDefinition.cpp
+++ b/src/Commons/FunctionDefinition.cpp
@@ -17,7 +17,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
int aceAddDeviceCap(const AceDeviceCapability& cap,
AceDeviceCaps &instance)
{
@@ -31,6 +30,5 @@ int aceAddApiFeature(const AceFeature& apiFeature,
instance.push_back(apiFeature);
return 0;
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/FunctionDefinition.h b/src/Commons/FunctionDefinition.h
index ba9b264..fa8b32c 100644
--- a/src/Commons/FunctionDefinition.h
+++ b/src/Commons/FunctionDefinition.h
@@ -22,59 +22,59 @@
namespace WrtDeviceApis {
namespace Commons {
-
/**
* Creates an empty device cap list. Additional device-caps may be added by
* ACE_CREATE_DEVICE_CAP and ACE_ADD_DEVICE_CAP macros
*/
#define ACE_CREATE_DEVICE_CAPS_LIST(device) \
- WrtDeviceApis::Commons::AceDeviceCaps ace_ ## device
+ WrtDeviceApis::Commons::AceDeviceCaps ace_##device
/**
* Creates an empty api features list. Additional api features may be added by
* ACE_CREATE_FEATURE and ACE_ADD_API_FEATURE macros
*/
#define ACE_CREATE_FEATURE_LIST(apifeature) \
- WrtDeviceApis::Commons::AceFeatures ace_ ## apifeature
+ WrtDeviceApis::Commons::AceFeatures ace_##apifeature
/**
* Creates a device capability which should be later added to device cap list
*/
#define ACE_CREATE_DEVICE_CAP(device_cap_id, cap_id) \
- WrtDeviceApis::Commons::AceDeviceCapability ace_ ## device_cap_id = \
+ WrtDeviceApis::Commons::AceDeviceCapability ace_##device_cap_id = \
AceDeviceCapability(cap_id, WrtDeviceApis::Commons::AceDeviceCapParams());
/**
* Create an api feature which should be later added to api features list
*/
#define ACE_CREATE_FEATURE(feature_id, feature_api) \
- WrtDeviceApis::Commons::AceFeature ace_ ## feature_id = { feature_api };
+ WrtDeviceApis::Commons::AceFeature ace_##feature_id = { feature_api \
+ };
/**
* Adds an existing device-cap created by ACE_CREATE_DEVICE_CAP macro to
* device cap list
*/
#define ACE_ADD_DEVICE_CAP(device, device_cap_id) \
- WrtDeviceApis::Commons::aceAddDeviceCap(ace_ ## device_cap_id, ace_ ## device)
+ WrtDeviceApis::Commons::aceAddDeviceCap(ace_##device_cap_id, ace_##device)
/**
* Adds an existing api feature created by ACE_CREATE_FEATURE macro to
* api feature list
*/
#define ACE_ADD_API_FEATURE(apifeature, feature_id) \
- WrtDeviceApis::Commons::aceAddApiFeature(ace_ ## feature_id, \
- ace_ ## apifeature)
+ WrtDeviceApis::Commons::aceAddApiFeature(ace_##feature_id, \
+ ace_##apifeature)
/**
* Creates a function definition with given id that uses provided api feature
* and device capability lists
*/
#define ACE_CREATE_FUNCTION(function_id, function_name, feature_id, device) \
- { function_name, ace_ ## feature_id, ace_ ## device }
+ { function_name, ace_##feature_id, ace_##device }
// Support for param:name begin
#define ACE_CREATE_PARAM(param_definition, param_name, position) \
- static WrtDeviceApis::Commons::AceDeviceCapParam ace_param_ ## \
+ static WrtDeviceApis::Commons::AceDeviceCapParam ace_param_## \
param_definition = \
{ std::string(param_name), position };
@@ -82,11 +82,10 @@ namespace Commons {
typedef std::map FunctionMapping;
-int aceAddDeviceCap(const AceDeviceCapability& cap,
- AceDeviceCaps& instance);
-int aceAddApiFeature(const AceFeature& apiFeature,
- AceFeatures& instance);
-
+int aceAddDeviceCap(const AceDeviceCapability &cap,
+ AceDeviceCaps & instance);
+int aceAddApiFeature(const AceFeature &apiFeature,
+ AceFeatures & instance);
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/IEvent.h b/src/Commons/IEvent.h
index 6ff743f..af3741a 100644
--- a/src/Commons/IEvent.h
+++ b/src/Commons/IEvent.h
@@ -31,19 +31,17 @@
namespace WrtDeviceApis {
namespace Commons {
-
class IEventPrivateData
{
public:
virtual ~IEventPrivateData()
- {
- }
+ {}
};
-
class IEventController
{
DPL::SharedPtr m_privateData;
+
public:
virtual void waitTillProcessed() = 0;
virtual void waitForAnswer() = 0;
@@ -53,11 +51,10 @@ class IEventController
}
virtual bool changeCallToSynchronous() = 0;
virtual ~IEventController()
- {
- }
+ {}
void setPrivateData(
- const DPL::SharedPtr &privateData)
+ const DPL::SharedPtr &privateData)
{
m_privateData = privateData;
}
@@ -68,7 +65,6 @@ class IEventController
};
typedef DPL::SharedPtr IEventControllerPtr;
-
// CRTP pattern
template
class IEvent : /*private DPL::WaitableEvent, */ public IEventController
@@ -108,6 +104,7 @@ class IEvent : /*private DPL::WaitableEvent, */ public IEventController
//if someone is waiting
signalSynchronousEventFlag();
}
+
protected:
DPL::Mutex m_stateMutex;
State m_state;
@@ -130,8 +127,7 @@ class IEvent : /*private DPL::WaitableEvent, */ public IEventController
m_cancelStatusFlag(NULL),
m_cancelled(false),
m_cancelAllowed(false)
- {
- }
+ {}
virtual void waitForAnswer()
{
@@ -213,8 +209,7 @@ class IEvent : /*private DPL::WaitableEvent, */ public IEventController
}
virtual void clearOnCancel()
- {
- }
+ {}
Commons::ExceptionCodes::Enumeration getExceptionCode() const
{
@@ -251,7 +246,7 @@ class IEvent : /*private DPL::WaitableEvent, */ public IEventController
}
virtual bool setForAsynchronousCall(
- EventAnswerReceiver< Super > *remoteController)
+ EventAnswerReceiver< Super > *remoteController)
{
DPL::Mutex::ScopedLock lock(&m_stateMutex);
if (m_cancelled) {
@@ -271,8 +266,10 @@ class IEvent : /*private DPL::WaitableEvent, */ public IEventController
}
/*
- * Normally, after invoking OnRequestReceived in RequestReceiver, the answer is being send automatically (after flow leaves OnRequestReceived).
- * After calling this function, the answer is not being send automatically, you need to call ManualAnswer to send event back.
+ * Normally, after invoking OnRequestReceived in RequestReceiver, the answer
+ * is being send automatically (after flow leaves OnRequestReceived).
+ * After calling this function, the answer is not being send automatically,
+ * you need to call ManualAnswer to send event back.
* It works both in asynchronous and synchronous handling type.
*/
virtual bool switchToManualAnswer()
@@ -367,7 +364,6 @@ class IEvent : /*private DPL::WaitableEvent, */ public IEventController
return m_cancelAllowed;
}
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/IExternEventCanceler.h b/src/Commons/IExternEventCanceler.h
index 913dad4..5a7a7e0 100644
--- a/src/Commons/IExternEventCanceler.h
+++ b/src/Commons/IExternEventCanceler.h
@@ -26,7 +26,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
/**
* This class is related to JSPendingOperation object.
*
@@ -41,10 +40,8 @@ class IExternEventCanceler
virtual void OnCancelEvent(const DPL::SharedPtr& event) = 0;
virtual ~IExternEventCanceler()
- {
- }
+ {}
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/JSObject.h b/src/Commons/JSObject.h
index a5ef354..d52f5a8 100644
--- a/src/Commons/JSObject.h
+++ b/src/Commons/JSObject.h
@@ -41,8 +41,7 @@ class JSObject : private DPL::Noncopyable
virtual RealObject getObject() const;
virtual ~JSObject()
- {
- }
+ {}
private:
RealObject m_object;
diff --git a/src/Commons/JSObjectDeclaration.cpp b/src/Commons/JSObjectDeclaration.cpp
index 46a3da3..2ca8c9e 100644
--- a/src/Commons/JSObjectDeclaration.cpp
+++ b/src/Commons/JSObjectDeclaration.cpp
@@ -31,24 +31,23 @@ JSObjectDeclaration::JSObjectDeclaration(js_entity_definition_ptr_t classD) :
m_classTemplate(NULL),
m_constructorCallback(classD->js_class_constructor_cb)
{
- if (NULL != classD->js_class_template_getter_fun)
- {
+ if (NULL != classD->js_class_template_getter_fun) {
m_classTemplate = classD->js_class_template_getter_fun();
}
- if(classD->class_options){
+ if (classD->class_options) {
LogDebug("class options is not a null");
m_options = OptionsPtr(new Options(classD->class_options));
}
}
JSObjectDeclaration::~JSObjectDeclaration()
-{
-}
+{}
-bool JSObjectDeclaration::checkIframesSupported() const{
+bool JSObjectDeclaration::checkIframesSupported() const
+{
LogDebug("Check iframe supported");
- if(!m_options ||
- m_options->getIframeObject() == Options::IFrameObject::None)
+ if (!m_options ||
+ m_options->getIframeObject() == Options::IFrameObject::None)
{
LogDebug("Iframe NOT supported for object: " << getName());
return false;
@@ -60,12 +59,12 @@ bool JSObjectDeclaration::checkIframesSupported() const{
}
JSObjectDeclaration::Options::ClassType
- JSObjectDeclaration::Options::getType() const
+JSObjectDeclaration::Options::getType() const
{
LogDebug("Get type field from declaration's option");
Assert(m_options && "Pointer to options is NULL");
- switch(m_options->type){
+ switch (m_options->type) {
case JS_CLASS: return ClassType::Class;
case JS_FUNCTION: return ClassType::Function;
case JS_INTERFACE: return ClassType::Interface;
@@ -74,12 +73,12 @@ JSObjectDeclaration::Options::ClassType
}
JSObjectDeclaration::Options::IFrameObject
- JSObjectDeclaration::Options::getIframeObject() const
+JSObjectDeclaration::Options::getIframeObject() const
{
LogDebug("Get Frame Option");
Assert(m_options && "Options object is NULL");
- switch(m_options->iframe_option){
+ switch (m_options->iframe_option) {
case NONE: return IFrameObject::None;
case REFERENCE: return IFrameObject::Reference;
case CREATE_INSTANCE: return IFrameObject::CreateInstance;
@@ -89,12 +88,12 @@ JSObjectDeclaration::Options::IFrameObject
}
JSObjectDeclaration::Options::IFrameNotice
- JSObjectDeclaration::Options::getIframeNotice() const
+JSObjectDeclaration::Options::getIframeNotice() const
{
LogDebug("Get Frame Option");
Assert(m_options && "Pointer to options is null");
- switch(m_options->iframe_notice){
+ switch (m_options->iframe_notice) {
case NONE_NOTICE: return IFrameNotice::None;
case ALWAYS_NOTICE: return IFrameNotice::AlwaysNotice;
default:
@@ -103,16 +102,16 @@ JSObjectDeclaration::Options::IFrameNotice
}
JSObjectDeclaration::Options::IFrameOverlay
- JSObjectDeclaration::Options::getIframeOverlay() const
+JSObjectDeclaration::Options::getIframeOverlay() const
{
LogDebug("Get Frame Option");
Assert(m_options && "Pointer to options is null");
- switch(m_options->iframe_overlay){
+ switch (m_options->iframe_overlay) {
case IGNORED: return IFrameOverlay::Ignored;
case USE_OVERLAYED: return IFrameOverlay::UseOverlayed;
case OVERLAYED_BEFORE_ORIGINAL:
- return IFrameOverlay::OverlayedBeforeOriginal;
+ return IFrameOverlay::OverlayedBeforeOriginal;
default:
Assert(0 && "Wrong value of overlay option");
}
@@ -134,7 +133,7 @@ void JSObjectDeclaration::Options::invokeCallback(JsContext ctx,
}
JSObjectDeclaration::Options::PrivateData
- JSObjectDeclaration::Options::getPrivateData() const
+JSObjectDeclaration::Options::getPrivateData() const
{
Assert(m_options && m_options->private_data && "empty private data");
return m_options->private_data;
diff --git a/src/Commons/JSObjectDeclaration.h b/src/Commons/JSObjectDeclaration.h
index fa14dce..699936e 100644
--- a/src/Commons/JSObjectDeclaration.h
+++ b/src/Commons/JSObjectDeclaration.h
@@ -39,62 +39,65 @@ class JSObjectDeclaration : private DPL::Noncopyable
typedef js_class_constructor_cb_t ConstructorCallback;
typedef class_definition_options_t ClassOptions;
-
- class Options : DPL::Noncopyable {
+ class Options : DPL::Noncopyable
+ {
public:
- enum class ClassType{
+ enum class ClassType
+ {
Class,
Function,
Interface
};
- enum class IFrameObject{
+ enum class IFrameObject
+ {
None,
Reference,
CreateInstance
};
- enum class IFrameNotice{
+ enum class IFrameNotice
+ {
None,
AlwaysNotice
};
//only for function
- enum class IFrameOverlay{
- Ignored,
- UseOverlayed,
- OverlayedBeforeOriginal
+ enum class IFrameOverlay
+ {
+ Ignored,
+ UseOverlayed,
+ OverlayedBeforeOriginal
};
typedef js_object_instance_t ObjectInstance;
typedef java_script_context_t JsContext;
typedef void* PrivateData;
- public:
- ClassType getType() const;
+ public:
+ ClassType getType() const;
- IFrameObject getIframeObject() const;
- IFrameNotice getIframeNotice() const;
- IFrameOverlay getIframeOverlay() const;
- js_function_impl getFunctionImpl() const;
+ IFrameObject getIframeObject() const;
+ IFrameNotice getIframeNotice() const;
+ IFrameOverlay getIframeOverlay() const;
+ js_function_impl getFunctionImpl() const;
- void invokeCallback(JsContext ctx,
- ObjectInstance iframe,
- ObjectInstance object) const;
+ void invokeCallback(JsContext ctx,
+ ObjectInstance iframe,
+ ObjectInstance object) const;
- PrivateData getPrivateData() const;
+ PrivateData getPrivateData() const;
- private:
- const ClassOptions* m_options;
+ private:
+ const ClassOptions* m_options;
- private:
- explicit Options(const ClassOptions* options) : m_options(options)
+ private:
+ explicit Options(const ClassOptions* options) : m_options(options)
{
assert(options && "Dont create empty options");
}
friend class JSObjectDeclaration;
-
};
typedef std::shared_ptr OptionsPtr;
@@ -128,8 +131,8 @@ class JSObjectDeclaration : private DPL::Noncopyable
return m_constructorCallback;
}
-
- const OptionsPtr getOptions() const{
+ const OptionsPtr getOptions() const
+ {
return m_options;
}
diff --git a/src/Commons/ListenerEvent.h b/src/Commons/ListenerEvent.h
index 33338bc..7956ab7 100644
--- a/src/Commons/ListenerEvent.h
+++ b/src/Commons/ListenerEvent.h
@@ -28,7 +28,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
template
class ListenerEventEmitter;
@@ -90,15 +89,13 @@ class ListenerEvent
ListenerEvent() :
m_mtx(new DPL::Mutex()),
m_code(Commons::ExceptionCodes::None)
- {
- }
+ {}
ListenerEvent(const ListenerEvent &ths) :
m_mtx(new DPL::Mutex()),
m_code(ths.m_code),
m_privateData(ths.m_privateData)
- {
- }
+ {}
ListenerEvent& operator=(const ListenerEvent &other)
{
@@ -112,7 +109,8 @@ class ListenerEvent
/**
* Sets event's private data.
- * Event's private data object has to implement @see IEventPrivateData interface.
+ * Event's private data object has to implement @see IEventPrivateData
+ * interface.
* @param data Private data.
* @throw EventWrongStateExeption When event has already been emitted.
*/
@@ -127,7 +125,6 @@ class ListenerEvent
Commons::ExceptionCodes::Enumeration m_code; ///< Exception code.
PrivateDataTypePtr m_privateData; ///< Private data.
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/ListenerEventEmitter.h b/src/Commons/ListenerEventEmitter.h
index 7b52ec9..77bada2 100644
--- a/src/Commons/ListenerEventEmitter.h
+++ b/src/Commons/ListenerEventEmitter.h
@@ -29,7 +29,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
template
class Emitters;
@@ -64,19 +63,19 @@ class ListenerEventEmitter : private DPL::Noncopyable
public:
ListenerEventEmitter() : m_listener(NULL)
- {
- }
+ {}
public:
virtual ~ListenerEventEmitter()
- {
- }
+ {}
/**
* Sets event's private data.
- * Event's private data object has to implement @see IEventPrivateData interface.
+ * Event's private data object has to implement @see IEventPrivateData
+ * interface.
* @param data Private data.
- * @remarks Practically private dat should be only set at object creation and
+ * @remarks Practically private dat should be only set at object creation
+ * and
* not chaged during this object lifetime.
*/
virtual void setEventPrivateData(const EventPrivateDataTypePtr& data)
@@ -142,7 +141,6 @@ class ListenerEventEmitter : private DPL::Noncopyable
template
const typename ListenerEventEmitter::IdType ListenerEventEmitter<
EventClass>::emptyId = 0;
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/Range.h b/src/Commons/Range.h
index 1f905a2..ab731e1 100644
--- a/src/Commons/Range.h
+++ b/src/Commons/Range.h
@@ -22,7 +22,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
/**
* Stores data describing a range of values.
*/
@@ -44,7 +43,6 @@ struct Range
*/
ValueType max;
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/Regex.cpp b/src/Commons/Regex.cpp
index 1374a14..9284d3f 100644
--- a/src/Commons/Regex.cpp
+++ b/src/Commons/Regex.cpp
@@ -18,10 +18,9 @@
namespace WrtDeviceApis {
namespace Commons {
-
bool validate(const std::string &pattern,
- const std::string &value,
- unsigned int options)
+ const std::string &value,
+ unsigned int options)
{
pcrecpp::RE_Options pcreOpt;
if (options & VALIDATE_MATCH_CASELESS) {
@@ -35,7 +34,7 @@ bool validate(const std::string &pattern,
}
std::string filter(const std::string &pattern,
- const std::string &value)
+ const std::string &value)
{
pcrecpp::RE re(pattern);
std::string ret = static_cast(value);
@@ -50,6 +49,5 @@ std::string toUpper(const std::string &value)
re.GlobalReplace(UPPER_P, &ret);
return ret;
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/Regex.h b/src/Commons/Regex.h
index 99d6b0e..f6c046b 100644
--- a/src/Commons/Regex.h
+++ b/src/Commons/Regex.h
@@ -20,9 +20,12 @@
namespace WrtDeviceApis {
namespace Commons {
-
-const unsigned int VALIDATE_MATCH_CASELESS = 0x0001; //use when you want to make caseless match
-const unsigned int VALIDATE_MATCH_FULL = 0x0002; //use when you want supplied text matches a supplied pattern exactly
+const unsigned int VALIDATE_MATCH_CASELESS = 0x0001; //use when you want to
+ // make caseless match
+const unsigned int VALIDATE_MATCH_FULL = 0x0002; //use when you want
+ // supplied text
+ // matches a supplied
+ // pattern exactly
const std::string LOWER_P = "p";
const std::string UPPER_P = "P";
@@ -34,17 +37,18 @@ const std::string UPPER_P = "P";
* @return True when value is matched against pattern
*/
bool validate(const std::string &pattern,
- const std::string &value,
- unsigned int options = 0);
+ const std::string &value,
+ unsigned int options = 0);
/**
- * Filter value against pattern(Any character except "0-9+#*Pp" will be removed from value)
+ * Filter value against pattern(Any character except "0-9+#*Pp" will be removed
+ * from value)
* @param pattern Regexp pattern
* @param value String to be filtered
* @return filtered value
*/
std::string filter(const std::string &pattern,
- const std::string &value);
+ const std::string &value);
/**
* Replace character "p" in value by "P"
@@ -52,7 +56,6 @@ std::string filter(const std::string &pattern,
* @return replaced value
*/
std::string toUpper(const std::string &value);
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/RegexPatterns.h b/src/Commons/RegexPatterns.h
index ffd2f85..3c9ceb6 100644
--- a/src/Commons/RegexPatterns.h
+++ b/src/Commons/RegexPatterns.h
@@ -20,12 +20,10 @@
namespace WrtDeviceApis {
namespace Commons {
-
const std::string PATTERN_PHONE_NUMBER_FILTER("[^0-9+#*Pp]");
const std::string PATTERN_PHONE_NUMBER("^[0-9#+*]+$");
const std::string PATTERN_PHONE_NUMBER_P("^\\+?[0-9#*Pp]*[0-9][0-9#*Pp]*$");
const std::string PATTERN_PHONE_NUMBER_PW("^[0-9#+*PpWw]+$");
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/RegexUtils.cpp b/src/Commons/RegexUtils.cpp
index 1d0494a..db749e7 100644
--- a/src/Commons/RegexUtils.cpp
+++ b/src/Commons/RegexUtils.cpp
@@ -19,7 +19,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
std::string addStartPositionMark(const std::string &value)
{
if (!String::startsWith(value, "^") && !String::startsWith(value, ".*")) {
@@ -31,7 +30,8 @@ std::string addStartPositionMark(const std::string &value)
std::string addEndPositionMark(const std::string &value)
{
if ((!String::endsWith(value, "$") || String::endsWith(value, "\\$")) &&
- !String::endsWith(value, ".*")) {
+ !String::endsWith(value, ".*"))
+ {
return value + "$";
}
return value;
@@ -65,10 +65,10 @@ std::string escape(const std::string& str)
// Escape standard regular expressions' metacharacters,
// i.e.: \, ., -, +, ?, (, ), [, ], ^, $, |
const char* metas = "(\\.|\\-|\\+|\\?|\\(|\\)|\\[|\\]|\\^|\\$|\\|"
- "|(\\\\[^\\*\\%]|\\\\$))"; // \*, \% won't get additional '\'
+ "|(\\\\[^\\*\\%]|\\\\$))"; // \*, \% won't get
+ // additional '\'
pcrecpp::RE(metas).GlobalReplace("\\\\\\1", &result);
return result;
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/RegexUtils.h b/src/Commons/RegexUtils.h
index e4bc94f..a06e1cd 100644
--- a/src/Commons/RegexUtils.h
+++ b/src/Commons/RegexUtils.h
@@ -20,7 +20,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
/**
* Adds ^ character at the beginning in proper way
* @param value Regexp pattern
@@ -66,7 +65,6 @@ std::string prepareAsterisk(const std::string& str);
* @return String with regex special characters escaped.
*/
std::string escape(const std::string& str);
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/StaticAssert.h b/src/Commons/StaticAssert.h
index 2ccafb3..bbd19f2 100644
--- a/src/Commons/StaticAssert.h
+++ b/src/Commons/StaticAssert.h
@@ -25,7 +25,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
template
struct CompileTimeChecker
{
@@ -37,8 +36,8 @@ struct CompileTimeChecker {};
#define STATIC_CHECK(expr, msg) \
{ \
- class ERROR_ ## msg {}; \
- CompileTimeChecker<(expr)!= 0>((ERROR_ ## msg())); \
+ class ERROR_##msg {}; \
+ CompileTimeChecker<(expr) != 0>((ERROR_##msg())); \
}
/**
@@ -52,9 +51,8 @@ struct CompileTimeChecker {};
* */
#define STATIC_ERROR(msg, C) \
{ \
- C->_ ## msg(); \
+ C->_##msg(); \
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/StringBuilder.cpp b/src/Commons/StringBuilder.cpp
index 8ebe80c..7fb1cb9 100644
--- a/src/Commons/StringBuilder.cpp
+++ b/src/Commons/StringBuilder.cpp
@@ -22,13 +22,11 @@
namespace WrtDeviceApis {
namespace Commons {
-
class StringBuilderImpl
{
public:
StringBuilderImpl() : m_counter(1)
- {
- }
+ {}
void append(const std::string& str)
{
@@ -83,8 +81,7 @@ class StringBuilderImpl
};
StringBuilder::StringBuilder() : m_impl(new StringBuilderImpl())
-{
-}
+{}
StringBuilder::~StringBuilder()
{
@@ -99,7 +96,9 @@ StringBuilder::StringBuilder(const StringBuilder& other)
StringBuilder & StringBuilder::operator=(const StringBuilder& other)
{
- if (this == &other) { return *this; }
+ if (this == &other) {
+ return *this;
+ }
other.m_impl->addRef();
@@ -127,6 +126,5 @@ std::string StringBuilder::toString() const
{
return m_impl->toString();
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/StringBuilder.h b/src/Commons/StringBuilder.h
index 7e151f0..fa12c37 100644
--- a/src/Commons/StringBuilder.h
+++ b/src/Commons/StringBuilder.h
@@ -24,7 +24,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
class StringBuilderImpl;
class StringBuilder
@@ -43,7 +42,6 @@ class StringBuilder
private:
StringBuilderImpl* m_impl;
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/StringUtils.cpp b/src/Commons/StringUtils.cpp
index 1fe0b7a..0b432b6 100644
--- a/src/Commons/StringUtils.cpp
+++ b/src/Commons/StringUtils.cpp
@@ -22,7 +22,6 @@
namespace WrtDeviceApis {
namespace Commons {
namespace String {
-
std::string lTrim(const std::string& str)
{
std::string result = str;
@@ -47,13 +46,13 @@ std::string trim(const std::string& str)
}
bool startsWith(const std::string& str,
- const std::string& startStr)
+ const std::string& startStr)
{
return str.find(startStr) == 0;
}
bool endsWith(const std::string& str,
- const std::string& endStr)
+ const std::string& endStr)
{
std::size_t pos = str.rfind(endStr);
if (pos == std::string::npos) {
@@ -63,7 +62,7 @@ bool endsWith(const std::string& str,
}
std::string unique(const std::string& str,
- const char needle)
+ const char needle)
{
std::string result = str;
@@ -83,7 +82,7 @@ std::string unique(const std::string& str,
}
bool inCStringArray(const std::string& needle,
- const char* stack[])
+ const char* stack[])
{
while (*stack) {
if (needle == *stack) {
@@ -119,7 +118,7 @@ std::string merge(const std::vector& strs,
}
std::vector split(const std::string& str,
- std::string::value_type delim)
+ std::string::value_type delim)
{
std::vector result;
std::string::size_type begin = 0, end = 0;
@@ -130,7 +129,9 @@ std::vector split(const std::string& str,
if (!part.empty()) {
result.push_back(part);
}
- if (std::string::npos == end) { break; }
+ if (std::string::npos == end) {
+ break;
+ }
begin = end + 1;
}
return result;
@@ -140,7 +141,6 @@ int toInt(const std::string& str)
{
return convertTo(str);
}
-
}
}
}
diff --git a/src/Commons/StringUtils.h b/src/Commons/StringUtils.h
index ee7cbe8..b36071f 100644
--- a/src/Commons/StringUtils.h
+++ b/src/Commons/StringUtils.h
@@ -31,7 +31,6 @@
namespace WrtDeviceApis {
namespace Commons {
namespace String {
-
/**
* Removes spaces from begining of the string.
* @param str String to remove spaces from.
@@ -155,13 +154,11 @@ template
std::string parse(const T& data)
{
std::ostringstream oss;
- if (!(oss << data))
- {
+ if (!(oss << data)) {
Throw(ConversionException);
}
return oss.str();
}
-
}
}
}
diff --git a/src/Commons/ThreadPool.cpp b/src/Commons/ThreadPool.cpp
old mode 100755
new mode 100644
index 5ec65eb..fd5cd3a
--- a/src/Commons/ThreadPool.cpp
+++ b/src/Commons/ThreadPool.cpp
@@ -30,7 +30,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
ThreadPool &ThreadPool::getInstance()
{
static ThreadPool theInstance;
@@ -38,7 +37,7 @@ ThreadPool &ThreadPool::getInstance()
}
DPL::Event::AbstractEventDispatcher *ThreadPool::getDispatcher(
- DPL::Event::ThreadEventDispatcher &callingThreadDispatcher)
+ DPL::Event::ThreadEventDispatcher &callingThreadDispatcher)
{
DPL::Thread *currentThread = DPL::Thread::GetCurrentThread();
//if we are in main thread
@@ -50,8 +49,7 @@ DPL::Event::AbstractEventDispatcher *ThreadPool::getDispatcher(
}
ThreadPool::ThreadPool()
-{
-}
+{}
ThreadPool::~ThreadPool()
{
@@ -63,7 +61,7 @@ ThreadPool::~ThreadPool()
}
DPL::Thread* ThreadPool::getThreadHandleCreateIfNotExists(
- ThreadEnum::Enumeration type)
+ ThreadEnum::Enumeration type)
{
DPL::Mutex::ScopedLock lock(&m_threadHandlersMutex);
ThreadHandleMap::iterator element = m_threadHandlers.find(type);
@@ -73,7 +71,7 @@ DPL::Thread* ThreadPool::getThreadHandleCreateIfNotExists(
DPL::Thread* newThread = new DPL::Thread();
m_threadHandlers.insert(
m_threadHandlers.begin(),
- std::pair(type, newThread));
+ std::pair(type, newThread));
newThread->Run();
return newThread;
}
@@ -88,7 +86,8 @@ DPL::Thread *ThreadPool::getThreadRef(ThreadEnum::Enumeration type)
}
/* we could stay with
* getThreadHandleCreateIfNotExists(type);
- * but by switch we can attach actually one thread to more than one ThreadEnums
+ * but by switch we can attach actually one thread to more than one
+ * ThreadEnums
*/
switch (type) {
case ThreadEnum::NULL_THREAD:
@@ -155,13 +154,15 @@ DPL::Thread *ThreadPool::getThreadRef(ThreadEnum::Enumeration type)
thandle = getThreadHandleCreateIfNotExists(ThreadEnum::POWER_THREAD);
break;
case ThreadEnum::PLUGIN_TEMPLETE_THREAD:
- thandle = getThreadHandleCreateIfNotExists(ThreadEnum::PLUGIN_TEMPLETE_THREAD);
+ thandle = getThreadHandleCreateIfNotExists(
+ ThreadEnum::PLUGIN_TEMPLETE_THREAD);
break;
case ThreadEnum::BLUETOOTH_THREAD:
thandle = getThreadHandleCreateIfNotExists(ThreadEnum::BLUETOOTH_THREAD);
break;
case ThreadEnum::APPLICATION_THREAD:
- thandle = getThreadHandleCreateIfNotExists(ThreadEnum::APPLICATION_THREAD);
+ thandle = getThreadHandleCreateIfNotExists(
+ ThreadEnum::APPLICATION_THREAD);
break;
case ThreadEnum::GYROSCOPE_THREAD:
thandle = getThreadHandleCreateIfNotExists(ThreadEnum::GYROSCOPE_THREAD);
@@ -170,19 +171,23 @@ DPL::Thread *ThreadPool::getThreadRef(ThreadEnum::Enumeration type)
thandle = getThreadHandleCreateIfNotExists(ThreadEnum::CLOCK_THREAD);
break;
case ThreadEnum::SYSTEMINFO_THREAD:
- thandle = getThreadHandleCreateIfNotExists(ThreadEnum::SYSTEMINFO_THREAD);
+ thandle = getThreadHandleCreateIfNotExists(
+ ThreadEnum::SYSTEMINFO_THREAD);
break;
case ThreadEnum::CALLHISTORY_THREAD:
- thandle = getThreadHandleCreateIfNotExists(ThreadEnum::CALLHISTORY_THREAD);
+ thandle = getThreadHandleCreateIfNotExists(
+ ThreadEnum::CALLHISTORY_THREAD);
break;
case ThreadEnum::ACCOUNT_THREAD:
- thandle = getThreadHandleCreateIfNotExists(ThreadEnum::CALLHISTORY_THREAD);
+ thandle = getThreadHandleCreateIfNotExists(
+ ThreadEnum::CALLHISTORY_THREAD);
break;
case ThreadEnum::NFC_THREAD:
thandle = getThreadHandleCreateIfNotExists(ThreadEnum::NFC_THREAD);
break;
case ThreadEnum::MEDIACONTENT_THREAD:
- thandle = getThreadHandleCreateIfNotExists(ThreadEnum::MEDIACONTENT_THREAD);
+ thandle = getThreadHandleCreateIfNotExists(
+ ThreadEnum::MEDIACONTENT_THREAD);
break;
case ThreadEnum::SE_THREAD:
thandle = getThreadHandleCreateIfNotExists(ThreadEnum::SE_THREAD);
@@ -203,6 +208,5 @@ DPL::Thread *ThreadPool::getThreadRef(ThreadEnum::Enumeration type)
}
return thandle;
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/ThreadPool.h b/src/Commons/ThreadPool.h
old mode 100755
new mode 100644
index 7ee9ed6..ada3233
--- a/src/Commons/ThreadPool.h
+++ b/src/Commons/ThreadPool.h
@@ -31,13 +31,12 @@
namespace WrtDeviceApis {
namespace Commons {
-
class ThreadEnum
{
private:
ThreadEnum()
- {
- }
+ {}
+
public:
enum Enumeration
{
@@ -80,7 +79,6 @@ class ThreadEnum
};
};
-
class ThreadPool : private DPL::Noncopyable
{
private:
@@ -93,6 +91,7 @@ class ThreadPool : private DPL::Noncopyable
//DPL::MainEventDispatcher m_mainEventDispatcher;
ThreadPool();
+
public:
~ThreadPool();
@@ -105,11 +104,10 @@ class ThreadPool : private DPL::Noncopyable
* Get proper dispatcher for current calling thread
*/
DPL::Event::AbstractEventDispatcher *getDispatcher(
- DPL::Event::ThreadEventDispatcher &callingThreadDispatcher);
+ DPL::Event::ThreadEventDispatcher &callingThreadDispatcher);
static ThreadPool& getInstance();
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/TimeUtils.cpp b/src/Commons/TimeUtils.cpp
index 0467c03..ce5cce8 100644
--- a/src/Commons/TimeUtils.cpp
+++ b/src/Commons/TimeUtils.cpp
@@ -24,48 +24,41 @@
namespace WrtDeviceApis {
namespace Commons {
namespace Time {
-
struct tm* localtime_r(long long int* timep, struct tm* result)
{
UErrorCode status = U_ZERO_ERROR;
UCalendar *cal;
- if( !result || !timep )
- {
+ if (!result || !timep) {
return NULL;
}
cal = ucal_open(NULL, 0, NULL, UCAL_DEFAULT, &status);
- if(U_FAILURE(status))
- {
+ if (U_FAILURE(status)) {
return NULL;
}
ucal_setMillis(cal, (*timep * (double)1000.0), &status);
- result->tm_sec = ucal_get(cal, UCAL_SECOND, &status);
- result->tm_min = ucal_get(cal, UCAL_MINUTE, &status);
- result->tm_hour = ucal_get(cal, UCAL_HOUR, &status);
+ result->tm_sec = ucal_get(cal, UCAL_SECOND, &status);
+ result->tm_min = ucal_get(cal, UCAL_MINUTE, &status);
+ result->tm_hour = ucal_get(cal, UCAL_HOUR, &status);
result->tm_mday = ucal_get(cal, UCAL_DAY_OF_MONTH, &status);
- result->tm_mon = ucal_get(cal, UCAL_MONTH, &status);
- result->tm_year = ucal_get(cal, UCAL_YEAR, &status);
- result->tm_wday = ucal_get(cal, UCAL_DAY_OF_WEEK, &status);
- result->tm_yday = ucal_get(cal, UCAL_DAY_OF_YEAR, &status);
- result->tm_isdst= ucal_get(cal, UCAL_DST_OFFSET, &status);
+ result->tm_mon = ucal_get(cal, UCAL_MONTH, &status);
+ result->tm_year = ucal_get(cal, UCAL_YEAR, &status);
+ result->tm_wday = ucal_get(cal, UCAL_DAY_OF_WEEK, &status);
+ result->tm_yday = ucal_get(cal, UCAL_DAY_OF_YEAR, &status);
+ result->tm_isdst = ucal_get(cal, UCAL_DST_OFFSET, &status);
ucal_close(cal);
- if(U_FAILURE(status))
- {
+ if (U_FAILURE(status)) {
return NULL;
- }
- else
- {
+ } else {
return result;
}
}
-
}
}
}
diff --git a/src/Commons/TimeUtils.h b/src/Commons/TimeUtils.h
index 27e4038..de55e4c 100644
--- a/src/Commons/TimeUtils.h
+++ b/src/Commons/TimeUtils.h
@@ -26,9 +26,7 @@
namespace WrtDeviceApis {
namespace Commons {
namespace Time {
-
struct tm* localtime_r(long long int* timep, struct tm* result);
-
}
}
}
diff --git a/src/Commons/TypeTraits.h b/src/Commons/TypeTraits.h
index 3e7e78f..bcc98f7 100644
--- a/src/Commons/TypeTraits.h
+++ b/src/Commons/TypeTraits.h
@@ -20,7 +20,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
template
struct IsNull
{
@@ -53,7 +52,6 @@ struct AlwaysFalse
{
static const bool value = false;
};
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/TypesDeclaration.h b/src/Commons/TypesDeclaration.h
index e903fe9..0f2dca2 100644
--- a/src/Commons/TypesDeclaration.h
+++ b/src/Commons/TypesDeclaration.h
@@ -21,7 +21,6 @@
namespace WrtDeviceApis {
namespace Commons {
-
struct AceFeature
{
AceFeature(const std::string& featName) : name(featName) {}
@@ -33,10 +32,9 @@ typedef std::vector AceFeatures;
struct AceDeviceCapParam
{
AceDeviceCapParam(const std::string& parName,
- const std::string& parVal) : name(parName),
+ const std::string& parVal) : name(parName),
value(parVal)
- {
- }
+ {}
std::string name;
std::string value;
@@ -48,11 +46,10 @@ struct AceDeviceCapability
{
AceDeviceCapability() {}
AceDeviceCapability(const std::string& name,
- const AceDeviceCapParams& params) :
+ const AceDeviceCapParams& params) :
devCapName(name),
devCapParams(params)
- {
- }
+ {}
std::string devCapName;
AceDeviceCapParams devCapParams;
diff --git a/src/Commons/WrtAccess/WrtAccess.cpp b/src/Commons/WrtAccess/WrtAccess.cpp
index cfda0f1..b81c368 100644
--- a/src/Commons/WrtAccess/WrtAccess.cpp
+++ b/src/Commons/WrtAccess/WrtAccess.cpp
@@ -38,7 +38,6 @@
IMPLEMENT_SAFE_SINGLETON(WrtDeviceApis::Commons::WrtAccess)
namespace {
-
/**
* Helper class - single parameter and its value
*/
@@ -47,11 +46,11 @@ struct AceParam
const char *name;
const char *value;
- AceParam():
+ AceParam() :
name(NULL), value(NULL)
{}
- AceParam(const char *name, const char *value):
+ AceParam(const char *name, const char *value) :
name(name), value(value)
{}
};
@@ -61,9 +60,9 @@ struct AceParam
*/
struct AceParamList
{
- size_t count;
+ size_t count;
AceParam* param;
- AceParamList():
+ AceParamList() :
count(0),
param(NULL)
{}
@@ -92,10 +91,9 @@ class ScopedDeviceCapArray : public DPL::ScopedResource
{
public:
explicit ScopedDeviceCapArray(AceParamList *ptr =
- DeviceCapParamPolicy::NullValue()) :
+ DeviceCapParamPolicy::NullValue()) :
DPL::ScopedResource(ptr)
- {
- }
+ {}
AceParamList & operator [](std::ptrdiff_t k) const
{
@@ -110,35 +108,31 @@ class ScopedDeviceCapArray : public DPL::ScopedResource
namespace WrtDeviceApis {
namespace Commons {
-
WrtAccess::WrtAccess() :
- m_sessionId(GenerateSessionId()),
- m_pluginOwners(0)
-{
-}
+ m_sessionId(GenerateSessionId()),
+ m_pluginOwners(0)
+{}
WrtAccess::~WrtAccess()
-{
-}
+{}
WrtAccess::SessionId WrtAccess::GenerateSessionId()
{
const size_t SESSION_ID_LENGTH = 32;
std::ostringstream pid;
- pid << static_cast (getpid());
+ pid << static_cast(getpid());
std::string session_id = pid.str();
session_id.reserve(session_id.length() + SESSION_ID_LENGTH);
- for (size_t i = 0; i < SESSION_ID_LENGTH; ++i)
- {
+ for (size_t i = 0; i < SESSION_ID_LENGTH; ++i) {
int c = random() % 16;
- session_id += (c < 10 ?
- static_cast('0' + c) :
- static_cast('A' + c - 10));
+ session_id += (c < 10 ?
+ static_cast('0' + c) :
+ static_cast('A' + c - 10));
}
return session_id;
}
@@ -146,8 +140,7 @@ WrtAccess::SessionId WrtAccess::GenerateSessionId()
void WrtAccess::initialize(int widgetId)
{
LogDebug("initialize");
- if (widgetId < 0)
- {
+ if (widgetId < 0) {
LogDebug("Invalid widget id");
Throw(Exception);
}
@@ -176,8 +169,9 @@ int WrtAccess::getWidgetId() const
bool WrtAccess::checkAccessControl(const AceFunction& aceFunction) const
{
- Assert(m_pluginOwners && "WrtAccessSingleton needs to be initialized with"
- "WidgetId during on_widget_start_callback in each plugin");
+ Assert(
+ m_pluginOwners && "WrtAccessSingleton needs to be initialized with"
+ "WidgetId during on_widget_start_callback in each plugin");
size_t deviceCount = aceFunction.deviceCapabilities.size();
DPL::ScopedArray deviceScopedArray;
@@ -222,10 +216,12 @@ bool WrtAccess::checkAccessControl(const AceFunction& aceFunction) const
LogDebug("constructing ACE request");
ace_request_t aceRequest;
- aceRequest.session_id = const_cast(m_sessionId.c_str());
+ aceRequest.session_id =
+ const_cast(m_sessionId.c_str());
aceRequest.widget_handle = getWidgetId();
aceRequest.feature_list.count = featuresCount;
- aceRequest.feature_list.items = const_cast(featureScopedArray.Get());
+ aceRequest.feature_list.items =
+ const_cast(featureScopedArray.Get());
aceRequest.dev_cap_list.count = deviceCount;
aceRequest.dev_cap_list.items = new ace_dev_cap_t[deviceCount];
@@ -235,16 +231,16 @@ bool WrtAccess::checkAccessControl(const AceFunction& aceFunction) const
unsigned int i;
for (i = 0; i < deviceCount; ++i) {
aceRequest.dev_cap_list.items[i].name =
- const_cast(devCapNames[i]);
+ const_cast(devCapNames[i]);
aceRequest.dev_cap_list.items[i].param_list.count = paramList[i].count;
aceRequest.dev_cap_list.items[i].param_list.items =
- new ace_param_t[paramList[i].count];
+ new ace_param_t[paramList[i].count];
unsigned int j;
for (j = 0; j < paramList[i].count; ++j) {
aceRequest.dev_cap_list.items[i].param_list.items[j].name =
- const_cast(paramList[i].param[j].name);
+ const_cast(paramList[i].param[j].name);
aceRequest.dev_cap_list.items[i].param_list.items[j].value =
- const_cast(paramList[i].param[j].value);
+ const_cast(paramList[i].param[j].value);
}
}
@@ -252,9 +248,9 @@ bool WrtAccess::checkAccessControl(const AceFunction& aceFunction) const
ace_return_t ret = ace_check_access(&aceRequest, &aceCheckResult);
for (i = 0; i < deviceCount; ++i) {
- delete [] aceRequest.dev_cap_list.items[i].param_list.items;
+ delete[] aceRequest.dev_cap_list.items[i].param_list.items;
}
- delete [] aceRequest.dev_cap_list.items;
+ delete[] aceRequest.dev_cap_list.items;
if (ACE_OK != ret) {
LogError("Error in ace check: " << static_cast(ret));
@@ -262,6 +258,5 @@ bool WrtAccess::checkAccessControl(const AceFunction& aceFunction) const
}
return ACE_TRUE == aceCheckResult;
}
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/WrtAccess/WrtAccess.h b/src/Commons/WrtAccess/WrtAccess.h
index 2011a77..cc89709 100644
--- a/src/Commons/WrtAccess/WrtAccess.h
+++ b/src/Commons/WrtAccess/WrtAccess.h
@@ -29,16 +29,15 @@
namespace WrtDeviceApis {
namespace Commons {
-
class WrtAccess
{
-public:
+ public:
void initialize(int widgetId);
void deinitialize(int widgetId);
int getWidgetId() const;
bool checkAccessControl(const AceFunction &aceFunction) const;
-private:
+ private:
typedef std::string SessionId;
SessionId GenerateSessionId();
@@ -54,7 +53,6 @@ private:
};
typedef DPL::Singleton WrtAccessSingleton;
-
}
} // WrtDeviceApisCommon
diff --git a/src/Commons/plugin_initializer_def.h b/src/Commons/plugin_initializer_def.h
old mode 100755
new mode 100644
index f2429f9..73a6185
--- a/src/Commons/plugin_initializer_def.h
+++ b/src/Commons/plugin_initializer_def.h
@@ -16,8 +16,10 @@
/*
* @author Karol Majewski (k.majewski@samsung.com)
* @version 0.1
- * @brief This is a file that you provides interface for wrt-engine while loading and using plugin
- * If you are a plugin developer you need to plugin_initializer.cpp in your module and provide implementation for macros below
+ * @brief This is a file that you provides interface for wrt-engine while
+ * loading and using plugin
+ * If you are a plugin developer you need to plugin_initializer.cpp
+ * in your module and provide implementation for macros below
*/
#ifndef WRTDEVICEAPIS_COMMONS_PLUGIN_INITIALIZER_DEF_H_
@@ -56,21 +58,22 @@ typedef java_script_context_t JavaScriptContext;
* */
#define WRT_JS_EXTENSION_OBJECT_TIZEN "tizen"
-
-
-
//HAVE TO BE IMPLEMENTED IN EVERY PLUGIN
/*
- * You have to(!) call this macro in your plugin_initializer.cpp(!) file providing callback that will be called while loading each widget (for every loaded widget this function will be called)
+ * You have to(!) call this macro in your plugin_initializer.cpp(!) file
+ * providing callback that will be called while loading each widget (for every
+ * loaded widget this function will be called)
* Example:
* plugin_initializer.cpp
- * void on_widget_start_callback(int widgetId, JSContextRef context, const engine_interface_t *interface)
+ * void on_widget_start_callback(int widgetId, JSContextRef context,
+ * const engine_interface_t *interface)
* {
* //...
* }
* PLUGIN_ON_WIDGET_START(on_widget_start_callback)
*/
-#define PLUGIN_ON_WIDGET_START(CALLBACK_NAME) extern "C" const on_widget_start_proc PLUGIN_WIDGET_START_PROC EXPORT_SYMBOL = CALLBACK_NAME;
+#define PLUGIN_ON_WIDGET_START(CALLBACK_NAME) extern "C" const \
+ on_widget_start_proc PLUGIN_WIDGET_START_PROC EXPORT_SYMBOL = CALLBACK_NAME;
/*
* You have to(!) call this macro in your plugin_initializer.cpp(!) file
@@ -85,10 +88,13 @@ typedef java_script_context_t JavaScriptContext;
* PLUGIN_ON_WIDGET_INIT(on_widget_init_callback)
*/
#define PLUGIN_ON_WIDGET_INIT(CALLBACK_NAME) extern "C" \
-const on_widget_init_proc PLUGIN_WIDGET_INIT_PROC EXPORT_SYMBOL = CALLBACK_NAME;
+ const on_widget_init_proc PLUGIN_WIDGET_INIT_PROC EXPORT_SYMBOL = \
+ CALLBACK_NAME;
/*
- * You have to(!) call this macro in your plugin_initializer.cpp(!) file providing callback that will be called while unloading each widget (for every unloaded widget this function will be called)
+ * You have to(!) call this macro in your plugin_initializer.cpp(!) file
+ * providing callback that will be called while unloading each widget (for
+ * every unloaded widget this function will be called)
* Example:
* void on_widget_stop_callback(int widgetId)
* {
@@ -96,10 +102,13 @@ const on_widget_init_proc PLUGIN_WIDGET_INIT_PROC EXPORT_SYMBOL = CALLBACK_NAME;
* }
* PLUGIN_ON_WIDGET_STOP(on_widget_stop_callback)
*/
-#define PLUGIN_ON_WIDGET_STOP(CALLBACK_NAME) extern "C" const on_widget_stop_proc PLUGIN_WIDGET_STOP_PROC EXPORT_SYMBOL = CALLBACK_NAME;
+#define PLUGIN_ON_WIDGET_STOP(CALLBACK_NAME) extern "C" const \
+ on_widget_stop_proc PLUGIN_WIDGET_STOP_PROC EXPORT_SYMBOL = CALLBACK_NAME;
/*
- * You have to(!) call this macro in your plugin_initializer.cpp(!) file providing callback that will be called while unloading each page (for every loaded page, including nested page, this function will be called)
+ * You have to(!) call this macro in your plugin_initializer.cpp(!) file
+ * providing callback that will be called while unloading each page (for every
+ * loaded page, including nested page, this function will be called)
* Example:
* void on_frame_load_callback(java_script_context_t context)
* {
@@ -107,10 +116,13 @@ const on_widget_init_proc PLUGIN_WIDGET_INIT_PROC EXPORT_SYMBOL = CALLBACK_NAME;
* }
* PLUGIN_ON_FRAME_LOAD(on_frame_load_callback)
*/
-#define PLUGIN_ON_FRAME_LOAD(CALLBACK_NAME) extern "C" const on_frame_load_proc PLUGIN_FRAME_LOAD_PROC EXPORT_SYMBOL = CALLBACK_NAME;
+#define PLUGIN_ON_FRAME_LOAD(CALLBACK_NAME) extern "C" const on_frame_load_proc \
+ PLUGIN_FRAME_LOAD_PROC EXPORT_SYMBOL = CALLBACK_NAME;
/*
- * You have to(!) call this macro in your plugin_initializer.cpp(!) file providing callback that will be called while ununloading each page (for every unloaded page, including nested page, this function will be called)
+ * You have to(!) call this macro in your plugin_initializer.cpp(!) file
+ * providing callback that will be called while ununloading each page (for
+ * every unloaded page, including nested page, this function will be called)
* Example:
* void on_frame_unload_callback(java_script_context_t context)
* {
@@ -118,42 +130,52 @@ const on_widget_init_proc PLUGIN_WIDGET_INIT_PROC EXPORT_SYMBOL = CALLBACK_NAME;
* }
* PLUGIN_ON_FRAME_UNLOAD(on_frame_unload_callback)
*/
-#define PLUGIN_ON_FRAME_UNLOAD(CALLBACK_NAME) extern "C" const on_frame_unload_proc PLUGIN_FRAME_UNLOAD_PROC EXPORT_SYMBOL = CALLBACK_NAME;
+#define PLUGIN_ON_FRAME_UNLOAD(CALLBACK_NAME) extern "C" const \
+ on_frame_unload_proc PLUGIN_FRAME_UNLOAD_PROC EXPORT_SYMBOL = CALLBACK_NAME;
/*
- * You have to(!) define an array of structures in your plugin_initializer.cpp(!) file describing a JS class (class_definition) and it's parent class name (parent_name).
+ * You have to(!) define an array of structures in your
+ * plugin_initializer.cpp(!) file describing a JS class (class_definition) and
+ * it's parent class name (parent_name).
* JS class will be bind to a parent class name (parent_name.jsclass_name).
* Example:
* plugin_initializer.cpp
* PLUGIN_CLASS_MAP_BEGIN
- * PLUGIN_CLASS_MAP_ADD_CLASS("bondi",WrtPluginBondi::JSICameraManager::getClassInfo())
- * PLUGIN_CLASS_MAP_ADD_CLASS("bondi",WrtPluginBondi::JSICameraAnotherClass::getClassInfo())
+ * PLUGIN_CLASS_MAP_ADD_CLASS(
+ * "bondi",
+ * WrtPluginBondi::JSICameraManager::getClassInfo())
+ * PLUGIN_CLASS_MAP_ADD_CLASS(
+ * "bondi",
+ * WrtPluginBondi::JSICameraAnotherClass::getClassInfo())
* PLUGIN_CLASS_MAP_END
*
*/
-#define PLUGIN_CLASS_MAP_BEGIN extern "C" const js_entity_definition_t\
- PLUGIN_CLASS_MAP[] EXPORT_SYMBOL = {
+#define PLUGIN_CLASS_MAP_BEGIN extern "C" const js_entity_definition_t \
+ PLUGIN_CLASS_MAP[] EXPORT_SYMBOL = {
-#define PLUGIN_CLASS_MAP_ADD_INTERFACE(PARENTNAME,INTERFACENAME,\
- JSPRODUCTCLASSTEMPLATE,PRODUCTCONSTRUCTORCB,PRIVDATA) \
- {PARENTNAME,INTERFACENAME,"",JSPRODUCTCLASSTEMPLATE,\
- PRODUCTCONSTRUCTORCB,PRIVDATA},
+#define PLUGIN_CLASS_MAP_ADD_INTERFACE(PARENTNAME, \
+ INTERFACENAME, \
+ JSPRODUCTCLASSTEMPLATE, \
+ PRODUCTCONSTRUCTORCB, \
+ PRIVDATA) \
+ { PARENTNAME, INTERFACENAME, "", JSPRODUCTCLASSTEMPLATE, \
+ PRODUCTCONSTRUCTORCB, PRIVDATA },
-#define PLUGIN_CLASS_MAP_ADD_INTERFACE_PRODUCT(PARENTNAME,OBJECTNAME,\
- INTERFACENAME,PRIVDATA)\
- {PARENTNAME,OBJECTNAME,INTERFACENAME,NULL,NULL,PRIVDATA},
+#define PLUGIN_CLASS_MAP_ADD_INTERFACE_PRODUCT(PARENTNAME, OBJECTNAME, \
+ INTERFACENAME, PRIVDATA) \
+ { PARENTNAME, OBJECTNAME, INTERFACENAME, NULL, NULL, PRIVDATA },
-#define PLUGIN_CLASS_MAP_ADD_CLASS(PARENTNAME,CLASSNAME,JSCLASSTEMPLATE,\
- PRIVDATA)\
- {PARENTNAME,CLASSNAME,"",JSCLASSTEMPLATE,NULL,PRIVDATA},
+#define PLUGIN_CLASS_MAP_ADD_CLASS(PARENTNAME, CLASSNAME, JSCLASSTEMPLATE, \
+ PRIVDATA) \
+ { PARENTNAME, CLASSNAME, "", JSCLASSTEMPLATE, NULL, PRIVDATA },
-#define PLUGIN_CLASS_MAP_END {NULL,NULL,NULL,NULL,NULL,NULL} };
+#define PLUGIN_CLASS_MAP_END { NULL, NULL, NULL, NULL, NULL, NULL } };
-#define PLUGIN_CLASS_MAP_BEGIN_STATIC static const js_entity_definition_t\
- PLUGIN_CLASS_MAP[] = {
+#define PLUGIN_CLASS_MAP_BEGIN_STATIC static const js_entity_definition_t \
+ PLUGIN_CLASS_MAP[] = {
-#define PLUGIN_GET_CLASS_MAP(CALLBACK_NAME) extern "C" const\
- get_widget_entity_map_proc\
- PLUGIN_GET_CLASS_PROC_MAP EXPORT_SYMBOL = CALLBACK_NAME;
+#define PLUGIN_GET_CLASS_MAP(CALLBACK_NAME) extern "C" const \
+ get_widget_entity_map_proc \
+ PLUGIN_GET_CLASS_PROC_MAP EXPORT_SYMBOL = CALLBACK_NAME;
#endif // WRTDEVICEAPIS_COMMONS_PLUGIN_INITIALIZER_DEF_H_
diff --git a/src/CommonsJavaScript/Converter.cpp b/src/CommonsJavaScript/Converter.cpp
index f550032..27183f4 100644
--- a/src/CommonsJavaScript/Converter.cpp
+++ b/src/CommonsJavaScript/Converter.cpp
@@ -25,14 +25,11 @@ using namespace WrtDeviceApis::Commons;
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
Converter::Converter(JSContextRef context) : m_context(context)
-{
-}
+{}
Converter::~Converter()
-{
-}
+{}
JSObjectRef Converter::toJSObjectRef(const JSValueRef& arg)
{
@@ -136,7 +133,8 @@ std::string Converter::tryString(const JSValueRef& arg)
{
if (!JSValueIsString(m_context, arg) &&
!JSValueIsNumber(m_context, arg) &&
- !JSValueIsBoolean(m_context, arg)) {
+ !JSValueIsBoolean(m_context, arg))
+ {
ThrowMsg(ConversionException,
"Argument is not convertable to JS String.");
}
@@ -222,7 +220,8 @@ std::vector Converter::toVectorOfStrings(const JSValueRef& arg)
return toVectorOfT_(arg, &Converter::toString);
}
-std::vector Converter::toVectorOfTimeT(const JSValueRef& arg) {
+std::vector Converter::toVectorOfTimeT(const JSValueRef& arg)
+{
return toVectorOfT_(arg, &Converter::toDateTimeT);
}
@@ -246,7 +245,8 @@ JSValueRef Converter::toJSValueRef(unsigned long arg)
return JSValueMakeNumber(m_context, arg);
}
-JSValueRef Converter::toJSValueRefLong(const long arg) {
+JSValueRef Converter::toJSValueRefLong(const long arg)
+{
return JSValueMakeNumber(m_context, arg);
}
@@ -304,11 +304,13 @@ JSValueRef Converter::toJSValueRef(const char* arg)
return toJSValueRef(std::string(arg));
}
-JSValueRef Converter::toJSValueRef(const std::vector& arg) {
+JSValueRef Converter::toJSValueRef(const std::vector& arg)
+{
return toJSValueRef_(arg);
}
-JSValueRef Converter::toJSValueRef(const std::vector& arg) {
+JSValueRef Converter::toJSValueRef(const std::vector& arg)
+{
return toJSValueRef_(arg);
}
@@ -379,7 +381,6 @@ bool Converter::isNan(double value) const
NOT_IEEE754_REPRESENTATION);
return (value != value);
}
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/Converter.h b/src/CommonsJavaScript/Converter.h
index 302141d..ff196b6 100644
--- a/src/CommonsJavaScript/Converter.h
+++ b/src/CommonsJavaScript/Converter.h
@@ -29,7 +29,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
class Converter : private DPL::Noncopyable
{
public:
@@ -229,14 +228,14 @@ class Converter : private DPL::Noncopyable
std::vector toVectorOfStrings(const JSValueRef& arg);
/**
- * Converts JSValueRef to vector of time_t.
- * @param arg JSValueRef to convert.
- * @return std::vector
- * @throw ConversionException Thrown when conversion fails.
- */
- std::vector toVectorOfTimeT(const JSValueRef& arg);
+ * Converts JSValueRef to vector of time_t.
+ * @param arg JSValueRef to convert.
+ * @return std::vector
+ * @throw ConversionException Thrown when conversion fails.
+ */
+ std::vector toVectorOfTimeT(const JSValueRef& arg);
- /**
+ /**
* Converts boolean value to JSValueRef.
* @param arg Boolean value to convert.
* @return JSValueRef object.
@@ -277,12 +276,12 @@ class Converter : private DPL::Noncopyable
JSValueRef toJSValueRef(unsigned long arg);
/**
- * Converts long value to JSValueRef.
- * @param arg long value to convert.
- * @return JSValueRef object.
- * @throw ConversionException Thrown when conversion fails.
- */
- JSValueRef toJSValueRefLong(const long arg);
+ * Converts long value to JSValueRef.
+ * @param arg long value to convert.
+ * @return JSValueRef object.
+ * @throw ConversionException Thrown when conversion fails.
+ */
+ JSValueRef toJSValueRefLong(const long arg);
/**
* Converts unsigned long value to JSValueRef.
@@ -292,7 +291,7 @@ class Converter : private DPL::Noncopyable
*/
JSValueRef toJSValueRef(long long int arg);
- /**
+ /**
* Converts STL string to JSValueRef.
* @param arg STL string to convert.
* @return JSValueRef object.
@@ -325,22 +324,22 @@ class Converter : private DPL::Noncopyable
JSValueRef toJSValueRef(const tm& arg);
/**
- * Converts STL vector of integer to JSValueRef.
- * @param arg STL vector of integer to convert.
- * @return JSValueRef object.
- * @throw ConversionException Thrown when conversion fails.
- */
- JSValueRef toJSValueRef(const std::vector& arg);
+ * Converts STL vector of integer to JSValueRef.
+ * @param arg STL vector of integer to convert.
+ * @return JSValueRef object.
+ * @throw ConversionException Thrown when conversion fails.
+ */
+ JSValueRef toJSValueRef(const std::vector& arg);
- /**
- * Converts STL vector of time_t to JSValueRef.
- * @param arg STL vector of time_t to convert.
- * @return JSValueRef object.
- * @throw ConversionException Thrown when conversion fails.
- */
- JSValueRef toJSValueRef(const std::vector& arg);
+ /**
+ * Converts STL vector of time_t to JSValueRef.
+ * @param arg STL vector of time_t to convert.
+ * @return JSValueRef object.
+ * @throw ConversionException Thrown when conversion fails.
+ */
+ JSValueRef toJSValueRef(const std::vector& arg);
- /**
+ /**
* Converts STL vector of string to JSStringRef.
* @param arg STL string to convert.
* @return JSValueRef object.
@@ -397,16 +396,18 @@ class Converter : private DPL::Noncopyable
template
std::vector toVectorOfT_(const JSValueRef& arg,
- T (Derived::*f)(const JSValueRef &),
- Derived* object)
+ T (Derived::*f)(const JSValueRef &),
+ Derived* object)
{
if (JSValueIsNull(m_context,
- arg) || JSValueIsUndefined(m_context, arg)) {
+ arg) || JSValueIsUndefined(m_context, arg))
+ {
return std::vector();
}
if (!JSIsArrayValue(m_context, arg)) {
- ThrowMsg(Commons::ConversionException, "Argument is not an JS array.");
+ ThrowMsg(Commons::ConversionException,
+ "Argument is not an JS array.");
}
std::vector result;
@@ -420,15 +421,17 @@ class Converter : private DPL::Noncopyable
template
std::vector toVectorOfT_(const JSValueRef& arg,
- T (Converter::*f)(const JSValueRef &))
+ T (Converter::*f)(const JSValueRef &))
{
if (JSValueIsNull(m_context,
- arg) || JSValueIsUndefined(m_context, arg)) {
+ arg) || JSValueIsUndefined(m_context, arg))
+ {
return std::vector();
}
if (!JSIsArrayValue(m_context, arg)) {
- ThrowMsg(Commons::ConversionException, "Argument is not an JS array.");
+ ThrowMsg(Commons::ConversionException,
+ "Argument is not an JS array.");
}
std::vector result;
@@ -442,13 +445,14 @@ class Converter : private DPL::Noncopyable
template
JSValueRef toJSValueRef_(const std::vector& arg,
- JSValueRef (Derived::*f)(const T &),
- Derived* object)
+ JSValueRef (Derived::*f)(const T &),
+ Derived* object)
{
JSObjectRef jsResult = JSCreateArrayObject(m_context, 0, NULL);
if (NULL == jsResult) {
- ThrowMsg(WrtDeviceApis::Commons::NullPointerException, "Could not create js array object");
+ ThrowMsg(WrtDeviceApis::Commons::NullPointerException,
+ "Could not create js array object");
}
for (std::size_t i = 0; i < arg.size(); ++i) {
@@ -489,7 +493,8 @@ class Converter : private DPL::Noncopyable
JSObjectRef jsResult = JSCreateArrayObject(m_context, 0, NULL);
if (NULL == jsResult) {
- ThrowMsg(WrtDeviceApis::Commons::NullPointerException, "Could not create js array object");
+ ThrowMsg(WrtDeviceApis::Commons::NullPointerException,
+ "Could not create js array object");
}
typename std::list::const_iterator it = arg.begin();
@@ -506,13 +511,14 @@ class Converter : private DPL::Noncopyable
template
JSValueRef toJSValueRef_(const std::list& arg,
- JSValueRef (Derived::*f)(const T &),
- Derived* object)
+ JSValueRef (Derived::*f)(const T &),
+ Derived* object)
{
JSObjectRef jsResult = JSCreateArrayObject(m_context, 0, NULL);
if (NULL == jsResult) {
- ThrowMsg(WrtDeviceApis::Commons::NullPointerException, "Could not create js array object");
+ ThrowMsg(WrtDeviceApis::Commons::NullPointerException,
+ "Could not create js array object");
}
typename std::list::const_iterator it = arg.begin();
@@ -534,7 +540,8 @@ class Converter : private DPL::Noncopyable
{
std::stringstream ss;
if (!(ss << arg)) {
- ThrowMsg(WrtDeviceApis::Commons::ConversionException, "Could not convert to string.");
+ ThrowMsg(WrtDeviceApis::Commons::ConversionException,
+ "Could not convert to string.");
}
return ss.str();
}
@@ -572,7 +579,6 @@ class ConverterFactory : private DPL::Noncopyable
typedef ConverterFactory BasicConverterFactory;
typedef BasicConverterFactory::ConverterType BasicConverter;
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/DOMExceptionData.cpp b/src/CommonsJavaScript/DOMExceptionData.cpp
index 6625eca..3eb148a 100644
--- a/src/CommonsJavaScript/DOMExceptionData.cpp
+++ b/src/CommonsJavaScript/DOMExceptionData.cpp
@@ -17,13 +17,11 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
DOMExceptionData::DOMExceptionData(int code,
const std::string& message) :
m_code(code),
m_message(message)
-{
-}
+{}
int DOMExceptionData::getCode() const
{
@@ -34,6 +32,5 @@ std::string DOMExceptionData::getMessage() const
{
return m_message;
}
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/DOMExceptionData.h b/src/CommonsJavaScript/DOMExceptionData.h
index fee0e86..b6cd760 100644
--- a/src/CommonsJavaScript/DOMExceptionData.h
+++ b/src/CommonsJavaScript/DOMExceptionData.h
@@ -21,12 +21,11 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
class DOMExceptionData
{
public:
explicit DOMExceptionData(int code,
- const std::string& message = std::string());
+ const std::string& message = std::string());
int getCode() const;
std::string getMessage() const;
@@ -37,7 +36,6 @@ class DOMExceptionData
};
typedef DPL::SharedPtr DOMExceptionDataPtr;
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/JSCallbackManager.cpp b/src/CommonsJavaScript/JSCallbackManager.cpp
index 21d278a..fd541da 100644
--- a/src/CommonsJavaScript/JSCallbackManager.cpp
+++ b/src/CommonsJavaScript/JSCallbackManager.cpp
@@ -24,12 +24,13 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
-JSCallbackManagerPtr JSCallbackManager::createObject(JSContextRef context,
- JSValueRef onSuccess,
- JSValueRef onError,
- bool acceptJSNullAsOnSuccess,
- bool acceptJSNullAsOnError)
+JSCallbackManagerPtr JSCallbackManager::createObject(
+ JSContextRef context,
+ JSValueRef onSuccess,
+ JSValueRef onError,
+ bool
+ acceptJSNullAsOnSuccess,
+ bool acceptJSNullAsOnError)
{
LogDebug("entered");
JSObjectRef l_onSuccess = NULL;
@@ -38,10 +39,12 @@ JSCallbackManagerPtr JSCallbackManager::createObject(JSContextRef context,
LogDebug("onSuccessCallback ptr=" << onSuccess);
LogDebug("onErrorCallback ptr=" << onError);
if (NULL != onSuccess &&
- (!acceptJSNullAsOnSuccess || !JSValueIsNull(context, onSuccess))) {
+ (!acceptJSNullAsOnSuccess || !JSValueIsNull(context, onSuccess)))
+ {
l_onSuccess = JSValueToObject(context, onSuccess, NULL);
if (!l_onSuccess ||
- !JSObjectIsFunction(context, l_onSuccess)) {
+ !JSObjectIsFunction(context, l_onSuccess))
+ {
ThrowMsg(Commons::InvalidArgumentException,
"success callback is not a function");
}
@@ -49,10 +52,12 @@ JSCallbackManagerPtr JSCallbackManager::createObject(JSContextRef context,
LogWarning("onSuccessCallback is NULL and is not registred");
}
if (NULL != onError &&
- (!acceptJSNullAsOnError || !JSValueIsNull(context, onError))) {
+ (!acceptJSNullAsOnError || !JSValueIsNull(context, onError)))
+ {
l_onError = JSValueToObject(context, onError, NULL);
if (!l_onError ||
- !JSObjectIsFunction(context, l_onError)) {
+ !JSObjectIsFunction(context, l_onError))
+ {
ThrowMsg(Commons::InvalidArgumentException,
"error callback is not a function");
}
@@ -64,8 +69,8 @@ JSCallbackManagerPtr JSCallbackManager::createObject(JSContextRef context,
}
JSCallbackManager::JSCallbackManager(JSContextRef context,
- JSObjectRef onSuccess,
- JSObjectRef onError) :
+ JSObjectRef onSuccess,
+ JSObjectRef onError) :
m_onSuccess(NULL),
m_onError(NULL),
m_object(NULL),
@@ -190,7 +195,7 @@ void JSCallbackManager::callOnSuccess(JSValueRef obj)
}
void JSCallbackManager::callOnSuccess(JSValueRef obj[],
- int paramCount)
+ int paramCount)
{
LogDebug("entered");
if (m_onSuccess == NULL) {
@@ -222,7 +227,7 @@ void JSCallbackManager::callOnError(JSValueRef obj)
}
void JSCallbackManager::callOnError(JSValueRef obj[],
- int paramCount)
+ int paramCount)
{
LogDebug("entered");
if (m_onError == NULL) {
@@ -256,6 +261,5 @@ void JSCallbackManager::makeCallback(JSContextRef context,
return;
}
}
-
}
}
diff --git a/src/CommonsJavaScript/JSCallbackManager.h b/src/CommonsJavaScript/JSCallbackManager.h
index 9eb7ea5..457fe95 100644
--- a/src/CommonsJavaScript/JSCallbackManager.h
+++ b/src/CommonsJavaScript/JSCallbackManager.h
@@ -28,7 +28,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
class JSCallbackManager;
typedef DPL::SharedPtr JSCallbackManagerPtr;
@@ -36,37 +35,42 @@ class JSCallbackManager : public WrtDeviceApis::Commons::IEventPrivateData
{
private:
JSCallbackManager()
- {
- }
+ {}
/**
- * Used to create JSCallbackManagerPtr object by factory method createObject
+ * Used to create JSCallbackManagerPtr object by factory method
+ * createObject
*/
JSCallbackManager(JSContextRef context,
- JSObjectRef onSuccess,
- JSObjectRef onError);
+ JSObjectRef onSuccess,
+ JSObjectRef onError);
public:
- //JSCallbackManager( JSContextRef context, JSValueRef onSuccess, JSValueRef onError );
+ //JSCallbackManager( JSContextRef context, JSValueRef onSuccess, JSValueRef
+ // onError );
/**
* Create JSCallbackManagerPtr object witch checking callback parameters
- * if callbacks are NULL it was programmer intention to not use callback and no exception will be rised
+ * if callbacks are NULL it was programmer intention to not use callback and
+ * no exception will be rised
* if callbacks are some object but not a function it will rise exception
* @param[in] context - global context
* @param[in] onSuccess - success callback (may be NULL if not needed)
* @param[in] onError - error callback (may be NULL if not needed)
- * @param[in] acceptJSNullAsOnSuccess - converts JSNull on onSuccess to NULL when true
- * @param[in] acceptJSNullAsOnError - converts JSNull on onError to NULL when true
- * @throw Commons::InvalidArgumentException - if callback is not null and is not a js function
+ * @param[in] acceptJSNullAsOnSuccess - converts JSNull on onSuccess to NULL
+ * when true
+ * @param[in] acceptJSNullAsOnError - converts JSNull on onError to NULL
+ * when true
+ * @throw Commons::InvalidArgumentException - if callback is not null and is
+ * not a js function
*/
static JSCallbackManagerPtr createObject(
- JSContextRef context,
- JSValueRef onSuccess = NULL,
- JSValueRef onError = NULL,
- bool acceptJSNullAsOnSuccess = false,
- bool acceptJSNullAsOnError = false);
+ JSContextRef context,
+ JSValueRef onSuccess = NULL,
+ JSValueRef onError = NULL,
+ bool acceptJSNullAsOnSuccess = false,
+ bool acceptJSNullAsOnError = false);
virtual ~JSCallbackManager();
diff --git a/src/CommonsJavaScript/JSDOMException.cpp b/src/CommonsJavaScript/JSDOMException.cpp
index e1e476a..ffee065 100644
--- a/src/CommonsJavaScript/JSDOMException.cpp
+++ b/src/CommonsJavaScript/JSDOMException.cpp
@@ -77,14 +77,14 @@ const Error PROPERTY_ERROR[] = {
WrtDeviceApis::CommonsJavaScript::JSDOMException::SECURITY_ERR },
{ "NETWORK_ERR",
WrtDeviceApis::CommonsJavaScript::JSDOMException::NETWORK_ERR },
- { "ABORT_ERR",
+ { "ABORT_ERR",
WrtDeviceApis::CommonsJavaScript::JSDOMException::ABORT_ERR },
{ "TIMEOUT_ERR",
WrtDeviceApis::CommonsJavaScript::JSDOMException::TIMEOUT_ERR },
{ "INVALID_VALUES_ERR",
WrtDeviceApis::CommonsJavaScript::JSDOMException::INVALID_VALUES_ERR },
- { "IO_ERR",
- WrtDeviceApis::CommonsJavaScript::JSDOMException::IO_ERR },
+ { "IO_ERR",
+ WrtDeviceApis::CommonsJavaScript::JSDOMException::IO_ERR },
{ "QUOTA_EXCEEDED_ERR",
WrtDeviceApis::CommonsJavaScript::JSDOMException::QUOTA_EXCEEDED_ERR }
};
@@ -92,7 +92,6 @@ const Error PROPERTY_ERROR[] = {
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
JSClassRef JSDOMException::m_classRef = NULL;
JSClassDefinition JSDOMException::m_classInfo = {
@@ -136,8 +135,7 @@ JSClassRef JSDOMException::getClassRef()
void JSDOMException::initialize(JSContextRef /*context*/,
JSObjectRef /*object*/)
-{
-}
+{}
void JSDOMException::finalize(JSObjectRef object)
{
@@ -156,7 +154,8 @@ bool JSDOMException::hasProperty(JSContextRef /*context*/,
const size_t size = sizeof(PROPERTY_ERROR) / sizeof(PROPERTY_ERROR[0]);
for (size_t i = 0; i < size; ++i) {
if (JSStringIsEqualToUTF8CString(propertyName,
- PROPERTY_ERROR[i].name)) {
+ PROPERTY_ERROR[i].name))
+ {
return true;
}
}
@@ -180,12 +179,12 @@ JSValueRef JSDOMException::getStaticProperty(JSContextRef context,
if (JSStringIsEqualToUTF8CString(propertyName, PROPERTY_CODE)) {
return converter.toJSValueRef(privateObject->getObject()->getCode());
} else if (JSStringIsEqualToUTF8CString(propertyName,
- PROPERTY_MESSAGE)) {
+ PROPERTY_MESSAGE))
+ {
return converter.toJSValueRef(
privateObject->getObject()->getMessage());
}
- }
- catch (const Commons::ConversionException& ex) {
+ } catch (const Commons::ConversionException& ex) {
LogError("Exception: " << ex.GetMessage());
}
@@ -207,8 +206,7 @@ JSValueRef JSDOMException::getProperty(JSContextRef context,
return converter.toJSValueRef(PROPERTY_ERROR[i].value);
}
}
- }
- catch (const Commons::ConversionException& ex) {
+ } catch (const Commons::ConversionException& ex) {
LogError("Exception: " << ex.GetMessage());
}
@@ -216,9 +214,9 @@ JSValueRef JSDOMException::getProperty(JSContextRef context,
}
void JSDOMException::getPropertyNames(
- JSContextRef /*context*/,
- JSObjectRef /*object*/,
- JSPropertyNameAccumulatorRef accumulator)
+ JSContextRef /*context*/,
+ JSObjectRef /*object*/,
+ JSPropertyNameAccumulatorRef accumulator)
{
const size_t size = sizeof(PROPERTY_ERROR) / sizeof(PROPERTY_ERROR[0]);
for (size_t i = 0; i < size; ++i) {
@@ -235,7 +233,6 @@ bool JSDOMException::hasInstance(JSContextRef context,
{
return JSValueIsObjectOfClass(context, possibleInstance, getClassRef());
}
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/JSDOMException.h b/src/CommonsJavaScript/JSDOMException.h
index e7e97c5..dcea1e4 100644
--- a/src/CommonsJavaScript/JSDOMException.h
+++ b/src/CommonsJavaScript/JSDOMException.h
@@ -22,7 +22,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
class JSDOMException
{
public:
@@ -69,7 +68,7 @@ class JSDOMException
* The callback invoked when an object is first created.
*/
static void initialize(JSContextRef context,
- JSObjectRef object);
+ JSObjectRef object);
/**
* The callback invoked when an object is finalized.
@@ -80,39 +79,41 @@ class JSDOMException
* The callback invoked when getting a property's value.
*/
static bool hasProperty(JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName);
+ JSObjectRef object,
+ JSStringRef propertyName);
/**
* The callback invoked when getting a property's value.
*/
static JSValueRef getProperty(JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
/**
* The callback invoked when getting a property's value.
*/
static JSValueRef getStaticProperty(JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static void getPropertyNames(JSContextRef context,
- JSObjectRef object,
- JSPropertyNameAccumulatorRef accumulator);
+ JSObjectRef object,
+ JSPropertyNameAccumulatorRef accumulator);
/**
- * The callback invoked when an object is used as the target of an 'instanceof' expression.
+ * The callback invoked when an object is used as the target of an
+ * 'instanceof' expression.
*/
static bool hasInstance(JSContextRef context,
- JSObjectRef constructor,
- JSValueRef possibleInstance,
- JSValueRef* exception);
+ JSObjectRef constructor,
+ JSValueRef possibleInstance,
+ JSValueRef* exception);
/**
- * This structure contains properties and callbacks that define a type of object.
+ * This structure contains properties and callbacks that define a type of
+ * object.
*/
static JSClassDefinition m_classInfo;
@@ -123,7 +124,6 @@ class JSDOMException
static JSClassRef m_classRef;
};
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/JSDOMExceptionFactory.cpp b/src/CommonsJavaScript/JSDOMExceptionFactory.cpp
index 398dfa3..94c1797 100644
--- a/src/CommonsJavaScript/JSDOMExceptionFactory.cpp
+++ b/src/CommonsJavaScript/JSDOMExceptionFactory.cpp
@@ -24,7 +24,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
#define DEFINE_JS_EXCEPTION_FACTORY(Class, Code) \
JSDOMExceptionFactory JSDOMExceptionFactory::Class(Code)
@@ -69,30 +68,28 @@ DEFINE_JS_EXCEPTION_FACTORY(QuotaExceededException,
JSDOMException::QUOTA_EXCEEDED_ERR);
JSDOMExceptionFactory::JSDOMExceptionFactory(int code) : m_code(code)
-{
-}
+{}
JSValueRef JSDOMExceptionFactory::make(JSContextRef context,
- JSValueRef* exception,
- const std::string& message)
+ JSValueRef* exception,
+ const std::string& message)
{
Assert(exception && "Exception object can't be NULL.");
JSDOMException::PrivateObject::ObjectType data(new DOMExceptionData(m_code,
message));
*exception = JSUtils::makeObject(context,
- JSDOMException::getClassRef(),
- data);
+ JSDOMException::getClassRef(),
+ data);
return JSValueMakeUndefined(context);
}
JSObjectRef JSDOMExceptionFactory::make(JSContextRef context,
- const std::string& message)
+ const std::string& message)
{
JSDOMException::PrivateObject::ObjectType data(new DOMExceptionData(m_code,
message));
return JSUtils::makeObject(context,
- JSDOMException::getClassRef(), data);
+ JSDOMException::getClassRef(), data);
}
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/JSDOMExceptionFactory.h b/src/CommonsJavaScript/JSDOMExceptionFactory.h
index 84f79ba..2bf8329 100644
--- a/src/CommonsJavaScript/JSDOMExceptionFactory.h
+++ b/src/CommonsJavaScript/JSDOMExceptionFactory.h
@@ -22,7 +22,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
#define DECLARE_JS_EXCEPTION_FACTORY(Class) static JSDOMExceptionFactory Class
class JSDOMExceptionFactory : public DPL::Noncopyable
@@ -69,30 +68,31 @@ class JSDOMExceptionFactory : public DPL::Noncopyable
* JSValueRef* exception)
* {
* ...
- * return JSExceptionFactory::InvalidArgumentException.make(context, exception);
+ * return JSExceptionFactory::InvalidArgumentException.make(context,
+ * exception);
* ...
* }
* @endcode
*/
JSValueRef make(JSContextRef context,
- JSValueRef* exception,
- const std::string& message = std::string());
+ JSValueRef* exception,
+ const std::string& message = std::string());
/**
* Creates exception object.
* @param context JS context of the exception.
* @return JS exception object.
* @code
- * JSObjectRef jsError = JSExceptionFactory::InvalidArgumentException.make(context);
+ * JSObjectRef jsError =
+ * JSExceptionFactory::InvalidArgumentException.make(context);
* @endcode
*/
JSObjectRef make(JSContextRef context,
- const std::string& message = std::string());
+ const std::string& message = std::string());
private:
int m_code;
};
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/JSPendingOperation.cpp b/src/CommonsJavaScript/JSPendingOperation.cpp
index 23c841e..1891361 100644
--- a/src/CommonsJavaScript/JSPendingOperation.cpp
+++ b/src/CommonsJavaScript/JSPendingOperation.cpp
@@ -28,7 +28,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
namespace {
const char* PLUGIN_NAME = "PendingOperation";
}
diff --git a/src/CommonsJavaScript/JSPendingOperation.h b/src/CommonsJavaScript/JSPendingOperation.h
index 0f75970..1a67d89 100644
--- a/src/CommonsJavaScript/JSPendingOperation.h
+++ b/src/CommonsJavaScript/JSPendingOperation.h
@@ -32,7 +32,8 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-//typedef Commons::PrivateObjectT::Type PendingOperationPrivateObject;
+//typedef Commons::PrivateObjectT::Type
+// PendingOperationPrivateObject;
class JSPendingOperation
{
@@ -47,7 +48,7 @@ class JSPendingOperation
* The callback invoked when an object is first created.
*/
static void initialize(JSContextRef context,
- JSObjectRef object);
+ JSObjectRef object);
/**
* The callback invoked when an object is finalized.
@@ -55,7 +56,8 @@ class JSPendingOperation
static void finalize(JSObjectRef object);
/**
- * This structure contains properties and callbacks that define a type of object.
+ * This structure contains properties and callbacks that define a type of
+ * object.
*/
static JSClassDefinition m_classInfo;
@@ -70,11 +72,11 @@ class JSPendingOperation
* Cancel the pending operation, if it has yet not completed.
*/
static JSValueRef cancel(JSContextRef context,
- JSObjectRef object,
- JSObjectRef thisObject,
- size_t argumentCount,
- const JSValueRef arguments[],
- JSValueRef* exception);
+ JSObjectRef object,
+ JSObjectRef thisObject,
+ size_t argumentCount,
+ const JSValueRef arguments[],
+ JSValueRef* exception);
};
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/JSPendingOperationPrivateObject.h b/src/CommonsJavaScript/JSPendingOperationPrivateObject.h
index 745d284..3f41bf2 100644
--- a/src/CommonsJavaScript/JSPendingOperationPrivateObject.h
+++ b/src/CommonsJavaScript/JSPendingOperationPrivateObject.h
@@ -35,8 +35,8 @@ class IJSPendingOperationPrivateObject
{
public:
explicit IJSPendingOperationPrivateObject(
- const DPL::SharedPtr
- &event) :
+ const DPL::SharedPtr
+ &event) :
m_event(event)
{
assert(NULL != m_event);
@@ -49,8 +49,7 @@ class IJSPendingOperationPrivateObject
}
virtual ~IJSPendingOperationPrivateObject()
- {
- }
+ {}
protected:
DPL::SharedPtr m_event;
@@ -77,9 +76,9 @@ class IJSExtCancelPendingOperationPrivateObject :
{
public:
IJSExtCancelPendingOperationPrivateObject(
- const DPL::SharedPtr< TemplateEvent> &event,
- const DPL::SharedPtr<
- Commons::IExternEventCanceler > & cancel) :
+ const DPL::SharedPtr< TemplateEvent> &event,
+ const DPL::SharedPtr<
+ Commons::IExternEventCanceler > & cancel) :
IJSPendingOperationPrivateObject(
DPL::StaticPointerCast(event)),
m_canceler(cancel)
@@ -106,8 +105,7 @@ class IJSExtCancelPendingOperationPrivateObject :
}
virtual ~IJSExtCancelPendingOperationPrivateObject()
- {
- }
+ {}
protected:
DPL::SharedPtr< Commons::IExternEventCanceler > m_canceler;
diff --git a/src/CommonsJavaScript/JSUtils.cpp b/src/CommonsJavaScript/JSUtils.cpp
index f3248a3..f4c9c95 100644
--- a/src/CommonsJavaScript/JSUtils.cpp
+++ b/src/CommonsJavaScript/JSUtils.cpp
@@ -19,12 +19,10 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
using namespace WrtDeviceApis::Commons;
-
bool JSUtils::hasProperty(JSStaticValue* properties,
- JSStringRef name)
+ JSStringRef name)
{
JSStaticValue* property = properties;
while (property->name) {
@@ -37,9 +35,9 @@ bool JSUtils::hasProperty(JSStaticValue* properties,
}
JSValueRef JSUtils::getJSProperty(JSContextRef context,
- JSValueRef jsValue,
- const std::string &name,
- JSValueRef *exception)
+ JSValueRef jsValue,
+ const std::string &name,
+ JSValueRef *exception)
{
ScopedJSStringRef jsPropName(JSStringCreateWithUTF8CString(name.c_str()));
Converter converter(context);
@@ -52,8 +50,8 @@ JSValueRef JSUtils::getJSProperty(JSContextRef context,
}
JSValueRef JSUtils::getJSProperty(JSContextRef context,
- JSObjectRef object,
- const std::string& name)
+ JSObjectRef object,
+ const std::string& name)
{
Converter converter(context);
Try {
@@ -68,14 +66,13 @@ JSValueRef JSUtils::getJSProperty(JSContextRef context,
}
}
}
- Catch(ConversionException) {
- }
+ Catch(ConversionException) {}
return NULL;
}
JSValueRef JSUtils::getJSPropertyOrUndefined(JSContextRef context,
- JSObjectRef object,
- const std::string& name)
+ JSObjectRef object,
+ const std::string& name)
{
Converter converter(context);
Try {
@@ -84,8 +81,7 @@ JSValueRef JSUtils::getJSPropertyOrUndefined(JSContextRef context,
return JSObjectGetProperty(context, object, propName.get(), NULL);
}
}
- Catch(ConversionException) {
- }
+ Catch(ConversionException) {}
return JSValueMakeUndefined(context);
}
} // CommonsJavaScript
diff --git a/src/CommonsJavaScript/JSUtils.h b/src/CommonsJavaScript/JSUtils.h
index c55f8db..5d835a1 100644
--- a/src/CommonsJavaScript/JSUtils.h
+++ b/src/CommonsJavaScript/JSUtils.h
@@ -24,61 +24,61 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
class JSUtils
{
public:
static bool hasProperty(JSStaticValue* properties,
- JSStringRef name);
+ JSStringRef name);
/**
* Gets a property from JSObject if exists
* @return JSValueRef if property exists, NULL if not
*/
static JSValueRef getJSProperty(JSContextRef context,
- JSValueRef jsValue,
- const std::string &name,
- JSValueRef* exception = NULL);
+ JSValueRef jsValue,
+ const std::string &name,
+ JSValueRef* exception = NULL);
static JSValueRef getJSProperty(JSContextRef context,
- JSObjectRef object,
- const std::string& name);
+ JSObjectRef object,
+ const std::string& name);
static JSValueRef getJSPropertyOrUndefined(JSContextRef context,
- JSObjectRef object,
- const std::string& name);
+ JSObjectRef object,
+ const std::string& name);
template
static JSObjectRef makeObject(JSContextRef context,
- JSClassRef classRef,
- C data)
+ JSClassRef classRef,
+ C data)
{
typedef typename PrivateObjectT::Type Private;
Private* priv = new Private(context, data);
JSObjectRef object = JSObjectMake(context, classRef, priv);
if (!object) {
- ThrowMsg(Commons::NullPointerException, "Could not create JS object.");
+ ThrowMsg(Commons::NullPointerException,
+ "Could not create JS object.");
}
return object;
}
static JSObjectRef makeObject(JSContextRef context,
- JSClassRef classRef)
+ JSClassRef classRef)
{
typedef PrivateObjectT::Type Private;
Private* priv = new Private(context);
JSObjectRef object = JSObjectMake(context, classRef, priv);
if (!object) {
- ThrowMsg(Commons::NullPointerException, "Could not create JS object.");
+ ThrowMsg(Commons::NullPointerException,
+ "Could not create JS object.");
}
return object;
}
}; // JSUtils
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/PrivateObject.h b/src/CommonsJavaScript/PrivateObject.h
index d303d7a..e73a210 100644
--- a/src/CommonsJavaScript/PrivateObject.h
+++ b/src/CommonsJavaScript/PrivateObject.h
@@ -24,17 +24,15 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
template
struct NoAcquire
{
void acquire(T*)
- {
- }
+ {}
+
protected:
~NoAcquire()
- {
- }
+ {}
};
template
@@ -45,10 +43,10 @@ struct AcquireByProtect
Assert(object && "Object passed to protect can't be NULL.");
JSValueProtect(object->getContext(), object->getObject());
}
+
protected:
~AcquireByProtect()
- {
- }
+ {}
};
template
@@ -58,10 +56,10 @@ struct NoRelease
{
(void)object;
}
+
protected:
~NoRelease()
- {
- }
+ {}
};
template
@@ -71,10 +69,10 @@ struct ReleaseByDelete
{
delete object->getObject();
}
+
protected:
~ReleaseByDelete()
- {
- }
+ {}
};
template
@@ -85,10 +83,10 @@ struct ReleaseByUnprotect
Assert(object && "Object passed to unprotect can't be NULL.");
JSValueUnprotect(object->getContext(), object->getObject());
}
+
protected:
~ReleaseByUnprotect()
- {
- }
+ {}
};
template
@@ -97,8 +95,7 @@ struct NoOwnership : protected NoAcquire,
{
protected:
~NoOwnership()
- {
- }
+ {}
};
template
@@ -107,8 +104,7 @@ struct OwnershipByAcquisition : protected NoAcquire,
{
protected:
~OwnershipByAcquisition()
- {
- }
+ {}
};
template
@@ -117,8 +113,7 @@ struct OwnershipByProtection : protected AcquireByProtect,
{
protected:
~OwnershipByProtection()
- {
- }
+ {}
};
template::value(object) && "Object is NULL.");
+ Assert(!Commons::IsNull::value(
+ object) && "Object is NULL.");
acquire(this);
}
@@ -198,8 +194,7 @@ class PrivateObject : private DPL::Noncopyable
* Destroys instance of the object.
*/
virtual ~PrivateObject()
- {
- }
+ {}
/**
* Gets stored JS context.
@@ -237,7 +232,6 @@ struct PrivateObjectT
{
typedef PrivateObject Type;
};
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/ScopedJSStringRef.cpp b/src/CommonsJavaScript/ScopedJSStringRef.cpp
index a16bbcb..2f0c17f 100644
--- a/src/CommonsJavaScript/ScopedJSStringRef.cpp
+++ b/src/CommonsJavaScript/ScopedJSStringRef.cpp
@@ -17,10 +17,8 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
ScopedJSStringRef::ScopedJSStringRef(JSStringRef ref) : m_ref(ref)
-{
-}
+{}
ScopedJSStringRef::~ScopedJSStringRef()
{
diff --git a/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.cpp b/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.cpp
index fe20f9c..87111fd 100644
--- a/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.cpp
+++ b/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.cpp
@@ -17,16 +17,11 @@
#include
namespace WrtDeviceApis {
-
namespace CommonsJavaScript {
-
-
AceSecurityStatus aceCheckAccessSimple(
- WrtDeviceApis::Commons::AceFunction aceFunction)
+ WrtDeviceApis::Commons::AceFunction aceFunction)
{
- return aceCheckAccess2>(aceFunction);
+ return aceCheckAccess2 >(aceFunction);
}
-
}
-
}
diff --git a/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.h b/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.h
index ad93dd8..dcdd452 100644
--- a/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.h
+++ b/src/CommonsJavaScript/Security/SecurityFunctionDeclaration.h
@@ -26,7 +26,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
enum class AceSecurityStatus
{
AccessGranted,
@@ -39,7 +38,7 @@ class DefaultArgsVerifier
{
public:
void operator()(WrtDeviceApis::Commons::AceFunction& aceFunction,
- Args && ... args) const
+ Args && ... args) const
{
static_assert(
WrtDeviceApis::Commons::AlwaysFalse::value,
@@ -52,15 +51,14 @@ class DefaultArgsVerifier<>
{
public:
void operator()(WrtDeviceApis::Commons::AceFunction& /*aceFunction*/) const
- {
- }
+ {}
};
template
AceSecurityStatus aceCheckAccess2(
- WrtDeviceApis::Commons::AceFunction aceFunction,
- Args && ... args)
+ WrtDeviceApis::Commons::AceFunction aceFunction,
+ Args && ... args)
{
using namespace WrtDeviceApis::Commons;
@@ -68,9 +66,10 @@ AceSecurityStatus aceCheckAccess2(
argsVerify(aceFunction, args ...);
Try {
- if (!(WrtAccessSingleton::Instance().checkAccessControl(aceFunction))) {
- LogDebug("Function is not allowed to run");
- return AceSecurityStatus::AccessDenied;
+ if (!(WrtAccessSingleton::Instance().checkAccessControl(aceFunction)))
+ {
+ LogDebug("Function is not allowed to run");
+ return AceSecurityStatus::AccessDenied;
}
}
Catch(WrtDeviceApis::Commons::OutOfRangeException) {
@@ -83,12 +82,9 @@ AceSecurityStatus aceCheckAccess2(
return AceSecurityStatus::AccessGranted;
}
-
-
//The simplest version
AceSecurityStatus aceCheckAccessSimple(
- WrtDeviceApis::Commons::AceFunction aceFunction);
-
+ WrtDeviceApis::Commons::AceFunction aceFunction);
}
}
diff --git a/src/CommonsJavaScript/Security/StaticDeclaration.h b/src/CommonsJavaScript/Security/StaticDeclaration.h
index 736b14a..c089d50 100644
--- a/src/CommonsJavaScript/Security/StaticDeclaration.h
+++ b/src/CommonsJavaScript/Security/StaticDeclaration.h
@@ -29,30 +29,29 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
template
-class StaticDeclarations : public DPL::Noncopyable
+class StaticDeclarations : public DPL::Noncopyable
{
struct FunctionTriplet {
const char* name;
std::vector devCaps;
std::vector features;
};
- public:
+ public:
typedef typename std::map ParamsMap;
typedef std::map > > DeviceCapsMaps;
+ std::pair > > DeviceCapsMaps;
typedef std::map FunctionsMap;
typedef std::map
- AceFunctionsMap;
+ AceFunctionsMap;
typedef std::map > FeaturesMap;
@@ -70,7 +69,7 @@ class StaticDeclarations : public DPL::Noncopyable
* for given device capability id
* */
static WrtDeviceApis::Commons::AceDeviceCapability
- getDeviceCapabilityWithoutParams(const DeviceCapType& devCapsId)
+ getDeviceCapabilityWithoutParams(const DeviceCapType& devCapsId)
{
WrtDeviceApis::Commons::AceDeviceCapability deviceCap;
auto it = m_deviceCaps.find(devCapsId);
@@ -87,7 +86,7 @@ class StaticDeclarations : public DPL::Noncopyable
* for given device capability id
* */
static WrtDeviceApis::Commons::AceDeviceCapability
- getDeviceCapability(const DeviceCapType& devCapsId)
+ getDeviceCapability(const DeviceCapType& devCapsId)
{
auto it = m_deviceCaps.find(devCapsId);
@@ -109,11 +108,11 @@ class StaticDeclarations : public DPL::Noncopyable
}
static void addDeviceCapabilty(
- const DeviceCapType& devCapsId,
- WrtDeviceApis::Commons::AceFunction& aceFunction)
+ const DeviceCapType& devCapsId,
+ WrtDeviceApis::Commons::AceFunction& aceFunction)
{
aceFunction.deviceCapabilities.push_back(
- getDeviceCapability(devCapsId));
+ getDeviceCapability(devCapsId));
}
/**
@@ -135,16 +134,16 @@ class StaticDeclarations : public DPL::Noncopyable
const std::string& value)
{
//get name of the deviceCaps
- std::string devCapName = getDevCapNameById(devCapId) ;
+ std::string devCapName = getDevCapNameById(devCapId);
std::string paramName = getParamName(paramId);
//search throw all the device capabilities
FOREACH(devCapIt, function.deviceCapabilities) {
- if(devCapIt->devCapName == devCapName) {
+ if (devCapIt->devCapName == devCapName) {
//device capability has been found
//check params
FOREACH(devParamIt, devCapIt->devCapParams) {
- if(devParamIt->name == paramName) {
+ if (devParamIt->name == paramName) {
devParamIt->value = value;
return true;
}
@@ -160,7 +159,7 @@ class StaticDeclarations : public DPL::Noncopyable
* To set param value function you may use setParamValue Function
* */
static WrtDeviceApis::Commons::AceFunction getEmptyFunction(
- const FunctionType& functionId)
+ const FunctionType& functionId)
{
WrtDeviceApis::Commons::AceFunction function;
auto it = m_functions.find(functionId);
@@ -168,7 +167,7 @@ class StaticDeclarations : public DPL::Noncopyable
function.name = it->second.first;
return function;
- };
+ }
/**
* The most useful Function
@@ -178,7 +177,7 @@ class StaticDeclarations : public DPL::Noncopyable
* To set param value function you may use setParamValue function
* */
static WrtDeviceApis::Commons::AceFunction getSecurityFunction(
- const FunctionType& functionId)
+ const FunctionType& functionId)
{
WrtDeviceApis::Commons::AceFunction function;
auto it = m_functions.find(functionId);
@@ -186,15 +185,15 @@ class StaticDeclarations : public DPL::Noncopyable
function.name = it->second.name;
- FOREACH (featIt, it->second.features)
- function.features.push_back(std::string(*featIt));
+ FOREACH(featIt, it->second.features)
+ function.features.push_back(std::string(*featIt));
FOREACH(devCapIt, it->second.devCaps) {
function.deviceCapabilities.push_back(
- getDeviceCapability(*devCapIt));
+ getDeviceCapability(*devCapIt));
}
return function;
- };
+ }
/**
* To create static map
@@ -204,7 +203,7 @@ class StaticDeclarations : public DPL::Noncopyable
FOREACH(functionIt, m_functions)
{
m_aceFunctions[functionIt->first] =
- getSecurityFunction(functionIt->first);
+ getSecurityFunction(functionIt->first);
}
}
@@ -223,10 +222,10 @@ class StaticDeclarations : public DPL::Noncopyable
strndup(featureIt->first.c_str(), featureIt->first.size() + 1);
mapping->features[i].devCaps.devCapsCount =
- featureIt->second.size();
+ featureIt->second.size();
mapping->features[i].devCaps.deviceCaps =
- new char*[mapping->features[i].devCaps.devCapsCount];
+ new char*[mapping->features[i].devCaps.devCapsCount];
for (size_t j = 0;
j < mapping->features[i].devCaps.devCapsCount;
@@ -253,16 +252,14 @@ class StaticDeclarations : public DPL::Noncopyable
devcaps_t* ret = NULL;
- for (size_t i = 0; i < feats->featuresCount ; ++i)
- {
+ for (size_t i = 0; i < feats->featuresCount; ++i) {
Assert(feats->features &&
feats->features[i].feature_name &&
"NULL api feature in feature mapping");
std::string feat(feats->features[i].feature_name);
- if (feature == feat)
- {
+ if (feature == feat) {
ret = &(feats->features[i].devCaps);
break;
}
@@ -273,27 +270,22 @@ class StaticDeclarations : public DPL::Noncopyable
static void featuresDeinitializer(feature_mapping_t* mapping)
{
- if (mapping)
- {
- if (mapping->features)
- {
- for (size_t i = 0; i < mapping->featuresCount; ++i)
- {
+ if (mapping) {
+ if (mapping->features) {
+ for (size_t i = 0; i < mapping->featuresCount; ++i) {
free(mapping->features[i].feature_name);
devcaps_t& dc = mapping->features[i].devCaps;
- if (dc.deviceCaps)
- {
- for (size_t j = 0; j < dc.devCapsCount; ++j)
- {
+ if (dc.deviceCaps) {
+ for (size_t j = 0; j < dc.devCapsCount; ++j) {
free(dc.deviceCaps[j]);
}
- delete []dc.deviceCaps;
+ delete[] dc.deviceCaps;
}
}
- delete []mapping->features;
+ delete[] mapping->features;
}
delete mapping;
}
@@ -301,16 +293,15 @@ class StaticDeclarations : public DPL::Noncopyable
static void getMappingInterface(feature_mapping_interface_t *mapping)
{
- if (mapping)
- {
+ if (mapping) {
mapping->featGetter =
- StaticDeclarations::getFeaturesToDevCapMapping;
+ StaticDeclarations::getFeaturesToDevCapMapping;
mapping->dcGetter = StaticDeclarations::devcapsGetter;
mapping->release = StaticDeclarations::featuresDeinitializer;
}
}
-private:
+ private:
static ParamsMap m_params;
static DeviceCapsMaps m_deviceCaps;
static FunctionsMap m_functions;
@@ -318,7 +309,6 @@ private:
static FeaturesMap m_features;
};
-
}
}
diff --git a/src/CommonsJavaScript/SecurityExceptions.h b/src/CommonsJavaScript/SecurityExceptions.h
old mode 100755
new mode 100644
index 47a06b0..ffc111b
--- a/src/CommonsJavaScript/SecurityExceptions.h
+++ b/src/CommonsJavaScript/SecurityExceptions.h
@@ -22,7 +22,6 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
/**
* synchronously checks access status and throws JS Security exception if
* necessary
@@ -68,7 +67,6 @@ namespace CommonsJavaScript {
break; \
} \
} while (0)
-
}
}
#endif /*WRTDEVICEAPIS_COMMONSJAVASCRIPT_JS_SECURITYEXCEPTIONS_H_ */
diff --git a/src/CommonsJavaScript/SupportPendingOperation.h b/src/CommonsJavaScript/SupportPendingOperation.h
index 59c1987..05567e6 100644
--- a/src/CommonsJavaScript/SupportPendingOperation.h
+++ b/src/CommonsJavaScript/SupportPendingOperation.h
@@ -26,29 +26,30 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
template
class SupportPendingOperation
{
-public:
- virtual T getPendingOperation() const {
+ public:
+ virtual T getPendingOperation() const
+ {
return *m_operation;
}
- virtual void setPendingOperation(const T& operation){
+ virtual void setPendingOperation(const T& operation)
+ {
m_operation = operation;
}
- bool checkPendingOperation() const{
+ bool checkPendingOperation() const
+ {
return !m_operation.IsNull();
}
virtual ~SupportPendingOperation(){}
-protected:
+ protected:
DPL::Optional m_operation;
};
-
}
}
diff --git a/src/CommonsJavaScript/Utils.h b/src/CommonsJavaScript/Utils.h
index ae59476..d8b8f95 100644
--- a/src/CommonsJavaScript/Utils.h
+++ b/src/CommonsJavaScript/Utils.h
@@ -36,7 +36,7 @@ namespace CommonsJavaScript {
*/
template
JSObjectRef makePendingOperation(JSContextRef context,
- const DPL::SharedPtr& event)
+ const DPL::SharedPtr& event)
{
Commons::IEventControllerPtr eventController =
DPL::StaticPointerCast(event);
@@ -48,10 +48,10 @@ JSObjectRef makePendingOperation(JSContextRef context,
template
JSObjectRef makeExtCancelSupportedPendingOperation(
- JSContextRef context,
- const DPL::SharedPtr& event,
- const DPL::SharedPtr >&
- cancel)
+ JSContextRef context,
+ const DPL::SharedPtr& event,
+ const DPL::SharedPtr >&
+ cancel)
{
IJSPendingOperationPrivateObject* pendingOperation =
new IJSExtCancelPendingOperationPrivateObject(event, cancel);
diff --git a/src/CommonsJavaScript/Validator.cpp b/src/CommonsJavaScript/Validator.cpp
index 43b2c84..ef664e0 100644
--- a/src/CommonsJavaScript/Validator.cpp
+++ b/src/CommonsJavaScript/Validator.cpp
@@ -21,9 +21,8 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
Validator::Validator(JSContextRef context,
- JSValueRef* exception) :
+ JSValueRef* exception) :
m_context(context),
m_exception(exception)
{
@@ -31,15 +30,15 @@ Validator::Validator(JSContextRef context,
}
Validator::~Validator()
-{
-}
+{}
bool Validator::isDate(const JSValueRef& arg)
{
if (JSValueIsNull(m_context,
arg) ||
JSValueIsUndefined(m_context,
- arg) || !JSValueIsObject(m_context, arg)) {
+ arg) || !JSValueIsObject(m_context, arg))
+ {
return false;
}
Converter converter(m_context);
@@ -65,7 +64,7 @@ Validator::isCallback(const JSValueRef& arg)
bool
Validator::checkArrayKeys(const std::vector &allowed,
- JSValueRef argument)
+ JSValueRef argument)
{
if (argument == NULL) {
return true;
@@ -95,10 +94,12 @@ Validator::checkArrayKeys(const std::vector &allowed,
found = false;
for (std::list::const_iterator it = allowedJS.begin();
it != allowedJS.end();
- it++) {
+ it++)
+ {
if (JSStringIsEqual(*it,
JSPropertyNameArrayGetNameAtIndex(jsProps,
- i))) {
+ i)))
+ {
found = true;
break;
}
@@ -126,6 +127,5 @@ bool Validator::isNullOrUndefined(const JSValueRef& arg)
return (JSValueIsNull(m_context, arg) ||
JSValueIsUndefined(m_context, arg));
}
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/CommonsJavaScript/Validator.h b/src/CommonsJavaScript/Validator.h
index c015fba..6a89550 100644
--- a/src/CommonsJavaScript/Validator.h
+++ b/src/CommonsJavaScript/Validator.h
@@ -26,12 +26,11 @@
namespace WrtDeviceApis {
namespace CommonsJavaScript {
-
class Validator : private DPL::Noncopyable
{
public:
explicit Validator(JSContextRef context,
- JSValueRef* exception = NULL);
+ JSValueRef* exception = NULL);
virtual ~Validator();
/**
@@ -55,7 +54,7 @@ class Validator : private DPL::Noncopyable
* @return true when object's properties are subset of allowed
*/
bool checkArrayKeys(const std::vector &allowed,
- JSValueRef argument);
+ JSValueRef argument);
bool isNullOrUndefined(const JSValueRef& arg);
@@ -81,7 +80,7 @@ class ValidatorFactory : private DPL::Noncopyable
* @return Converter object.
*/
static ValidatorType getValidator(JSContextRef context,
- JSValueRef* exception = NULL)
+ JSValueRef* exception = NULL)
{
C* convert = new C(context, exception);
return ValidatorType(convert);
@@ -93,7 +92,6 @@ class ValidatorFactory : private DPL::Noncopyable
typedef ValidatorFactory BasicValidatorFactory;
typedef BasicValidatorFactory::ValidatorType BasicValidator;
-
} // CommonsJavaScript
} // WrtDeviceApis
diff --git a/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.cpp b/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.cpp
index 048c149..fe6bf89 100644
--- a/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.cpp
+++ b/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.cpp
@@ -38,24 +38,24 @@ using namespace WrtDeviceApis::SoftKeyboardChangeEvent::Api;
#define SOFTKEYBOARD_CHANGE_EVENT_PROPERTY_HEIGHT "height"
#define CATCH_EXCEPTION_CONVERSION \
- Catch(Commons::ConversionException) {\
- LogError("Error on conversion");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::ConversionException) { \
+ LogError("Error on conversion"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_NULL_PTR \
- Catch(Commons::NullPointerException) {\
- LogError("Error on pointer, null value");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::NullPointerException) { \
+ LogError("Error on pointer, null value"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_PLATFORM_ERROR \
- Catch(Commons::PlatformException){\
- LogError("PlatformException occured");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::PlatformException){ \
+ LogError("PlatformException occured"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
namespace WrtPlugins {
@@ -81,11 +81,14 @@ JSClassDefinition JSSoftKeyboardChangeEvent::m_classInfo = {
};
JSStaticValue JSSoftKeyboardChangeEvent::m_property[] = {
- { SOFTKEYBOARD_CHANGE_EVENT_PROPERTY_STATE, JSSoftKeyboardChangeEvent::getState,
+ { SOFTKEYBOARD_CHANGE_EVENT_PROPERTY_STATE,
+ JSSoftKeyboardChangeEvent::getState,
0, kJSPropertyAttributeReadOnly },
- { SOFTKEYBOARD_CHANGE_EVENT_PROPERTY_WIDTH, JSSoftKeyboardChangeEvent::getWidth,
+ { SOFTKEYBOARD_CHANGE_EVENT_PROPERTY_WIDTH,
+ JSSoftKeyboardChangeEvent::getWidth,
0, kJSPropertyAttributeReadOnly },
- { SOFTKEYBOARD_CHANGE_EVENT_PROPERTY_HEIGHT, JSSoftKeyboardChangeEvent::getHeight,
+ { SOFTKEYBOARD_CHANGE_EVENT_PROPERTY_HEIGHT,
+ JSSoftKeyboardChangeEvent::getHeight,
0, kJSPropertyAttributeReadOnly },
{ 0, 0, 0, 0 }
};
@@ -103,14 +106,17 @@ const JSClassDefinition* JSSoftKeyboardChangeEvent::getClassInfo()
return &m_classInfo;
}
-JSClassRef JSSoftKeyboardChangeEvent::m_jsClassRef = JSClassCreate(JSSoftKeyboardChangeEvent::getClassInfo());
+JSClassRef JSSoftKeyboardChangeEvent::m_jsClassRef = JSClassCreate(
+ JSSoftKeyboardChangeEvent::getClassInfo());
-void JSSoftKeyboardChangeEvent::initialize(JSContextRef context, JSObjectRef object)
+void JSSoftKeyboardChangeEvent::initialize(JSContextRef context,
+ JSObjectRef object)
{
LogDebug("entered");
JSSoftKeyboardChangeEventPrivateObject* priv =
- static_cast(JSObjectGetPrivate(object));
+ static_cast(JSObjectGetPrivate(
+ object));
Assert(priv && "Missing private object");
}
@@ -119,18 +125,18 @@ void JSSoftKeyboardChangeEvent::finalize(JSObjectRef object)
{
LogDebug("entered");
JSSoftKeyboardChangeEventPrivateObject* priv =
- static_cast(JSObjectGetPrivate(object));
+ static_cast(JSObjectGetPrivate(
+ object));
delete priv;
LogDebug("private object is realised");
-
}
JSValueRef JSSoftKeyboardChangeEvent::getState(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered!");
@@ -141,14 +147,14 @@ JSValueRef JSSoftKeyboardChangeEvent::getState(
}
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
- CATCH_EXCEPTION_PLATFORM_ERROR
+ CATCH_EXCEPTION_PLATFORM_ERROR
}
JSValueRef JSSoftKeyboardChangeEvent::getWidth(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered!");
@@ -159,14 +165,14 @@ JSValueRef JSSoftKeyboardChangeEvent::getWidth(
}
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
- CATCH_EXCEPTION_PLATFORM_ERROR
+ CATCH_EXCEPTION_PLATFORM_ERROR
}
JSValueRef JSSoftKeyboardChangeEvent::getHeight(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -177,13 +183,15 @@ JSValueRef JSSoftKeyboardChangeEvent::getHeight(
}
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
- CATCH_EXCEPTION_PLATFORM_ERROR
+ CATCH_EXCEPTION_PLATFORM_ERROR
}
-ISoftKeyboardChangeEventPtr JSSoftKeyboardChangeEvent::getPrivateObject(JSObjectRef arg)
+ISoftKeyboardChangeEventPtr JSSoftKeyboardChangeEvent::getPrivateObject(
+ JSObjectRef arg)
{
JSSoftKeyboardChangeEventPrivateObject* priv =
- static_cast(JSObjectGetPrivate(arg));
+ static_cast(JSObjectGetPrivate(
+ arg));
if (!priv) {
LogError("Private object not initialized");
@@ -197,6 +205,5 @@ ISoftKeyboardChangeEventPtr JSSoftKeyboardChangeEvent::getPrivateObject(JSObject
#undef CATCH_EXCEPTION_CONVERSION
#undef CATCH_EXCEPTION_NULL_PTR
#undef CATCH_EXCEPTION_PLATFORM_ERROR
-
}
}
diff --git a/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.h b/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.h
index f9dce7f..7471abf 100644
--- a/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.h
+++ b/src/js-overlay/JSClass/JSSoftKeyboardChangeEvent.h
@@ -30,10 +30,10 @@
namespace WrtPlugins {
namespace Tizen {
-
typedef WrtDeviceApis::CommonsJavaScript::PrivateObjectT<
- WrtDeviceApis::SoftKeyboardChangeEvent::Api::ISoftKeyboardChangeEventPtr>::Type
- JSSoftKeyboardChangeEventPrivateObject;
+ WrtDeviceApis::SoftKeyboardChangeEvent::Api::ISoftKeyboardChangeEventPtr>::
+ Type
+JSSoftKeyboardChangeEventPrivateObject;
class JSSoftKeyboardChangeEvent
{
@@ -65,7 +65,8 @@ class JSSoftKeyboardChangeEvent
static JSStaticValue m_property[];
/**
- * This structure contains properties and callbacks that define a type of object.
+ * This structure contains properties and callbacks that define a type of
+ * object.
*/
static JSClassDefinition m_classInfo;
@@ -73,25 +74,26 @@ class JSSoftKeyboardChangeEvent
// getters for properties
static JSValueRef getState(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static JSValueRef getWidth(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static JSValueRef getHeight(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
-
- static WrtDeviceApis::SoftKeyboardChangeEvent::Api::ISoftKeyboardChangeEventPtr
- getPrivateObject(JSObjectRef arg);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
+
+ static WrtDeviceApis::SoftKeyboardChangeEvent::Api::
+ ISoftKeyboardChangeEventPtr
+ getPrivateObject(JSObjectRef arg);
};
} // Tizen
} // WrtPlugins
diff --git a/src/js-overlay/JSClass/JSStorageEvent.cpp b/src/js-overlay/JSClass/JSStorageEvent.cpp
index 09c49ce..05444e5 100644
--- a/src/js-overlay/JSClass/JSStorageEvent.cpp
+++ b/src/js-overlay/JSClass/JSStorageEvent.cpp
@@ -41,31 +41,31 @@ using namespace WrtDeviceApis::StorageEvent::Api;
#define WRT_STORAGE_EVENT_PROPERTY_STORAGE_AREA "storageArea"
#define CATCH_EXCEPTION_CONVERSION \
- Catch(Commons::ConversionException) {\
- LogError("Error on conversion");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::ConversionException) { \
+ LogError("Error on conversion"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_NULL_PTR \
- Catch(Commons::NullPointerException) {\
- LogError("Error on pointer, null value");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::NullPointerException) { \
+ LogError("Error on pointer, null value"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_PLATFORM_ERROR \
- Catch(Commons::PlatformException){\
- LogError("PlatformException occured");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::PlatformException){ \
+ LogError("PlatformException occured"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_SECURITY \
- Catch(Commons::SecurityException){\
- LogError("Security exception occured");\
- return JSDOMExceptionFactory::\
- SecurityException.make(context, exception);\
+ Catch(Commons::SecurityException){ \
+ LogError("Security exception occured"); \
+ return JSDOMExceptionFactory:: \
+ SecurityException.make(context, exception); \
}
namespace WrtPlugins {
@@ -117,7 +117,8 @@ const JSClassDefinition* JSStorageEvent::getClassInfo()
return &m_classInfo;
}
-JSClassRef JSStorageEvent::m_jsClassRef = JSClassCreate(JSStorageEvent::getClassInfo());
+JSClassRef JSStorageEvent::m_jsClassRef = JSClassCreate(
+ JSStorageEvent::getClassInfo());
void JSStorageEvent::initialize(JSContextRef context,
JSObjectRef object)
@@ -138,14 +139,13 @@ void JSStorageEvent::finalize(JSObjectRef object)
delete priv;
LogDebug("private object is realised");
-
}
JSValueRef JSStorageEvent::getKey(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -154,19 +154,18 @@ JSValueRef JSStorageEvent::getKey(
Converter converter(context);
return converter.toJSValueRef(getPrivateObject(object)->getKey());
-
}
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
CATCH_EXCEPTION_PLATFORM_ERROR
- CATCH_EXCEPTION_SECURITY
+ CATCH_EXCEPTION_SECURITY
}
JSValueRef JSStorageEvent::getOldValue(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -176,24 +175,23 @@ JSValueRef JSStorageEvent::getOldValue(
DPL::OptionalString oldValue = getPrivateObject(object)->getOldValue();
- if(!oldValue) {
+ if (!oldValue) {
return JSValueMakeNull(context);
} else {
return converter.toJSValueRef(DPL::ToUTF8String(*oldValue));
}
-
}
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
CATCH_EXCEPTION_PLATFORM_ERROR
- CATCH_EXCEPTION_SECURITY
+ CATCH_EXCEPTION_SECURITY
}
JSValueRef JSStorageEvent::getNewValue(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -203,24 +201,23 @@ JSValueRef JSStorageEvent::getNewValue(
DPL::OptionalString newValue = getPrivateObject(object)->getNewValue();
- if(!newValue) {
+ if (!newValue) {
return JSValueMakeNull(context);
} else {
return converter.toJSValueRef(DPL::ToUTF8String(*newValue));
}
-
}
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
CATCH_EXCEPTION_PLATFORM_ERROR
- CATCH_EXCEPTION_SECURITY
+ CATCH_EXCEPTION_SECURITY
}
JSValueRef JSStorageEvent::getUrl(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -229,17 +226,16 @@ JSValueRef JSStorageEvent::getUrl(
Converter converter(context);
return converter.toJSValueRef(getPrivateObject(object)->getUrl());
-
}
CATCH_EXCEPTION_CONVERSION
- CATCH_EXCEPTION_NULL_PTR
+ CATCH_EXCEPTION_NULL_PTR
}
JSValueRef JSStorageEvent::getStorageArea(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -251,7 +247,7 @@ JSValueRef JSStorageEvent::getStorageArea(
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
CATCH_EXCEPTION_PLATFORM_ERROR
- CATCH_EXCEPTION_SECURITY
+ CATCH_EXCEPTION_SECURITY
}
IStorageEventPtr JSStorageEvent::getPrivateObject(JSObjectRef arg)
@@ -272,6 +268,5 @@ IStorageEventPtr JSStorageEvent::getPrivateObject(JSObjectRef arg)
#undef CATCH_EXCEPTION_NULL_PTR
#undef CATCH_EXCEPTION_PLATFORM_ERROR
#undef CATCH_EXCEPTION_SECURITY
-
}
}
diff --git a/src/js-overlay/JSClass/JSStorageEvent.h b/src/js-overlay/JSClass/JSStorageEvent.h
index 67bde4d..e1bb899 100644
--- a/src/js-overlay/JSClass/JSStorageEvent.h
+++ b/src/js-overlay/JSClass/JSStorageEvent.h
@@ -30,10 +30,9 @@
namespace WrtPlugins {
namespace W3C {
-
typedef WrtDeviceApis::CommonsJavaScript::PrivateObjectT<
WrtDeviceApis::StorageEvent::Api::IStorageEventPtr>::Type
- JSStorageEventPrivateObject;
+JSStorageEventPrivateObject;
class JSStorageEvent
{
@@ -53,7 +52,7 @@ class JSStorageEvent
* The callback invoked when an object is first created.
*/
static void initialize(JSContextRef context,
- JSObjectRef object);
+ JSObjectRef object);
/**
* The callback invoked when an object is finalized.
@@ -66,7 +65,8 @@ class JSStorageEvent
static JSStaticValue m_property[];
/**
- * This structure contains properties and callbacks that define a type of object.
+ * This structure contains properties and callbacks that define a type of
+ * object.
*/
static JSClassDefinition m_classInfo;
@@ -74,33 +74,33 @@ class JSStorageEvent
// getters for properties
static JSValueRef getKey(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static JSValueRef getOldValue(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static JSValueRef getNewValue(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static JSValueRef getUrl(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static JSValueRef getStorageArea(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static WrtDeviceApis::StorageEvent::Api::IStorageEventPtr
- getPrivateObject(JSObjectRef arg);
+ getPrivateObject(JSObjectRef arg);
};
} // W3C
} // WrtPlugins
diff --git a/src/js-overlay/JSClass/JSTizenServiceEvent.cpp b/src/js-overlay/JSClass/JSTizenServiceEvent.cpp
index ac4c5ad..77be7eb 100644
--- a/src/js-overlay/JSClass/JSTizenServiceEvent.cpp
+++ b/src/js-overlay/JSClass/JSTizenServiceEvent.cpp
@@ -38,31 +38,31 @@ using namespace WrtDeviceApis::TizenServiceEvent::Api;
#define TIZEN_SERVICE_EVENT_PROPERTY_BUNDLE "__bundle"
#define CATCH_EXCEPTION_CONVERSION \
- Catch(Commons::ConversionException) {\
- LogError("Error on conversion");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::ConversionException) { \
+ LogError("Error on conversion"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_NULL_PTR \
- Catch(Commons::NullPointerException) {\
- LogError("Error on pointer, null value");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::NullPointerException) { \
+ LogError("Error on pointer, null value"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_PLATFORM_ERROR \
- Catch(Commons::PlatformException){\
- LogError("PlatformException occured");\
- return JSDOMExceptionFactory::\
- UnknownException.make(context, exception);\
+ Catch(Commons::PlatformException){ \
+ LogError("PlatformException occured"); \
+ return JSDOMExceptionFactory:: \
+ UnknownException.make(context, exception); \
}
#define CATCH_EXCEPTION_SECURITY \
- Catch(Commons::SecurityException){\
- LogError("Security exception occured");\
- return JSDOMExceptionFactory::\
- SecurityException.make(context, exception);\
+ Catch(Commons::SecurityException){ \
+ LogError("Security exception occured"); \
+ return JSDOMExceptionFactory:: \
+ SecurityException.make(context, exception); \
}
namespace WrtPlugins {
@@ -108,7 +108,8 @@ const JSClassDefinition* JSTizenServiceEvent::getClassInfo()
return &m_classInfo;
}
-JSClassRef JSTizenServiceEvent::m_jsClassRef = JSClassCreate(JSTizenServiceEvent::getClassInfo());
+JSClassRef JSTizenServiceEvent::m_jsClassRef = JSClassCreate(
+ JSTizenServiceEvent::getClassInfo());
void JSTizenServiceEvent::initialize(JSContextRef context,
JSObjectRef object)
@@ -116,7 +117,8 @@ void JSTizenServiceEvent::initialize(JSContextRef context,
LogDebug("entered");
JSTizenServiceEventPrivateObject* priv =
- static_cast(JSObjectGetPrivate(object));
+ static_cast(JSObjectGetPrivate(
+ object));
Assert(priv && "Missing private object");
}
@@ -125,18 +127,18 @@ void JSTizenServiceEvent::finalize(JSObjectRef object)
{
LogDebug("entered");
JSTizenServiceEventPrivateObject* priv =
- static_cast(JSObjectGetPrivate(object));
+ static_cast(JSObjectGetPrivate(
+ object));
delete priv;
LogDebug("private object is realised");
-
}
JSValueRef JSTizenServiceEvent::getScale(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -148,14 +150,14 @@ JSValueRef JSTizenServiceEvent::getScale(
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
CATCH_EXCEPTION_PLATFORM_ERROR
- CATCH_EXCEPTION_SECURITY
+ CATCH_EXCEPTION_SECURITY
}
JSValueRef JSTizenServiceEvent::getBundle(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception)
{
LogDebug("entered");
@@ -167,7 +169,7 @@ JSValueRef JSTizenServiceEvent::getBundle(
CATCH_EXCEPTION_CONVERSION
CATCH_EXCEPTION_NULL_PTR
CATCH_EXCEPTION_PLATFORM_ERROR
- CATCH_EXCEPTION_SECURITY
+ CATCH_EXCEPTION_SECURITY
}
ITizenServiceEventPtr JSTizenServiceEvent::getPrivateObject(JSObjectRef arg)
@@ -188,6 +190,5 @@ ITizenServiceEventPtr JSTizenServiceEvent::getPrivateObject(JSObjectRef arg)
#undef CATCH_EXCEPTION_NULL_PTR
#undef CATCH_EXCEPTION_PLATFORM_ERROR
#undef CATCH_EXCEPTION_SECURITY
-
}
}
diff --git a/src/js-overlay/JSClass/JSTizenServiceEvent.h b/src/js-overlay/JSClass/JSTizenServiceEvent.h
index cb7fbb3..1c34075 100644
--- a/src/js-overlay/JSClass/JSTizenServiceEvent.h
+++ b/src/js-overlay/JSClass/JSTizenServiceEvent.h
@@ -30,10 +30,9 @@
namespace WrtPlugins {
namespace Tizen {
-
typedef WrtDeviceApis::CommonsJavaScript::PrivateObjectT<
WrtDeviceApis::TizenServiceEvent::Api::ITizenServiceEventPtr>::Type
- JSTizenServiceEventPrivateObject;
+JSTizenServiceEventPrivateObject;
class JSTizenServiceEvent
{
@@ -53,7 +52,7 @@ class JSTizenServiceEvent
* The callback invoked when an object is first created.
*/
static void initialize(JSContextRef context,
- JSObjectRef object);
+ JSObjectRef object);
/**
* The callback invoked when an object is finalized.
@@ -66,7 +65,8 @@ class JSTizenServiceEvent
static JSStaticValue m_property[];
/**
- * This structure contains properties and callbacks that define a type of object.
+ * This structure contains properties and callbacks that define a type of
+ * object.
*/
static JSClassDefinition m_classInfo;
@@ -74,19 +74,19 @@ class JSTizenServiceEvent
// getters for properties
static JSValueRef getScale(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static JSValueRef getBundle(
- JSContextRef context,
- JSObjectRef object,
- JSStringRef propertyName,
- JSValueRef* exception);
+ JSContextRef context,
+ JSObjectRef object,
+ JSStringRef propertyName,
+ JSValueRef* exception);
static WrtDeviceApis::TizenServiceEvent::Api::ITizenServiceEventPtr
- getPrivateObject(JSObjectRef arg);
+ getPrivateObject(JSObjectRef arg);
};
} // Tizen
} // WrtPlugins
diff --git a/src/js-overlay/js_function_manager.cpp b/src/js-overlay/js_function_manager.cpp
index d1be598..dfa55b2 100644
--- a/src/js-overlay/js_function_manager.cpp
+++ b/src/js-overlay/js_function_manager.cpp
@@ -39,77 +39,70 @@ const char* JSHOOK_NAME = "jsHook";
const char* ADD_EVENT_LISTENER_NAME = "addEventListener";
}
-namespace JavaScriptFunctions
-{
+namespace JavaScriptFunctions {
//options
- class_definition_options_t jsHookfunctionsOptions =
- {
- JS_FUNCTION,
- CREATE_INSTANCE,
- NONE_NOTICE,
- USE_OVERLAYED, //ignored
- NULL,
- NULL,
- reinterpret_cast(JSCFunctions::JavaScriptHookProc)
- };
-
- class_definition_options_t jsPrintfunctionsOptions =
- {
- JS_FUNCTION,
- CREATE_INSTANCE,
- NONE_NOTICE,
- USE_OVERLAYED, //ignored
- NULL,
- NULL,
- reinterpret_cast(JSCFunctions::JavaScriptPrintProc)
- };
-
- class_definition_options_t addEventListenerOptions =
- {
- JS_FUNCTION,
- CREATE_INSTANCE,
- ALWAYS_NOTICE,
- OVERLAYED_BEFORE_ORIGINAL,
- IFrameSupport::RegisterAddEventListener,
- NULL,
- reinterpret_cast(AddEventListenerSupport::AddEventListener)
- };
-
- js_entity_definition_t jsPrint =
- {
- JSGLOBAL_OBJECT,
- JSPRINT_NAME,
- "",
- NULL,
- NULL,
- &jsPrintfunctionsOptions
- };
-
- js_entity_definition_t jsHook =
- {
- JSGLOBAL_OBJECT,
- JSHOOK_NAME,
- "",
- NULL,
- NULL,
- &jsHookfunctionsOptions
- };
-
- js_entity_definition_t addEventListener =
- {
- JSGLOBAL_OBJECT,
- ADD_EVENT_LISTENER_NAME,
- "",
- NULL,
- NULL,
- &addEventListenerOptions
- };
- const js_entity_definition_ptr_t jsPrintPtr = &jsPrint;
- const js_entity_definition_ptr_t jsHookPtr = &jsHook;
- const js_entity_definition_ptr_t addEventListenerPtr = &addEventListener;
+class_definition_options_t jsHookfunctionsOptions = {
+ JS_FUNCTION,
+ CREATE_INSTANCE,
+ NONE_NOTICE,
+ USE_OVERLAYED, //ignored
+ NULL,
+ NULL,
+ reinterpret_cast(JSCFunctions::JavaScriptHookProc)
+};
+
+class_definition_options_t jsPrintfunctionsOptions = {
+ JS_FUNCTION,
+ CREATE_INSTANCE,
+ NONE_NOTICE,
+ USE_OVERLAYED, //ignored
+ NULL,
+ NULL,
+ reinterpret_cast(JSCFunctions::JavaScriptPrintProc)
+};
+
+class_definition_options_t addEventListenerOptions = {
+ JS_FUNCTION,
+ CREATE_INSTANCE,
+ ALWAYS_NOTICE,
+ OVERLAYED_BEFORE_ORIGINAL,
+ IFrameSupport::RegisterAddEventListener,
+ NULL,
+ reinterpret_cast(AddEventListenerSupport::
+ AddEventListener)
+};
+
+js_entity_definition_t jsPrint = {
+ JSGLOBAL_OBJECT,
+ JSPRINT_NAME,
+ "",
+ NULL,
+ NULL,
+ &jsPrintfunctionsOptions
+};
+
+js_entity_definition_t jsHook = {
+ JSGLOBAL_OBJECT,
+ JSHOOK_NAME,
+ "",
+ NULL,
+ NULL,
+ &jsHookfunctionsOptions
+};
+
+js_entity_definition_t addEventListener = {
+ JSGLOBAL_OBJECT,
+ ADD_EVENT_LISTENER_NAME,
+ "",
+ NULL,
+ NULL,
+ &addEventListenerOptions
+};
+const js_entity_definition_ptr_t jsPrintPtr = &jsPrint;
+const js_entity_definition_ptr_t jsHookPtr = &jsHook;
+const js_entity_definition_ptr_t addEventListenerPtr = &addEventListener;
}
-
bool JsFunctionManager::initialize()
{
LogInfo("JSObjectDeclaration for js functions are intialized");
diff --git a/src/js-overlay/js_iframe_support.cpp b/src/js-overlay/js_iframe_support.cpp
index 782fc0e..e8ae4b1 100644
--- a/src/js-overlay/js_iframe_support.cpp
+++ b/src/js-overlay/js_iframe_support.cpp
@@ -28,29 +28,28 @@
namespace WrtPlugins {
namespace W3C {
-
IFrameSupport::IFramesContainer IFrameSupport::m_iframesObject =
IFrameSupport::IFramesContainer();
-
void IFrameSupport::RegisterWidget(java_script_context_t global_context,
js_object_instance_t iframe,
js_object_instance_t object)
{
LogDebug("New widget instance registered");
- LogDebug("iframe: " << iframe );
- LogDebug("object: " << object );
+ LogDebug("iframe: " << iframe);
+ LogDebug("object: " << object);
getIFrameData(static_cast(iframe))->widget =
static_cast(object);
}
-void IFrameSupport::RegisterAddEventListener(java_script_context_t global_context,
- js_object_instance_t iframe,
- js_object_instance_t object)
+void IFrameSupport::RegisterAddEventListener(
+ java_script_context_t global_context,
+ js_object_instance_t iframe,
+ js_object_instance_t object)
{
LogDebug("New addEventListener instance registered");
- LogDebug("iframe: " << iframe );
- LogDebug("object: " << object );
+ LogDebug("iframe: " << iframe);
+ LogDebug("object: " << object);
getIFrameData(static_cast(iframe))->addEventListener
= static_cast(object);
}
@@ -59,8 +58,7 @@ JSObjectRef IFrameSupport::getIFrameObjectForWidget(JSObjectRef widgetObject)
{
FOREACH(it, m_iframesObject)
{
- if(it->second->widget == widgetObject)
- {
+ if (it->second->widget == widgetObject) {
LogDebug("iframe found");
return it->first;
}
@@ -72,12 +70,11 @@ JSObjectRef IFrameSupport::getIFrameObjectForWidget(JSObjectRef widgetObject)
IFrameDataPtr IFrameSupport::getIFrameData(JSObjectRef iframe)
{
auto it = m_iframesObject.find(iframe);
- if(it != m_iframesObject.end()){
+ if (it != m_iframesObject.end()) {
return it->second;
}
return m_iframesObject[iframe] = IFrameDataPtr(new IFrameData());
}
-
}
}
diff --git a/src/js-overlay/js_iframe_support.h b/src/js-overlay/js_iframe_support.h
index 92f58f8..de07932 100644
--- a/src/js-overlay/js_iframe_support.h
+++ b/src/js-overlay/js_iframe_support.h
@@ -31,7 +31,6 @@
namespace WrtPlugins {
namespace W3C {
-
struct IFrameData
{
IFrameData() : widget(0), addEventListener(0){}
@@ -41,7 +40,6 @@ struct IFrameData
};
typedef std::shared_ptr IFrameDataPtr;
-
class IFrameSupport
{
public:
@@ -64,7 +62,6 @@ class IFrameSupport
private:
static IFrameDataPtr getIFrameData(JSObjectRef iframe);
};
-
}
}
diff --git a/src/js-overlay/js_overlay_addEventListener.cpp b/src/js-overlay/js_overlay_addEventListener.cpp
index c14fe5f..a97d60d 100644
--- a/src/js-overlay/js_overlay_addEventListener.cpp
+++ b/src/js-overlay/js_overlay_addEventListener.cpp
@@ -22,7 +22,6 @@
* @brief
*/
-
#include
#include
#include
@@ -33,25 +32,26 @@
namespace WrtPlugins {
namespace W3C {
-
const std::string storageEventName = "storage";
const std::string appServiceEventName = "appservice";
const std::string softKeyboardChangeEventName = "softkeyboardchange";
AddEventListenerSupport::IFramesListeners
- AddEventListenerSupport::m_listeners =
- AddEventListenerSupport::IFramesListeners();
+AddEventListenerSupport::m_listeners =
+ AddEventListenerSupport::IFramesListeners();
JSContextRef AddEventListenerSupport::m_context = NULL;
void AddEventListenerSupport::initialize(JSContextRef context)
{
- if(!m_context) m_context = context;
+ if (!m_context) {
+ m_context = context;
+ }
}
void AddEventListenerSupport::deinitialize()
{
- if(!m_context) {
+ if (!m_context) {
LogDebug("Not yet initialized");
}
@@ -59,18 +59,18 @@ void AddEventListenerSupport::deinitialize()
m_context = NULL;
}
-bool AddEventListenerSupport::isInitialized()
+bool AddEventListenerSupport::isInitialized()
{
- return m_context!=NULL;
+ return m_context != NULL;
}
JSValueRef AddEventListenerSupport::
-AddEventListener(JSContextRef context,
- JSObjectRef object,
- JSObjectRef thisObject,
- size_t argumentCount,
- const JSValueRef arguments[],
- JSValueRef* exception)
+ AddEventListener(JSContextRef context,
+ JSObjectRef object,
+ JSObjectRef thisObject,
+ size_t argumentCount,
+ const JSValueRef arguments[],
+ JSValueRef* exception)
{
LogDebug("Add event listener invoked");
LogDebug("This(iframe?):" << thisObject);
@@ -82,12 +82,13 @@ AddEventListener(JSContextRef context,
}
std::string eventName = WrtDeviceApis::CommonsJavaScript::
- Converter(context).toString(arguments[0]);
+ Converter(context).toString(arguments[0]);
LogDebug("Event name: " << eventName);
- if(eventName != storageEventName &&
- eventName != appServiceEventName &&
- eventName != softKeyboardChangeEventName) {
+ if (eventName != storageEventName &&
+ eventName != appServiceEventName &&
+ eventName != softKeyboardChangeEventName)
+ {
LogDebug("Event type not supported");
return JSValueMakeUndefined(context);
}
@@ -97,8 +98,7 @@ AddEventListener(JSContextRef context,
JSValueToObject(m_context,
arguments[1],
NULL);
- if(!JSObjectIsFunction(m_context, objectCb))
- {
+ if (!JSObjectIsFunction(m_context, objectCb)) {
LogError("JS object is not a function");
return JSValueMakeUndefined(context);
}
@@ -108,7 +108,7 @@ AddEventListener(JSContextRef context,
data.object = objectCb;
data.thisObject = thisObject;
- if(eventName == storageEventName) {
+ if (eventName == storageEventName) {
data.eventType = StorageCustomEvent;
} else if (eventName == appServiceEventName) {
data.eventType = ServiceCustomEvent;
@@ -122,7 +122,7 @@ AddEventListener(JSContextRef context,
}
void AddEventListenerSupport::
-CallStorageListenersFromDifferentIFrames(
+ CallStorageListenersFromDifferentIFrames(
JSObjectRef iframe,
const WrtDeviceApis::StorageEvent::Api::IStorageEventPtr& event)
{
@@ -131,7 +131,7 @@ CallStorageListenersFromDifferentIFrames(
FOREACH(it, m_listeners)
{
- if(it->first == iframe){
+ if (it->first == iframe) {
continue;
}
@@ -141,7 +141,7 @@ CallStorageListenersFromDifferentIFrames(
JSObjectRef eventObject =
JSObjectMake(m_context, JSStorageEvent::getClassRef(), eventPriv);
const size_t argc = 1;
- JSValueRef argv[argc] = {eventObject};
+ JSValueRef argv[argc] = { eventObject };
JSValueProtect(m_context, eventObject);
@@ -150,7 +150,7 @@ CallStorageListenersFromDifferentIFrames(
LogDebug("Call");
if (listener->eventType ==
- StorageCustomEvent)
+ StorageCustomEvent)
{
JSObjectCallAsFunction(
m_context,
@@ -166,13 +166,13 @@ CallStorageListenersFromDifferentIFrames(
}
LogDebug("Done");
-};
+}
void AddEventListenerSupport::
-CallCustomEventListenersFromIFrame(
- JSObjectRef iframe,
- CustomEventType eventType,
- JSObjectRef eventObject)
+ CallCustomEventListenersFromIFrame(
+ JSObjectRef iframe,
+ CustomEventType eventType,
+ JSObjectRef eventObject)
{
LogDebug("Invoked callbacks");
@@ -183,7 +183,7 @@ CallCustomEventListenersFromIFrame(
}
const size_t argc = 1;
- JSValueRef argv[argc] = {eventObject};
+ JSValueRef argv[argc] = { eventObject };
JSValueProtect(m_context, eventObject);
FOREACH(listener, *it->second)
@@ -201,17 +201,17 @@ CallCustomEventListenersFromIFrame(
}
JSValueUnprotect(m_context, eventObject);
LogDebug("Done");
-};
+}
AddEventListenerSupport::ListenersPtr
-AddEventListenerSupport::getIFrameListeners(JSObjectRef iframe){
+AddEventListenerSupport::getIFrameListeners(JSObjectRef iframe)
+{
auto it = m_listeners.find(iframe);
- if(it != m_listeners.end()){
+ if (it != m_listeners.end()) {
return it->second;
}
return m_listeners[iframe] = ListenersPtr(new Listeners());
}
-
}
}
diff --git a/src/js-overlay/js_overlay_addEventListener.h b/src/js-overlay/js_overlay_addEventListener.h
index d8ea74a..bfbd0b0 100644
--- a/src/js-overlay/js_overlay_addEventListener.h
+++ b/src/js-overlay/js_overlay_addEventListener.h
@@ -35,7 +35,6 @@
namespace WrtPlugins {
namespace W3C {
-
class AddEventListenerSupport
{
public:
@@ -62,8 +61,8 @@ class AddEventListenerSupport
private:
- struct CallbackData{
- CustomEventType eventType;
+ struct CallbackData {
+ CustomEventType eventType;
JSObjectRef object;
JSObjectRef thisObject;
};
@@ -80,7 +79,6 @@ class AddEventListenerSupport
private:
static ListenersPtr getIFrameListeners(JSObjectRef iframe);
};
-
}
}
diff --git a/src/js-overlay/js_overlay_functions.cpp b/src/js-overlay/js_overlay_functions.cpp
index 69b1263..8097d20 100644
--- a/src/js-overlay/js_overlay_functions.cpp
+++ b/src/js-overlay/js_overlay_functions.cpp
@@ -25,7 +25,6 @@
#include
namespace JSCFunctions {
-
std::string ConvertJSStringToStdString(JSStringRef value)
{
int nSize = JSStringGetLength(value) + 1;
@@ -60,19 +59,19 @@ JSValueRef JavaScriptPrintProc(JSContextRef context,
}
JSValueRef JavaScriptHookProc(
- JSContextRef context,
- JSObjectRef /*object*/,
- JSObjectRef /*thisObject*/,
- size_t argumentCount,
- const JSValueRef arguments[],
- JSValueRef* exception)
+ JSContextRef context,
+ JSObjectRef /*object*/,
+ JSObjectRef /*thisObject*/,
+ size_t argumentCount,
+ const JSValueRef arguments[],
+ JSValueRef* exception)
{
bool inError = false;
if (argumentCount < 2 ||
argumentCount > 3 ||
!JSValueIsString(context, arguments[0]) ||
- !JSValueIsString(context, arguments[1])) {
-
+ !JSValueIsString(context, arguments[1]))
+ {
inError = true;
}
diff --git a/src/js-overlay/js_overlay_functions.h b/src/js-overlay/js_overlay_functions.h
index 7dbad59..3c7f86a 100644
--- a/src/js-overlay/js_overlay_functions.h
+++ b/src/js-overlay/js_overlay_functions.h
@@ -39,7 +39,7 @@ JSValueRef JavaScriptHookProc(
JSObjectRef /*thisObject*/,
size_t argumentCount,
const JSValueRef arguments[],
- JSValueRef* exception);
+ JSValueRef * exception);
}
#endif
diff --git a/src/js-overlay/js_overlay_support.cpp b/src/js-overlay/js_overlay_support.cpp
index 7e2ca84..9bd809e 100644
--- a/src/js-overlay/js_overlay_support.cpp
+++ b/src/js-overlay/js_overlay_support.cpp
@@ -26,9 +26,7 @@
#include
-namespace JSOverlaySupport
-{
-
+namespace JSOverlaySupport {
class JSFunctionDispatcher
{
public:
@@ -58,8 +56,6 @@ class JSFunctionDispatcher
JSValueRef* exception);
};
-
-
JSObjectPtr createWrappedFunction(
JSGlobalContextRef ctx,
const JSObjectPtr& originalFunction,
@@ -92,8 +88,6 @@ JSObjectPtr createWrappedFunction(
return JSObjectPtr(new JSObject(fun));
}
-
-
JSClassDefinition JSFunctionDispatcher::m_classInfo = {
0,
kJSClassAttributeNone,
@@ -120,7 +114,6 @@ JSClassRef JSFunctionDispatcher::getClassRef()
return classRef;
}
-
void JSFunctionDispatcher::initialize(JSContextRef /*context*/,
JSObjectRef /*object*/)
{
@@ -131,9 +124,8 @@ void JSFunctionDispatcher::finalize(JSObjectRef object)
{
LogDebug("finalize");
- PrivateData* priv = static_cast (JSObjectGetPrivate(object));
- if(priv)
- {
+ PrivateData* priv = static_cast(JSObjectGetPrivate(object));
+ if (priv) {
JSValueUnprotect(priv->context,
static_cast(
priv->overlayFunction->getObject()));
@@ -141,8 +133,6 @@ void JSFunctionDispatcher::finalize(JSObjectRef object)
}
}
-
-
JSValueRef JSFunctionDispatcher::callAsFunction(
JSContextRef context,
JSObjectRef object,
@@ -157,47 +147,40 @@ JSValueRef JSFunctionDispatcher::callAsFunction(
JSFunctionDispatcher::PrivateData* priv =
static_cast
- (JSObjectGetPrivate(object));
+ (JSObjectGetPrivate(object));
- if(!priv)
- {
+ if (!priv) {
LogError("Private object is NULL");
return result;
}
//call overlayed function
- if (priv->overlayFunction->getObject())
- {
+ if (priv->overlayFunction->getObject()) {
LogDebug("Overlayed function will be invoked...");
result = JSObjectCallAsFunction(
- context,
- static_cast(
- priv->overlayFunction->getObject()),
- thisObject,
- argumentCount,
- arguments,
- exception);
+ context,
+ static_cast(
+ priv->overlayFunction->getObject()),
+ thisObject,
+ argumentCount,
+ arguments,
+ exception);
}
//call original function
- if (priv->originalFunction->getObject())
- {
+ if (priv->originalFunction->getObject()) {
LogDebug("Original function will be invoked..");
result = JSObjectCallAsFunction(
- context,
- static_cast(
- priv->originalFunction->getObject()),
- thisObject,
- argumentCount,
- arguments,
- exception);
+ context,
+ static_cast(
+ priv->originalFunction->getObject()),
+ thisObject,
+ argumentCount,
+ arguments,
+ exception);
}
LogDebug("Done");
return result;
}
-
-
-
-
}
diff --git a/src/js-overlay/js_overlay_support.h b/src/js-overlay/js_overlay_support.h
index 3d7cd04..0cfb19b 100644
--- a/src/js-overlay/js_overlay_support.h
+++ b/src/js-overlay/js_overlay_support.h
@@ -29,8 +29,7 @@
#include
#include
-namespace JSOverlaySupport
-{
+namespace JSOverlaySupport {
JSObjectPtr createWrappedFunction(
JSGlobalContextRef ctx,
const JSObjectPtr& originalFunction,
diff --git a/src/js-overlay/js_overlay_types.h b/src/js-overlay/js_overlay_types.h
index c913f62..e47634f 100644
--- a/src/js-overlay/js_overlay_types.h
+++ b/src/js-overlay/js_overlay_types.h
@@ -28,7 +28,6 @@
namespace WrtPlugins {
namespace W3C {
-
// If needed, enum for new custom event should be defined here
enum CustomEventType {
StorageCustomEvent,
@@ -41,15 +40,13 @@ typedef struct SoftKeyboardChangeArgs {
std::string state; // value is 'on' or 'off'
int width;
int height;
- SoftKeyboardChangeArgs():
+ SoftKeyboardChangeArgs() :
width(0),
height(0)
- {
- }
+ {}
} SoftKeyboardChangeArgs;
// If needed, argument structure of other custom events should be defined here
-
} // W3C
} // WrtPlugins
#endif // _WRT_PLUGINS_JS_OVERLAY_TYPES_H_
diff --git a/src/modules/API/DEPRACATED/AppLauncher/AppLauncherFactory.h b/src/modules/API/DEPRACATED/AppLauncher/AppLauncherFactory.h
index 79db286..40874d3 100644
--- a/src/modules/API/DEPRACATED/AppLauncher/AppLauncherFactory.h
+++ b/src/modules/API/DEPRACATED/AppLauncher/AppLauncherFactory.h
@@ -32,8 +32,8 @@ class AppLauncherFactory : private DPL::Noncopyable
{
private:
AppLauncherFactory()
- {
- }
+ {}
+
public:
static AppLauncherFactory& getInstance();
IAppLauncherManagerPtr createAppLauncherManagerObject();
diff --git a/src/modules/API/DEPRACATED/AppLauncher/EventGetDefaultApplication.h b/src/modules/API/DEPRACATED/AppLauncher/EventGetDefaultApplication.h
index dbd4ef7..e55f865 100644
--- a/src/modules/API/DEPRACATED/AppLauncher/EventGetDefaultApplication.h
+++ b/src/modules/API/DEPRACATED/AppLauncher/EventGetDefaultApplication.h
@@ -38,6 +38,7 @@ class EventGetDefaultApplication : public WrtPlugins::Platform::IEvent<
std::string m_applicationFullPath;
std::string m_applicationName;
std::string m_mime;
+
public:
void setMime(const std::string &value)
{
@@ -64,11 +65,9 @@ class EventGetDefaultApplication : public WrtPlugins::Platform::IEvent<
return m_applicationName;
}
virtual void clearOnCancel()
- {
- }
+ {}
EventGetDefaultApplication()
- {
- }
+ {}
};
typedef DPL::SharedPtr
diff --git a/src/modules/API/DEPRACATED/AppLauncher/EventGetInstalledApplications.h b/src/modules/API/DEPRACATED/AppLauncher/EventGetInstalledApplications.h
index 2f2b343..65b89f6 100644
--- a/src/modules/API/DEPRACATED/AppLauncher/EventGetInstalledApplications.h
+++ b/src/modules/API/DEPRACATED/AppLauncher/EventGetInstalledApplications.h
@@ -42,6 +42,7 @@ class EventGetInstalledApplications : public WrtPlugins::Platform::IEvent<
std::vector m_applicationNames;
std::map m_applicationTypesPath;
std::map m_applicationTypesName;
+
public:
void addApplicationTypeByName(const std::pair &value)
@@ -80,11 +81,9 @@ class EventGetInstalledApplications : public WrtPlugins::Platform::IEvent<
return m_applicationNames;
}
virtual void clearOnCancel()
- {
- }
+ {}
EventGetInstalledApplications()
- {
- }
+ {}
};
typedef DPL::SharedPtr
diff --git a/src/modules/API/DEPRACATED/AppLauncher/EventLaunchApplication.h b/src/modules/API/DEPRACATED/AppLauncher/EventLaunchApplication.h
index 021ff0b..62a799f 100644
--- a/src/modules/API/DEPRACATED/AppLauncher/EventLaunchApplication.h
+++ b/src/modules/API/DEPRACATED/AppLauncher/EventLaunchApplication.h
@@ -38,10 +38,12 @@ class EventLaunchApplication : public WrtPlugins::Platform::IEvent<
{
//Uri type. http://, file://, sms:, mailto: etc
ApplicationUriType m_applicationUriType;
- // used as param to uriType, for example http address, path to file, phone number, etc
+ // used as param to uriType, for example http address, path to file, phone
+ // number, etc
std::string m_applicationUriParam;
//optional parameters for file://
std::vector m_applicationParameters;
+
public:
void addApplicationParameter(const std::string &value)
{
@@ -68,12 +70,10 @@ class EventLaunchApplication : public WrtPlugins::Platform::IEvent<
return m_applicationUriParam;
}
virtual void clearOnCancel()
- {
- }
+ {}
EventLaunchApplication() : m_applicationUriType(
APPLICATION_URI_TYPE_UNDEFINED)
- {
- }
+ {}
};
typedef DPL::SharedPtr EventLaunchApplicationPtr;
diff --git a/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.cpp b/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.cpp
index 525d749..92324a2 100644
--- a/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.cpp
+++ b/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.cpp
@@ -32,27 +32,25 @@ IAppLauncherManager::IAppLauncherManager() :
APPLAUNCHER_THREAD),
EventRequestReceiverLaunchApplication(Platform::ThreadEnum::
APPLAUNCHER_THREAD)
-{
-}
+{}
IAppLauncherManager::~IAppLauncherManager()
-{
-}
+{}
void IAppLauncherManager::getDefaultApplication(
- const EventGetDefaultApplicationPtr &event)
+ const EventGetDefaultApplicationPtr &event)
{
EventRequestReceiverGetDefaultApplication::PostRequest(event);
}
void IAppLauncherManager::getInstalledApplications(
- const EventGetInstalledApplicationsPtr &event)
+ const EventGetInstalledApplicationsPtr &event)
{
EventRequestReceiverGetInstalledApplications::PostRequest(event);
}
void IAppLauncherManager::launchApplication(
- const EventLaunchApplicationPtr &event)
+ const EventLaunchApplicationPtr &event)
{
EventRequestReceiverLaunchApplication::PostRequest(event);
}
diff --git a/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.h b/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.h
index bb07021..3939e83 100644
--- a/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.h
+++ b/src/modules/API/DEPRACATED/AppLauncher/IAppLauncherManager.h
@@ -47,15 +47,16 @@ class IAppLauncherManager : public EventRequestReceiverGetDefaultApplication,
IAppLauncherManager();
virtual ~IAppLauncherManager();
virtual void getDefaultApplication(
- const EventGetDefaultApplicationPtr &event);
+ const EventGetDefaultApplicationPtr &event);
virtual void getInstalledApplications(
- const EventGetInstalledApplicationsPtr &event);
+ const EventGetInstalledApplicationsPtr &event);
virtual void launchApplication(const EventLaunchApplicationPtr &event);
+
protected:
virtual void OnRequestReceived(const EventGetDefaultApplicationPtr &event)
= 0;
virtual void OnRequestReceived(
- const EventGetInstalledApplicationsPtr &event) = 0;
+ const EventGetInstalledApplicationsPtr &event) = 0;
virtual void OnRequestReceived(const EventLaunchApplicationPtr &event) = 0;
};
diff --git a/src/modules/API/DEPRACATED/Device/EventClamshellStateChange.cpp b/src/modules/API/DEPRACATED/Device/EventClamshellStateChange.cpp
index d3af2c3..3bea5a9 100644
--- a/src/modules/API/DEPRACATED/Device/EventClamshellStateChange.cpp
+++ b/src/modules/API/DEPRACATED/Device/EventClamshellStateChange.cpp
@@ -19,12 +19,10 @@ namespace WrtPlugins {
namespace Api {
namespace Device {
EventClamshellStateChange::EventClamshellStateChange() : m_state(CSS_CLOSE)
-{
-}
+{}
EventClamshellStateChange::~EventClamshellStateChange()
-{
-}
+{}
ClamshellState EventClamshellStateChange::getState() const
{
diff --git a/src/modules/API/DEPRACATED/Device/IClamshell.cpp b/src/modules/API/DEPRACATED/Device/IClamshell.cpp
index 0413fc0..f58af1d 100644
--- a/src/modules/API/DEPRACATED/Device/IClamshell.cpp
+++ b/src/modules/API/DEPRACATED/Device/IClamshell.cpp
@@ -19,8 +19,7 @@ namespace WrtPlugins {
namespace Api {
namespace Device {
IClamshell::~IClamshell()
-{
-}
+{}
} // Device
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Device/IClamshell.h b/src/modules/API/DEPRACATED/Device/IClamshell.h
index 232df18..8abba64 100644
--- a/src/modules/API/DEPRACATED/Device/IClamshell.h
+++ b/src/modules/API/DEPRACATED/Device/IClamshell.h
@@ -38,7 +38,7 @@ class IClamshell : private DPL::Noncopyable
* @throw PlatformException If error in platform occurs.
*/
virtual void addOnStateChange(
- const EventClamshellStateChangeEmitterPtr& emitter) = 0;
+ const EventClamshellStateChangeEmitterPtr& emitter) = 0;
/**
* Removes on change state emitter.
@@ -47,7 +47,7 @@ class IClamshell : private DPL::Noncopyable
* @throw PlatformException If error in platform occurs.
*/
virtual void removeOnStateChange(
- EventClamshellStateChangeEmitter::IdType id) = 0;
+ EventClamshellStateChangeEmitter::IdType id) = 0;
};
} // Device
} // Api
diff --git a/src/modules/API/DEPRACATED/Device/IKeypad.cpp b/src/modules/API/DEPRACATED/Device/IKeypad.cpp
index 78a6de9..9f3f9a8 100644
--- a/src/modules/API/DEPRACATED/Device/IKeypad.cpp
+++ b/src/modules/API/DEPRACATED/Device/IKeypad.cpp
@@ -19,8 +19,7 @@ namespace WrtPlugins {
namespace Api {
namespace Device {
IKeypad::~IKeypad()
-{
-}
+{}
} // Device
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Device/IManager.cpp b/src/modules/API/DEPRACATED/Device/IManager.cpp
index fdb4ac5..86ab212 100644
--- a/src/modules/API/DEPRACATED/Device/IManager.cpp
+++ b/src/modules/API/DEPRACATED/Device/IManager.cpp
@@ -25,8 +25,7 @@ IManager& IManager::getInstance()
}
IManager::~IManager()
-{
-}
+{}
} // Device
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Display/EventChangeOrientation.cpp b/src/modules/API/DEPRACATED/Display/EventChangeOrientation.cpp
index 6c58e09..fa0fa6f 100644
--- a/src/modules/API/DEPRACATED/Display/EventChangeOrientation.cpp
+++ b/src/modules/API/DEPRACATED/Display/EventChangeOrientation.cpp
@@ -19,12 +19,10 @@ namespace WrtPlugins {
namespace Api {
namespace Display {
EventChangeOrientation::EventChangeOrientation() : m_orientation(O_PORTRAIT)
-{
-}
+{}
EventChangeOrientation::~EventChangeOrientation()
-{
-}
+{}
Orientation EventChangeOrientation::getOrientation() const
{
diff --git a/src/modules/API/DEPRACATED/Display/EventChangeState.cpp b/src/modules/API/DEPRACATED/Display/EventChangeState.cpp
index 39060f7..e94bb4b 100644
--- a/src/modules/API/DEPRACATED/Display/EventChangeState.cpp
+++ b/src/modules/API/DEPRACATED/Display/EventChangeState.cpp
@@ -19,12 +19,10 @@ namespace WrtPlugins {
namespace Api {
namespace Display {
EventChangeState::EventChangeState() : m_state(ST_OFF)
-{
-}
+{}
EventChangeState::~EventChangeState()
-{
-}
+{}
State EventChangeState::getState() const
{
diff --git a/src/modules/API/DEPRACATED/Display/IManager.cpp b/src/modules/API/DEPRACATED/Display/IManager.cpp
index 5f94d11..2ccbeb4 100644
--- a/src/modules/API/DEPRACATED/Display/IManager.cpp
+++ b/src/modules/API/DEPRACATED/Display/IManager.cpp
@@ -25,8 +25,7 @@ IManager& IManager::getInstance()
}
IManager::~IManager()
-{
-}
+{}
} // Display
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Display/IManager.h b/src/modules/API/DEPRACATED/Display/IManager.h
index b9811af..45cfa84 100644
--- a/src/modules/API/DEPRACATED/Display/IManager.h
+++ b/src/modules/API/DEPRACATED/Display/IManager.h
@@ -42,7 +42,8 @@ class IManager
* @throw UnsupportedException If current platform doesn't support it.
* @throw OutOfRangeException If specified screen doesn't exist.
* @throw PlatformException If error in platform occurs.
- * @remarks On some platforms passing 0 as screen index may result in returning
+ * @remarks On some platforms passing 0 as screen index may result in
+ * returning
* some global screen interface. Other may return default screen.
* @remarks Ownership is NOT passed to the caller.
*/
diff --git a/src/modules/API/DEPRACATED/Display/IScreen.cpp b/src/modules/API/DEPRACATED/Display/IScreen.cpp
index fbc6e59..9fd76af 100644
--- a/src/modules/API/DEPRACATED/Display/IScreen.cpp
+++ b/src/modules/API/DEPRACATED/Display/IScreen.cpp
@@ -19,8 +19,7 @@ namespace WrtPlugins {
namespace Api {
namespace Display {
IScreen::~IScreen()
-{
-}
+{}
} // Display
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Display/IScreen.h b/src/modules/API/DEPRACATED/Display/IScreen.h
index 035ff61..95e5cd5 100644
--- a/src/modules/API/DEPRACATED/Display/IScreen.h
+++ b/src/modules/API/DEPRACATED/Display/IScreen.h
@@ -84,7 +84,7 @@ class IScreen : private DPL::Noncopyable
* @throw PlatformException If error in platform occurs.
*/
virtual void addOnChangeOrientation(
- const EventChangeOrientationEmitterPtr& emitter) = 0;
+ const EventChangeOrientationEmitterPtr& emitter) = 0;
/**
* Removes on change size emitter.
@@ -93,7 +93,7 @@ class IScreen : private DPL::Noncopyable
* @throw PlatformException If error in platform occurs.
*/
virtual void removeOnChangeOrientation(
- EventChangeOrientationEmitter::IdType id) = 0;
+ EventChangeOrientationEmitter::IdType id) = 0;
/**
* Adds on change state event emitter.
diff --git a/src/modules/API/DEPRACATED/FeatureLoader/EventLoadFeature.h b/src/modules/API/DEPRACATED/FeatureLoader/EventLoadFeature.h
index f1590f3..9b1c931 100644
--- a/src/modules/API/DEPRACATED/FeatureLoader/EventLoadFeature.h
+++ b/src/modules/API/DEPRACATED/FeatureLoader/EventLoadFeature.h
@@ -32,8 +32,7 @@ class EventLoadFeature : public WrtPlugins::Platform::IEvent
m_success(false),
m_feature(feature),
m_object(0)
- {
- }
+ {}
~EventLoadFeature()
{
@@ -66,8 +65,8 @@ class EventLoadFeature : public WrtPlugins::Platform::IEvent
}
virtual void clearOnCancel()
- {
- }
+ {}
+
private:
bool m_success;
std::string m_feature;
diff --git a/src/modules/API/DEPRACATED/FeatureLoader/FeatureManagerFactory.h b/src/modules/API/DEPRACATED/FeatureLoader/FeatureManagerFactory.h
index 831cfae..485e6e1 100644
--- a/src/modules/API/DEPRACATED/FeatureLoader/FeatureManagerFactory.h
+++ b/src/modules/API/DEPRACATED/FeatureLoader/FeatureManagerFactory.h
@@ -38,11 +38,9 @@ class FeatureManagerFactory :
private:
FeatureManagerFactory()
- {
- }
+ {}
~FeatureManagerFactory()
- {
- }
+ {}
};
} // namespace Api
} // namespace WrtPlugins
diff --git a/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.cpp b/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.cpp
index 7ab099e..19ac1ef 100644
--- a/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.cpp
+++ b/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.cpp
@@ -25,12 +25,10 @@ namespace Api {
IFeatureManager::IFeatureManager() :
Platform::EventRequestReceiver(Platform::ThreadEnum::
BONDI_THREAD)
-{
-}
+{}
IFeatureManager::~IFeatureManager()
-{
-}
+{}
void IFeatureManager::loadFeature(const EventLoadFeaturePtr &event)
{
diff --git a/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.h b/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.h
index 6a14c6b..471c736 100644
--- a/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.h
+++ b/src/modules/API/DEPRACATED/FeatureLoader/IFeatureManager.h
@@ -33,6 +33,7 @@ class IFeatureManager :
*/
virtual void loadFeature(const EventLoadFeaturePtr &event);
+
protected:
virtual void OnRequestReceived(const EventLoadFeaturePtr &event) = 0;
};
diff --git a/src/modules/API/DEPRACATED/Gallery/IEventClose.h b/src/modules/API/DEPRACATED/Gallery/IEventClose.h
index b5ffc60..b0bacc1 100644
--- a/src/modules/API/DEPRACATED/Gallery/IEventClose.h
+++ b/src/modules/API/DEPRACATED/Gallery/IEventClose.h
@@ -53,8 +53,7 @@ class IEventClose : public WrtPlugins::Platform::IEvent
}
IEventClose() : m_result(Commons::ExceptionCodes::None)
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventClosePtr;
diff --git a/src/modules/API/DEPRACATED/Gallery/IEventGetGalleries.h b/src/modules/API/DEPRACATED/Gallery/IEventGetGalleries.h
index a1a9fce..95f0520 100644
--- a/src/modules/API/DEPRACATED/Gallery/IEventGetGalleries.h
+++ b/src/modules/API/DEPRACATED/Gallery/IEventGetGalleries.h
@@ -34,9 +34,10 @@ class IEventGetGalleries : public WrtPlugins::Platform::IEvent<
{
Commons::ExceptionCodes::Enumeration m_result;
IGallerySetPtr m_galleries;
+
public:
void setResult(
- const Commons::ExceptionCodes::Enumeration &value)
+ const Commons::ExceptionCodes::Enumeration &value)
{
m_result = value;
}
@@ -55,8 +56,7 @@ class IEventGetGalleries : public WrtPlugins::Platform::IEvent<
IEventGetGalleries() : m_result(Commons::ExceptionCodes::None),
m_galleries(NULL)
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventGetGalleriesPtr;
diff --git a/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItemById.h b/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItemById.h
index 4454bf7..f651078 100644
--- a/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItemById.h
+++ b/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItemById.h
@@ -74,8 +74,7 @@ class IEventGetMediaItemById : public WrtPlugins::Platform::IEvent<
IEventGetMediaItemById() : m_result(Commons::ExceptionCodes::None),
m_id(0)
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventGetMediaItemByIdPtr;
diff --git a/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItems.h b/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItems.h
index b3597dc..4dc5ce0 100644
--- a/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItems.h
+++ b/src/modules/API/DEPRACATED/Gallery/IEventGetMediaItems.h
@@ -38,7 +38,7 @@ class IEventGetMediaItems : public WrtPlugins::Platform::IEvent<
public:
void setResult(
- const Commons::ExceptionCodes::Enumeration &value)
+ const Commons::ExceptionCodes::Enumeration &value)
{
m_result = value;
}
@@ -64,8 +64,7 @@ class IEventGetMediaItems : public WrtPlugins::Platform::IEvent<
}
IEventGetMediaItems() : m_result(Commons::ExceptionCodes::None)
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventGetMediaItemsPtr;
diff --git a/src/modules/API/DEPRACATED/Gallery/IEventOpen.h b/src/modules/API/DEPRACATED/Gallery/IEventOpen.h
index fc02c3a..81c3f28 100644
--- a/src/modules/API/DEPRACATED/Gallery/IEventOpen.h
+++ b/src/modules/API/DEPRACATED/Gallery/IEventOpen.h
@@ -36,7 +36,7 @@ class IEventOpen : public WrtPlugins::Platform::IEvent
public:
void setResult(
- const Commons::ExceptionCodes::Enumeration &value)
+ const Commons::ExceptionCodes::Enumeration &value)
{
m_result = value;
}
@@ -54,8 +54,7 @@ class IEventOpen : public WrtPlugins::Platform::IEvent
}
IEventOpen() : m_result(Commons::ExceptionCodes::None)
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventOpenPtr;
diff --git a/src/modules/API/DEPRACATED/Gallery/IEventRefresh.h b/src/modules/API/DEPRACATED/Gallery/IEventRefresh.h
index 19b66aa..05bf525 100644
--- a/src/modules/API/DEPRACATED/Gallery/IEventRefresh.h
+++ b/src/modules/API/DEPRACATED/Gallery/IEventRefresh.h
@@ -53,8 +53,7 @@ class IEventRefresh : public WrtPlugins::Platform::IEvent
}
IEventRefresh() : m_result(Commons::ExceptionCodes::None)
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventRefreshPtr;
diff --git a/src/modules/API/DEPRACATED/Gallery/IGallery.cpp b/src/modules/API/DEPRACATED/Gallery/IGallery.cpp
index 7db716d..c746dce 100644
--- a/src/modules/API/DEPRACATED/Gallery/IGallery.cpp
+++ b/src/modules/API/DEPRACATED/Gallery/IGallery.cpp
@@ -19,12 +19,10 @@ namespace WrtPlugins {
namespace Api {
namespace Gallery {
IGallery::IGallery()
-{
-}
+{}
IGallery::~IGallery()
-{
-}
+{}
} // Gallery
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.cpp b/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.cpp
index e0424dd..60e856a 100644
--- a/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.cpp
+++ b/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.cpp
@@ -58,7 +58,7 @@ void IGalleryRequestManager::getMediaItems(const IEventGetMediaItemsPtr &event)
}
void IGalleryRequestManager::getMediaItemById(
- const IEventGetMediaItemByIdPtr &event)
+ const IEventGetMediaItemByIdPtr &event)
{
EventRequestReceiver< IEventGetMediaItemById >::PostRequest(event);
}
diff --git a/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.h b/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.h
index e7e64f0..a21d52a 100644
--- a/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.h
+++ b/src/modules/API/DEPRACATED/Gallery/IGalleryRequestManager.h
@@ -61,12 +61,10 @@ class IGalleryRequestManager :
ERRChangeView(Platform::ThreadEnum::GALLERY_THREAD),
ERRGetMediaItems(Platform::ThreadEnum::GALLERY_THREAD),
ERRGetMediaItemById(Platform::ThreadEnum::GALLERY_THREAD)
- {
- }
+ {}
virtual ~IGalleryRequestManager()
- {
- }
+ {}
virtual void getGalleries(const IEventGetGalleriesPtr &event);
virtual void open(const IEventOpenPtr &event);
@@ -92,8 +90,8 @@ class GalleryFactory : private DPL::Noncopyable
{
protected:
GalleryFactory()
- {
- }
+ {}
+
public:
static GalleryFactory& getInstance();
IGalleryRequestManagerPtr getGalleryManager();
diff --git a/src/modules/API/DEPRACATED/Gallery/IMediaItem.h b/src/modules/API/DEPRACATED/Gallery/IMediaItem.h
index 1dc8e40..7367c1d 100644
--- a/src/modules/API/DEPRACATED/Gallery/IMediaItem.h
+++ b/src/modules/API/DEPRACATED/Gallery/IMediaItem.h
@@ -52,11 +52,9 @@ class IMediaItem
IMediaItem() : m_id(0),
m_type(UNDEFINED),
m_date(0)
- {
- }
+ {}
virtual ~IMediaItem()
- {
- }
+ {}
virtual const std::string &getFileName() const
{
diff --git a/src/modules/API/DEPRACATED/Gallery/IViewProperties.cpp b/src/modules/API/DEPRACATED/Gallery/IViewProperties.cpp
index 68aca66..3865181 100644
--- a/src/modules/API/DEPRACATED/Gallery/IViewProperties.cpp
+++ b/src/modules/API/DEPRACATED/Gallery/IViewProperties.cpp
@@ -63,7 +63,7 @@ void IViewProperties::setMetaTag(const std::string &metaTag)
}
void IViewProperties::setPrimarySortOrder(
- IViewProperties::SortOrder primarySortOrder)
+ IViewProperties::SortOrder primarySortOrder)
{
if (primarySortOrder < NONE || primarySortOrder > BY_TYPE) {
Throw(Commons::InvalidArgumentException);
@@ -72,7 +72,7 @@ void IViewProperties::setPrimarySortOrder(
}
void IViewProperties::setSecondarySortOrder(
- IViewProperties::SortOrder secondarySortOrder)
+ IViewProperties::SortOrder secondarySortOrder)
{
if (secondarySortOrder < NONE || secondarySortOrder > BY_TYPE) {
Throw(Commons::InvalidArgumentException);
@@ -96,8 +96,7 @@ IViewProperties::IViewProperties() :
m_secondarySortOrder(NONE),
m_startDate(0),
m_endDate(0)
-{
-}
+{}
} // Gallery
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Geolocation/EventGetCurrentPosition.h b/src/modules/API/DEPRACATED/Geolocation/EventGetCurrentPosition.h
index b6ad34d..622d5b5 100644
--- a/src/modules/API/DEPRACATED/Geolocation/EventGetCurrentPosition.h
+++ b/src/modules/API/DEPRACATED/Geolocation/EventGetCurrentPosition.h
@@ -124,8 +124,7 @@ class EventGetCurrentPosition : public WrtPlugins::Platform::IEvent<
}
EventGetCurrentPosition()
- {
- }
+ {}
};
typedef DPL::SharedPtr EventGetCurrentPositionPtr;
diff --git a/src/modules/API/DEPRACATED/Geolocation/EventPositionChanged.h b/src/modules/API/DEPRACATED/Geolocation/EventPositionChanged.h
index d3f1946..77ad5ef 100644
--- a/src/modules/API/DEPRACATED/Geolocation/EventPositionChanged.h
+++ b/src/modules/API/DEPRACATED/Geolocation/EventPositionChanged.h
@@ -46,8 +46,7 @@ class EventPositionChanged : public Platform::ListenerEvent<
}
EventPositionChanged()
- {
- }
+ {}
};
typedef DPL::SharedPtr EventPositionChangedPtr;
diff --git a/src/modules/API/DEPRACATED/Geolocation/GeolocationFactory.cpp b/src/modules/API/DEPRACATED/Geolocation/GeolocationFactory.cpp
index 735af94..7f679b8 100644
--- a/src/modules/API/DEPRACATED/Geolocation/GeolocationFactory.cpp
+++ b/src/modules/API/DEPRACATED/Geolocation/GeolocationFactory.cpp
@@ -35,8 +35,7 @@ GeolocationFactory& GeolocationFactory::getInstance()
}
GeolocationFactory::GeolocationFactory()
-{
-}
+{}
}
}
}
diff --git a/src/modules/API/DEPRACATED/Geolocation/IGeolocation.cpp b/src/modules/API/DEPRACATED/Geolocation/IGeolocation.cpp
index e67d96a..7d1f96d 100644
--- a/src/modules/API/DEPRACATED/Geolocation/IGeolocation.cpp
+++ b/src/modules/API/DEPRACATED/Geolocation/IGeolocation.cpp
@@ -28,12 +28,10 @@ using namespace Platform;
IGeolocation::IGeolocation() :
EventRequestReceiver(ThreadEnum::
GEOLOCATION_THREAD)
-{
-}
+{}
IGeolocation::~IGeolocation()
-{
-}
+{}
}
}
}
diff --git a/src/modules/API/DEPRACATED/Geolocation/IGeolocation.h b/src/modules/API/DEPRACATED/Geolocation/IGeolocation.h
index 4da7a31..67f250e 100644
--- a/src/modules/API/DEPRACATED/Geolocation/IGeolocation.h
+++ b/src/modules/API/DEPRACATED/Geolocation/IGeolocation.h
@@ -66,9 +66,9 @@ class IGeolocation :
* @exception Commons::PlatformException when platform error occurs
*/
virtual long watchPosition(const EventPositionChangedEmitterPtr& emitter,
- long timeout,
- long maximumAge,
- bool highAccuracy) = 0;
+ long timeout,
+ long maximumAge,
+ bool highAccuracy) = 0;
/**
* Stopping periodic location updates started with watchPosition
@@ -81,7 +81,8 @@ class IGeolocation :
* Choses location method
* @param method A location method
* @exception Commons::PlatformException when platform error occurs
- * @remarks does nothing when executed with the same method as currently used
+ * @remarks does nothing when executed with the same method as currently
+ * used
*/
virtual void changeLocationMethod(ApiLocationMethod method) = 0;
diff --git a/src/modules/API/DEPRACATED/Geolocation/PositionProperties.h b/src/modules/API/DEPRACATED/Geolocation/PositionProperties.h
index 31fe3fe..82e5ce8 100644
--- a/src/modules/API/DEPRACATED/Geolocation/PositionProperties.h
+++ b/src/modules/API/DEPRACATED/Geolocation/PositionProperties.h
@@ -47,8 +47,7 @@ struct PositionProperties
speed(0.0),
direction(0.0),
altitudeSpeed(0.0)
- {
- }
+ {}
};
typedef DPL::SharedPtr PositionPropertiesPtr;
diff --git a/src/modules/API/DEPRACATED/Memory/IManager.cpp b/src/modules/API/DEPRACATED/Memory/IManager.cpp
index cd25798..2347b42 100644
--- a/src/modules/API/DEPRACATED/Memory/IManager.cpp
+++ b/src/modules/API/DEPRACATED/Memory/IManager.cpp
@@ -25,8 +25,7 @@ IManager& IManager::getInstance()
}
IManager::~IManager()
-{
-}
+{}
} // Memory
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/System/IDate.cpp b/src/modules/API/DEPRACATED/System/IDate.cpp
index a5e9567..9d939f6 100644
--- a/src/modules/API/DEPRACATED/System/IDate.cpp
+++ b/src/modules/API/DEPRACATED/System/IDate.cpp
@@ -19,8 +19,7 @@ namespace WrtPlugins {
namespace Api {
namespace System {
IDate::~IDate()
-{
-}
+{}
} // System
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/System/IEnvironment.cpp b/src/modules/API/DEPRACATED/System/IEnvironment.cpp
index 2ad4f24..abf2b09 100644
--- a/src/modules/API/DEPRACATED/System/IEnvironment.cpp
+++ b/src/modules/API/DEPRACATED/System/IEnvironment.cpp
@@ -25,8 +25,7 @@ IEnvironment& IEnvironment::getInstance()
}
IEnvironment::~IEnvironment()
-{
-}
+{}
} // System
} // Api
} // WrtPlugins
diff --git a/src/modules/API/DEPRACATED/Telephony/IEventClearLogs.h b/src/modules/API/DEPRACATED/Telephony/IEventClearLogs.h
index 7d70cc2..7a13ec9 100644
--- a/src/modules/API/DEPRACATED/Telephony/IEventClearLogs.h
+++ b/src/modules/API/DEPRACATED/Telephony/IEventClearLogs.h
@@ -33,6 +33,7 @@ class IEventClearLog : public WrtPlugins::Platform::IEvent
{
bool m_result;
LogFilterPtr m_filter;
+
public:
void setFilter(LogFilterPtr value)
{
@@ -51,14 +52,11 @@ class IEventClearLog : public WrtPlugins::Platform::IEvent
return m_result;
}
virtual void clearOnCancel()
- {
- }
+ {}
IEventClearLog() : m_result(false)
- {
- }
+ {}
~IEventClearLog()
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventClearLogPtr;
diff --git a/src/modules/API/DEPRACATED/Telephony/IEventDeleteLogEntry.h b/src/modules/API/DEPRACATED/Telephony/IEventDeleteLogEntry.h
index d9dd2f1..40ffd88 100644
--- a/src/modules/API/DEPRACATED/Telephony/IEventDeleteLogEntry.h
+++ b/src/modules/API/DEPRACATED/Telephony/IEventDeleteLogEntry.h
@@ -34,6 +34,7 @@ class IEventDeleteLogEntry : public WrtPlugins::Platform::IEvent<
{
bool m_result;
LogFilterPtr m_filter;
+
public:
void setFilter(LogFilterPtr value)
{
@@ -52,14 +53,11 @@ class IEventDeleteLogEntry : public WrtPlugins::Platform::IEvent<
return m_result;
}
virtual void clearOnCancel()
- {
- }
+ {}
IEventDeleteLogEntry() : m_result(false)
- {
- }
+ {}
~IEventDeleteLogEntry()
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventDeleteLogEntryPtr;
diff --git a/src/modules/API/DEPRACATED/Telephony/IEventFindLogEntries.h b/src/modules/API/DEPRACATED/Telephony/IEventFindLogEntries.h
index 9be97ce..c8b8111 100644
--- a/src/modules/API/DEPRACATED/Telephony/IEventFindLogEntries.h
+++ b/src/modules/API/DEPRACATED/Telephony/IEventFindLogEntries.h
@@ -38,6 +38,7 @@ class IEventFindLogEntries : public WrtPlugins::Platform::IEvent<
LogFilterPtr m_filter;
int m_firstCall;
int m_lastCall;
+
public:
void setFirstCall(int value)
{
@@ -80,16 +81,13 @@ class IEventFindLogEntries : public WrtPlugins::Platform::IEvent<
return m_result;
}
virtual void clearOnCancel()
- {
- }
+ {}
IEventFindLogEntries() : m_result(false),
m_firstCall(0),
m_lastCall(-1)
- {
- }
+ {}
~IEventFindLogEntries()
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventFindLogEntriesPtr;
diff --git a/src/modules/API/DEPRACATED/Telephony/IEventGetNumberOfLogs.h b/src/modules/API/DEPRACATED/Telephony/IEventGetNumberOfLogs.h
index 8f6831c..c89b9fc 100644
--- a/src/modules/API/DEPRACATED/Telephony/IEventGetNumberOfLogs.h
+++ b/src/modules/API/DEPRACATED/Telephony/IEventGetNumberOfLogs.h
@@ -35,6 +35,7 @@ class IEventGetNumberOfLogs : public WrtPlugins::Platform::IEvent<
bool m_result;
int m_numberOfLogs;
LogFilterPtr m_filter;
+
public:
void setFilter(LogFilterPtr value)
{
@@ -61,15 +62,12 @@ class IEventGetNumberOfLogs : public WrtPlugins::Platform::IEvent<
return m_result;
}
virtual void clearOnCancel()
- {
- }
+ {}
IEventGetNumberOfLogs() : m_result(false),
m_numberOfLogs(0)
- {
- }
+ {}
~IEventGetNumberOfLogs()
- {
- }
+ {}
};
typedef DPL::SharedPtr IEventGetNumberOfLogsPtr;
diff --git a/src/modules/API/DEPRACATED/Telephony/ILogManager.cpp b/src/modules/API/DEPRACATED/Telephony/ILogManager.cpp
index ebce9a4..d8a58f3 100644
--- a/src/modules/API/DEPRACATED/Telephony/ILogManager.cpp
+++ b/src/modules/API/DEPRACATED/Telephony/ILogManager.cpp
@@ -29,12 +29,10 @@ ILogManager::ILogManager() :
EventRequestReceiverFindLogEntries(Platform::ThreadEnum::TELEPHONY_THREAD),
EventRequestReceiverDeleteLogEntry(Platform::ThreadEnum::TELEPHONY_THREAD),
EventRequestReceiverClearLogs(Platform::ThreadEnum::TELEPHONY_THREAD)
-{
-}
+{}
ILogManager::~ILogManager()
-{
-}
+{}
void ILogManager::getNumberOfLogs(const IEventGetNumberOfLogsPtr &event)
{
diff --git a/src/modules/API/DEPRACATED/Telephony/ILogManager.h b/src/modules/API/DEPRACATED/Telephony/ILogManager.h
index ac0a01e..88c9e78 100644
--- a/src/modules/API/DEPRACATED/Telephony/ILogManager.h
+++ b/src/modules/API/DEPRACATED/Telephony/ILogManager.h
@@ -52,9 +52,10 @@ class ILogManager : public EventRequestReceiverGetNumberOfLogs,
virtual void findLogEntries(const IEventFindLogEntriesPtr &event);
virtual void deleteLogEntry(const IEventDeleteLogEntryPtr &event);
virtual void clearLogs(const IEventClearLogPtr &event);
+
protected:
virtual void OnRequestReceived(
- const IEventGetNumberOfLogsPtr &event) = 0;
+ const IEventGetNumberOfLogsPtr &event) = 0;
virtual void OnRequestReceived(const IEventFindLogEntriesPtr &event)
= 0;
virtual void OnRequestReceived(const IEventDeleteLogEntryPtr &event)
diff --git a/src/modules/API/DEPRACATED/Telephony/LogEntry.cpp b/src/modules/API/DEPRACATED/Telephony/LogEntry.cpp
index fe62d1f..cc6ecdd 100644
--- a/src/modules/API/DEPRACATED/Telephony/LogEntry.cpp
+++ b/src/modules/API/DEPRACATED/Telephony/LogEntry.cpp
@@ -29,12 +29,10 @@ LogEntry::LogEntry() :
m_startTime(0),
m_duration(0),
m_folder(LogEntry::INVALID_FOLDER)
-{
-}
+{}
LogEntry::~LogEntry()
-{
-}
+{}
int LogEntry::getId() const
{
diff --git a/src/modules/API/DEPRACATED/Telephony/LogEntry.h b/src/modules/API/DEPRACATED/Telephony/LogEntry.h
index 6f13cc1..9f6ca15 100644
--- a/src/modules/API/DEPRACATED/Telephony/LogEntry.h
+++ b/src/modules/API/DEPRACATED/Telephony/LogEntry.h
@@ -41,7 +41,8 @@ class LogEntry
MISSED_CALLS_FOLDER,
INITIATED_CALLS_FOLDER,
INVALID_FOLDER = 10000,
- UNDEFINED_FOLDER /* should be used only to mark a fact filter is not set */
+ UNDEFINED_FOLDER /* should be used only to mark a fact filter
+ *is not set */
} LogFolder;
LogEntry();
diff --git a/src/modules/API/DEPRACATED/Telephony/LogFilter.cpp b/src/modules/API/DEPRACATED/Telephony/LogFilter.cpp
index 954723b..842caef 100644
--- a/src/modules/API/DEPRACATED/Telephony/LogFilter.cpp
+++ b/src/modules/API/DEPRACATED/Telephony/LogFilter.cpp
@@ -36,12 +36,10 @@ LogFilter::LogFilter() :
m_durationMax(LOG_FILTER_UNDEFINED_DURATION),
m_phoneNumberIsSet(false),
m_descriptionIsSet(false)
-{
-}
+{}
LogFilter::~LogFilter()
-{
-}
+{}
int
LogFilter::getIdFilter() const
diff --git a/src/modules/API/DEPRACATED/Telephony/TelephonyFactory.h b/src/modules/API/DEPRACATED/Telephony/TelephonyFactory.h
index f3bc338..d859c1e 100644
--- a/src/modules/API/DEPRACATED/Telephony/TelephonyFactory.h
+++ b/src/modules/API/DEPRACATED/Telephony/TelephonyFactory.h
@@ -31,8 +31,8 @@ class TelephonyFactory : private DPL::Noncopyable
{
private:
TelephonyFactory()
- {
- }
+ {}
+
public:
static TelephonyFactory& getInstance();
ILogManagerPtr createLogManagerObject();
diff --git a/src/modules/API/DEPRACATED/UI/IPreferences.h b/src/modules/API/DEPRACATED/UI/IPreferences.h
index 7fe7d22..094bd1d 100644
--- a/src/modules/API/DEPRACATED/UI/IPreferences.h
+++ b/src/modules/API/DEPRACATED/UI/IPreferences.h
@@ -44,15 +44,15 @@ class IPreferences : public Platform::EventRequestReceiver< IEventSetWallpaper >
ThreadEnum
::
UI_THREAD)
- {
- }
+ {}
virtual void OnRequestReceived(
- const DPL::SharedPtr &event) = 0;
+ const DPL::SharedPtr &event) = 0;
virtual void OnRequestReceived(
- const DPL::SharedPtr &event) = 0;
+ const DPL::SharedPtr &event) = 0;
virtual void OnRequestReceived(
- const DPL::SharedPtr &event) = 0;
+ const DPL::SharedPtr &event) = 0;
+
public:
virtual void setWallpaper(DPL::SharedPtr &event)
{
@@ -63,14 +63,13 @@ class IPreferences : public Platform::EventRequestReceiver< IEventSetWallpaper >
PostRequest(event);
}
virtual void setMessageRingtone(
- DPL::SharedPtr &event)
+ DPL::SharedPtr &event)
{
PostRequest(event);
}
virtual ~IPreferences()
- {
- }
+ {}
};
//============================================================
} //namespace
diff --git a/src/modules/API/DEPRACATED/UI/IPreferencesEvents.h b/src/modules/API/DEPRACATED/UI/IPreferencesEvents.h
index 99d4d23..f27d406 100644
--- a/src/modules/API/DEPRACATED/UI/IPreferencesEvents.h
+++ b/src/modules/API/DEPRACATED/UI/IPreferencesEvents.h
@@ -33,12 +33,10 @@ class IEventSetWallpaper : public WrtPlugins::Platform::IEvent<
{
public:
IEventSetWallpaper()
- {
- }
+ {}
virtual ~IEventSetWallpaper()
- {
- }
+ {}
};
typedef DPL::SharedPtr