!7992 类申明时，private/public/protected关键词与之前的代码要有一行空格

Merge pull request !7992 from 胡晗/DTS2024072913637_new

window_scene/intention_event/framework/anr_handler/include/anr_handler.h

@@ -36,6 +36,7 @@ public:
     void SetSessionStage(int32_t eventId, const wptr<ISessionStage> &sessionStage);
     void HandleEventConsumed(int32_t eventId, int64_t actionTime);
     void OnWindowDestroyed(int32_t persistentId);
+
 private:
     using Task = std::function<void()>;
     bool PostTask(Task &&task, const std::string& name = "ANRHandlerTask", int64_t delayTime = 0);
@@ -46,6 +47,7 @@ private:
     int32_t GetPersistentIdOfEvent(int32_t eventId);
     bool IsOnEventHandler(int32_t persistentId);
     void UpdateLatestEventId(int32_t eventId);
+    
 private:
     std::shared_ptr<AppExecFwk::EventHandler> eventHandler_ { nullptr };
     struct ANRHandlerState {

window_scene/intention_event/service/anr_manager/include/anr_manager.h

@@ -45,6 +45,7 @@ public:
     void SetAnrObserver(std::function<void(int32_t)> anrObserver);
     void SetAppInfoGetter(std::function<void(int32_t, std::string&, int32_t)> callback);
     std::string GetBundleName(int32_t pid, int32_t uid);
+    
 private:
     struct AppInfo {
         int32_t pid { -1 };

window_scene/intention_event/service/event_stage/include/event_stage.h

@@ -32,6 +32,7 @@ public:
     std::vector<int32_t> GetTimerIds(int32_t persistentId);
     std::vector<int32_t> DelEvents(int32_t persistentId, int32_t eventId);
     void OnSessionLost(int32_t persistentId);
+    
 private:
     struct EventTime {
         int32_t eventId { 0 };

window_scene/intention_event/service/timer_manager/include/timer_manager.h

@@ -42,6 +42,7 @@ public:
     void Init();
     int32_t AddTimer(int32_t intervalMs, std::function<void()> callback);
     int32_t RemoveTimer(int32_t timerId);
+
 private:
     struct TimerItem {
         int32_t id { 0 };
@@ -49,6 +50,7 @@ private:
         int64_t nextCallTime  { 0 };
         std::function<void()> callback;
     };
+    
 private:
     void OnThread();
     void OnStop();

window_scene/intention_event/utils/include/entrance_log.h

@@ -50,6 +50,7 @@ public:
             }
         }
     }
+    
 private:
     HilogFunc logfn_ { nullptr };
     const char* tag_ { nullptr };

window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.h

@@ -191,6 +191,7 @@ public:
     using Task = std::function<void()>;
     explicit MainThreadScheduler(napi_env env);
     void PostMainThreadTask(Task&& localTask, std::string traceInfo = "Unnamed", int64_t delayTime = 0);
+    
 private:
     void GetMainEventHandler();
     napi_env env_;

window_scene/session/container/include/zidl/window_event_channel_proxy.h

@@ -47,6 +47,7 @@ public:
     WSError TransferAccessibilityChildTreeUnregister() override;
     WSError TransferAccessibilityDumpChildInfo(
         const std::vector<std::string>& params, std::vector<std::string>& info) override;
+        
 private:
     static inline BrokerDelegator<WindowEventChannelProxy> delegator_;
 };

window_scene/session/host/include/extension_session.h

@@ -46,6 +46,7 @@ class ChannelDeathRecipient : public IRemoteObject::DeathRecipient {
 public:
     explicit ChannelDeathRecipient(const sptr<WindowEventChannelListener>& listener): listener_(listener) {}
     virtual void OnRemoteDied(const wptr<IRemoteObject>& wptrDeath) override;
+    
 private:
     sptr<WindowEventChannelListener> listener_ = nullptr;
 };

window_scene/session/host/include/system_session.h

@@ -45,6 +45,7 @@ protected:
     bool CheckKeyEventDispatch(const std::shared_ptr<MMI::KeyEvent>& keyEvent) const;
     void UpdatePointerArea(const WSRect& rect) override;
     bool CheckPointerEventDispatch(const std::shared_ptr<MMI::PointerEvent>& pointerEvent) const override;
+    
 private:
     void UpdateCameraWindowStatus(bool isShowing);
     bool NeedSystemPermission(WindowType type);

window_scene/session_manager/include/setting_observer.h

@@ -31,6 +31,7 @@ public:
 
     using UpdateFunc = std::function<void(const std::string&)>;
     void SetUpdateFunc(UpdateFunc& func);
+    
 private:
     std::string key_ {};
     UpdateFunc update_ = nullptr;

window_scene/session_manager/src/session_manager_lite.cpp

@@ -104,6 +104,7 @@ public:
         SessionManagerLite::GetInstance().DeleteSessionListener(listener);
         return ret;
     }
+    
 private:
     static inline BrokerDelegator<SceneSessionManagerLiteProxyMock> delegator_;
 };

wm/include/extension_window_impl.h

@@ -32,6 +32,7 @@ public:
     sptr<Window> GetWindow() override;
     WMError HideNonSecureWindows(bool shouldHide) override;
     WMError SetWaterMarkFlag(bool isEnable) override;
+    
 private:
     sptr<Window> windowExtensionSessionImpl_;
 };

wm/include/input_transfer_station.h

@@ -41,9 +41,11 @@ public:
     {
         isRegisteredMMI_ = true;
     }
+
 protected:
     InputTransferStation() = default;
     ~InputTransferStation();
+    
 private:
     bool IsRegisterToMMI() const
     {

wm/include/pattern_detach_callback.h

@@ -25,6 +25,7 @@ class PatternDetachCallback : public PatternDetachCallbackStub {
 public:
     void OnPatternDetach(int32_t persisitentId) override;
     void GetResult(long timeOut);
+    
 private:
     RunnableFuture<int> future_{};
 };

wm/include/static_call.h

@@ -33,8 +33,10 @@ public:
     virtual sptr<Window> CreateWindow(sptr<WindowOption>& option, std::shared_ptr<AbilityRuntime::Context> context,
         const sptr<IRemoteObject>& iSession, const std::string& identityToken = "");
     virtual std::vector<sptr<Window>> GetSubWindow(uint32_t parentId);
+
 protected:
     StaticCall() = default;
+    
 private:
     static inline SingletonDelegator<StaticCall> delegator_;
 };

wm/include/window_input_channel.h

@@ -31,6 +31,7 @@ public:
     void HandleKeyEvent(std::shared_ptr<MMI::KeyEvent>& keyEvent);
     void Destroy();
     Rect GetWindowRect();
+    
 private:
     bool IsKeyboardEvent(const std::shared_ptr<MMI::KeyEvent>& keyEvent) const;
     void DispatchKeyEventCallback(std::shared_ptr<MMI::KeyEvent>& keyEvent, bool consumed);

wm/include/window_prepare_terminate.h

@@ -27,6 +27,7 @@ public:
     virtual ~WindowPrepareTerminateHandler() override;
     virtual void DoPrepareTerminate() override;
     void SetPrepareTerminateFun(const PrepareTerminateFunc& func);
+    
 private:
     PrepareTerminateFunc func_;
 };

wm/include/zidl/window_stub.h

@@ -28,6 +28,7 @@ public:
 
     virtual int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
         MessageOption &option) override;
+
 private:
     static inline const class StaticDestroyMonitor {
     public:
@@ -40,6 +41,7 @@ private:
         {
             return destroyed_;
         }
+        
     private:
         bool destroyed_;
     } staticDestroyMonitor_;

wmserver/include/drag_controller.h

@@ -42,6 +42,7 @@ public:
     void StartDrag(uint32_t windowId);
     void UpdateDragInfo(uint32_t windowId);
     void FinishDrag(uint32_t windowId);
+    
 private:
     sptr<WindowNode> GetHitWindow(DisplayId id, const PointInfo point);
     bool GetHitPoint(uint32_t windowId, PointInfo& point);

wmserver/include/minimize_app.h

@@ -53,6 +53,7 @@ public:
     static sptr<WindowNode> GetRecoverdNodeFromMinimizeList();
     static bool IsNodeNeedMinimizeWithReason(const sptr<WindowNode>& node, MinimizeReason reason);
     static bool EnableMinimize(MinimizeReason reason);
+    
 private:
     static inline bool IsFromUser(MinimizeReason reason)
     {

wmserver/include/remote_animation.h

@@ -82,6 +82,7 @@ public:
         return animationFirst_;
     }
     static bool isRemoteAnimationEnable_;
+    
 private:
     static sptr<RSWindowAnimationTarget> CreateWindowAnimationTarget(sptr<WindowTransitionInfo> info,
         const sptr<WindowNode>& windowNode);

wmserver/include/starting_window.h

@@ -45,6 +45,7 @@ public:
     static void SetAnimationConfig(AnimationConfig config);
     static bool transAnimateEnable_;
     static std::string uiType_;
+    
 private:
     static WMError CreateLeashAndStartingSurfaceNode(sptr<WindowNode>& node);
     static WMError SetStartingWindowAnimation(wptr<WindowNode> weak);

wmserver/include/window_common_event.h

@@ -32,6 +32,7 @@ public:
     void SubscriberEvent();
     void UnSubscriberEvent();
     void OnReceiveEvent(const EventFwk::CommonEventData& data);
+
 private:
     class EventSubscriber : public EventFwk::CommonEventSubscriber {
     public:
@@ -43,6 +44,7 @@ private:
         {
             eventHandler_->OnReceiveEvent(data);
         }
+        
     private:
         std::shared_ptr<WindowCommonEvent> eventHandler_;
     };

wmserver/include/window_manager_agent_controller.h

@@ -39,6 +39,7 @@ public:
     void UpdateCameraFloatWindowStatus(uint32_t accessTokenId, bool isShowing);
     void NotifyWaterMarkFlagChangedResult(bool showWaterMark);
     void NotifyGestureNavigationEnabledResult(bool enable);
+    
 private:
     WindowManagerAgentController() {}
     virtual ~WindowManagerAgentController() = default;

wmserver/include/window_node.h

@@ -167,6 +167,7 @@ public:
     AbilityInfo abilityInfo_;
     WindowNodeStateMachine stateMachine_;
     bool isFocused_ { false };
+    
 private:
     sptr<WindowProperty> property_ = nullptr;
     sptr<IWindow> windowToken_ = nullptr;

wmserver/include/window_node_container.h

@@ -134,6 +134,7 @@ public:
     static bool GetAnimateTransactionEnabled();
     void SetWindowPairFrameGravity(DisplayId displayId, Gravity gravity);
     static std::string uiType_;
+    
 private:
     friend class WindowRoot;
     void TraverseWindowNode(sptr<WindowNode>& root, std::vector<sptr<WindowNode>>& windowNodes) const;

wmserver/include/window_pair.h

@@ -217,6 +217,7 @@ public:
      * @return true means existing recent or status is not PARI_DONE.
      */
     bool IsDuringSplit();
+    
 private:
     /**
      * @brief Gets whether the window is related to split window.

wmserver/include/window_root.h

@@ -117,6 +117,7 @@ public:
     void UpdateDisplayOrientationWhenHideWindow(sptr<WindowNode>& node);
     bool HasMainFullScreenWindowShown(DisplayId displayId);
     WMError SetGestureNavigaionEnabled(bool enable);
+    
 private:
     void OnRemoteDied(const sptr<IRemoteObject>& remoteObject);
     WMError DestroyWindowInner(sptr<WindowNode>& node);

wmserver/include/window_system_effect.h

@@ -57,6 +57,7 @@ public:
     static WMError SetWindowEffect(const sptr<WindowNode>& node, bool needCheckAnimation = true);
     static WMError SetWindowShadow(const sptr<WindowNode>& node);
     static WMError SetCornerRadius(const sptr<WindowNode>& node, bool needCheckAnimation = true);
+    
 private:
     static float ConvertRadiusToSigma(float radius)
     {

wmserver/include/zidl/ressched_report.h

@@ -41,6 +41,7 @@ public:
         OHOS::ResourceSchedule::ResSchedClient::GetInstance().ReportData(resType, value, payload);
 #endif
     }
+    
 private:
     ResSchedReport() {}
     ~ResSchedReport() {}