From 0c9d87b081f9dd3856194f71f1643c99994d0b95 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 1 Apr 2017 10:43:59 +1100
Subject: Standardize on C++ headers, remove headers that aren't needed and add
 <cstddef> where it may be needed in the future.

---
 lexlib/Accessor.cxx          | 8 ++------
 lexlib/CharacterSet.cxx      | 7 ++-----
 lexlib/LexerBase.cxx         | 9 +++------
 lexlib/LexerModule.cxx       | 8 ++------
 lexlib/LexerNoExceptions.cxx | 8 ++------
 lexlib/LexerSimple.cxx       | 8 ++------
 lexlib/PropSetSimple.cxx     | 5 ++---
 lexlib/StyleContext.cxx      | 8 +++-----
 lexlib/WordList.cxx          | 7 ++-----
 9 files changed, 20 insertions(+), 48 deletions(-)

(limited to 'lexlib')

diff --git a/lexlib/Accessor.cxx b/lexlib/Accessor.cxx
index f8b46ef88..e35894dd3 100644
--- a/lexlib/Accessor.cxx
+++ b/lexlib/Accessor.cxx
@@ -5,12 +5,8 @@
 // Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
 
 #include "ILexer.h"
 #include "Scintilla.h"
diff --git a/lexlib/CharacterSet.cxx b/lexlib/CharacterSet.cxx
index 55602af30..bb9a86df6 100644
--- a/lexlib/CharacterSet.cxx
+++ b/lexlib/CharacterSet.cxx
@@ -6,11 +6,8 @@
 // Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
 
 #include "CharacterSet.h"
 
diff --git a/lexlib/LexerBase.cxx b/lexlib/LexerBase.cxx
index d887b3c6c..71e2601dc 100644
--- a/lexlib/LexerBase.cxx
+++ b/lexlib/LexerBase.cxx
@@ -5,12 +5,9 @@
 // Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
 
 #include "ILexer.h"
 #include "Scintilla.h"
diff --git a/lexlib/LexerModule.cxx b/lexlib/LexerModule.cxx
index 390bae06e..a9fc4f522 100644
--- a/lexlib/LexerModule.cxx
+++ b/lexlib/LexerModule.cxx
@@ -5,12 +5,8 @@
 // Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
 
 #include <string>
 
diff --git a/lexlib/LexerNoExceptions.cxx b/lexlib/LexerNoExceptions.cxx
index 30c291bcb..2adc3a733 100644
--- a/lexlib/LexerNoExceptions.cxx
+++ b/lexlib/LexerNoExceptions.cxx
@@ -5,12 +5,8 @@
 // Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
 
 #include "ILexer.h"
 #include "Scintilla.h"
diff --git a/lexlib/LexerSimple.cxx b/lexlib/LexerSimple.cxx
index 437c96f78..f741e0fef 100644
--- a/lexlib/LexerSimple.cxx
+++ b/lexlib/LexerSimple.cxx
@@ -5,12 +5,8 @@
 // Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
 
 #include <string>
 
diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx
index 6592d70eb..a16a22538 100644
--- a/lexlib/PropSetSimple.cxx
+++ b/lexlib/PropSetSimple.cxx
@@ -7,9 +7,8 @@
 
 // Maintain a dictionary of properties
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <string>
 #include <map>
diff --git a/lexlib/StyleContext.cxx b/lexlib/StyleContext.cxx
index f9f15be2e..9c3057ac5 100644
--- a/lexlib/StyleContext.cxx
+++ b/lexlib/StyleContext.cxx
@@ -5,11 +5,9 @@
 // Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org>
 // This file is in the public domain.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
+#include <cctype>
 
 #include "ILexer.h"
 
diff --git a/lexlib/WordList.cxx b/lexlib/WordList.cxx
index 64a2a50c0..2f673397f 100644
--- a/lexlib/WordList.cxx
+++ b/lexlib/WordList.cxx
@@ -5,11 +5,8 @@
 // Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <algorithm>
 
-- 
cgit v1.2.3