summaryrefslogtreecommitdiff
path: root/plugins/mTextControl
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 /plugins/mTextControl
parentdff565f40105b20b0e8e4dba1f48ccc9b8e7ff44 (diff)
more nullptr
Diffstat (limited to 'plugins/mTextControl')
-rw-r--r--plugins/mTextControl/src/FormattedTextDraw.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/mTextControl/src/FormattedTextDraw.h b/plugins/mTextControl/src/FormattedTextDraw.h
index 8f318717e6..c44d1f25e5 100644
--- a/plugins/mTextControl/src/FormattedTextDraw.h
+++ b/plugins/mTextControl/src/FormattedTextDraw.h
@@ -59,10 +59,10 @@ public:
{
HDC hdcScreen;
- hdcScreen = GetDC(NULL);
+ hdcScreen = GetDC(nullptr);
nPixelsPerInchX = GetDeviceCaps(hdcScreen, LOGPIXELSX);
nPixelsPerInchY = GetDeviceCaps(hdcScreen, LOGPIXELSY);
- ReleaseDC(NULL, hdcScreen);
+ ReleaseDC(nullptr, hdcScreen);
SetRectEmpty(&m_rcClient);
SetRectEmpty(&m_rcViewInset);
@@ -71,8 +71,8 @@ public:
InitDefaultCharFormat();
InitDefaultParaFormat();
- m_spTextServices = NULL;
- m_spTextDocument = NULL;
+ m_spTextServices = nullptr;
+ m_spTextDocument = nullptr;
m_dwPropertyBits = TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_WORDWRAP | TXTBIT_USECURRENTBKG;
m_dwScrollbar = 0;
@@ -82,9 +82,9 @@ public:
~CFormattedTextDraw()
{
free(m_pCF);
- if (m_spTextServices != NULL)
+ if (m_spTextServices != nullptr)
m_spTextServices->Release();
- if (m_spTextDocument != NULL)
+ if (m_spTextDocument != nullptr)
m_spTextDocument->Release();
}
@@ -93,7 +93,7 @@ public:
/* [in] */ REFIID,
/* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
{
- *ppvObject = NULL;
+ *ppvObject = nullptr;
return S_FALSE;
}