diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-04-01 10:43:59 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-04-01 10:43:59 +1100 |
| commit | 0c9d87b081f9dd3856194f71f1643c99994d0b95 (patch) | |
| tree | 3e3ebcc72d771c308471efac87144df173fd60a6 /src | |
| parent | 9a3399828738c816bd40d2e0e87b36894a0e67e7 (diff) | |
| download | scintilla-mirror-0c9d87b081f9dd3856194f71f1643c99994d0b95.tar.gz | |
Standardize on C++ headers, remove headers that aren't needed and add <cstddef>
where it may be needed in the future.
Diffstat (limited to 'src')
| -rw-r--r-- | src/AutoComplete.cxx | 8 | ||||
| -rw-r--r-- | src/CallTip.cxx | 6 | ||||
| -rw-r--r-- | src/Catalogue.cxx | 9 | ||||
| -rw-r--r-- | src/CellBuffer.cxx | 9 | ||||
| -rw-r--r-- | src/CharClassify.cxx | 4 | ||||
| -rw-r--r-- | src/ContractionState.cxx | 5 | ||||
| -rw-r--r-- | src/Decoration.cxx | 9 | ||||
| -rw-r--r-- | src/Document.cxx | 10 | ||||
| -rw-r--r-- | src/EditModel.cxx | 10 | ||||
| -rw-r--r-- | src/EditView.cxx | 13 | ||||
| -rw-r--r-- | src/Editor.cxx | 11 | ||||
| -rw-r--r-- | src/ExternalLexer.cxx | 8 | ||||
| -rw-r--r-- | src/KeyMap.cxx | 2 | ||||
| -rw-r--r-- | src/LineMarker.cxx | 4 | ||||
| -rw-r--r-- | src/MarginView.cxx | 13 | ||||
| -rw-r--r-- | src/PerLine.cxx | 3 | ||||
| -rw-r--r-- | src/PositionCache.cxx | 7 | ||||
| -rw-r--r-- | src/RESearch.cxx | 2 | ||||
| -rw-r--r-- | src/RunStyles.cxx | 9 | ||||
| -rw-r--r-- | src/ScintillaBase.cxx | 9 | ||||
| -rw-r--r-- | src/Selection.cxx | 2 | ||||
| -rw-r--r-- | src/Style.cxx | 2 | ||||
| -rw-r--r-- | src/UniConversion.cxx | 2 | ||||
| -rw-r--r-- | src/ViewStyle.cxx | 5 | ||||
| -rw-r--r-- | src/XPM.cxx | 4 |
25 files changed, 82 insertions, 84 deletions
diff --git a/src/AutoComplete.cxx b/src/AutoComplete.cxx index 419d495c2..a7b4a8b00 100644 --- a/src/AutoComplete.cxx +++ b/src/AutoComplete.cxx @@ -5,10 +5,10 @@ // Copyright 1998-2003 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 <cstdlib> +#include <cassert> +#include <cstring> +#include <cstdio> #include <stdexcept> #include <string> diff --git a/src/CallTip.cxx b/src/CallTip.cxx index 1d0aff2ec..1609bab0a 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -5,9 +5,9 @@ // Copyright 1998-2001 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 <cstdlib> +#include <cstring> +#include <cstdio> #include <stdexcept> #include <string> diff --git a/src/Catalogue.cxx b/src/Catalogue.cxx index 22e19bd06..8dbe1dde0 100644 --- a/src/Catalogue.cxx +++ b/src/Catalogue.cxx @@ -5,12 +5,9 @@ // 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 <cstring> #include <stdexcept> #include <vector> diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx index 0001c812d..f437cc335 100644 --- a/src/CellBuffer.cxx +++ b/src/CellBuffer.cxx @@ -5,10 +5,11 @@ // Copyright 1998-2001 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 <cstddef> +#include <cstdlib> +#include <cstring> +#include <cstdio> +#include <cstdarg> #include <stdexcept> #include <algorithm> diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx index 8678e6d64..5d0aa02a4 100644 --- a/src/CharClassify.cxx +++ b/src/CharClassify.cxx @@ -5,8 +5,8 @@ // Copyright 2006 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <stdlib.h> -#include <ctype.h> +#include <cstdlib> +#include <cctype> #include <stdexcept> diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index bf4cd6767..03e363941 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -5,8 +5,9 @@ // Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <string.h> -#include <assert.h> +#include <cstddef> +#include <cassert> +#include <cstring> #include <stdexcept> #include <algorithm> diff --git a/src/Decoration.cxx b/src/Decoration.cxx index 389db5029..ed8b91ddc 100644 --- a/src/Decoration.cxx +++ b/src/Decoration.cxx @@ -4,10 +4,11 @@ // Copyright 1998-2007 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 <cstddef> +#include <cstdlib> +#include <cstring> +#include <cstdio> +#include <cstdarg> #include <stdexcept> #include <algorithm> diff --git a/src/Document.cxx b/src/Document.cxx index 8c4fd36dc..e3b2a4be9 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -5,11 +5,11 @@ // Copyright 1998-2011 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 <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> +#include <cstdio> #include <stdexcept> #include <string> diff --git a/src/EditModel.cxx b/src/EditModel.cxx index 59ae18977..292ce954c 100644 --- a/src/EditModel.cxx +++ b/src/EditModel.cxx @@ -5,12 +5,10 @@ // Copyright 1998-2014 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 <math.h> -#include <assert.h> -#include <ctype.h> +#include <cstddef> +#include <cstdlib> +#include <cassert> +#include <cmath> #include <stdexcept> #include <string> diff --git a/src/EditView.cxx b/src/EditView.cxx index f1066681f..90fa991ab 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -5,12 +5,13 @@ // Copyright 1998-2014 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 <math.h> -#include <assert.h> -#include <ctype.h> +#include <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> +#include <cctype> +#include <cstdio> +#include <cmath> #include <stdexcept> #include <string> diff --git a/src/Editor.cxx b/src/Editor.cxx index 32528df1d..e7e494a6c 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -5,11 +5,12 @@ // Copyright 1998-2011 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 <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> +#include <cctype> +#include <cstdio> #include <cmath> #include <stdexcept> diff --git a/src/ExternalLexer.cxx b/src/ExternalLexer.cxx index 2f81df7e0..2d3501f5b 100644 --- a/src/ExternalLexer.cxx +++ b/src/ExternalLexer.cxx @@ -5,11 +5,9 @@ // Copyright 2001 Simon Steele <ss@pnotepad.org>, portions copyright Neil Hodgson. // 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 <cstring> #include <stdexcept> #include <string> diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx index a6b1cf6c4..2d81ab4eb 100644 --- a/src/KeyMap.cxx +++ b/src/KeyMap.cxx @@ -5,7 +5,7 @@ // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <stdlib.h> +#include <cstdlib> #include <stdexcept> #include <vector> diff --git a/src/LineMarker.cxx b/src/LineMarker.cxx index 6239d1c9d..53d9617c4 100644 --- a/src/LineMarker.cxx +++ b/src/LineMarker.cxx @@ -5,8 +5,8 @@ // Copyright 1998-2011 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <string.h> -#include <math.h> +#include <cstring> +#include <cmath> #include <stdexcept> #include <vector> diff --git a/src/MarginView.cxx b/src/MarginView.cxx index ed1219a5d..be743213d 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -5,12 +5,13 @@ // Copyright 1998-2014 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 <math.h> -#include <assert.h> -#include <ctype.h> +#include <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> +#include <cctype> +#include <cstdio> +#include <cmath> #include <stdexcept> #include <string> diff --git a/src/PerLine.cxx b/src/PerLine.cxx index 6b1267b5d..ceace09f4 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -5,7 +5,8 @@ // Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <string.h> +#include <cstddef> +#include <cstring> #include <stdexcept> #include <vector> diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 3eee9058b..66d944d26 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -5,10 +5,9 @@ // Copyright 1998-2007 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 <ctype.h> +#include <cstddef> +#include <cstdlib> +#include <cstring> #include <stdexcept> #include <string> diff --git a/src/RESearch.cxx b/src/RESearch.cxx index 612596986..438a3301f 100644 --- a/src/RESearch.cxx +++ b/src/RESearch.cxx @@ -200,7 +200,7 @@ * matches: foo-foo fo-fo fob-fob foobar-foobar ... */ -#include <stdlib.h> +#include <cstdlib> #include <stdexcept> #include <string> diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx index a136f022a..aa0177ca1 100644 --- a/src/RunStyles.cxx +++ b/src/RunStyles.cxx @@ -4,10 +4,11 @@ // Copyright 1998-2007 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 <cstddef> +#include <cstdlib> +#include <cstring> +#include <cstdio> +#include <cstdarg> #include <stdexcept> #include <algorithm> diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index e480b97d3..e06fc5495 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -5,11 +5,10 @@ // Copyright 1998-2003 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 <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> #include <stdexcept> #include <string> diff --git a/src/Selection.cxx b/src/Selection.cxx index 7d4be8f68..aecd973a9 100644 --- a/src/Selection.cxx +++ b/src/Selection.cxx @@ -5,7 +5,7 @@ // Copyright 2009 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <stdlib.h> +#include <cstdlib> #include <stdexcept> #include <vector> diff --git a/src/Style.cxx b/src/Style.cxx index d8efd0ece..65f476f92 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -5,8 +5,6 @@ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <string.h> - #include <stdexcept> #include "Platform.h" diff --git a/src/UniConversion.cxx b/src/UniConversion.cxx index d0028d65e..9c4acb422 100644 --- a/src/UniConversion.cxx +++ b/src/UniConversion.cxx @@ -5,7 +5,7 @@ // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <stdlib.h> +#include <cstdlib> #include <stdexcept> #include <string> diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index b694a62e3..db3ad607b 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -5,8 +5,9 @@ // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <string.h> -#include <assert.h> +#include <cstddef> +#include <cassert> +#include <cstring> #include <stdexcept> #include <vector> diff --git a/src/XPM.cxx b/src/XPM.cxx index 49b58038a..646981a80 100644 --- a/src/XPM.cxx +++ b/src/XPM.cxx @@ -5,8 +5,8 @@ // Copyright 1998-2003 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 <cstdlib> +#include <cstring> #include <stdexcept> #include <vector> |