diff options
52 files changed, 162 insertions, 184 deletions
diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h index dddec85de..caac1d9fb 100644 --- a/cocoa/PlatCocoa.h +++ b/cocoa/PlatCocoa.h @@ -7,11 +7,10 @@ #ifndef PLATCOCOA_H #define PLATCOCOA_H -#include <assert.h> - #include <sys/time.h> #include <cstdlib> +#include <cassert> #include <cstring> #include <cstdio> diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index dbf78c303..b989857f5 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -12,10 +12,11 @@ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt). */ -#include <assert.h> #include <sys/time.h> +#include <cstddef> #include <cstdlib> +#include <cassert> #include <cstring> #include <cstdio> diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 2e2bde524..18cd5855f 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -13,10 +13,11 @@ * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt). */ -#include <stdlib.h> -#include <stdio.h> -#include <time.h> -#include <ctype.h> +#include <cstddef> +#include <cstdlib> +#include <cctype> +#include <cstdio> +#include <ctime> #include <stdexcept> #include <string> diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 6db080db5..9ad49c9b8 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -3,11 +3,11 @@ // Copyright 1998-2004 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <stddef.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <math.h> +#include <cstddef> +#include <cstdlib> +#include <cstring> +#include <cstdio> +#include <cmath> #include <string> #include <vector> diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 7b175d56b..6dfd33c95 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -3,13 +3,14 @@ // Copyright 1998-2004 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 <time.h> -#include <math.h> -#include <assert.h> -#include <ctype.h> +#include <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> +#include <cctype> +#include <cstdio> +#include <ctime> +#include <cmath> #include <stdexcept> #include <new> diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx index 3b54ff1a8..aede7dd4e 100644 --- a/gtk/ScintillaGTKAccessible.cxx +++ b/gtk/ScintillaGTKAccessible.cxx @@ -51,8 +51,9 @@ // FIXME: optimize character/byte offset conversion (with a cache?) -#include <stdlib.h> -#include <string.h> +#include <cstddef> +#include <cstdlib> +#include <cstring> #include <stdexcept> #include <new> 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> diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index 74d5eb770..d140c6e5c 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -11,12 +11,13 @@ #ifndef SCINTILLAQT_H #define SCINTILLAQT_H -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <assert.h> -#include <ctype.h> -#include <time.h> +#include <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> +#include <cctype> +#include <cstdio> +#include <ctime> #include <cmath> #include <stdexcept> #include <string> diff --git a/scripts/HeaderOrder.txt b/scripts/HeaderOrder.txt index 933eac3b4..13373ae33 100644 --- a/scripts/HeaderOrder.txt +++ b/scripts/HeaderOrder.txt @@ -17,13 +17,17 @@ #include <sys/time.h> // C++ wrappers of C standard library +#include <cstddef> #include <cstdlib> +#include <cstdint> #include <cassert> #include <cstring> #include <cctype> #include <cstdio> #include <cstdarg> +#include <ctime> #include <cmath> +#include <climits> // C++ standard library #include <stdexcept> 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> diff --git a/test/unit/testCharClassify.cxx b/test/unit/testCharClassify.cxx index 3d17405cc..5a66ff80f 100644 --- a/test/unit/testCharClassify.cxx +++ b/test/unit/testCharClassify.cxx @@ -1,6 +1,6 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> +#include <cstring> #include <algorithm> #include <iostream> diff --git a/test/unit/testContractionState.cxx b/test/unit/testContractionState.cxx index 2bf4854c3..3c6f2f669 100644 --- a/test/unit/testContractionState.cxx +++ b/test/unit/testContractionState.cxx @@ -1,6 +1,6 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> +#include <cstring> #include <stdexcept> #include <algorithm> diff --git a/test/unit/testDecoration.cxx b/test/unit/testDecoration.cxx index 0d45e562b..2f1c66a30 100644 --- a/test/unit/testDecoration.cxx +++ b/test/unit/testDecoration.cxx @@ -1,6 +1,6 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> +#include <cstring> #include <stdexcept> #include <algorithm> diff --git a/test/unit/testPartitioning.cxx b/test/unit/testPartitioning.cxx index 4863cfb11..513fa0fea 100644 --- a/test/unit/testPartitioning.cxx +++ b/test/unit/testPartitioning.cxx @@ -1,6 +1,6 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> +#include <cstring> #include <stdexcept> #include <algorithm> diff --git a/test/unit/testRunStyles.cxx b/test/unit/testRunStyles.cxx index 09a5b1cae..19d784fd9 100644 --- a/test/unit/testRunStyles.cxx +++ b/test/unit/testRunStyles.cxx @@ -1,6 +1,6 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> +#include <cstring> #include <stdexcept> #include <algorithm> diff --git a/test/unit/testSparseVector.cxx b/test/unit/testSparseVector.cxx index e0db7d094..8b9c8a140 100644 --- a/test/unit/testSparseVector.cxx +++ b/test/unit/testSparseVector.cxx @@ -1,8 +1,7 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> - #include <cassert> +#include <cstring> #include <stdexcept> #include <algorithm> diff --git a/test/unit/testSplitVector.cxx b/test/unit/testSplitVector.cxx index d71e26dd5..c58accc84 100644 --- a/test/unit/testSplitVector.cxx +++ b/test/unit/testSplitVector.cxx @@ -1,6 +1,6 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> +#include <cstring> #include <stdexcept> #include <algorithm> diff --git a/test/unit/testUnicodeFromUTF8.cxx b/test/unit/testUnicodeFromUTF8.cxx index 841a9c68c..116f4cf19 100644 --- a/test/unit/testUnicodeFromUTF8.cxx +++ b/test/unit/testUnicodeFromUTF8.cxx @@ -1,6 +1,6 @@ // Unit Tests for Scintilla internal data structures -#include <string.h> +#include <cstring> #include <algorithm> diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 9afc14eaf..0bca24854 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -5,15 +5,15 @@ // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. -#include <stddef.h> -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <stdarg.h> -#include <time.h> -#include <math.h> -#include <ctype.h> -#include <limits.h> +#include <cstddef> +#include <cstdlib> +#include <cstring> +#include <cctype> +#include <cstdio> +#include <cstdarg> +#include <ctime> +#include <cmath> +#include <climits> #include <vector> #include <map> diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 877ca5d88..8a817dde3 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -5,14 +5,15 @@ // 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 <limits.h> - +#include <cstddef> +#include <cstdlib> +#include <cassert> +#include <cstring> +#include <cctype> +#include <cstdio> #include <cmath> +#include <climits> + #include <stdexcept> #include <new> #include <string> |