diff options
| author | Goraf <22941576+Goraf@users.noreply.github.com> | 2018-02-24 15:32:06 +0100 |
|---|---|---|
| committer | Goraf <22941576+Goraf@users.noreply.github.com> | 2018-02-24 18:20:46 +0100 |
| commit | 1c0172cca4f1e90679321912e20436a7f42f122d (patch) | |
| tree | 77a544d2c09332ec176f42ebcf58a40d9c5d2b93 /plugins/BasicHistory/src | |
| parent | dff565f40105b20b0e8e4dba1f48ccc9b8e7ff44 (diff) | |
more nullptr
Diffstat (limited to 'plugins/BasicHistory/src')
| -rw-r--r-- | plugins/BasicHistory/src/ExportManager.h | 2 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/ImageDataObject.h | 4 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/Options.h | 4 | ||||
| -rw-r--r-- | plugins/BasicHistory/src/codecvt_CodePage.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/plugins/BasicHistory/src/ExportManager.h b/plugins/BasicHistory/src/ExportManager.h index 73cd4ca1b7..212f76f2ea 100644 --- a/plugins/BasicHistory/src/ExportManager.h +++ b/plugins/BasicHistory/src/ExportManager.h @@ -54,7 +54,7 @@ public: void SetDeleteWithoutExportEvents(int deltaTime, DWORD now);
void DeleteExportedEvents();
int Import(IImport::ImportType type, const std::vector<MCONTACT> &contacts);
- bool Import(IImport::ImportType type, std::vector<IImport::ExternalMessage> &eventList, std::wstring *err = NULL, bool *differentContact = NULL, std::vector<MCONTACT> *contacts = NULL);
+ bool Import(IImport::ImportType type, std::vector<IImport::ExternalMessage> &eventList, std::wstring *err = nullptr, bool *differentContact = nullptr, std::vector<MCONTACT> *contacts = nullptr);
static const wchar_t* GetExt(IImport::ImportType type);
};
diff --git a/plugins/BasicHistory/src/ImageDataObject.h b/plugins/BasicHistory/src/ImageDataObject.h index 4909219683..2e0ef3dd3f 100644 --- a/plugins/BasicHistory/src/ImageDataObject.h +++ b/plugins/BasicHistory/src/ImageDataObject.h @@ -81,12 +81,12 @@ public: STDMETHOD(GetData)(FORMATETC*, STGMEDIUM *pmedium) {
HANDLE hDst;
hDst = ::OleDuplicateData(m_stgmed.hBitmap, CF_BITMAP, 0);
- if (hDst == NULL)
+ if (hDst == nullptr)
return E_HANDLE;
pmedium->tymed = TYMED_GDI;
pmedium->hBitmap = (HBITMAP)hDst;
- pmedium->pUnkForRelease = NULL;
+ pmedium->pUnkForRelease = nullptr;
return S_OK;
}
diff --git a/plugins/BasicHistory/src/Options.h b/plugins/BasicHistory/src/Options.h index 097eec73f7..acb27417f2 100644 --- a/plugins/BasicHistory/src/Options.h +++ b/plugins/BasicHistory/src/Options.h @@ -115,7 +115,7 @@ struct TaskOptions deltaTime = 24;
orderNr = 0;
wchar_t buf[MAX_PATH];
- if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, buf)))
+ if (SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_PERSONAL, nullptr, SHGFP_TYPE_CURRENT, buf)))
{
filePath = buf;
filePath += L"\\";
@@ -123,7 +123,7 @@ struct TaskOptions filePath += TranslateT("History");
filePath += L"_<contact>_<date>.<ext>";
- lastExport = time(NULL);
+ lastExport = time(nullptr);
}
};
diff --git a/plugins/BasicHistory/src/codecvt_CodePage.h b/plugins/BasicHistory/src/codecvt_CodePage.h index 007af11434..1a6b7f3db1 100644 --- a/plugins/BasicHistory/src/codecvt_CodePage.h +++ b/plugins/BasicHistory/src/codecvt_CodePage.h @@ -52,7 +52,7 @@ protected: _Mid1 = _First1;
_Mid2 = _First2;
- int conv = WideCharToMultiByte(codePage, 0, _First1, _Last1 - _First1, _First2, _Last2 - _First2, NULL, NULL);
+ int conv = WideCharToMultiByte(codePage, 0, _First1, _Last1 - _First1, _First2, _Last2 - _First2, nullptr, nullptr);
if (conv == 0)
{
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
|