Remove EXTERNAL from plugin code

HaseenaSainul · Feb 27, 2024 · a13218b · a13218b
1 parent 186881f
commit a13218b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/DeviceIdentification/DeviceIdentification.h b/DeviceIdentification/DeviceIdentification.h
@@ -56,9 +56,11 @@ namespace Plugin {
             {
                 _parent.Deactivated(connectionId);
             }
+#ifdef USE_THUNDER_R4
             void Terminated(RPC::IRemoteConnection* /* connection */) override
             {
             }
+#endif
 
             BEGIN_INTERFACE_MAP(Notification)
             INTERFACE_ENTRY(RPC::IRemoteConnection::INotification)

diff --git a/LocationSync/LocationService.h b/LocationSync/LocationService.h
@@ -28,7 +28,7 @@ namespace Plugin {
 
     struct IGeography;
 
-    class EXTERNAL LocationService
+    class LocationService
         : public PluginHost::ISubSystem::ILocation,
           public PluginHost::ISubSystem::IInternet,
           public Web::WebLinkType<Core::SocketStream, Web::Response, Web::Request, Core::ProxyPoolType<Web::Response>&> {

diff --git a/LocationSync/LocationSync.cpp b/LocationSync/LocationSync.cpp
@@ -19,13 +19,31 @@
 
 #include "LocationSync.h"
 
+#ifdef USE_THUNDER_R4
+#include <interfaces/json/JTimeZone.h>
+#endif
+
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
 #define API_VERSION_NUMBER_PATCH 0
 
 namespace WPEFramework {
 namespace Plugin {
 
+    namespace {
+
+        static Metadata<LocationSync> metadata(
+            // Version
+            1, 0, 0,
+            // Preconditions
+            {  subsystem::NETWORK },
+            // Terminations
+            {},
+            // Controls
+            { subsystem::INTERNET, subsystem::LOCATION }
+        );
+    }
+
     SERVICE_REGISTRATION(LocationSync, API_VERSION_NUMBER_MAJOR, API_VERSION_NUMBER_MINOR, API_VERSION_NUMBER_PATCH);
 
     static Core::ProxyPoolType<Web::Response> responseFactory(4);
@@ -119,10 +137,9 @@ namespace Plugin {
 
 #ifdef USE_THUNDER_R4
             Exchange::Controller::IConfiguration* controller = nullptr;
-            string callsign = _T("");
             if ( (_timezoneoverriden == true) &&
                ( _locationinfo.TimeZone() != config.TimeZone.Value() ) &&
-               ( ( controller = _service->QueryInterfaceByCallsign<Exchange::Controller::IConfiguration>(callsign) ) != nullptr )
+               ( ( controller = _service->QueryInterfaceByCallsign<Exchange::Controller::IConfiguration>(_T("")) ) != nullptr )
             ) {
                 config.TimeZone = _locationinfo.TimeZone();
                 string newconfig;

diff --git a/Packager/PackagerImplementation.h b/Packager/PackagerImplementation.h
@@ -43,7 +43,7 @@ namespace Plugin {
             PLUGIN
         };
 
-        class EXTERNAL Config : public Core::JSON::Container {
+        class Config : public Core::JSON::Container {
         public:
             Config()
                 : Core::JSON::Container()

diff --git a/SecurityAgent/AccessControlList.h b/SecurityAgent/AccessControlList.h
@@ -97,14 +97,14 @@ namespace Plugin {
     //   }
     // },
 
-    class EXTERNAL AccessControlList {
+    class AccessControlList {
     public:
         enum mode {
             BLOCKED,
             ALLOWED
         };
     private:
-        class EXTERNAL JSONACL : public Core::JSON::Container {
+        class JSONACL : public Core::JSON::Container {
         public:
             class Plugins : public Core::JSON::Container {
             public:

diff --git a/WebBridge/WebBridge.cpp b/WebBridge/WebBridge.cpp
@@ -51,7 +51,7 @@ ENUM_CONVERSION_END(Plugin::WebBridge::context);
 
         SERVICE_REGISTRATION(WebBridge, API_VERSION_NUMBER_MAJOR, API_VERSION_NUMBER_MINOR, API_VERSION_NUMBER_PATCH)
 
-        class EXTERNAL Registration : public Core::JSON::Container {
+        class Registration : public Core::JSON::Container {
         public:
             Registration(Registration&&) = delete;
             Registration(const Registration&) = delete;