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

4
samples/stc/edit.cpp
View file

@ -152,7 +152,7 @@ Edit::Edit (wxWindow *parent, wxWindowID id,
m_FoldingID = 2;
// initialize language
m_language = NULL;
m_language = nullptr;
// default font for all styles
SetViewEOL (g_CommonPrefs.displayEOLEnable);
@ -606,7 +606,7 @@ bool Edit::InitializePrefs (const wxString &name) {
// initialize styles
StyleClearAll();
LanguageInfo const* curInfo = NULL;
LanguageInfo const* curInfo = nullptr;
// determine language
bool found = false;

182
samples/stc/prefs.cpp
View file

@ -100,112 +100,112 @@ const LanguageInfo g_LanguagePrefs [] = {
{"C++",
"*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hpp;*.hxx;*.sma",
wxSTC_LEX_CPP,
{{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_COMMENT, NULL},
{mySTC_TYPE_COMMENT_LINE, NULL},
{mySTC_TYPE_COMMENT_DOC, NULL},
{mySTC_TYPE_NUMBER, NULL},
{{mySTC_TYPE_DEFAULT, nullptr},
{mySTC_TYPE_COMMENT, nullptr},
{mySTC_TYPE_COMMENT_LINE, nullptr},
{mySTC_TYPE_COMMENT_DOC, nullptr},
{mySTC_TYPE_NUMBER, nullptr},
{mySTC_TYPE_WORD1, CppWordlist1}, // KEYWORDS
{mySTC_TYPE_STRING, NULL},
{mySTC_TYPE_CHARACTER, NULL},
{mySTC_TYPE_UUID, NULL},
{mySTC_TYPE_PREPROCESSOR, NULL},
{mySTC_TYPE_OPERATOR, NULL},
{mySTC_TYPE_IDENTIFIER, NULL},
{mySTC_TYPE_STRING_EOL, NULL},
{mySTC_TYPE_DEFAULT, NULL}, // VERBATIM
{mySTC_TYPE_REGEX, NULL},
{mySTC_TYPE_COMMENT_SPECIAL, NULL}, // DOXY
{mySTC_TYPE_STRING, nullptr},
{mySTC_TYPE_CHARACTER, nullptr},
{mySTC_TYPE_UUID, nullptr},
{mySTC_TYPE_PREPROCESSOR, nullptr},
{mySTC_TYPE_OPERATOR, nullptr},
{mySTC_TYPE_IDENTIFIER, nullptr},
{mySTC_TYPE_STRING_EOL, nullptr},
{mySTC_TYPE_DEFAULT, nullptr}, // VERBATIM
{mySTC_TYPE_REGEX, nullptr},
{mySTC_TYPE_COMMENT_SPECIAL, nullptr}, // DOXY
{mySTC_TYPE_WORD2, CppWordlist2}, // EXTRA WORDS
{mySTC_TYPE_WORD3, CppWordlist3}, // DOXY KEYWORDS
{mySTC_TYPE_ERROR, NULL}, // KEYWORDS ERROR
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL}},
{mySTC_TYPE_ERROR, nullptr}, // KEYWORDS ERROR
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr}},
mySTC_FOLD_COMMENT | mySTC_FOLD_COMPACT | mySTC_FOLD_PREPROC},
// Python
{"Python",
"*.py;*.pyw",
wxSTC_LEX_PYTHON,
{{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_COMMENT_LINE, NULL},
{mySTC_TYPE_NUMBER, NULL},
{mySTC_TYPE_STRING, NULL},
{mySTC_TYPE_CHARACTER, NULL},
{{mySTC_TYPE_DEFAULT, nullptr},
{mySTC_TYPE_COMMENT_LINE, nullptr},
{mySTC_TYPE_NUMBER, nullptr},
{mySTC_TYPE_STRING, nullptr},
{mySTC_TYPE_CHARACTER, nullptr},
{mySTC_TYPE_WORD1, PythonWordlist1}, // KEYWORDS
{mySTC_TYPE_DEFAULT, NULL}, // TRIPLE
{mySTC_TYPE_DEFAULT, NULL}, // TRIPLEDOUBLE
{mySTC_TYPE_DEFAULT, NULL}, // CLASSNAME
{mySTC_TYPE_DEFAULT, nullptr}, // TRIPLE
{mySTC_TYPE_DEFAULT, nullptr}, // TRIPLEDOUBLE
{mySTC_TYPE_DEFAULT, nullptr}, // CLASSNAME
{mySTC_TYPE_DEFAULT, PythonWordlist2}, // DEFNAME
{mySTC_TYPE_OPERATOR, NULL},
{mySTC_TYPE_IDENTIFIER, NULL},
{mySTC_TYPE_DEFAULT, NULL}, // COMMENT_BLOCK
{mySTC_TYPE_STRING_EOL, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL}},
{mySTC_TYPE_OPERATOR, nullptr},
{mySTC_TYPE_IDENTIFIER, nullptr},
{mySTC_TYPE_DEFAULT, nullptr}, // COMMENT_BLOCK
{mySTC_TYPE_STRING_EOL, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr}},
mySTC_FOLD_COMMENTPY | mySTC_FOLD_QUOTESPY},
// * (any)
{wxTRANSLATE(DEFAULT_LANGUAGE),
"*.*",
wxSTC_LEX_PROPERTIES,
{{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_DEFAULT, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL},
{-1, NULL}},
{{mySTC_TYPE_DEFAULT, nullptr},
{mySTC_TYPE_DEFAULT, nullptr},
{mySTC_TYPE_DEFAULT, nullptr},
{mySTC_TYPE_DEFAULT, nullptr},
{mySTC_TYPE_DEFAULT, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr},
{-1, nullptr}},
0},
};

14
samples/stc/stctest.cpp
View file

@ -66,13 +66,13 @@ class AppBook;
//----------------------------------------------------------------------------
//! global application name
wxString *g_appname = NULL;
wxString *g_appname = nullptr;
#if wxUSE_PRINTING_ARCHITECTURE
//! global print data, to remember settings during the session
wxPrintData *g_printData = (wxPrintData*) NULL;
wxPageSetupDialogData *g_pageSetupData = (wxPageSetupDialogData*) NULL;
wxPrintData *g_printData = nullptr;
wxPageSetupDialogData *g_pageSetupData = nullptr;
#endif // wxUSE_PRINTING_ARCHITECTURE
@ -278,12 +278,12 @@ wxBEGIN_EVENT_TABLE (AppFrame, wxFrame)
wxEND_EVENT_TABLE ()
AppFrame::AppFrame (const wxString &title)
: wxFrame ((wxFrame *)NULL, wxID_ANY, title, wxDefaultPosition, wxSize(750,550))
: wxFrame (nullptr, wxID_ANY, title, wxDefaultPosition, wxSize(750,550))
{
SetIcon(wxICON(sample));
// initialize important variables
m_edit = NULL;
m_edit = nullptr;
// set icon and background
SetTitle (*g_appname);
@ -665,7 +665,7 @@ AppAbout::AppAbout (wxWindow *parent,
style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
// set timer if any
m_timer = NULL;
m_timer = nullptr;
if (milliseconds > 0) {
m_timer = new wxTimer (this, myID_ABOUTTIMER);
m_timer->Start (milliseconds, wxTIMER_ONE_SHOT);
@ -840,7 +840,7 @@ void MinimalEditor::OnText(wxStyledTextEvent& event)
class MinimalEditorFrame : public wxFrame
{
public:
MinimalEditorFrame() : wxFrame(NULL, wxID_ANY, _("Minimal Editor"))
MinimalEditorFrame() : wxFrame(nullptr, wxID_ANY, _("Minimal Editor"))
{
MinimalEditor* editor = new MinimalEditor(this);
editor->SetFont(wxFontInfo().Family(wxFONTFAMILY_TELETYPE));