Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>

Changes to be committed:
2025-02-21 15:42:15 +00:00 · 2022-07-16 15:11:27 +08:00 · 2022-07-16 15:11:27 +08:00 · 18c1a6c5bd
commit 18c1a6c5bd
parent 08008d1abb
19 changed files with 43 additions and 43 deletions
--- a/etc/para/src/para_handle.cpp
+++ b/etc/para/src/para_handle.cpp
@ -13,7 +13,6 @@
 * limitations under the License.
 */

-
 #include "para_handle.h"
 #include "parameter.h"

--- a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h
+++ b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h
@ -16,9 +16,10 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H

-#include <stdint.h>
+#include <cstdint>
+#include <functional>
+#include <string>

-#include "functional"
 #include "i_input_method_agent.h"
 #include "iremote_broker.h"
 #include "iremote_object.h"
@ -26,7 +27,6 @@
 #include "message_parcel.h"
 #include "nocopyable.h"
 #include "refbase.h"
-#include "string"

 namespace OHOS {
 namespace MiscServices {
--- a/frameworks/inputmethod_controller/include/input_client_proxy.h
+++ b/frameworks/inputmethod_controller/include/input_client_proxy.h
@ -13,12 +13,12 @@
 * limitations under the License.
 */

-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H

-#include <stdint.h>
-#include "functional"
+#include <cstdint>
+#include <functional>
+
 #include "i_input_client.h"
 #include "i_input_method_agent.h"
 #include "iremote_broker.h"
--- a/frameworks/inputmethod_controller/include/input_client_stub.h
+++ b/frameworks/inputmethod_controller/include/input_client_stub.h
@ -13,11 +13,10 @@
 * limitations under the License.
 */

-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H

-#include <stdint.h>
+#include <cstdint>
 #include "i_input_client.h"
 #include "i_input_method_agent.h"
 #include "iremote_stub.h"
--- a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
+++ b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
@ -16,15 +16,16 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H

-#include <stdint.h>
-#include "functional"
+#include <cstdint>
+#include <functional>
+#include <string>
+
 #include "i_input_data_channel.h"
 #include "iremote_broker.h"
 #include "iremote_object.h"
 #include "iremote_proxy.h"
 #include "nocopyable.h"
 #include "refbase.h"
-#include "string"

 namespace OHOS {
 namespace MiscServices {
--- a/frameworks/inputmethod_controller/include/input_data_channel_stub.h
+++ b/frameworks/inputmethod_controller/include/input_data_channel_stub.h
@ -13,11 +13,12 @@
 * limitations under the License.
 */

-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H

-#include <stdint.h>
+#include <cstdint>
+#include <string>
+
 #include "i_input_data_channel.h"
 #include "iremote_stub.h"
 #include "message_handler.h"
@ -25,7 +26,6 @@
 #include "message_parcel.h"
 #include "nocopyable.h"
 #include "refbase.h"
-#include "string"

 namespace OHOS {
 namespace MiscServices {
--- a/frameworks/inputmethod_controller/src/input_client_proxy.cpp
+++ b/frameworks/inputmethod_controller/src/input_client_proxy.cpp
@ -13,7 +13,6 @@
 * limitations under the License.
 */

-
 #include "input_client_proxy.h"
 #include "global.h"
 #include "message_option.h"
--- a/frameworks/inputmethod_controller/src/input_client_stub.cpp
+++ b/frameworks/inputmethod_controller/src/input_client_stub.cpp
@ -13,14 +13,15 @@
 * limitations under the License.
 */

-
 #include "input_client_stub.h"
+
+#include <new>
+#include <string>
+
 #include "global.h"
 #include "ipc_object_stub.h"
 #include "ipc_types.h"
 #include "message.h"
-#include "new"
-#include "string"

 namespace OHOS {
 namespace MiscServices {
--- a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
+++ b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
@ -13,14 +13,15 @@
 * limitations under the License.
 */

-
 #include "input_data_channel_stub.h"
+
+#include <new>
+
 #include "global.h"
 #include "input_method_controller.h"
 #include "ipc_object_stub.h"
 #include "ipc_types.h"
 #include "message.h"
-#include "new"

 namespace OHOS {
 namespace MiscServices {
--- a/services/dfx/src/inputmethod_dump.cpp
+++ b/services/dfx/src/inputmethod_dump.cpp
@ -16,12 +16,12 @@
 #include "inputmethod_dump.h"

 #include <cstdint>
+#include <functional>
+#include <list>
+#include <string>
+#include <vector>

-#include "functional"
 #include "global.h"
-#include "list"
-#include "string"
-#include "vector"

 namespace OHOS {
 namespace MiscServices {
--- a/services/dfx/src/inputmethod_sysevent.cpp
+++ b/services/dfx/src/inputmethod_sysevent.cpp
@ -17,7 +17,6 @@

 #include "hisysevent.h"

-
 namespace OHOS {
 namespace MiscServices {
 namespace {
--- a/services/include/input_attribute.h
+++ b/services/include/input_attribute.h
@ -16,7 +16,7 @@
 #ifndef SERVICES_INCLUDE_INPUT_ATTRIBUTE_H
 #define SERVICES_INCLUDE_INPUT_ATTRIBUTE_H

-#include <stdint.h>
+#include <cstdint>

 #include "parcel.h"

--- a/services/include/input_method_property.h
+++ b/services/include/input_method_property.h
@ -16,8 +16,7 @@
 #ifndef SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H
 #define SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H

-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>

--- a/services/include/keyboard_type.h
+++ b/services/include/keyboard_type.h
@ -16,7 +16,7 @@
 #ifndef SERVICES_INCLUDE_KEYBOARD_TYPE_H
 #define SERVICES_INCLUDE_KEYBOARD_TYPE_H

-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include "parcel.h"

--- a/services/include/message.h
+++ b/services/include/message.h
@ -17,7 +17,7 @@
 #ifndef SERVICES_INCLUDE_MESSAGE_H
 #define SERVICES_INCLUDE_MESSAGE_H

-#include <stdint.h>
+#include <cstdint>

 #include "message_parcel.h"

--- a/services/src/input_attribute.cpp
+++ b/services/src/input_attribute.cpp
@ -15,7 +15,7 @@

 #include "input_attribute.h"

-#include "new"
+#include <new>

 namespace OHOS {
 namespace MiscServices {
--- a/services/src/input_method_property.cpp
+++ b/services/src/input_method_property.cpp
@ -13,12 +13,13 @@
 * limitations under the License.
 */

-
 #include "input_method_property.h"
+
+#include <new>
+#include <string>
+#include <vector>
+
 #include "__config"
-#include "new"
-#include "string"
-#include "vector"

 namespace OHOS {
 namespace MiscServices {
--- a/services/src/keyboard_type.cpp
+++ b/services/src/keyboard_type.cpp
@ -13,11 +13,12 @@
 * limitations under the License.
 */

-
 #include "keyboard_type.h"
+
+#include <new>
+#include <string>
+
 #include "__config"
-#include "new"
-#include "string"

 namespace OHOS {
 namespace MiscServices {
--- a/services/src/message_handler.cpp
+++ b/services/src/message_handler.cpp
@ -13,12 +13,12 @@
 * limitations under the License.
 */

-
 #include "message_handler.h"
-#include "new"
-#include "queue"

-namespace OHOS {
+#include <new>
+#include <queue>
+
+    namespace OHOS {
 namespace MiscServices {
    /*! Constructor
    */