fix warning

Signed-off-by: zhouyongfei <zhouyongfei@huawei.com>
This commit is contained in:
zhouyongfei
2022-03-25 09:53:57 +00:00
parent ed19081e74
commit 792925aa2c
101 changed files with 370 additions and 347 deletions
@@ -41,6 +41,6 @@ namespace MiscServices {
virtual int32_t onInputReleased(int32_t retValue) = 0;
virtual int32_t setDisplayMode(int32_t mode) = 0;
};
}
}
#endif // FM_IMMS_PROJECT_IINPUTCLIENT_H
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_I_INPUT_CLIENT_H
@@ -58,6 +58,6 @@ namespace MiscServices {
virtual int32_t GetInputPattern() = 0;
virtual void StopInput() = 0;
};
}
}
#endif // FM_IMMS_PROJECT_IINPUTDATACHANNEL_H
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_I_INPUT_DATA_CHANNEL_H
@@ -35,6 +35,6 @@ namespace MiscServices {
private:
static inline BrokerDelegator<InputClientProxy> delegator_;
};
}
}
#endif
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
@@ -36,9 +36,10 @@ namespace MiscServices {
int32_t onInputReady(const sptr<IInputMethodAgent>& agent) override;
int32_t onInputReleased(int32_t retValue) override;
int32_t setDisplayMode(int32_t mode) override;
private:
MessageHandler *msgHandler = nullptr;
};
}
}
#endif
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
@@ -44,6 +44,6 @@ namespace MiscServices {
private:
static inline BrokerDelegator<InputDataChannelProxy> delegator_;
};
}
}
#endif
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H
@@ -48,9 +48,10 @@ namespace MiscServices {
int32_t GetEnterKeyType() override;
int32_t GetInputPattern() override;
void StopInput() override;
private:
MessageHandler *msgHandler;
};
}
}
#endif
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H
@@ -71,6 +71,7 @@ namespace MiscServices {
int32_t GetEnterKeyType();
int32_t GetInputPattern();
void HideCurrentInput();
private:
InputMethodController();
~InputMethodController();
@@ -106,6 +107,6 @@ namespace MiscServices {
int32_t enterKeyType_ = 0;
int32_t inputPattern_ = 0;
};
}
}
#endif
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_METHOD_CONTROLLER_H
@@ -36,12 +36,12 @@ namespace MiscServices {
~InputMethodSystemAbilityProxy() = default;
DISALLOW_COPY_AND_MOVE(InputMethodSystemAbilityProxy);
virtual void prepareInput(MessageParcel& data) override;
virtual void releaseInput(MessageParcel& data) override;
virtual void startInput(MessageParcel& data) override;
virtual void stopInput(MessageParcel& data) override;
virtual void SetCoreAndAgent(MessageParcel& data) override;
virtual void HideCurrentInput(MessageParcel& data) override;
void prepareInput(MessageParcel& data) override;
void releaseInput(MessageParcel& data) override;
void startInput(MessageParcel& data) override;
void stopInput(MessageParcel& data) override;
void SetCoreAndAgent(MessageParcel& data) override;
void HideCurrentInput(MessageParcel& data) override;
int32_t Prepare(int32_t displayId, sptr<InputClientStub> &client, sptr<InputDataChannelStub> &channel,
InputAttribute &attribute);
@@ -49,17 +49,17 @@ namespace MiscServices {
int32_t Start(sptr<InputClientStub> &client);
int32_t Stop(sptr<InputClientStub> &client);
virtual void displayOptionalInputMethod(MessageParcel& data) override;
virtual int32_t getDisplayMode(int32_t retMode) override;
virtual int32_t getKeyboardWindowHeight(int32_t retHeight) override;
virtual int32_t getCurrentKeyboardType(KeyboardType *retType) override;
virtual int32_t listInputMethodEnabled(std::vector<InputMethodProperty*> *properties) override;
virtual int32_t listInputMethod(std::vector<InputMethodProperty*> *properties) override;
virtual int32_t listKeyboardType(const std::u16string& imeId, std::vector<KeyboardType*> *types) override;
void displayOptionalInputMethod(MessageParcel& data) override;
int32_t getDisplayMode(int32_t retMode) override;
int32_t getKeyboardWindowHeight(int32_t retHeight) override;
int32_t getCurrentKeyboardType(KeyboardType *retType) override;
int32_t listInputMethodEnabled(std::vector<InputMethodProperty*> *properties) override;
int32_t listInputMethod(std::vector<InputMethodProperty*> *properties) override;
int32_t listKeyboardType(const std::u16string& imeId, std::vector<KeyboardType*> *types) override;
private:
static inline BrokerDelegator<InputMethodSystemAbilityProxy> delegator_;
};
}
}
#endif
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_METHOD_SYSTEM_ABILITY_PROXY_H
@@ -93,10 +93,12 @@ namespace MiscServices {
HIDE,
SHOW
};
enum class FunctionKey {
NONE = 0,
CONFIRM
};
class KeyboardInfo {
public:
KeyboardStatus GetKeyboardStatus() const
@@ -118,10 +120,11 @@ namespace MiscServices {
{
functionKey = static_cast<FunctionKey>(key);
}
private:
KeyboardStatus keyboardStatus = KeyboardStatus::NONE;
FunctionKey functionKey = FunctionKey::NONE;
};
}
}
#endif // FM_IMC_PROJECT_INPUT_METHOD_UTILS_H
} // namespace MiscServices
} // namespace OHOS
#endif // FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_METHOD_UTILS_H