diff options
| author | George Hazan <ghazan@miranda.im> | 2019-03-12 18:48:25 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-03-12 18:48:25 +0300 |
| commit | 413bfdfbc3b4bbcdf5ebe47d83c618c3781c6a82 (patch) | |
| tree | 7e23801fb844bcf352b9a88fff0760c8f67833a0 | |
| parent | 6e67be23d4796ce8a3d39408aa2e02b632c67b47 (diff) | |
warning fixes
| -rw-r--r-- | include/m_json.h | 6 | ||||
| -rw-r--r-- | plugins/SimpleStatusMsg/src/awaymsg.cpp | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/m_json.h b/include/m_json.h index bf755ca2fe..1353041355 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -135,13 +135,11 @@ class JSONROOT JSONNode *m_node;
public:
- __forceinline JSONROOT() { m_node = nullptr; }
- __forceinline JSONROOT(LPCSTR text) { Parse(text); }
+ __forceinline JSONROOT() : m_node(nullptr) {}
+ __forceinline JSONROOT(LPCSTR text) : m_node(json_parse(text)) {}
__forceinline ~JSONROOT() { json_delete(m_node); }
__forceinline operator JSONNode*() const { return m_node; }
-
- __forceinline JSONNode* Parse(LPCSTR text) { return (m_node = json_parse(text)); }
};
struct NULL_PARAM : public PARAM
diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 280351b7c7..114789ed5b 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -36,8 +36,8 @@ class CReadAwayMsgDlg : public CDlgBase CCtrlButton btnCopy;
MCONTACT m_hContact;
- HANDLE m_hSeq;
- HANDLE m_hAwayMsgEvent;
+ HANDLE m_hSeq = nullptr;
+ HANDLE m_hAwayMsgEvent = nullptr;
public:
CReadAwayMsgDlg(MCONTACT hContact) :
|