summaryrefslogtreecommitdiff
path: root/include/m_gui.h
diff options
context:
space:
mode:
authorGoraf <22941576+Goraf@users.noreply.github.com>2018-02-24 15:32:06 +0100
committerGoraf <22941576+Goraf@users.noreply.github.com>2018-02-24 18:20:46 +0100
commit1c0172cca4f1e90679321912e20436a7f42f122d (patch)
tree77a544d2c09332ec176f42ebcf58a40d9c5d2b93 /include/m_gui.h
parentdff565f40105b20b0e8e4dba1f48ccc9b8e7ff44 (diff)
more nullptr
Diffstat (limited to 'include/m_gui.h')
-rw-r--r--include/m_gui.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/m_gui.h b/include/m_gui.h
index 45b6130122..0a1dfc2025 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -259,7 +259,7 @@ struct CCallbackImp
};
public:
- __inline CCallbackImp(): m_object(NULL), m_func(NULL) {}
+ __inline CCallbackImp(): m_object(nullptr), m_func(nullptr) {}
__inline CCallbackImp(const CCallbackImp &other): m_object(other.m_object), m_func(other.m_func) {}
__inline CCallbackImp &operator=(const CCallbackImp &other) { m_object = other.m_object; m_func = other.m_func; return *this; }
@@ -362,7 +362,7 @@ public:
__forceinline DWORD LoadInt() { return (DWORD)(T)*m_option; }
__forceinline void SaveInt(DWORD value) { *m_option = (T)value; }
- __forceinline wchar_t* LoadText() { return NULL; }
+ __forceinline wchar_t* LoadText() { return nullptr; }
__forceinline void SaveText(wchar_t*) {}
};
@@ -1453,7 +1453,7 @@ protected:
virtual void OnProtoCheckOnline(WPARAM, LPARAM);
private:
- void UpdateProtoTitle(const wchar_t *szText = NULL);
+ void UpdateProtoTitle(const wchar_t *szText = nullptr);
void UpdateStatusBar();
};