solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Use nullptr instead of NULL in the code and documentation

Browse source 
This is a combination of running clang-tidy with modernize-use-nullptr
check for some ports (GTK, X11, OSX) and manual changes to the ports for
which it couldn't be used easily (MSW, DFB) and also manually updating
the docs.

Also replace NULL with null or nullptr in the comments as this is more
consistent with the use of nullptr in the code and makes it simpler to
grep for the remaining occurrences of NULL itself.

And also use null in the assert messages.

Only a few occurrences of "NULL" are still left in non-C files, mostly
corresponding to unclear comments or string output which it might not be
safe to change.
This commit is contained in:
Vadim Zeitlin 2022-10-16 01:24:34 +02:00
parent 39ea524943
commit 4f4c5fcfdf
1844 changed files with 13721 additions and 13734 deletions
Download patch file Download diff file Expand all files Collapse all files

20
samples/scroll/scroll.cpp
View file

@ -451,15 +451,15 @@ public:
wxBORDER_SUNKEN)
{
m_nLines = 50;
m_winSync = NULL;
m_winSync = nullptr;
m_inDoSync = false;
wxClientDC dc(this);
dc.GetTextExtent("Line 17", NULL, &m_hLine);
dc.GetTextExtent("Line 17", nullptr, &m_hLine);
}
// this scrolled window can be synchronized with another one: if this
// function is called with a non-NULL pointer, the given window will be
// function is called with a non-null pointer, the given window will be
// scrolled to the same position as this one
void SyncWith(MyScrolledWindowBase *win)
{
@ -468,7 +468,7 @@ public:
DoSyncIfNecessary();
}
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL) override
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = nullptr) override
{
wxScrolled<wxWindow>::ScrollWindow(dx, dy, rect);
@ -497,7 +497,7 @@ private:
}
}
// the window to synchronize with this one or NULL
// the window to synchronize with this one or nullptr
MyScrolledWindowBase *m_winSync;
// the flag preventing infinite recursion which would otherwise happen if
@ -851,7 +851,7 @@ wxBEGIN_EVENT_TABLE(MyFrame,wxFrame)
wxEND_EVENT_TABLE()
MyFrame::MyFrame()
: wxFrame(NULL, wxID_ANY, "wxWidgets scroll sample")
: wxFrame(nullptr, wxID_ANY, "wxWidgets scroll sample")
{
SetIcon(wxICON(sample));
@ -940,8 +940,8 @@ void MyFrame::OnToggleSync(wxCommandEvent& event)
}
else
{
m_win1->SyncWith(NULL);
m_win2->SyncWith(NULL);
m_win1->SyncWith(nullptr);
m_win2->SyncWith(nullptr);
}
}
@ -1000,7 +1000,7 @@ void MyScrolledWindowDumb::OnDraw(wxDC& dc)
for ( size_t line = 0; line < m_nLines; line++ )
{
int yPhys;
CalcScrolledPosition(0, y, NULL, &yPhys);
CalcScrolledPosition(0, y, nullptr, &yPhys);
dc.DrawText(wxString::Format("Line %u (logical %d, physical %d)",
unsigned(line), y, yPhys), 0, y);
@ -1029,7 +1029,7 @@ void MyScrolledWindowSmart::OnDraw(wxDC& dc)
for ( size_t line = lineFrom; line <= lineTo; line++ )
{
int yPhys;
CalcScrolledPosition(0, y, NULL, &yPhys);
CalcScrolledPosition(0, y, nullptr, &yPhys);
dc.DrawText(wxString::Format("Line %u (logical %d, physical %d)",
unsigned(line), y, yPhys), 0, y);