diff --git a/frameworks/ets/ani/accesstoken/include/ani_request_permission.h b/frameworks/ets/ani/accesstoken/include/ani_request_permission.h index 6598e1dd719c803be6b4e78a8365206ac2153dd2..2e25a8eeb709403d1e266d7ba089ddce554bb22a 100644 --- a/frameworks/ets/ani/accesstoken/include/ani_request_permission.h +++ b/frameworks/ets/ani/accesstoken/include/ani_request_permission.h @@ -59,11 +59,11 @@ struct RequestAsyncContext : public RequestAsyncContextBase { class AuthorizationResult : public Security::AccessToken::TokenCallbackStub { public: AuthorizationResult(std::shared_ptr data); - virtual ~AuthorizationResult() override; + ~AuthorizationResult() override; - virtual void GrantResultsCallback( + void GrantResultsCallback( const std::vector& permissionList, const std::vector& grantResults) override; - virtual void WindowShownCallback() override; + void WindowShownCallback() override; private: std::shared_ptr data_ = nullptr; diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.h b/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.h index 2b9e8350c12e81049c55d37e90b7291fe83d79c8..bf566fdcfc19ef3005302f97bfceda4cce8ec935 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.h +++ b/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.h @@ -25,7 +25,7 @@ namespace AccessToken { class AccessTokenDeathRecipient : public IRemoteObject::DeathRecipient { public: AccessTokenDeathRecipient() {} - virtual ~AccessTokenDeathRecipient() override = default; + ~AccessTokenDeathRecipient() override = default; void OnRemoteDied(const wptr& object) override; }; } // namespace AccessToken diff --git a/interfaces/innerkits/nativetoken/include/nativetoken_json_oper.h b/interfaces/innerkits/nativetoken/include/nativetoken_json_oper.h index b696171dc9e3b2ca05dc36d68aba94787865db51..eb20645096985209e829cb00ba9d6a8dc557b03a 100644 --- a/interfaces/innerkits/nativetoken/include/nativetoken_json_oper.h +++ b/interfaces/innerkits/nativetoken/include/nativetoken_json_oper.h @@ -13,13 +13,13 @@ * limitations under the License. */ +#ifndef NATIVETOKEN_JSON_OPER_H +#define NATIVETOKEN_JSON_OPER_H + #include #include "cJSON.h" #include "nativetoken.h" -#ifndef NATIVETOKEN_JSON_OPER_H -#define NATIVETOKEN_JSON_OPER_H - #ifdef __cplusplus extern "C" { #endif diff --git a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_state_data.h b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_state_data.h index 3b261d218abf3d2ba206b2ada2f77870689ba80e..817e6cf1401987da6bf4eb488f0e5073c7f7c166 100644 --- a/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_state_data.h +++ b/interfaces/innerkits/privacy/test/unittest/app_manager_client/app_state_data.h @@ -35,7 +35,7 @@ enum class ApplicationState { APP_STATE_END, }; struct AppStateData : public Parcelable { - virtual bool Marshalling(Parcel &parcel) const override; + bool Marshalling(Parcel &parcel) const override; static AppStateData *Unmarshalling(Parcel &parcel); std::string bundleName; diff --git a/interfaces/kits/js/napi/accesstoken/include/napi_request_permission.h b/interfaces/kits/js/napi/accesstoken/include/napi_request_permission.h index 45cd3f3905961fae5d4da412c5c66caa42e98f4c..c351a02cc49fc5aab61378990ffe64f15b70af98 100644 --- a/interfaces/kits/js/napi/accesstoken/include/napi_request_permission.h +++ b/interfaces/kits/js/napi/accesstoken/include/napi_request_permission.h @@ -107,11 +107,11 @@ struct ResultCallback { class AuthorizationResult : public Security::AccessToken::TokenCallbackStub { public: AuthorizationResult(std::shared_ptr& data) : data_(data) {} - virtual ~AuthorizationResult() override = default; + ~AuthorizationResult() override = default; - virtual void GrantResultsCallback(const std::vector& permissionList, + void GrantResultsCallback(const std::vector& permissionList, const std::vector& grantResults) override; - virtual void WindowShownCallback() override; + void WindowShownCallback() override; private: std::shared_ptr data_ = nullptr; diff --git a/services/accesstokenmanager/main/cpp/include/callback/accesstoken_callback_proxys.h b/services/accesstokenmanager/main/cpp/include/callback/accesstoken_callback_proxys.h index 50f1c3e95c200cf6c59564efca8852c5d0f11501..df4b095a4de34368d8657bb87cc4144b2f64bb03 100644 --- a/services/accesstokenmanager/main/cpp/include/callback/accesstoken_callback_proxys.h +++ b/services/accesstokenmanager/main/cpp/include/callback/accesstoken_callback_proxys.h @@ -32,7 +32,7 @@ class PermissionStateChangeCallbackProxy : public IRemoteProxy& impl); ~PermissionStateChangeCallbackProxy() override; - virtual void PermStateChangeCallback(PermStateChangeInfo& result) override; + void PermStateChangeCallback(PermStateChangeInfo& result) override; private: static inline BrokerDelegator delegator_; diff --git a/services/accesstokenmanager/main/cpp/include/callback/callback_death_recipients.h b/services/accesstokenmanager/main/cpp/include/callback/callback_death_recipients.h index 93b24b1d2414e8ee7cd74df6bdcee78f1ee82032..80d42395d2c553e201d9969d3a3b164fa5300429 100644 --- a/services/accesstokenmanager/main/cpp/include/callback/callback_death_recipients.h +++ b/services/accesstokenmanager/main/cpp/include/callback/callback_death_recipients.h @@ -24,18 +24,18 @@ namespace AccessToken { class PermStateCallbackDeathRecipient : public IRemoteObject::DeathRecipient { public: PermStateCallbackDeathRecipient() = default; - virtual ~PermStateCallbackDeathRecipient() override = default; + ~PermStateCallbackDeathRecipient() override = default; - virtual void OnRemoteDied(const wptr& remote) override; + void OnRemoteDied(const wptr& remote) override; }; #ifdef TOKEN_SYNC_ENABLE class TokenSyncCallbackDeathRecipient : public IRemoteObject::DeathRecipient { public: TokenSyncCallbackDeathRecipient() = default; - virtual ~TokenSyncCallbackDeathRecipient() override = default; + ~TokenSyncCallbackDeathRecipient() override = default; - virtual void OnRemoteDied(const wptr& remote) override; + void OnRemoteDied(const wptr& remote) override; }; #endif // TOKEN_SYNC_ENABLE } // namespace AccessToken diff --git a/services/accesstokenmanager/main/cpp/include/form_manager/form_manager_death_recipient.h b/services/accesstokenmanager/main/cpp/include/form_manager/form_manager_death_recipient.h index f04e0b01fd6d1f384a4b2a3708ffdf4d3747ed8e..b0bb04bd684e15ea5d8244e0e130a1a40e6b0481 100644 --- a/services/accesstokenmanager/main/cpp/include/form_manager/form_manager_death_recipient.h +++ b/services/accesstokenmanager/main/cpp/include/form_manager/form_manager_death_recipient.h @@ -24,7 +24,7 @@ namespace AccessToken { class FormMgrDeathRecipient : public IRemoteObject::DeathRecipient { public: FormMgrDeathRecipient() {} - virtual ~FormMgrDeathRecipient() override = default; + ~FormMgrDeathRecipient() override = default; void OnRemoteDied(const wptr& object) override; }; } // namespace AccessToken diff --git a/services/accesstokenmanager/main/cpp/include/form_manager/form_status_change_callback.h b/services/accesstokenmanager/main/cpp/include/form_manager/form_status_change_callback.h index f1b01a664e5795ab2e0e8ee4a618ffd9ec1a66ae..906d0bbb2b30d17adc230de13c9ae34108407f34 100644 --- a/services/accesstokenmanager/main/cpp/include/form_manager/form_status_change_callback.h +++ b/services/accesstokenmanager/main/cpp/include/form_manager/form_status_change_callback.h @@ -26,12 +26,12 @@ namespace AccessToken { class FormStateObserverStub : public IRemoteStub { public: FormStateObserverStub(); - virtual ~FormStateObserverStub() override; + ~FormStateObserverStub() override; - virtual int OnRemoteRequest( + int OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - virtual int32_t NotifyWhetherFormsVisible(const FormVisibilityType visibleType, + int32_t NotifyWhetherFormsVisible(const FormVisibilityType visibleType, const std::string &bundleName, std::vector &formInstances) override { return 0; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp index d8c3deda976f6f61b5c70f8815eb7a8875c2e17a..e5649507d15932cdf07d34885aaef4bf93224f9c 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp @@ -758,8 +758,7 @@ void PermissionManager::ScopeToString( copy(tokenIDs.begin(), tokenIDs.end(), std::ostream_iterator(str, ", ")); std::string tokenidStr = str.str(); - std::string permStr; - permStr = accumulate(permList.begin(), permList.end(), std::string(" ")); + std::string permStr = accumulate(permList.begin(), permList.end(), std::string(" ")); LOGI(ATM_DOMAIN, ATM_TAG, "TokenidStr = %{public}s permStr =%{public}s", tokenidStr.c_str(), permStr.c_str()); diff --git a/services/common/app_manager/include/app_manager_access_client.h b/services/common/app_manager/include/app_manager_access_client.h index 2e2bbcdd0b995add7e4b26267315e04117c50675..ac175ff3457796e88bd64354bed5eda9a3ec89e7 100644 --- a/services/common/app_manager/include/app_manager_access_client.h +++ b/services/common/app_manager/include/app_manager_access_client.h @@ -50,7 +50,7 @@ private: class AppMgrDeathRecipient : public IRemoteObject::DeathRecipient { public: AppMgrDeathRecipient() {} - virtual ~AppMgrDeathRecipient() override = default; + ~AppMgrDeathRecipient() override = default; void OnRemoteDied(const wptr& object) override; }; diff --git a/services/common/app_manager/include/app_state_data.h b/services/common/app_manager/include/app_state_data.h index 1c0509db2c141f97abd7ea1ec8af1296a9d9bc78..e9002bb40be51e33db1551b4bb7404b2afdcf081 100644 --- a/services/common/app_manager/include/app_state_data.h +++ b/services/common/app_manager/include/app_state_data.h @@ -35,7 +35,7 @@ enum class ApplicationState { APP_STATE_END, }; struct AppStateData : public Parcelable { - virtual bool Marshalling(Parcel &parcel) const override; + bool Marshalling(Parcel &parcel) const override; static AppStateData *Unmarshalling(Parcel &parcel); std::string bundleName; diff --git a/services/common/app_manager/include/app_status_change_callback.h b/services/common/app_manager/include/app_status_change_callback.h index 7c442c243c62262892a8e6eee63c7190df1cd949..cb374eef21b806947abcbc6309b78ed128bdca04 100644 --- a/services/common/app_manager/include/app_status_change_callback.h +++ b/services/common/app_manager/include/app_status_change_callback.h @@ -59,16 +59,16 @@ public: class ApplicationStateObserverStub : public IRemoteStub { public: ApplicationStateObserverStub(); - virtual ~ApplicationStateObserverStub() override; + ~ApplicationStateObserverStub() override; - virtual int OnRemoteRequest( + int OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - virtual void OnProcessStateChanged(const ProcessData &processData) override {} - virtual void OnProcessDied(const ProcessData &processData) override {} - virtual void OnAppStateChanged(const AppStateData &appStateData) override {} - virtual void OnAppStopped(const AppStateData &appStateData) override {} - virtual void OnAppCacheStateChanged(const AppStateData &appStateData) override {} + void OnProcessStateChanged(const ProcessData &processData) override {} + void OnProcessDied(const ProcessData &processData) override {} + void OnAppStateChanged(const AppStateData &appStateData) override {} + void OnAppStopped(const AppStateData &appStateData) override {} + void OnAppCacheStateChanged(const AppStateData &appStateData) override {} DISALLOW_COPY_AND_MOVE(ApplicationStateObserverStub); private: diff --git a/services/common/app_manager/include/process_data.h b/services/common/app_manager/include/process_data.h index 8193c47060d2867e73b7b2199eb26682caedeea6..da60cb74488cd0b02b537ff736f4f4b123a81fd5 100644 --- a/services/common/app_manager/include/process_data.h +++ b/services/common/app_manager/include/process_data.h @@ -54,7 +54,7 @@ struct ProcessData : public Parcelable { * * @param outParcel Indicates the Parcel object to which the Sequenceable object will be marshaled. */ - virtual bool Marshalling(Parcel &parcel) const override; + bool Marshalling(Parcel &parcel) const override; /** * @brief Unmarshals this Sequenceable object from a Parcel. diff --git a/services/common/background_task_manager/include/background_task_manager_death_recipient.h b/services/common/background_task_manager/include/background_task_manager_death_recipient.h index 8d388329038b79f0b73d4d769d37277eef38cbdc..dd24c4f7169d592c1490ec235977d5460a832ae5 100644 --- a/services/common/background_task_manager/include/background_task_manager_death_recipient.h +++ b/services/common/background_task_manager/include/background_task_manager_death_recipient.h @@ -24,7 +24,7 @@ namespace AccessToken { class BackgroundTaskMgrDeathRecipient : public IRemoteObject::DeathRecipient { public: BackgroundTaskMgrDeathRecipient() {} - virtual ~BackgroundTaskMgrDeathRecipient() override = default; + ~BackgroundTaskMgrDeathRecipient() override = default; void OnRemoteDied(const wptr& object) override; }; } // namespace AccessToken diff --git a/services/common/background_task_manager/include/continuous_task_change_callback.h b/services/common/background_task_manager/include/continuous_task_change_callback.h index edff2b0e0ad8f412b01b9d52b01f91bf7090b984..14f6e9ae39136a11a1eac6edc98675690dd19d95 100644 --- a/services/common/background_task_manager/include/continuous_task_change_callback.h +++ b/services/common/background_task_manager/include/continuous_task_change_callback.h @@ -26,15 +26,15 @@ namespace AccessToken { class BackgroundTaskSubscriberStub : public IRemoteStub { public: BackgroundTaskSubscriberStub(); - virtual ~BackgroundTaskSubscriberStub() override; + ~BackgroundTaskSubscriberStub() override; - virtual int OnRemoteRequest( + int OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - virtual void OnContinuousTaskStart( + void OnContinuousTaskStart( const std::shared_ptr &continuousTaskCallbackInfo) override {} - virtual void OnContinuousTaskStop( + void OnContinuousTaskStop( const std::shared_ptr &continuousTaskCallbackInfo) override {} DISALLOW_COPY_AND_MOVE(BackgroundTaskSubscriberStub); diff --git a/services/common/handler/include/access_event_handler.h b/services/common/handler/include/access_event_handler.h index 4fbbbb8e29c255e74df6d0ddf348f4bde7e9815d..c2c4df5cd01f0205e6a49e3ee4fd563160769278 100644 --- a/services/common/handler/include/access_event_handler.h +++ b/services/common/handler/include/access_event_handler.h @@ -27,7 +27,7 @@ namespace AccessToken { class AccessEventHandler : public AppExecFwk::EventHandler { public: explicit AccessEventHandler(const std::shared_ptr& runner); - virtual ~AccessEventHandler() override; + ~AccessEventHandler() override; bool ProxyPostTask(const Callback &callback, int64_t delayTime); diff --git a/services/common/proxy_death/include/proxy_death_recipient.h b/services/common/proxy_death/include/proxy_death_recipient.h index 3975a4c42d3298193083ee8009cf163eea84d3b6..6895a7937e4ddd9c03d0335b634e112f87522229 100644 --- a/services/common/proxy_death/include/proxy_death_recipient.h +++ b/services/common/proxy_death/include/proxy_death_recipient.h @@ -28,7 +28,7 @@ namespace AccessToken { class ProxyDeathRecipient : public IRemoteObject::DeathRecipient { public: ProxyDeathRecipient(ProxyDeathHandler* handler); - virtual ~ProxyDeathRecipient() override = default; + ~ProxyDeathRecipient() override = default; void OnRemoteDied(const wptr& object) override; private: ProxyDeathHandler* handler_ = nullptr; diff --git a/services/privacymanager/include/active/perm_active_status_callback_death_recipient.h b/services/privacymanager/include/active/perm_active_status_callback_death_recipient.h index 5e2bc3185d2590e60aca1cfc28eeadb6ac827c8f..1a9deef8721f3ee0809bade69e75fd45b6841126 100644 --- a/services/privacymanager/include/active/perm_active_status_callback_death_recipient.h +++ b/services/privacymanager/include/active/perm_active_status_callback_death_recipient.h @@ -25,9 +25,9 @@ namespace AccessToken { class PermActiveStatusCallbackDeathRecipient : public IRemoteObject::DeathRecipient { public: PermActiveStatusCallbackDeathRecipient() = default; - virtual ~PermActiveStatusCallbackDeathRecipient() override = default; + ~PermActiveStatusCallbackDeathRecipient() override = default; - virtual void OnRemoteDied(const wptr &remote) override; + void OnRemoteDied(const wptr &remote) override; }; } // namespace AccessToken } // namespace Security diff --git a/services/privacymanager/include/active/perm_active_status_change_callback_proxy.h b/services/privacymanager/include/active/perm_active_status_change_callback_proxy.h index db358c94be9367bd3cf740bfb01c501d861ce4d1..54ddbdfce70a535b66b2d41f0eb0eba93b1947c0 100644 --- a/services/privacymanager/include/active/perm_active_status_change_callback_proxy.h +++ b/services/privacymanager/include/active/perm_active_status_change_callback_proxy.h @@ -30,7 +30,7 @@ public: explicit PermActiveStatusChangeCallbackProxy(const sptr& impl); ~PermActiveStatusChangeCallbackProxy() override; - virtual void ActiveStatusChangeCallback(ActiveChangeResponse& result) override; + void ActiveStatusChangeCallback(ActiveChangeResponse& result) override; private: static inline BrokerDelegator delegator_; }; diff --git a/services/privacymanager/include/active/state_change_callback_proxy.h b/services/privacymanager/include/active/state_change_callback_proxy.h index 121f8123dfb0649e5b349a0a7e74784b1ee58ce8..d1fdc01f9554647441c27ec1f78a05095f6b3dc7 100644 --- a/services/privacymanager/include/active/state_change_callback_proxy.h +++ b/services/privacymanager/include/active/state_change_callback_proxy.h @@ -29,7 +29,7 @@ public: explicit StateChangeCallbackProxy(const sptr& impl); ~StateChangeCallbackProxy() override; - virtual void StateChangeNotify(AccessTokenID tokenId, bool isShowing) override; + void StateChangeNotify(AccessTokenID tokenId, bool isShowing) override; private: static inline BrokerDelegator delegator_; }; diff --git a/services/privacymanager/include/record/on_permission_used_record_callback_proxy.h b/services/privacymanager/include/record/on_permission_used_record_callback_proxy.h index 3a6975bd064b279622d4956ecad1a97f09e18bd9..77e3772c595b8319a11cd28c5fd58a6e46254f24 100644 --- a/services/privacymanager/include/record/on_permission_used_record_callback_proxy.h +++ b/services/privacymanager/include/record/on_permission_used_record_callback_proxy.h @@ -30,7 +30,7 @@ public: explicit OnPermissionUsedRecordCallbackProxy(const sptr& impl); ~OnPermissionUsedRecordCallbackProxy() override; - virtual void OnQueried(ErrCode code, PermissionUsedResult& result) override; + void OnQueried(ErrCode code, PermissionUsedResult& result) override; private: static inline BrokerDelegator delegator_; }; diff --git a/services/privacymanager/src/record/permission_record_manager.cpp b/services/privacymanager/src/record/permission_record_manager.cpp index b5f0904747c4a597dbfcce370f598365a03a85be..1b8e946de15c451fee0bdfc7ac343d63bfdcb169 100644 --- a/services/privacymanager/src/record/permission_record_manager.cpp +++ b/services/privacymanager/src/record/permission_record_manager.cpp @@ -1436,8 +1436,7 @@ bool PermissionRecordManager::HasCallerInStartList(int32_t callerPid) void PermissionRecordManager::PermListToString(const std::vector& permList) { - std::string permStr; - permStr = accumulate(permList.begin(), permList.end(), std::string(" ")); + std::string permStr = accumulate(permList.begin(), permList.end(), std::string(" ")); LOGI(PRI_DOMAIN, PRI_TAG, "PermStr =%{public}s.", permStr.c_str()); } diff --git a/services/tokensyncmanager/include/command/delete_remote_token_command.h b/services/tokensyncmanager/include/command/delete_remote_token_command.h index 36b93b342c0b96478e92437572d784f70da6da53..6628adb0e61ed1b64badfd5e2b6b9762b9cda77c 100644 --- a/services/tokensyncmanager/include/command/delete_remote_token_command.h +++ b/services/tokensyncmanager/include/command/delete_remote_token_command.h @@ -37,7 +37,7 @@ public: explicit DeleteRemoteTokenCommand(const std::string &json); DeleteRemoteTokenCommand(const std::string &srcDeviceId, const std::string &dstDeviceId, AccessTokenID deleteID); - virtual ~DeleteRemoteTokenCommand() override = default; + ~DeleteRemoteTokenCommand() override = default; private: /** diff --git a/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h b/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h index 90a349d1709d676ce940000912a6d38e2a705bdf..8f161f6bfb4d0e5a6c48d04cf3e7c95985a19bb4 100644 --- a/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h +++ b/services/tokensyncmanager/include/command/sync_remote_hap_token_command.h @@ -42,7 +42,7 @@ public: explicit SyncRemoteHapTokenCommand(const std::string &json); SyncRemoteHapTokenCommand(const std::string &srcDeviceId, const std::string &dstDeviceId, AccessTokenID id); - virtual ~SyncRemoteHapTokenCommand() override = default; + ~SyncRemoteHapTokenCommand() override = default; private: /** diff --git a/services/tokensyncmanager/include/command/update_remote_hap_token_command.h b/services/tokensyncmanager/include/command/update_remote_hap_token_command.h index f31280c210c2fcbfb72e43dc6b975814227bb435..e6293ec89d37ecccfb4c125162ee399370b787cd 100644 --- a/services/tokensyncmanager/include/command/update_remote_hap_token_command.h +++ b/services/tokensyncmanager/include/command/update_remote_hap_token_command.h @@ -41,7 +41,7 @@ public: explicit UpdateRemoteHapTokenCommand(const std::string &json); UpdateRemoteHapTokenCommand(const std::string &srcDeviceId, const std::string &dstDeviceId, const HapTokenInfoForSync& tokenInfo); - virtual ~UpdateRemoteHapTokenCommand() override = default; + ~UpdateRemoteHapTokenCommand() override = default; private: /**