diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-04-26 18:06:06 +1000 | 
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-04-26 18:06:06 +1000 | 
| commit | 4dcd314b9a77c93f650f5ff4e42b3695366e0095 (patch) | |
| tree | a495cbab189fc35a754ef335c90c2e696dce372c /src/Editor.cxx | |
| parent | 8f04bd4802e0e6063175b20d36df0d812b6a5db4 (diff) | |
| download | scintilla-mirror-4dcd314b9a77c93f650f5ff4e42b3695366e0095.tar.gz | |
Avoid some warnings.
Diffstat (limited to 'src/Editor.cxx')
| -rw-r--r-- | src/Editor.cxx | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/src/Editor.cxx b/src/Editor.cxx index 573bdb140..66b8fe47d 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -102,7 +102,7 @@ Timer::Timer() noexcept :  		ticking(false), ticksToWait(0), tickerID{} {}  Idler::Idler() noexcept : -		state(false), idlerID(0) {} +		state(false), idlerID(nullptr) {}  static constexpr bool IsAllSpacesOrTabs(std::string_view sv) noexcept {  	for (const char ch : sv) { @@ -188,7 +188,7 @@ Editor::Editor() : durationWrapOneLine(0.00001, 0.000001, 0.0001) {  	modEventMask = SC_MODEVENTMASKALL;  	commandEvents = true; -	pdoc->AddWatcher(this, 0); +	pdoc->AddWatcher(this, nullptr);  	recordingMacro = false;  	foldAutomatic = 0; @@ -199,7 +199,7 @@ Editor::Editor() : durationWrapOneLine(0.00001, 0.000001, 0.0001) {  }  Editor::~Editor() { -	pdoc->RemoveWatcher(this, 0); +	pdoc->RemoveWatcher(this, nullptr);  	DropGraphics();  } @@ -3959,7 +3959,7 @@ int Editor::KeyDefault(int, int) {  int Editor::KeyDownWithModifiers(int key, int modifiers, bool *consumed) {  	DwellEnd(false); -	const int msg = kmap.Find(key, modifiers); +	const unsigned int msg = kmap.Find(key, modifiers);  	if (msg) {  		if (consumed)  			*consumed = true; @@ -5273,7 +5273,7 @@ void Editor::SetAnnotationHeights(Sci::Line start, Sci::Line end) {  void Editor::SetDocPointer(Document *document) {  	//Platform::DebugPrintf("** %x setdoc to %x\n", pdoc, document); -	pdoc->RemoveWatcher(this, 0); +	pdoc->RemoveWatcher(this, nullptr);  	pdoc->Release();  	if (!document) {  		pdoc = new Document(SC_DOCUMENTOPTION_DEFAULT); @@ -5306,7 +5306,7 @@ void Editor::SetDocPointer(Document *document) {  	view.ClearAllTabstops(); -	pdoc->AddWatcher(this, 0); +	pdoc->AddWatcher(this, nullptr);  	SetScrollBars();  	Redraw();  } | 
