fix csec: sort header files and others

Signed-off-by: Zhang Peng <zhangpeng280@huawei.com>
Change-Id: I4a414a5cc7c58c22e8d083027f6b1ac5c57b993c

interfaces/innerkits/wm/window.h

@@ -236,7 +236,7 @@ public:
     virtual void UnregisterTouchOutsideListener(const sptr<ITouchOutsideListener>& listener) = 0;
     virtual void SetAceAbilityHandler(const sptr<IAceAbilityHandler>& handler) = 0;
     virtual WMError SetUIContent(const std::string& contentInfo, NativeEngine* engine,
-        NativeValue* storage, bool isdistributed = false, AppExecFwk::Ability* ability = nullptr) = 0;
+        NativeValue* storage, bool isDistributed = false, AppExecFwk::Ability* ability = nullptr) = 0;
     virtual std::string GetContentInfo() = 0;
     virtual Ace::UIContent* GetUIContent() const = 0;
     virtual void OnNewWant(const AAFwk::Want& want) = 0;

interfaces/innerkits/wm/window_manager.h

@@ -151,7 +151,7 @@ public:
 
 private:
     WindowManager();
-    ~WindowManager();
+    ~WindowManager() = default;
     class Impl;
     std::unique_ptr<Impl> pImpl_;
 

wm/src/window_manager.cpp

@@ -42,7 +42,7 @@ bool WindowVisibilityInfo::Marshalling(Parcel &parcel) const
 
 WindowVisibilityInfo* WindowVisibilityInfo::Unmarshalling(Parcel &parcel)
 {
-    auto* windowVisibilityInfo = new (std::nothrow) WindowVisibilityInfo();
+    auto windowVisibilityInfo = new (std::nothrow) WindowVisibilityInfo();
     if (windowVisibilityInfo == nullptr) {
         WLOGFE("window visibility info is nullptr.");
         return nullptr;
@@ -68,7 +68,7 @@ bool WindowInfo::Marshalling(Parcel &parcel) const
 
 WindowInfo* WindowInfo::Unmarshalling(Parcel &parcel)
 {
-    auto* windowInfo = new (std::nothrow) WindowInfo();
+    auto windowInfo = new (std::nothrow) WindowInfo();
     if (windowInfo == nullptr) {
         WLOGFE("window info is nullptr.");
         return nullptr;
@@ -94,7 +94,7 @@ bool AccessibilityWindowInfo::Marshalling(Parcel &parcel) const
 
 AccessibilityWindowInfo* AccessibilityWindowInfo::Unmarshalling(Parcel &parcel)
 {
-    auto* accessibilityWindowInfo = new (std::nothrow) AccessibilityWindowInfo();
+    auto accessibilityWindowInfo = new (std::nothrow) AccessibilityWindowInfo();
     if (accessibilityWindowInfo == nullptr) {
         WLOGFE("accessibility window info is nullptr.");
         return nullptr;
@@ -117,7 +117,7 @@ bool FocusChangeInfo::Marshalling(Parcel &parcel) const
 
 FocusChangeInfo* FocusChangeInfo::Unmarshalling(Parcel &parcel)
 {
-    auto* focusChangeInfo = new FocusChangeInfo();
+    auto focusChangeInfo = new FocusChangeInfo();
     bool res = parcel.ReadUint32(focusChangeInfo->windowId_) && parcel.ReadUint64(focusChangeInfo->displayId_) &&
         parcel.ReadInt32(focusChangeInfo->pid_) && parcel.ReadInt32(focusChangeInfo->uid_);
     if (!res) {
@@ -283,11 +283,7 @@ void WindowManager::Impl::UpdateCameraFloatWindowStatus(uint32_t accessTokenId,
         }, EventPriority::LOW, "CameraFloatWindowStatus");
 }
 
-WindowManager::WindowManager() : pImpl_(std::make_unique<Impl>())
-{
-}
-
-WindowManager::~WindowManager() = default;
+WindowManager::WindowManager() : pImpl_(std::make_unique<Impl>()) {}
 
 void WindowManager::RegisterFocusChangedListener(const sptr<IFocusChangedListener>& listener)
 {

wmserver/src/window_layout_policy_cascade.cpp

@@ -19,8 +19,6 @@
 #include "window_helper.h"
 #include "window_inner_manager.h"
 #include "window_manager_hilog.h"
-#include "wm_common.h"
-#include "wm_common_inner.h"
 #include "wm_trace.h"
 
 namespace OHOS {

wmserver/src/window_manager_service.cpp

@@ -15,21 +15,21 @@
 
 #include "window_manager_service.h"
 
-#include <cinttypes>
-
 #include <ability_manager_client.h>
+#include <cinttypes>
 #include <ipc_skeleton.h>
 #include <parameters.h>
 #include <rs_iwindow_animation_controller.h>
 #include <system_ability_definition.h>
 
-#include "dm_common.h"
 #include "display_manager_service_inner.h"
+#include "dm_common.h"
 #include "drag_controller.h"
-#include "remote_animation.h"
 #include "minimize_app.h"
-#include "ui/rs_ui_director.h"
+#include "permission.h"
+#include "remote_animation.h"
 #include "singleton_container.h"
+#include "ui/rs_ui_director.h"
 #include "window_helper.h"
 #include "window_inner_manager.h"
 #include "window_manager_agent_controller.h"
@@ -37,7 +37,6 @@
 #include "window_manager_hilog.h"
 #include "wm_common.h"
 #include "wm_trace.h"
-#include "permission.h"
 namespace OHOS {
 namespace Rosen {
 namespace {