diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
| commit | 313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf (patch) | |
| tree | 2ec6649c5e74a1d7127d150f485432def1814a1a | |
| parent | 7b287ecd7f8527bb8f47e08090a0120ff418c730 (diff) | |
| download | scintilla-mirror-313a81f7f8419b3c1ac6ac57ea7719c7b8aa28cf.tar.gz | |
The Scintilla namespace is always active for internal symbols and for the lexer
interfaces ILexer4 and IDocument.
235 files changed, 35 insertions, 641 deletions
diff --git a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj index 2ebbb56b0..5d38032cc 100644 --- a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj +++ b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj @@ -1148,7 +1148,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Scintilla_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( - SCI_NAMESPACE, SCI_LEXER, ); GCC_WARN_UNINITIALIZED_AUTOS = NO; @@ -1182,7 +1181,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = Scintilla_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( - SCI_NAMESPACE, SCI_LEXER, ); GCC_WARN_UNINITIALIZED_AUTOS = NO; diff --git a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj index 55a2f035f..6c146e604 100644 --- a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj +++ b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj @@ -295,7 +295,6 @@ GCC_PREFIX_HEADER = ScintillaTest_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( SCI_LEXER, - SCI_NAMESPACE, ); HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Info.plist; @@ -321,7 +320,6 @@ GCC_PREFIX_HEADER = ScintillaTest_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( SCI_LEXER, - SCI_NAMESPACE, ); HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = Info.plist; diff --git a/doc/SciCoding.html b/doc/SciCoding.html index 9e9a5b60e..4f7664516 100644 --- a/doc/SciCoding.html +++ b/doc/SciCoding.html @@ -133,8 +133,7 @@ C++, exceptions may not be thrown out of Scintilla and all exceptions should be caught before returning from Scintilla. Run-time type information adds to memory use so is turned off. - A 'Scintilla' name spaces is optionally used based on the SCI_NAMESPACE - definition. This helps with name clashes on OS X. + A 'Scintilla' name space is used. This helps with name clashes on OS X. </p> <p> The goto statement is not used because of bad memories from my first job diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 9f391d0e1..a4fea6139 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -537,6 +537,10 @@ related to lexing so doesn't belong in ILexer.h. </li> <li> + The Scintilla namespace is always active for internal symbols and for the lexer interfaces + ILexer4 and IDocument. + </li> + <li> The Baan lexer checks that matches to 3rd set of keywords are function calls and leaves as identifiers if not. </li> <li> diff --git a/gtk/Converter.h b/gtk/Converter.h index f17949d98..0ef80ae23 100644 --- a/gtk/Converter.h +++ b/gtk/Converter.h @@ -6,9 +6,7 @@ #ifndef CONVERTER_H #define CONVERTER_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif const GIConv iconvhBad = (GIConv)(-1); const gsize sizeFailure = static_cast<gsize>(-1); @@ -67,8 +65,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 06926f347..ebedc6e93 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -57,9 +57,7 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) { #pragma warning(disable: 4505) #endif -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif enum encodingType { singleByte, UTF8, dbcs}; @@ -123,9 +121,7 @@ void Font::Release() { } // Required on OS X -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // SurfaceID is a cairo_t* class SurfaceImpl : public Surface { @@ -187,9 +183,7 @@ public: void SetUnicodeMode(bool unicodeMode_) override; void SetDBCSMode(int codePage) override; }; -#ifdef SCI_NAMESPACE } -#endif const char *CharacterSetID(int characterSet) { switch (characterSet) { diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 21762464f..48aa30a71 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -105,9 +105,7 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) { #pragma warning(disable: 4505) #endif -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static GdkWindow *PWindow(const Window &w) { GtkWidget *widget = static_cast<GtkWidget *>(w.GetID()); @@ -710,9 +708,7 @@ void ScintillaGTK::StartDrag() { #endif } -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif std::string ConvertText(const char *s, size_t len, const char *charSetDest, const char *charSetSource, bool transliterations, bool silent) { // s is not const because of different versions of iconv disagreeing about const @@ -745,9 +741,7 @@ std::string ConvertText(const char *s, size_t len, const char *charSetDest, } return destForm; } -#ifdef SCI_NAMESPACE } -#endif // Returns the target converted to UTF8. // Return the length in bytes. diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h index 8255db9c6..07456a689 100644 --- a/gtk/ScintillaGTK.h +++ b/gtk/ScintillaGTK.h @@ -6,9 +6,7 @@ #ifndef SCINTILLAGTK_H #define SCINTILLAGTK_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class ScintillaGTKAccessible; @@ -284,8 +282,6 @@ public: std::string ConvertText(const char *s, size_t len, const char *charSetDest, const char *charSetSource, bool transliterations, bool silent=false); -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx index 24ce8a950..05d6b768c 100644 --- a/gtk/ScintillaGTKAccessible.cxx +++ b/gtk/ScintillaGTKAccessible.cxx @@ -128,9 +128,7 @@ #include "ScintillaGTK.h" #include "ScintillaGTKAccessible.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif struct ScintillaObjectAccessiblePrivate { ScintillaGTKAccessible *pscin; diff --git a/gtk/ScintillaGTKAccessible.h b/gtk/ScintillaGTKAccessible.h index bb47ddf3e..cfb367f43 100644 --- a/gtk/ScintillaGTKAccessible.h +++ b/gtk/ScintillaGTKAccessible.h @@ -6,9 +6,7 @@ #ifndef SCINTILLAGTKACCESSIBLE_H #define SCINTILLAGTKACCESSIBLE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif #ifndef ATK_CHECK_VERSION # define ATK_CHECK_VERSION(x, y, z) 0 @@ -188,9 +186,7 @@ public: }; }; -#ifdef SCI_NAMESPACE } -#endif #endif /* SCINTILLAGTKACCESSIBLE_H */ diff --git a/include/ILexer.h b/include/ILexer.h index 455806a08..9bc995c3d 100644 --- a/include/ILexer.h +++ b/include/ILexer.h @@ -10,9 +10,7 @@ #include "Sci_Position.h" -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum { dvRelease4=2 }; @@ -75,8 +73,6 @@ public: virtual const char * SCI_METHOD DescriptionOfStyle(int style) = 0; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/include/Platform.h b/include/Platform.h index a18ef2255..e1c8a4c76 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -71,9 +71,7 @@ #endif -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif typedef float XYPOSITION; typedef double XYACCUMULATOR; @@ -511,15 +509,9 @@ public: #ifdef NDEBUG #define PLATFORM_ASSERT(c) ((void)0) #else -#ifdef SCI_NAMESPACE #define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Scintilla::Platform::Assert(#c, __FILE__, __LINE__)) -#else -#define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Platform::Assert(#c, __FILE__, __LINE__)) -#endif #endif -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexers/LexA68k.cxx b/lexers/LexA68k.cxx index b5f48987e..1475ad078 100644 --- a/lexers/LexA68k.cxx +++ b/lexers/LexA68k.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Return values for GetOperatorType diff --git a/lexers/LexAPDL.cxx b/lexers/LexAPDL.cxx index 873ec9d13..447e40d58 100644 --- a/lexers/LexAPDL.cxx +++ b/lexers/LexAPDL.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80 && (isalnum(ch) || ch == '_')); diff --git a/lexers/LexASY.cxx b/lexers/LexASY.cxx index b49975e70..3ec522729 100644 --- a/lexers/LexASY.cxx +++ b/lexers/LexASY.cxx @@ -19,9 +19,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseAsyDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) { diff --git a/lexers/LexAU3.cxx b/lexers/LexAU3.cxx index c8ab9d700..b4029413c 100644 --- a/lexers/LexAU3.cxx +++ b/lexers/LexAU3.cxx @@ -68,9 +68,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsTypeCharacter(const int ch) { diff --git a/lexers/LexAVE.cxx b/lexers/LexAVE.cxx index fd9927379..b976734ae 100644 --- a/lexers/LexAVE.cxx +++ b/lexers/LexAVE.cxx @@ -25,9 +25,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { diff --git a/lexers/LexAVS.cxx b/lexers/LexAVS.cxx index 129c3563b..df5223f8d 100644 --- a/lexers/LexAVS.cxx +++ b/lexers/LexAVS.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); diff --git a/lexers/LexAbaqus.cxx b/lexers/LexAbaqus.cxx index 5f265c722..96a7b886e 100644 --- a/lexers/LexAbaqus.cxx +++ b/lexers/LexAbaqus.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAKeywordChar(const int ch) { return (ch < 0x80 && (isalnum(ch) || (ch == '_') || (ch == ' '))); diff --git a/lexers/LexAda.cxx b/lexers/LexAda.cxx index df26d7578..9d7f5d0f7 100644 --- a/lexers/LexAda.cxx +++ b/lexers/LexAda.cxx @@ -25,9 +25,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* * Interface diff --git a/lexers/LexAsm.cxx b/lexers/LexAsm.cxx index d236ed657..f34c8b50c 100644 --- a/lexers/LexAsm.cxx +++ b/lexers/LexAsm.cxx @@ -32,9 +32,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || diff --git a/lexers/LexAsn1.cxx b/lexers/LexAsn1.cxx index 7c5f48e75..0ec2a0636 100644 --- a/lexers/LexAsn1.cxx +++ b/lexers/LexAsn1.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Some char test functions static bool isAsn1Number(int ch) diff --git a/lexers/LexBaan.cxx b/lexers/LexBaan.cxx index 7d98f5ef3..0de335105 100644 --- a/lexers/LexBaan.cxx +++ b/lexers/LexBaan.cxx @@ -36,9 +36,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -# ifdef SCI_NAMESPACE using namespace Scintilla; -# endif namespace { // Use an unnamed namespace to protect the functions and classes from name conflicts diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx index 9c02c2897..931d1bf47 100644 --- a/lexers/LexBash.cxx +++ b/lexers/LexBash.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #define HERE_DELIM_MAX 256 diff --git a/lexers/LexBasic.cxx b/lexers/LexBasic.cxx index 68e4c8574..3998af93b 100644 --- a/lexers/LexBasic.cxx +++ b/lexers/LexBasic.cxx @@ -39,9 +39,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* Bits: * 1 - whitespace diff --git a/lexers/LexBatch.cxx b/lexers/LexBatch.cxx index 377b2cbf1..db7e37688 100644 --- a/lexers/LexBatch.cxx +++ b/lexers/LexBatch.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static bool Is0To9(char ch) { return (ch >= '0') && (ch <= '9'); diff --git a/lexers/LexBibTeX.cxx b/lexers/LexBibTeX.cxx index fef58a9b0..7e4cb9fc1 100644 --- a/lexers/LexBibTeX.cxx +++ b/lexers/LexBibTeX.cxx @@ -30,9 +30,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif namespace { bool IsAlphabetic(unsigned int ch) diff --git a/lexers/LexBullant.cxx b/lexers/LexBullant.cxx index 404188769..2386d2252 100644 --- a/lexers/LexBullant.cxx +++ b/lexers/LexBullant.cxx @@ -19,9 +19,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static int classifyWordBullant(Sci_PositionU start, Sci_PositionU end, WordList &keywords, Accessor &styler) { char s[100]; diff --git a/lexers/LexCLW.cxx b/lexers/LexCLW.cxx index af2ca151a..d469d6bfd 100644 --- a/lexers/LexCLW.cxx +++ b/lexers/LexCLW.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Is an end of line character inline bool IsEOL(const int ch) { diff --git a/lexers/LexCOBOL.cxx b/lexers/LexCOBOL.cxx index 3150e3338..f0374824f 100644 --- a/lexers/LexCOBOL.cxx +++ b/lexers/LexCOBOL.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #define IN_DIVISION 0x01 #define IN_DECLARATIVES 0x02 diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 840d3c8b9..952410a85 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -33,9 +33,7 @@ #include "SparseState.h" #include "SubStyles.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif namespace { // Use an unnamed namespace to protect the functions and classes from name conflicts diff --git a/lexers/LexCSS.cxx b/lexers/LexCSS.cxx index 01ca78687..6e4739d3e 100644 --- a/lexers/LexCSS.cxx +++ b/lexers/LexCSS.cxx @@ -31,9 +31,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const unsigned int ch) { diff --git a/lexers/LexCaml.cxx b/lexers/LexCaml.cxx index cefc1eda2..038068a7b 100644 --- a/lexers/LexCaml.cxx +++ b/lexers/LexCaml.cxx @@ -46,9 +46,7 @@ static const int baseT[24] = { 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0,16 /* M - X */ }; -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #ifdef BUILD_AS_EXTERNAL_LEXER /* diff --git a/lexers/LexCmake.cxx b/lexers/LexCmake.cxx index 1cbca3611..b8fe15496 100644 --- a/lexers/LexCmake.cxx +++ b/lexers/LexCmake.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static bool isCmakeNumber(char ch) { diff --git a/lexers/LexCoffeeScript.cxx b/lexers/LexCoffeeScript.cxx index b835c52ec..465e92ca3 100644 --- a/lexers/LexCoffeeScript.cxx +++ b/lexers/LexCoffeeScript.cxx @@ -28,9 +28,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static bool IsSpaceEquiv(int state) { return (state == SCE_COFFEESCRIPT_DEFAULT diff --git a/lexers/LexConf.cxx b/lexers/LexConf.cxx index 2eed51b71..73fbe46ef 100644 --- a/lexers/LexConf.cxx +++ b/lexers/LexConf.cxx @@ -27,9 +27,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseConfDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { diff --git a/lexers/LexCrontab.cxx b/lexers/LexCrontab.cxx index b500d2d28..7f6d5fb0c 100644 --- a/lexers/LexCrontab.cxx +++ b/lexers/LexCrontab.cxx @@ -25,9 +25,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseNncrontabDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) diff --git a/lexers/LexCsound.cxx b/lexers/LexCsound.cxx index 6d065c8d1..24603801e 100644 --- a/lexers/LexCsound.cxx +++ b/lexers/LexCsound.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || diff --git a/lexers/LexD.cxx b/lexers/LexD.cxx index eb69f6bf9..9465942f5 100644 --- a/lexers/LexD.cxx +++ b/lexers/LexD.cxx @@ -29,9 +29,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* Nested comments require keeping the value of the nesting level for every position in the document. But since scintilla always styles line by line, diff --git a/lexers/LexDMAP.cxx b/lexers/LexDMAP.cxx index eb43cde6d..91b10c29b 100644 --- a/lexers/LexDMAP.cxx +++ b/lexers/LexDMAP.cxx @@ -25,9 +25,7 @@ #include "LexerModule.h" /***************************************/ -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /***********************************************/ static inline bool IsAWordChar(const int ch) { diff --git a/lexers/LexDMIS.cxx b/lexers/LexDMIS.cxx index 86fdbe32b..ce36ff056 100644 --- a/lexers/LexDMIS.cxx +++ b/lexers/LexDMIS.cxx @@ -23,9 +23,7 @@ #include "LexerModule.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const char *const DMISWordListDesc[] = { diff --git a/lexers/LexDiff.cxx b/lexers/LexDiff.cxx index 9512550c8..f87538daa 100644 --- a/lexers/LexDiff.cxx +++ b/lexers/LexDiff.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool AtEOL(Accessor &styler, Sci_PositionU i) { return (styler[i] == '\n') || diff --git a/lexers/LexECL.cxx b/lexers/LexECL.cxx index 2e5433e6e..6c916bce4 100644 --- a/lexers/LexECL.cxx +++ b/lexers/LexECL.cxx @@ -42,9 +42,7 @@ #define SET_UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ" #define SET_DIGITS "0123456789" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static bool IsSpaceEquiv(int state) { switch (state) { diff --git a/lexers/LexEDIFACT.cxx b/lexers/LexEDIFACT.cxx index b502fd13c..8c7c2cdf2 100644 --- a/lexers/LexEDIFACT.cxx +++ b/lexers/LexEDIFACT.cxx @@ -20,9 +20,7 @@ #include "LexerModule.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif class LexerEDIFACT : public DefaultLexer { diff --git a/lexers/LexEScript.cxx b/lexers/LexEScript.cxx index bc1fb3201..0cba29858 100644 --- a/lexers/LexEScript.cxx +++ b/lexers/LexEScript.cxx @@ -22,9 +22,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { diff --git a/lexers/LexEiffel.cxx b/lexers/LexEiffel.cxx index 2e2813ef6..d1d42a960 100644 --- a/lexers/LexEiffel.cxx +++ b/lexers/LexEiffel.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool isEiffelOperator(unsigned int ch) { // '.' left out as it is used to make up numbers diff --git a/lexers/LexErlang.cxx b/lexers/LexErlang.cxx index 89ed1ae2f..a61c3c91e 100644 --- a/lexers/LexErlang.cxx +++ b/lexers/LexErlang.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static int is_radix(int radix, int ch) { int digit; diff --git a/lexers/LexErrorList.cxx b/lexers/LexErrorList.cxx index 871902a88..a82d0cf7c 100644 --- a/lexers/LexErrorList.cxx +++ b/lexers/LexErrorList.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static bool strstart(const char *haystack, const char *needle) { return strncmp(haystack, needle, strlen(needle)) == 0; diff --git a/lexers/LexFlagship.cxx b/lexers/LexFlagship.cxx index 6f6f4c0c7..b73c1aa1e 100644 --- a/lexers/LexFlagship.cxx +++ b/lexers/LexFlagship.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Extended to accept accented characters static inline bool IsAWordChar(int ch) diff --git a/lexers/LexForth.cxx b/lexers/LexForth.cxx index 63d3f4f6d..80842097d 100644 --- a/lexers/LexForth.cxx +++ b/lexers/LexForth.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordStart(int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.'); diff --git a/lexers/LexFortran.cxx b/lexers/LexFortran.cxx index fdfb22886..113b0585a 100644 --- a/lexers/LexFortran.cxx +++ b/lexers/LexFortran.cxx @@ -25,9 +25,7 @@ #include "LexerModule.h" /***************************************/ -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /***********************************************/ static inline bool IsAWordChar(const int ch) { diff --git a/lexers/LexGAP.cxx b/lexers/LexGAP.cxx index ee0a7ad69..a2eca95ab 100644 --- a/lexers/LexGAP.cxx +++ b/lexers/LexGAP.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsGAPOperator(char ch) { if (IsASCII(ch) && isalnum(ch)) return false; diff --git a/lexers/LexGui4Cli.cxx b/lexers/LexGui4Cli.cxx index d4be71b92..e321a5b85 100644 --- a/lexers/LexGui4Cli.cxx +++ b/lexers/LexGui4Cli.cxx @@ -39,9 +39,7 @@ val SCE_GC_OPERATOR=9 #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #define debug Platform::DebugPrintf diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index c2ca50c11..018da1d4a 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #define SCE_HA_JS (SCE_HJA_START - SCE_HJ_START) #define SCE_HA_VBS (SCE_HBA_START - SCE_HB_START) diff --git a/lexers/LexHaskell.cxx b/lexers/LexHaskell.cxx index a7ac82a90..ee8c87e39 100644 --- a/lexers/LexHaskell.cxx +++ b/lexers/LexHaskell.cxx @@ -43,9 +43,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // See https://github.com/ghc/ghc/blob/master/compiler/parser/Lexer.x#L1682 // Note, letter modifiers are prohibited. diff --git a/lexers/LexHex.cxx b/lexers/LexHex.cxx index 449454471..6e1099786 100644 --- a/lexers/LexHex.cxx +++ b/lexers/LexHex.cxx @@ -118,9 +118,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // prototypes for general helper functions static inline bool IsNewline(const int ch); diff --git a/lexers/LexIndent.cxx b/lexers/LexIndent.cxx index ac25938c0..053bdd928 100644 --- a/lexers/LexIndent.cxx +++ b/lexers/LexIndent.cxx @@ -22,9 +22,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseIndentDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { diff --git a/lexers/LexInno.cxx b/lexers/LexInno.cxx index 50aa25d28..5d01c0588 100644 --- a/lexers/LexInno.cxx +++ b/lexers/LexInno.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseInnoDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) { int state = SCE_INNO_DEFAULT; diff --git a/lexers/LexJSON.cxx b/lexers/LexJSON.cxx index 16b43abf3..8e27bca6d 100644 --- a/lexers/LexJSON.cxx +++ b/lexers/LexJSON.cxx @@ -29,9 +29,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const char *const JSONWordListDesc[] = { "JSON Keywords", diff --git a/lexers/LexKVIrc.cxx b/lexers/LexKVIrc.cxx index 75cb8331b..0cae2a234 100644 --- a/lexers/LexKVIrc.cxx +++ b/lexers/LexKVIrc.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* KVIrc Script syntactic rules: http://www.kvirc.net/doc/doc_syntactic_rules.html */ diff --git a/lexers/LexKix.cxx b/lexers/LexKix.cxx index 82ff9a54b..bcd68137e 100644 --- a/lexers/LexKix.cxx +++ b/lexers/LexKix.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Extended to accept accented characters static inline bool IsAWordChar(int ch) { diff --git a/lexers/LexLaTeX.cxx b/lexers/LexLaTeX.cxx index 7af1fde24..63e1f8c62 100644 --- a/lexers/LexLaTeX.cxx +++ b/lexers/LexLaTeX.cxx @@ -29,9 +29,7 @@ #include "DefaultLexer.h" #include "LexerBase.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif using namespace std; diff --git a/lexers/LexLisp.cxx b/lexers/LexLisp.cxx index 8d81eae2e..8e7586355 100644 --- a/lexers/LexLisp.cxx +++ b/lexers/LexLisp.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #define SCE_LISP_CHARACTER 29 #define SCE_LISP_MACRO 30 diff --git a/lexers/LexLout.cxx b/lexers/LexLout.cxx index 39709827d..abba91ad1 100644 --- a/lexers/LexLout.cxx +++ b/lexers/LexLout.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalpha(ch) || ch == '@' || ch == '_'); diff --git a/lexers/LexLua.cxx b/lexers/LexLua.cxx index 018521791..b4a18b3ee 100644 --- a/lexers/LexLua.cxx +++ b/lexers/LexLua.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Test for [=[ ... ]=] delimiters, returns 0 if it's only a [ or ], // return 1 for [[ or ]], returns >=2 for [=[ or ]=] and so on. diff --git a/lexers/LexMMIXAL.cxx b/lexers/LexMMIXAL.cxx index 2a152b8a8..025cfcb84 100644 --- a/lexers/LexMMIXAL.cxx +++ b/lexers/LexMMIXAL.cxx @@ -25,9 +25,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { diff --git a/lexers/LexMPT.cxx b/lexers/LexMPT.cxx index 2732fb4d5..0f5469840 100644 --- a/lexers/LexMPT.cxx +++ b/lexers/LexMPT.cxx @@ -27,9 +27,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static int GetLotLineState(std::string &line) { if (line.length()) { diff --git a/lexers/LexMSSQL.cxx b/lexers/LexMSSQL.cxx index fa86db694..a06ff32c3 100644 --- a/lexers/LexMSSQL.cxx +++ b/lexers/LexMSSQL.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #define KW_MSSQL_STATEMENTS 0 #define KW_MSSQL_DATA_TYPES 1 diff --git a/lexers/LexMagik.cxx b/lexers/LexMagik.cxx index 4a2a7b9fb..057b90657 100644 --- a/lexers/LexMagik.cxx +++ b/lexers/LexMagik.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /** * Is it a core character (C isalpha(), exclamation and question mark) diff --git a/lexers/LexMake.cxx b/lexers/LexMake.cxx index 9e8dadf1b..b3dc12aa1 100644 --- a/lexers/LexMake.cxx +++ b/lexers/LexMake.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool AtEOL(Accessor &styler, Sci_PositionU i) { return (styler[i] == '\n') || diff --git a/lexers/LexMarkdown.cxx b/lexers/LexMarkdown.cxx index a1a50f20e..0dc3e374a 100644 --- a/lexers/LexMarkdown.cxx +++ b/lexers/LexMarkdown.cxx @@ -51,9 +51,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsNewline(const int ch) { return (ch == '\n' || ch == '\r'); diff --git a/lexers/LexMatlab.cxx b/lexers/LexMatlab.cxx index 154c755fd..498617ace 100644 --- a/lexers/LexMatlab.cxx +++ b/lexers/LexMatlab.cxx @@ -43,9 +43,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static bool IsMatlabCommentChar(int c) { return (c == '%') ; diff --git a/lexers/LexMetapost.cxx b/lexers/LexMetapost.cxx index cbfe10fa7..315a1eab0 100644 --- a/lexers/LexMetapost.cxx +++ b/lexers/LexMetapost.cxx @@ -30,9 +30,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // val SCE_METAPOST_DEFAULT = 0 // val SCE_METAPOST_SPECIAL = 1 diff --git a/lexers/LexModula.cxx b/lexers/LexModula.cxx index 583cbe38a..af4b8dd1b 100644 --- a/lexers/LexModula.cxx +++ b/lexers/LexModula.cxx @@ -28,9 +28,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #ifdef DEBUG_LEX_MODULA #define DEBUG_STATE( p, c )\ diff --git a/lexers/LexMySQL.cxx b/lexers/LexMySQL.cxx index 03cf106e6..7ba52a3e2 100644 --- a/lexers/LexMySQL.cxx +++ b/lexers/LexMySQL.cxx @@ -28,9 +28,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '_'); diff --git a/lexers/LexNimrod.cxx b/lexers/LexNimrod.cxx index d232f9f14..5526ff843 100644 --- a/lexers/LexNimrod.cxx +++ b/lexers/LexNimrod.cxx @@ -25,9 +25,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(int ch) { return (ch >= 0x80) || isalnum(ch) || ch == '_'; diff --git a/lexers/LexNsis.cxx b/lexers/LexNsis.cxx index 260834912..3b2b8a3ad 100644 --- a/lexers/LexNsis.cxx +++ b/lexers/LexNsis.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* // located in SciLexer.h diff --git a/lexers/LexNull.cxx b/lexers/LexNull.cxx index 34876775d..15a3a50aa 100644 --- a/lexers/LexNull.cxx +++ b/lexers/LexNull.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseNullDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) { diff --git a/lexers/LexOScript.cxx b/lexers/LexOScript.cxx index 24b85b700..3fe407063 100644 --- a/lexers/LexOScript.cxx +++ b/lexers/LexOScript.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // ----------------------------------------- // Functions classifying a single character. diff --git a/lexers/LexOpal.cxx b/lexers/LexOpal.cxx index 955927f63..c23620405 100644 --- a/lexers/LexOpal.cxx +++ b/lexers/LexOpal.cxx @@ -22,9 +22,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif inline static void getRange( Sci_PositionU start, Sci_PositionU end, Accessor & styler, char * s, Sci_PositionU len ) { diff --git a/lexers/LexPB.cxx b/lexers/LexPB.cxx index 49b8509d0..582a5899d 100644 --- a/lexers/LexPB.cxx +++ b/lexers/LexPB.cxx @@ -51,9 +51,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsTypeCharacter(const int ch) { diff --git a/lexers/LexPLM.cxx b/lexers/LexPLM.cxx index e306685d6..9cac8b6cd 100644 --- a/lexers/LexPLM.cxx +++ b/lexers/LexPLM.cxx @@ -20,9 +20,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void GetRange(Sci_PositionU start, Sci_PositionU end, diff --git a/lexers/LexPO.cxx b/lexers/LexPO.cxx index fcf886d6c..875c334f8 100644 --- a/lexers/LexPO.cxx +++ b/lexers/LexPO.cxx @@ -31,9 +31,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) { StyleContext sc(startPos, length, initStyle, styler); diff --git a/lexers/LexPOV.cxx b/lexers/LexPOV.cxx index c46744769..40d0d2e9d 100644 --- a/lexers/LexPOV.cxx +++ b/lexers/LexPOV.cxx @@ -32,9 +32,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(int ch) { return ch < 0x80 && (isalnum(ch) || ch == '_'); diff --git a/lexers/LexPS.cxx b/lexers/LexPS.cxx index e4730ca55..b7158e9bb 100644 --- a/lexers/LexPS.cxx +++ b/lexers/LexPS.cxx @@ -30,9 +30,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsASelfDelimitingChar(const int ch) { return (ch == '[' || ch == ']' || ch == '{' || ch == '}' || diff --git a/lexers/LexPascal.cxx b/lexers/LexPascal.cxx index b7213bb87..426b3c3f3 100644 --- a/lexers/LexPascal.cxx +++ b/lexers/LexPascal.cxx @@ -128,9 +128,7 @@ contains requires #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void GetRangeLowered(Sci_PositionU start, Sci_PositionU end, diff --git a/lexers/LexPerl.cxx b/lexers/LexPerl.cxx index 83475df31..1ea6bd589 100644 --- a/lexers/LexPerl.cxx +++ b/lexers/LexPerl.cxx @@ -29,9 +29,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Info for HERE document handling from perldata.pod (reformatted): // ---------------------------------------------------------------- diff --git a/lexers/LexPowerPro.cxx b/lexers/LexPowerPro.cxx index 7120c4003..34debff24 100644 --- a/lexers/LexPowerPro.cxx +++ b/lexers/LexPowerPro.cxx @@ -43,9 +43,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsStreamCommentStyle(int style) { return style == SCE_POWERPRO_COMMENTBLOCK; diff --git a/lexers/LexPowerShell.cxx b/lexers/LexPowerShell.cxx index 0b744c4eb..9969df35d 100644 --- a/lexers/LexPowerShell.cxx +++ b/lexers/LexPowerShell.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Extended to accept accented characters static inline bool IsAWordChar(int ch) { diff --git a/lexers/LexProgress.cxx b/lexers/LexProgress.cxx index e59e98361..53d195f37 100644 --- a/lexers/LexProgress.cxx +++ b/lexers/LexProgress.cxx @@ -40,9 +40,7 @@ Differentiate between labels and variables #include "SparseState.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif namespace { // Use an unnamed namespace to protect the functions and classes from name conflicts diff --git a/lexers/LexProps.cxx b/lexers/LexProps.cxx index ddfecb06f..1aebdbb06 100644 --- a/lexers/LexProps.cxx +++ b/lexers/LexProps.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool AtEOL(Accessor &styler, Sci_PositionU i) { return (styler[i] == '\n') || diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index 0985c6dd4..ee60037fb 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -32,9 +32,7 @@ #include "SubStyles.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif namespace { // Use an unnamed namespace to protect the functions and classes from name conflicts diff --git a/lexers/LexR.cxx b/lexers/LexR.cxx index c72937bbb..ead0dba18 100644 --- a/lexers/LexR.cxx +++ b/lexers/LexR.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_'); diff --git a/lexers/LexRebol.cxx b/lexers/LexRebol.cxx index bce93dfc8..d4973c0c8 100644 --- a/lexers/LexRebol.cxx +++ b/lexers/LexRebol.cxx @@ -29,9 +29,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (isalnum(ch) || ch == '?' || ch == '!' || ch == '.' || ch == '\'' || ch == '+' || ch == '-' || ch == '*' || ch == '&' || ch == '|' || ch == '=' || ch == '_' || ch == '~'); diff --git a/lexers/LexRegistry.cxx b/lexers/LexRegistry.cxx index 3f54df023..779ea2f47 100644 --- a/lexers/LexRegistry.cxx +++ b/lexers/LexRegistry.cxx @@ -29,9 +29,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const char *const RegistryWordListDesc[] = { 0 diff --git a/lexers/LexRuby.cxx b/lexers/LexRuby.cxx index d990f1b45..2affffe65 100644 --- a/lexers/LexRuby.cxx +++ b/lexers/LexRuby.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif //XXX Identical to Perl, put in common area static inline bool isEOLChar(char ch) { diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx index 6f14c3720..ec930e470 100644 --- a/lexers/LexRust.cxx +++ b/lexers/LexRust.cxx @@ -31,9 +31,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const int NUM_RUST_KEYWORD_LISTS = 7; static const int MAX_RUST_IDENT_CHARS = 1023; diff --git a/lexers/LexSML.cxx b/lexers/LexSML.cxx index 76cfde061..1cb00f91d 100644 --- a/lexers/LexSML.cxx +++ b/lexers/LexSML.cxx @@ -29,9 +29,7 @@ inline int issmlf(int c) {return isalpha(c) || c == '_';} inline int issmld(int c) {return isdigit(c) || c == '_';} -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseSMLDoc( Sci_PositionU startPos, Sci_Position length, diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx index 447cc20f3..69916b9fb 100644 --- a/lexers/LexSQL.cxx +++ b/lexers/LexSQL.cxx @@ -33,9 +33,7 @@ #include "SparseState.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(int ch, bool sqlAllowDottedWord) { if (!sqlAllowDottedWord) diff --git a/lexers/LexSTTXT.cxx b/lexers/LexSTTXT.cxx index b7ac8f432..dd2fe5465 100644 --- a/lexers/LexSTTXT.cxx +++ b/lexers/LexSTTXT.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ClassifySTTXTWord(WordList *keywordlists[], StyleContext &sc) { diff --git a/lexers/LexScriptol.cxx b/lexers/LexScriptol.cxx index 9c9d9c4c0..f82027aa3 100644 --- a/lexers/LexScriptol.cxx +++ b/lexers/LexScriptol.cxx @@ -21,9 +21,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ClassifyWordSol(Sci_PositionU start, Sci_PositionU end, WordList &keywords, Accessor &styler, char *prevWord) { diff --git a/lexers/LexSmalltalk.cxx b/lexers/LexSmalltalk.cxx index 4c72eb3ad..bd146d59c 100644 --- a/lexers/LexSmalltalk.cxx +++ b/lexers/LexSmalltalk.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* | lexTable classificationBlock charClasses | diff --git a/lexers/LexSorcus.cxx b/lexers/LexSorcus.cxx index 6a138065f..66669dc8c 100644 --- a/lexers/LexSorcus.cxx +++ b/lexers/LexSorcus.cxx @@ -25,9 +25,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif //each character a..z and A..Z + '_' can be part of a keyword diff --git a/lexers/LexSpecman.cxx b/lexers/LexSpecman.cxx index 72a973755..5a4c9105f 100644 --- a/lexers/LexSpecman.cxx +++ b/lexers/LexSpecman.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsAWordChar(const int ch) { return (ch < 0x80) && (isalnum(ch) || ch == '.' || ch == '_' || ch == '\''); diff --git a/lexers/LexSpice.cxx b/lexers/LexSpice.cxx index d834e26bf..9c21da308 100644 --- a/lexers/LexSpice.cxx +++ b/lexers/LexSpice.cxx @@ -25,9 +25,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* * Interface diff --git a/lexers/LexTACL.cxx b/lexers/LexTACL.cxx index c7a15f220..898234c77 100644 --- a/lexers/LexTACL.cxx +++ b/lexers/LexTACL.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif inline bool isTACLoperator(char ch) { diff --git a/lexers/LexTADS3.cxx b/lexers/LexTADS3.cxx index 03e82d31f..e2aecbf55 100644 --- a/lexers/LexTADS3.cxx +++ b/lexers/LexTADS3.cxx @@ -49,9 +49,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const int T3_SINGLE_QUOTE = 1; static const int T3_INT_EXPRESSION = 2; diff --git a/lexers/LexTAL.cxx b/lexers/LexTAL.cxx index e7f28eaaa..8d1f057a6 100644 --- a/lexers/LexTAL.cxx +++ b/lexers/LexTAL.cxx @@ -26,9 +26,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif inline bool isTALoperator(char ch) { diff --git a/lexers/LexTCL.cxx b/lexers/LexTCL.cxx index 9377a872e..0948f4880 100644 --- a/lexers/LexTCL.cxx +++ b/lexers/LexTCL.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Extended to accept accented characters static inline bool IsAWordChar(int ch) { diff --git a/lexers/LexTCMD.cxx b/lexers/LexTCMD.cxx index 03895c56a..8050dddea 100644 --- a/lexers/LexTCMD.cxx +++ b/lexers/LexTCMD.cxx @@ -24,9 +24,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static bool IsAlphabetic(int ch) { diff --git a/lexers/LexTeX.cxx b/lexers/LexTeX.cxx index 36cfe12cc..7ed1bcecc 100644 --- a/lexers/LexTeX.cxx +++ b/lexers/LexTeX.cxx @@ -34,9 +34,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // val SCE_TEX_DEFAULT = 0 // val SCE_TEX_SPECIAL = 1 diff --git a/lexers/LexTxt2tags.cxx b/lexers/LexTxt2tags.cxx index 7e57e118c..6d1a954e0 100644 --- a/lexers/LexTxt2tags.cxx +++ b/lexers/LexTxt2tags.cxx @@ -34,9 +34,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif diff --git a/lexers/LexVB.cxx b/lexers/LexVB.cxx index d221dd470..3b380c4fd 100644 --- a/lexers/LexVB.cxx +++ b/lexers/LexVB.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Internal state, highlighted as number #define SCE_B_FILENUMBER SCE_B_DEFAULT+100 diff --git a/lexers/LexVHDL.cxx b/lexers/LexVHDL.cxx index a1d75b277..229013ea6 100644 --- a/lexers/LexVHDL.cxx +++ b/lexers/LexVHDL.cxx @@ -28,9 +28,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void ColouriseVHDLDoc( Sci_PositionU startPos, diff --git a/lexers/LexVerilog.cxx b/lexers/LexVerilog.cxx index aa6cd6d33..901b6e93d 100644 --- a/lexers/LexVerilog.cxx +++ b/lexers/LexVerilog.cxx @@ -33,9 +33,7 @@ #include "SubStyles.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif namespace { // Use an unnamed namespace to protect the functions and classes from name conflicts diff --git a/lexers/LexVisualProlog.cxx b/lexers/LexVisualProlog.cxx index 9b59443f8..552c0ffc8 100644 --- a/lexers/LexVisualProlog.cxx +++ b/lexers/LexVisualProlog.cxx @@ -41,9 +41,7 @@ #include "OptionSet.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Options used for LexerVisualProlog struct OptionsVisualProlog { diff --git a/lexers/LexYAML.cxx b/lexers/LexYAML.cxx index 3709538b7..75515603e 100644 --- a/lexers/LexYAML.cxx +++ b/lexers/LexYAML.cxx @@ -23,9 +23,7 @@ #include "CharacterSet.h" #include "LexerModule.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const char * const yamlWordListDesc[] = { "Keywords", diff --git a/lexlib/Accessor.cxx b/lexlib/Accessor.cxx index 2e51fa32a..7cce9a554 100644 --- a/lexlib/Accessor.cxx +++ b/lexlib/Accessor.cxx @@ -17,9 +17,7 @@ #include "LexAccessor.h" #include "Accessor.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif Accessor::Accessor(IDocument *pAccess_, PropSetSimple *pprops_) : LexAccessor(pAccess_), pprops(pprops_) { } diff --git a/lexlib/Accessor.h b/lexlib/Accessor.h index 00b2a54da..8fc3f641a 100644 --- a/lexlib/Accessor.h +++ b/lexlib/Accessor.h @@ -8,9 +8,7 @@ #ifndef ACCESSOR_H #define ACCESSOR_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum { wsSpace=1, wsTab=2, wsSpaceTab=4, wsInconsistent=8 }; @@ -28,8 +26,6 @@ public: int IndentAmount(Sci_Position line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/CharacterCategory.cxx b/lexlib/CharacterCategory.cxx index c57c8bacb..92ad49fb0 100644 --- a/lexlib/CharacterCategory.cxx +++ b/lexlib/CharacterCategory.cxx @@ -12,9 +12,7 @@ #include "StringCopy.h" #include "CharacterCategory.h" -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif namespace { // Use an unnamed namespace to protect the declarations from name conflicts @@ -3850,6 +3848,4 @@ bool IsXidContinue(int character) { } } -#ifdef SCI_NAMESPACE } -#endif diff --git a/lexlib/CharacterCategory.h b/lexlib/CharacterCategory.h index 05ea4187b..767d79670 100644 --- a/lexlib/CharacterCategory.h +++ b/lexlib/CharacterCategory.h @@ -8,9 +8,7 @@ #ifndef CHARACTERCATEGORY_H #define CHARACTERCATEGORY_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum CharacterCategory { ccLu, ccLl, ccLt, ccLm, ccLo, @@ -30,8 +28,6 @@ bool IsIdContinue(int character); bool IsXidStart(int character); bool IsXidContinue(int character); -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/CharacterSet.cxx b/lexlib/CharacterSet.cxx index 0db3e41b7..791177fcc 100644 --- a/lexlib/CharacterSet.cxx +++ b/lexlib/CharacterSet.cxx @@ -11,13 +11,9 @@ #include "CharacterSet.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif int CompareCaseInsensitive(const char *a, const char *b) { while (*a && *b) { @@ -53,6 +49,4 @@ int CompareNCaseInsensitive(const char *a, const char *b, size_t len) { return *a - *b; } -#ifdef SCI_NAMESPACE } -#endif diff --git a/lexlib/CharacterSet.h b/lexlib/CharacterSet.h index 38d84a290..be906ceaa 100644 --- a/lexlib/CharacterSet.h +++ b/lexlib/CharacterSet.h @@ -8,9 +8,7 @@ #ifndef CHARACTERSET_H #define CHARACTERSET_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class CharacterSet { int size; @@ -188,8 +186,6 @@ inline int MakeLowerCase(int ch) { int CompareCaseInsensitive(const char *a, const char *b); int CompareNCaseInsensitive(const char *a, const char *b, size_t len); -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/DefaultLexer.cxx b/lexlib/DefaultLexer.cxx index 656c3d13d..42abac50f 100644 --- a/lexlib/DefaultLexer.cxx +++ b/lexlib/DefaultLexer.cxx @@ -20,9 +20,7 @@ #include "LexerModule.h" #include "DefaultLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const char styleSubable[] = { 0 }; diff --git a/lexlib/DefaultLexer.h b/lexlib/DefaultLexer.h index 9d2a0567d..e1b74260d 100644 --- a/lexlib/DefaultLexer.h +++ b/lexlib/DefaultLexer.h @@ -10,9 +10,7 @@ #ifndef DEFAULTLEXER_H #define DEFAULTLEXER_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // A simple lexer with no state class DefaultLexer : public ILexer4 { @@ -48,8 +46,6 @@ public: const char * SCI_METHOD DescriptionOfStyle(int style) override; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/LexAccessor.h b/lexlib/LexAccessor.h index 9f786132b..66d8fb442 100644 --- a/lexlib/LexAccessor.h +++ b/lexlib/LexAccessor.h @@ -8,9 +8,7 @@ #ifndef LEXACCESSOR_H #define LEXACCESSOR_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum EncodingType { enc8bit, encUnicode, encDBCS }; @@ -191,8 +189,6 @@ struct LexicalClass { const char *description; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/LexerBase.cxx b/lexlib/LexerBase.cxx index 4e1c03991..80558504f 100644 --- a/lexlib/LexerBase.cxx +++ b/lexlib/LexerBase.cxx @@ -20,9 +20,7 @@ #include "LexerModule.h" #include "LexerBase.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const char styleSubable[] = { 0 }; diff --git a/lexlib/LexerBase.h b/lexlib/LexerBase.h index b0c50813c..ae8096591 100644 --- a/lexlib/LexerBase.h +++ b/lexlib/LexerBase.h @@ -8,9 +8,7 @@ #ifndef LEXERBASE_H #define LEXERBASE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // A simple lexer with no state class LexerBase : public ILexer4 { @@ -50,8 +48,6 @@ public: const char * SCI_METHOD DescriptionOfStyle(int style) override; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/LexerModule.cxx b/lexlib/LexerModule.cxx index 690c59157..fa4a349c1 100644 --- a/lexlib/LexerModule.cxx +++ b/lexlib/LexerModule.cxx @@ -22,9 +22,7 @@ #include "LexerBase.h" #include "LexerSimple.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif LexerModule::LexerModule(int language_, LexerFunction fnLexer_, diff --git a/lexlib/LexerModule.h b/lexlib/LexerModule.h index db17f96e2..050f0470d 100644 --- a/lexlib/LexerModule.h +++ b/lexlib/LexerModule.h @@ -8,9 +8,7 @@ #ifndef LEXERMODULE_H #define LEXERMODULE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class Accessor; class WordList; @@ -82,8 +80,6 @@ inline int Maximum(int a, int b) { #pragma GCC diagnostic ignored "-Wshadow" #endif -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/LexerNoExceptions.cxx b/lexlib/LexerNoExceptions.cxx index 96a3a72a4..3627e188a 100644 --- a/lexlib/LexerNoExceptions.cxx +++ b/lexlib/LexerNoExceptions.cxx @@ -20,9 +20,7 @@ #include "LexerBase.h" #include "LexerNoExceptions.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif Sci_Position SCI_METHOD LexerNoExceptions::PropertySet(const char *key, const char *val) { try { diff --git a/lexlib/LexerNoExceptions.h b/lexlib/LexerNoExceptions.h index ba24a8eb7..57ce149a7 100644 --- a/lexlib/LexerNoExceptions.h +++ b/lexlib/LexerNoExceptions.h @@ -8,9 +8,7 @@ #ifndef LEXERNOEXCEPTIONS_H #define LEXERNOEXCEPTIONS_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // A simple lexer with no state class LexerNoExceptions : public LexerBase { @@ -25,8 +23,6 @@ public: virtual void Folder(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess, Accessor &styler) = 0; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/LexerSimple.cxx b/lexlib/LexerSimple.cxx index 3df15d32d..0be7d97ca 100644 --- a/lexlib/LexerSimple.cxx +++ b/lexlib/LexerSimple.cxx @@ -22,9 +22,7 @@ #include "LexerBase.h" #include "LexerSimple.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif LexerSimple::LexerSimple(const LexerModule *module_) : LexerBase(module_->LexClasses(), module_->NamedStyles()), diff --git a/lexlib/LexerSimple.h b/lexlib/LexerSimple.h index a88c409cb..0edeabe8f 100644 --- a/lexlib/LexerSimple.h +++ b/lexlib/LexerSimple.h @@ -8,9 +8,7 @@ #ifndef LEXERSIMPLE_H #define LEXERSIMPLE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // A simple lexer with no state class LexerSimple : public LexerBase { @@ -23,8 +21,6 @@ public: void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/OptionSet.h b/lexlib/OptionSet.h index 2935a2089..b6fc07049 100644 --- a/lexlib/OptionSet.h +++ b/lexlib/OptionSet.h @@ -10,9 +10,7 @@ #ifndef OPTIONSET_H #define OPTIONSET_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif template <typename T> class OptionSet { @@ -135,8 +133,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx index a16a22538..715009a5b 100644 --- a/lexlib/PropSetSimple.cxx +++ b/lexlib/PropSetSimple.cxx @@ -15,9 +15,7 @@ #include "PropSetSimple.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif typedef std::map<std::string, std::string> mapss; diff --git a/lexlib/PropSetSimple.h b/lexlib/PropSetSimple.h index 8ca741f03..91b170df3 100644 --- a/lexlib/PropSetSimple.h +++ b/lexlib/PropSetSimple.h @@ -8,9 +8,7 @@ #ifndef PROPSETSIMPLE_H #define PROPSETSIMPLE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class PropSetSimple { void *impl; @@ -25,8 +23,6 @@ public: int GetInt(const char *key, int defaultValue=0) const; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/SparseState.h b/lexlib/SparseState.h index 22f58baef..4e7ac92e3 100644 --- a/lexlib/SparseState.h +++ b/lexlib/SparseState.h @@ -10,9 +10,7 @@ #ifndef SPARSESTATE_H #define SPARSESTATE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif template <typename T> class SparseState { @@ -103,8 +101,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/StringCopy.h b/lexlib/StringCopy.h index 1812b4e35..1c5442e65 100644 --- a/lexlib/StringCopy.h +++ b/lexlib/StringCopy.h @@ -9,9 +9,7 @@ #ifndef STRINGCOPY_H #define STRINGCOPY_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // Safer version of string copy functions like strcpy, wcsncpy, etc. // Instantiate over fixed length strings of both char and wchar_t. @@ -29,8 +27,6 @@ void StringCopy(T (&dest)[count], const T* source) { #define ELEMENTS(a) (sizeof(a) / sizeof(a[0])) -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/StyleContext.cxx b/lexlib/StyleContext.cxx index 9c3057ac5..ba73fbf8f 100644 --- a/lexlib/StyleContext.cxx +++ b/lexlib/StyleContext.cxx @@ -16,9 +16,7 @@ #include "StyleContext.h" #include "CharacterSet.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif bool StyleContext::MatchIgnoreCase(const char *s) { if (MakeLowerCase(ch) != static_cast<unsigned char>(*s)) diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h index abfc07318..a76f7f417 100644 --- a/lexlib/StyleContext.h +++ b/lexlib/StyleContext.h @@ -8,9 +8,7 @@ #ifndef STYLECONTEXT_H #define STYLECONTEXT_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // All languages handled so far can treat all characters >= 0x80 as one class // which just continues the current token or starts an identifier if in default. @@ -204,8 +202,6 @@ public: void GetCurrentLowered(char *s, Sci_PositionU len); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/SubStyles.h b/lexlib/SubStyles.h index 07b0f1507..682909bf2 100644 --- a/lexlib/SubStyles.h +++ b/lexlib/SubStyles.h @@ -8,9 +8,7 @@ #ifndef SUBSTYLES_H #define SUBSTYLES_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class WordClassifier { int baseStyle; @@ -193,8 +191,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/lexlib/WordList.cxx b/lexlib/WordList.cxx index 1780a1ccf..f65b5ed48 100644 --- a/lexlib/WordList.cxx +++ b/lexlib/WordList.cxx @@ -14,9 +14,7 @@ #include "StringCopy.h" #include "WordList.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /** * Creates an array that points into each word in the string and puts \0 terminators diff --git a/lexlib/WordList.h b/lexlib/WordList.h index b1f8c85b2..a9f2d4ab2 100644 --- a/lexlib/WordList.h +++ b/lexlib/WordList.h @@ -8,9 +8,7 @@ #ifndef WORDLIST_H #define WORDLIST_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** */ @@ -35,8 +33,6 @@ public: const char *WordAt(int n) const; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp index 7c0e68e7e..1ba39be32 100644 --- a/qt/ScintillaEdit/ScintillaDocument.cpp +++ b/qt/ScintillaEdit/ScintillaDocument.cpp @@ -33,9 +33,7 @@ #include "CaseFolder.h" #include "Document.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif class WatcherHelper : public DocWatcher { ScintillaDocument *owner; diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h index ef62ab2f1..cd84b4ddd 100644 --- a/qt/ScintillaEdit/ScintillaDocument.h +++ b/qt/ScintillaEdit/ScintillaDocument.h @@ -9,10 +9,6 @@ class WatcherHelper; -#ifdef SCI_NAMESPACE -namespace Scintilla { -#endif - #ifndef EXPORT_IMPORT_API #ifdef WIN32 #ifdef MAKING_LIBRARY @@ -92,8 +88,4 @@ signals: friend class ::WatcherHelper; }; -#ifdef SCI_NAMESPACE -} -#endif - #endif // SCINTILLADOCUMENT_H diff --git a/qt/ScintillaEdit/ScintillaEdit.cpp.template b/qt/ScintillaEdit/ScintillaEdit.cpp.template index 428d27701..bf5895342 100644 --- a/qt/ScintillaEdit/ScintillaEdit.cpp.template +++ b/qt/ScintillaEdit/ScintillaEdit.cpp.template @@ -4,9 +4,7 @@ #include "ScintillaEdit.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif ScintillaEdit::ScintillaEdit(QWidget *parent) : ScintillaEditBase(parent) { } diff --git a/qt/ScintillaEdit/ScintillaEdit.h.template b/qt/ScintillaEdit/ScintillaEdit.h.template index 9d7c1d894..d9853eb1a 100644 --- a/qt/ScintillaEdit/ScintillaEdit.h.template +++ b/qt/ScintillaEdit/ScintillaEdit.h.template @@ -10,10 +10,6 @@ #include "ScintillaEditBase.h" #include "ScintillaDocument.h" -#ifdef SCI_NAMESPACE -namespace Scintilla { -#endif - #ifndef EXPORT_IMPORT_API #ifdef WIN32 #ifdef MAKING_LIBRARY @@ -67,10 +63,6 @@ public: }; -#ifdef SCI_NAMESPACE -} -#endif - #if defined(__GNUC__) #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #endif diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index e288cf5bf..713f4c46f 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -37,9 +37,7 @@ #include <QElapsedTimer> #include <cstdio> -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif //---------------------------------------------------------------------- @@ -1245,6 +1243,4 @@ double ElapsedTime::Duration(bool reset) return result / 1000000000.0; // 1 billion nanoseconds in a second } -#ifdef SCI_NAMESPACE } -#endif diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h index ae9a015bc..6749c4b0f 100644 --- a/qt/ScintillaEditBase/PlatQt.h +++ b/qt/ScintillaEditBase/PlatQt.h @@ -18,9 +18,7 @@ #include <QPainter> #include <QHash> -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif const char *CharacterSetID(int characterSet); @@ -125,8 +123,6 @@ public: QPainter *GetPainter(); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 64166e78a..60907159f 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -40,9 +40,7 @@ #endif #endif // QT_VERSION >= 5.0.0 -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif ScintillaEditBase::ScintillaEditBase(QWidget *parent) : QAbstractScrollArea(parent), sqt(0), preeditPos(-1), wheelDelta(0) diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h index 8685f080f..20acf3086 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.h +++ b/qt/ScintillaEditBase/ScintillaEditBase.h @@ -19,13 +19,12 @@ #include <QMimeData> #include <QTime> -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class ScintillaQt; class SurfaceImpl; -struct SCNotification; + +} #ifndef EXPORT_IMPORT_API #ifdef WIN32 @@ -138,7 +137,7 @@ protected: void scrollContentsBy(int, int) override {} private: - ScintillaQt *sqt; + Scintilla::ScintillaQt *sqt; QTime time; @@ -153,8 +152,4 @@ private: int ModifiersOfKeyboard() const; }; -#ifdef SCI_NAMESPACE -} -#endif - #endif /* SCINTILLAEDITBASE_H */ diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index 6a119ebd9..9209a7b65 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -26,9 +26,7 @@ #include <QTimer> #include <QTextCodec> -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif ScintillaQt::ScintillaQt(QAbstractScrollArea *parent) diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index 1f33fe56b..a8cd54bff 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -69,9 +69,9 @@ #include <QClipboard> #include <QPaintEvent> -#ifdef SCI_NAMESPACE +class ScintillaEditBase; + namespace Scintilla { -#endif class ScintillaQt : public QObject, public ScintillaBase { Q_OBJECT @@ -167,11 +167,9 @@ private: bool dragWasDropped; int rectangularSelectionModifier; - friend class ScintillaEditBase; + friend class ::ScintillaEditBase; }; -#ifdef SCI_NAMESPACE } -#endif #endif // SCINTILLAQT_H diff --git a/src/AutoComplete.cxx b/src/AutoComplete.cxx index 1c847ce0f..ac8a27c18 100644 --- a/src/AutoComplete.cxx +++ b/src/AutoComplete.cxx @@ -23,9 +23,7 @@ #include "Position.h" #include "AutoComplete.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif AutoComplete::AutoComplete() : active(false), diff --git a/src/AutoComplete.h b/src/AutoComplete.h index 17998657b..2d957f6e5 100644 --- a/src/AutoComplete.h +++ b/src/AutoComplete.h @@ -8,9 +8,7 @@ #ifndef AUTOCOMPLETE_H #define AUTOCOMPLETE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** */ @@ -88,8 +86,6 @@ public: void Select(const char *word); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/CallTip.cxx b/src/CallTip.cxx index de2b37c63..b7aaaceb8 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -22,9 +22,7 @@ #include "Position.h" #include "CallTip.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif CallTip::CallTip() { wCallTip = 0; diff --git a/src/CallTip.h b/src/CallTip.h index ad669fa22..cb5d2c12c 100644 --- a/src/CallTip.h +++ b/src/CallTip.h @@ -8,9 +8,7 @@ #ifndef CALLTIP_H #define CALLTIP_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** */ @@ -86,8 +84,6 @@ public: void SetForeBack(const ColourDesired &fore, const ColourDesired &back); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx index 24205dd81..cef963c68 100644 --- a/src/CaseConvert.cxx +++ b/src/CaseConvert.cxx @@ -20,9 +20,7 @@ #include "UniConversion.h" #include "UnicodeFromUTF8.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif namespace { // Use an unnamed namespace to protect the declarations from name conflicts @@ -802,9 +800,7 @@ CaseConverter *ConverterForConversion(enum CaseConversion conversion) { } -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif ICaseConverter *ConverterFor(enum CaseConversion conversion) { CaseConverter *pCaseConv = ConverterForConversion(conversion); @@ -835,6 +831,4 @@ std::string CaseConvertString(const std::string &s, enum CaseConversion conversi return retMapped; } -#ifdef SCI_NAMESPACE } -#endif diff --git a/src/CaseConvert.h b/src/CaseConvert.h index 7a0100300..cdd089710 100644 --- a/src/CaseConvert.h +++ b/src/CaseConvert.h @@ -10,9 +10,7 @@ #ifndef CASECONVERT_H #define CASECONVERT_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum CaseConversion { CaseConversionFold, @@ -43,8 +41,6 @@ size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixe // Converts a mixed case string using a particular conversion. std::string CaseConvertString(const std::string &s, enum CaseConversion conversion); -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/CaseFolder.cxx b/src/CaseFolder.cxx index 4e095df1a..bbb799197 100644 --- a/src/CaseFolder.cxx +++ b/src/CaseFolder.cxx @@ -13,9 +13,7 @@ #include "CaseConvert.h" #include "UniConversion.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif CaseFolder::~CaseFolder() { } diff --git a/src/CaseFolder.h b/src/CaseFolder.h index bdc7d3dbf..790da0b29 100644 --- a/src/CaseFolder.h +++ b/src/CaseFolder.h @@ -8,9 +8,7 @@ #ifndef CASEFOLDER_H #define CASEFOLDER_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class CaseFolder { public: @@ -38,8 +36,6 @@ public: size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Catalogue.cxx b/src/Catalogue.cxx index c4f7a7eda..0cbf0db61 100644 --- a/src/Catalogue.cxx +++ b/src/Catalogue.cxx @@ -19,9 +19,7 @@ #include "LexerModule.h" #include "Catalogue.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static std::vector<LexerModule *> lexerCatalogue; static int nextLanguage = SCLEX_AUTOMATIC+1; diff --git a/src/Catalogue.h b/src/Catalogue.h index 7fea37da8..b75a59fc8 100644 --- a/src/Catalogue.h +++ b/src/Catalogue.h @@ -8,9 +8,7 @@ #ifndef CATALOGUE_H #define CATALOGUE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class Catalogue { public: @@ -19,8 +17,6 @@ public: static void AddLexerModule(LexerModule *plm); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx index 0cc3b4eda..e87c5c305 100644 --- a/src/CellBuffer.cxx +++ b/src/CellBuffer.cxx @@ -25,9 +25,7 @@ #include "CellBuffer.h" #include "UniConversion.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif LineVector::LineVector() : starts(256), perLine(0) { Init(); diff --git a/src/CellBuffer.h b/src/CellBuffer.h index 8e670aca5..edc587dff 100644 --- a/src/CellBuffer.h +++ b/src/CellBuffer.h @@ -8,9 +8,7 @@ #ifndef CELLBUFFER_H #define CELLBUFFER_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // Interface to per-line data that wants to see each line insertion and deletion class PerLine { @@ -220,8 +218,6 @@ public: void PerformRedoStep(); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx index 5d0aa02a4..b4f021d59 100644 --- a/src/CharClassify.cxx +++ b/src/CharClassify.cxx @@ -12,9 +12,7 @@ #include "CharClassify.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif CharClassify::CharClassify() { SetDefaultCharClasses(true); diff --git a/src/CharClassify.h b/src/CharClassify.h index 26ab546b2..c1ca3c120 100644 --- a/src/CharClassify.h +++ b/src/CharClassify.h @@ -8,9 +8,7 @@ #ifndef CHARCLASSIFY_H #define CHARCLASSIFY_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class CharClassify { public: @@ -28,8 +26,6 @@ private: unsigned char charClass[maxChar]; // not type cc to save space }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx index c56c5647b..3c76d40d1 100644 --- a/src/ContractionState.cxx +++ b/src/ContractionState.cxx @@ -24,9 +24,7 @@ #include "SparseVector.h" #include "ContractionState.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif ContractionState::ContractionState() : linesInDocument(1) { } diff --git a/src/ContractionState.h b/src/ContractionState.h index 1070fb59f..517bf6258 100644 --- a/src/ContractionState.h +++ b/src/ContractionState.h @@ -8,9 +8,7 @@ #ifndef CONTRACTIONSTATE_H #define CONTRACTIONSTATE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif template<class T> class SparseVector; @@ -73,8 +71,6 @@ public: void Check() const; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/DBCS.cxx b/src/DBCS.cxx index 46cee8e69..0fb7ef0af 100644 --- a/src/DBCS.cxx +++ b/src/DBCS.cxx @@ -7,13 +7,9 @@ #include "DBCS.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif bool DBCSIsLeadByte(int codePage, char ch) { // Byte ranges found in Wikipedia articles with relevant search strings in each case @@ -43,6 +39,4 @@ bool DBCSIsLeadByte(int codePage, char ch) { return false; } -#ifdef SCI_NAMESPACE } -#endif diff --git a/src/DBCS.h b/src/DBCS.h index 875d44c8f..531437f45 100644 --- a/src/DBCS.h +++ b/src/DBCS.h @@ -8,14 +8,10 @@ #ifndef DBCS_H #define DBCS_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif bool DBCSIsLeadByte(int codePage, char ch); -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Decoration.cxx b/src/Decoration.cxx index f5f82832f..bca2d6cb0 100644 --- a/src/Decoration.cxx +++ b/src/Decoration.cxx @@ -24,9 +24,7 @@ #include "RunStyles.h" #include "Decoration.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif Decoration::Decoration(int indicator_) : indicator(indicator_) { } diff --git a/src/Decoration.h b/src/Decoration.h index d096da385..ab9912935 100644 --- a/src/Decoration.h +++ b/src/Decoration.h @@ -7,9 +7,7 @@ #ifndef DECORATION_H #define DECORATION_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class Decoration { int indicator; @@ -74,8 +72,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Document.cxx b/src/Document.cxx index c3a81f23d..7da62ff8f 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -52,9 +52,7 @@ #include "UniConversion.h" #include "UnicodeFromUTF8.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif void LexInterface::Colourise(Sci::Position start, Sci::Position end) { if (pdoc && instance && !performingStyle) { @@ -3094,18 +3092,8 @@ const char *BuiltinRegex::SubstituteByPosition(Document *doc, const char *text, #ifndef SCI_OWNREGEX -#ifdef SCI_NAMESPACE - RegexSearchBase *Scintilla::CreateRegexSearch(CharClassify *charClassTable) { return new BuiltinRegex(charClassTable); } -#else - -RegexSearchBase *CreateRegexSearch(CharClassify *charClassTable) { - return new BuiltinRegex(charClassTable); -} - -#endif - #endif diff --git a/src/Document.h b/src/Document.h index 0aff383d2..9f22f154a 100644 --- a/src/Document.h +++ b/src/Document.h @@ -8,9 +8,7 @@ #ifndef DOCUMENT_H #define DOCUMENT_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif enum EncodingFamily { efEightBit, efUnicode, efDBCS }; @@ -547,8 +545,6 @@ public: virtual void NotifyErrorOccurred(Document *doc, void *userData, int status) = 0; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/EditModel.cxx b/src/EditModel.cxx index 57d6941cf..7dfd90e37 100644 --- a/src/EditModel.cxx +++ b/src/EditModel.cxx @@ -47,9 +47,7 @@ #include "PositionCache.h" #include "EditModel.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif Caret::Caret() : active(false), on(false), period(500) {} diff --git a/src/EditModel.h b/src/EditModel.h index 087cf4934..773309d45 100644 --- a/src/EditModel.h +++ b/src/EditModel.h @@ -8,9 +8,7 @@ #ifndef EDITMODEL_H #define EDITMODEL_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** */ @@ -63,8 +61,6 @@ public: virtual Range GetHotSpotRange() const = 0; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/EditView.cxx b/src/EditView.cxx index 011d16575..8db21d5d9 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -54,9 +54,7 @@ #include "MarginView.h" #include "EditView.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsControlCharacter(int ch) { // iscntrl returns true for lots of chars > 127 which are displayable @@ -69,9 +67,7 @@ PrintParameters::PrintParameters() { wrapState = eWrapWord; } -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif bool ValidStyledText(const ViewStyle &vs, size_t styleOffset, const StyledText &st) { if (st.multipleStyles) { @@ -171,9 +167,7 @@ void DrawStyledText(Surface *surface, const ViewStyle &vs, int styleOffset, PRec } } -#ifdef SCI_NAMESPACE } -#endif const XYPOSITION epsilon = 0.0001f; // A small nudge to avoid floating point precision issues diff --git a/src/EditView.h b/src/EditView.h index a842ac63a..067b9299a 100644 --- a/src/EditView.h +++ b/src/EditView.h @@ -8,9 +8,7 @@ #ifndef EDITVIEW_H #define EDITVIEW_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif struct PrintParameters { int magnification; @@ -177,8 +175,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Editor.cxx b/src/Editor.cxx index 7670f6769..ca069faea 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -54,9 +54,7 @@ #include "EditView.h" #include "Editor.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif /* return whether this modification represents an operation that diff --git a/src/Editor.h b/src/Editor.h index 93f953859..709adca39 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -8,9 +8,7 @@ #ifndef EDITOR_H #define EDITOR_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** */ @@ -621,8 +619,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/ExternalLexer.cxx b/src/ExternalLexer.cxx index 4a2811c18..fdef2ad57 100644 --- a/src/ExternalLexer.cxx +++ b/src/ExternalLexer.cxx @@ -24,9 +24,7 @@ #include "Catalogue.h" #include "ExternalLexer.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif std::unique_ptr<LexerManager> LexerManager::theInstance; diff --git a/src/ExternalLexer.h b/src/ExternalLexer.h index 7804c19f0..1373c911d 100644 --- a/src/ExternalLexer.h +++ b/src/ExternalLexer.h @@ -14,9 +14,7 @@ #define EXT_LEXER_DECL #endif -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif typedef void*(EXT_LEXER_DECL *GetLexerFunction)(unsigned int Index); typedef int (EXT_LEXER_DECL *GetLexerCountFn)(); @@ -71,8 +69,6 @@ public: ~LMMinder(); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/FontQuality.h b/src/FontQuality.h index a0ae207f8..85dca1e16 100644 --- a/src/FontQuality.h +++ b/src/FontQuality.h @@ -9,9 +9,7 @@ #ifndef FONTQUALITY_H #define FONTQUALITY_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // These definitions match Scintilla.h #define SC_EFF_QUALITY_MASK 0xF @@ -24,8 +22,6 @@ namespace Scintilla { #define SCWIN_TECH_GDI 0 #define SCWIN_TECH_DIRECTWRITE 1 -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Indicator.cxx b/src/Indicator.cxx index b59f1804f..e8702b17c 100644 --- a/src/Indicator.cxx +++ b/src/Indicator.cxx @@ -17,9 +17,7 @@ #include "Indicator.h" #include "XPM.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static PRectangle PixelGridAlign(const PRectangle &rc) { // Move left and right side to nearest pixel to avoid blurry visuals diff --git a/src/Indicator.h b/src/Indicator.h index 9b887df9d..7e9a00ce3 100644 --- a/src/Indicator.h +++ b/src/Indicator.h @@ -8,9 +8,7 @@ #ifndef INDICATOR_H #define INDICATOR_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif struct StyleAndColour { int style; @@ -53,8 +51,6 @@ public: void SetFlags(int attributes_); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx index 2d81ab4eb..ee76ff052 100644 --- a/src/KeyMap.cxx +++ b/src/KeyMap.cxx @@ -17,9 +17,7 @@ #include "KeyMap.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif KeyMap::KeyMap() { for (int i = 0; MapDefault[i].key; i++) { diff --git a/src/KeyMap.h b/src/KeyMap.h index 7c4f80720..08f6c4ef7 100644 --- a/src/KeyMap.h +++ b/src/KeyMap.h @@ -8,9 +8,7 @@ #ifndef KEYMAP_H #define KEYMAP_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif #define SCI_NORM 0 #define SCI_SHIFT SCMOD_SHIFT @@ -60,8 +58,6 @@ public: unsigned int Find(int key, int modifiers) const; // 0 returned on failure }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/LineMarker.cxx b/src/LineMarker.cxx index 5f8243ff8..f556e77f8 100644 --- a/src/LineMarker.cxx +++ b/src/LineMarker.cxx @@ -22,9 +22,7 @@ #include "XPM.h" #include "LineMarker.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif void LineMarker::SetXPM(const char *textForm) { pxpm.reset(new XPM(textForm)); diff --git a/src/LineMarker.h b/src/LineMarker.h index 2006fe8fb..6b66e03e8 100644 --- a/src/LineMarker.h +++ b/src/LineMarker.h @@ -8,9 +8,7 @@ #ifndef LINEMARKER_H #define LINEMARKER_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif typedef void (*DrawLineMarkerFn)(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, int tFold, int marginStyle, const void *lineMarker); @@ -73,8 +71,6 @@ public: void Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, typeOfFold tFold, int marginStyle) const; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/MarginView.cxx b/src/MarginView.cxx index a4d50217e..121f7ecf6 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -51,13 +51,9 @@ #include "MarginView.h" #include "EditView.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourDesired wrapColour) { @@ -466,7 +462,5 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, surface->FillRectangle(rcBlankMargin, vs.styles[STYLE_DEFAULT].back); } -#ifdef SCI_NAMESPACE } -#endif diff --git a/src/MarginView.h b/src/MarginView.h index 695126ad9..1d5d46cac 100644 --- a/src/MarginView.h +++ b/src/MarginView.h @@ -8,9 +8,7 @@ #ifndef MARGINVIEW_H #define MARGINVIEW_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourDesired wrapColour); @@ -43,8 +41,6 @@ public: const EditModel &model, const ViewStyle &vs); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Partitioning.h b/src/Partitioning.h index 968220db7..07d093ea2 100644 --- a/src/Partitioning.h +++ b/src/Partitioning.h @@ -8,9 +8,7 @@ #ifndef PARTITIONING_H #define PARTITIONING_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /// A split vector of integers with a method for adding a value to all elements /// in a range. @@ -194,8 +192,6 @@ public: }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/PerLine.cxx b/src/PerLine.cxx index d8cf729c3..5a213f719 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -24,9 +24,7 @@ #include "CellBuffer.h" #include "PerLine.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif MarkerHandleSet::MarkerHandleSet() { } diff --git a/src/PerLine.h b/src/PerLine.h index bd97e53a6..f1df0c31d 100644 --- a/src/PerLine.h +++ b/src/PerLine.h @@ -8,9 +8,7 @@ #ifndef PERLINE_H #define PERLINE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** * This holds the marker identifier and the marker type to display. @@ -149,8 +147,6 @@ public: int GetNextTabstop(Sci::Line line, int x) const; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 379c6f338..0b563f525 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -43,9 +43,7 @@ #include "Selection.h" #include "PositionCache.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif LineLayout::LineLayout(int maxLineLength_) : lenLineStarts(0), diff --git a/src/PositionCache.h b/src/PositionCache.h index 402d657b8..f23823bdf 100644 --- a/src/PositionCache.h +++ b/src/PositionCache.h @@ -8,9 +8,7 @@ #ifndef POSITIONCACHE_H #define POSITIONCACHE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif static inline bool IsEOLChar(char ch) { return (ch == '\r') || (ch == '\n'); @@ -233,8 +231,6 @@ inline bool IsSpaceOrTab(int ch) { return ch == ' ' || ch == '\t'; } -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/RESearch.cxx b/src/RESearch.cxx index 65a732ef3..cee61cff6 100644 --- a/src/RESearch.cxx +++ b/src/RESearch.cxx @@ -210,9 +210,7 @@ #include "CharClassify.h" #include "RESearch.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif #define OKP 1 #define NOP 0 diff --git a/src/RESearch.h b/src/RESearch.h index b092a6e7c..83a20c5b5 100644 --- a/src/RESearch.h +++ b/src/RESearch.h @@ -9,9 +9,7 @@ #ifndef RESEARCH_H #define RESEARCH_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /* * The following defines are not meant to be changeable. @@ -66,9 +64,7 @@ private: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx index b0a9c1fac..f6d3d413b 100644 --- a/src/RunStyles.cxx +++ b/src/RunStyles.cxx @@ -23,9 +23,7 @@ #include "Partitioning.h" #include "RunStyles.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif // Find the first run at a position int RunStyles::RunFromPosition(int position) const { diff --git a/src/RunStyles.h b/src/RunStyles.h index 1c8ef301d..8997d924f 100644 --- a/src/RunStyles.h +++ b/src/RunStyles.h @@ -10,9 +10,7 @@ #ifndef RUNSTYLES_H #define RUNSTYLES_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class RunStyles { private: @@ -48,8 +46,6 @@ public: void Check() const; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index 0f491c30e..7c2e0eb8d 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -61,9 +61,7 @@ #include "AutoComplete.h" #include "ScintillaBase.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif ScintillaBase::ScintillaBase() { displayPopupMenu = SC_POPUP_ALL; @@ -545,9 +543,7 @@ void ScintillaBase::RightButtonDownWithModifiers(Point pt, unsigned int curTime, #ifdef SCI_LEXER -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class LexState : public LexInterface { const LexerModule *lexCurrent; @@ -589,9 +585,7 @@ public: const char *DescriptionOfStyle(int style); }; -#ifdef SCI_NAMESPACE } -#endif LexState::LexState(Document *pdoc_) : LexInterface(pdoc_) { lexCurrent = 0; diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index f63cf192c..bd7787357 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -8,9 +8,7 @@ #ifndef SCINTILLABASE_H #define SCINTILLABASE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif #ifdef SCI_LEXER class LexState; @@ -98,8 +96,6 @@ public: sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Selection.cxx b/src/Selection.cxx index fe81cdf49..2e2680ad8 100644 --- a/src/Selection.cxx +++ b/src/Selection.cxx @@ -18,9 +18,7 @@ #include "Position.h" #include "Selection.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif void SelectionPosition::MoveForInsertDelete(bool insertion, Sci::Position startChange, Sci::Position length) { if (insertion) { diff --git a/src/Selection.h b/src/Selection.h index 991864e01..8f2166961 100644 --- a/src/Selection.h +++ b/src/Selection.h @@ -8,9 +8,7 @@ #ifndef SELECTION_H #define SELECTION_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif class SelectionPosition { Sci::Position position; @@ -189,8 +187,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/SparseVector.h b/src/SparseVector.h index 230871ccc..f42194f26 100644 --- a/src/SparseVector.h +++ b/src/SparseVector.h @@ -8,9 +8,7 @@ #ifndef SPARSEVECTOR_H #define SPARSEVECTOR_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // SparseVector is similar to RunStyles but is more efficient for cases where values occur // for one position instead of over a range of positions. @@ -151,8 +149,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/SplitVector.h b/src/SplitVector.h index 6b839b24b..c59144d1b 100644 --- a/src/SplitVector.h +++ b/src/SplitVector.h @@ -9,9 +9,7 @@ #ifndef SPLITVECTOR_H #define SPLITVECTOR_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif template <typename T> class SplitVector { @@ -330,8 +328,6 @@ public: } }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/Style.cxx b/src/Style.cxx index 99be5f36e..cf61eb222 100644 --- a/src/Style.cxx +++ b/src/Style.cxx @@ -12,9 +12,7 @@ #include "Scintilla.h" #include "Style.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif FontAlias::FontAlias() { } diff --git a/src/Style.h b/src/Style.h index c0696a770..f2d70039f 100644 --- a/src/Style.h +++ b/src/Style.h @@ -8,9 +8,7 @@ #ifndef STYLE_H #define STYLE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif struct FontSpecification { const char *fontName; @@ -85,8 +83,6 @@ public: bool IsProtected() const { return !(changeable && visible);} }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/UniConversion.cxx b/src/UniConversion.cxx index b02850a06..e4eade7dc 100644 --- a/src/UniConversion.cxx +++ b/src/UniConversion.cxx @@ -12,13 +12,9 @@ #include "UniConversion.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif size_t UTF8Length(const wchar_t *uptr, size_t tlen) { size_t len = 0; @@ -327,6 +323,4 @@ std::string FixInvalidUTF8(const std::string &text) { return result; } -#ifdef SCI_NAMESPACE } -#endif diff --git a/src/UniConversion.h b/src/UniConversion.h index 8011e05bb..2f358c9c5 100644 --- a/src/UniConversion.h +++ b/src/UniConversion.h @@ -8,9 +8,7 @@ #ifndef UNICONVERSION_H #define UNICONVERSION_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif const int UTF8MaxBytes = 4; @@ -66,8 +64,6 @@ inline unsigned int UTF16CharLength(wchar_t uch) { return ((uch >= SURROGATE_LEAD_FIRST) && (uch <= SURROGATE_LEAD_LAST)) ? 2 : 1; } -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/UnicodeFromUTF8.h b/src/UnicodeFromUTF8.h index ae66cb0a9..17999a786 100644 --- a/src/UnicodeFromUTF8.h +++ b/src/UnicodeFromUTF8.h @@ -8,9 +8,7 @@ #ifndef UNICODEFROMUTF8_H #define UNICODEFROMUTF8_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif inline int UnicodeFromUTF8(const unsigned char *us) { if (us[0] < 0xC2) { @@ -25,8 +23,6 @@ inline int UnicodeFromUTF8(const unsigned char *us) { return us[0]; } -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/UniqueString.h b/src/UniqueString.h index 07da0f171..18c31283e 100644 --- a/src/UniqueString.h +++ b/src/UniqueString.h @@ -9,9 +9,7 @@ #ifndef UNIQUESTRING_H #define UNIQUESTRING_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif using UniqueString = std::unique_ptr<const char[]>; @@ -27,8 +25,6 @@ inline UniqueString UniqueStringCopy(const char *text) { return UniqueString(sNew); } -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index 771d4a8f4..70419569b 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -26,9 +26,7 @@ #include "Style.h" #include "ViewStyle.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif MarginStyle::MarginStyle(int style_, int width_, int mask_) : style(style_), width(width_), mask(mask_), sensitive(false), cursor(SC_CURSORREVERSEARROW) { diff --git a/src/ViewStyle.h b/src/ViewStyle.h index 7210fa610..4348e3eaa 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -8,9 +8,7 @@ #ifndef VIEWSTYLE_H #define VIEWSTYLE_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** */ @@ -215,8 +213,6 @@ private: void FindMaxAscentDescent(); }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/src/XPM.cxx b/src/XPM.cxx index 818a1acdc..0f314f35f 100644 --- a/src/XPM.cxx +++ b/src/XPM.cxx @@ -17,9 +17,7 @@ #include "XPM.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static const char *NextField(const char *s) { // In case there are leading spaces in the string @@ -8,9 +8,7 @@ #ifndef XPM_H #define XPM_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif /** * Hold a pixmap in XPM format. @@ -87,8 +85,6 @@ public: int GetWidth() const; }; -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/test/unit/testCellBuffer.cxx b/test/unit/testCellBuffer.cxx index 80d9b6be8..d71bab88d 100644 --- a/test/unit/testCellBuffer.cxx +++ b/test/unit/testCellBuffer.cxx @@ -16,6 +16,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test CellBuffer. TEST_CASE("CellBuffer") { diff --git a/test/unit/testCharClassify.cxx b/test/unit/testCharClassify.cxx index 5dd004e83..ce034e9d4 100644 --- a/test/unit/testCharClassify.cxx +++ b/test/unit/testCharClassify.cxx @@ -12,6 +12,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test CharClassify. class CharClassifyTest { diff --git a/test/unit/testContractionState.cxx b/test/unit/testContractionState.cxx index 4f7a522a4..a0d5fb0da 100644 --- a/test/unit/testContractionState.cxx +++ b/test/unit/testContractionState.cxx @@ -18,6 +18,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test ContractionState. TEST_CASE("ContractionState") { diff --git a/test/unit/testDecoration.cxx b/test/unit/testDecoration.cxx index 040590001..05b636bd8 100644 --- a/test/unit/testDecoration.cxx +++ b/test/unit/testDecoration.cxx @@ -19,6 +19,8 @@ const int indicator=4; +using namespace Scintilla; + // Test Decoration. TEST_CASE("Decoration") { diff --git a/test/unit/testPartitioning.cxx b/test/unit/testPartitioning.cxx index 925cc9a32..ed2957289 100644 --- a/test/unit/testPartitioning.cxx +++ b/test/unit/testPartitioning.cxx @@ -15,6 +15,8 @@ #include "catch.hpp" +using namespace Scintilla; + const int growSize = 4; const int lengthTestArray = 8; diff --git a/test/unit/testRunStyles.cxx b/test/unit/testRunStyles.cxx index e33cedb2e..e93278dbf 100644 --- a/test/unit/testRunStyles.cxx +++ b/test/unit/testRunStyles.cxx @@ -16,6 +16,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test RunStyles. TEST_CASE("RunStyles") { diff --git a/test/unit/testSparseState.cxx b/test/unit/testSparseState.cxx index 0cc9b149d..3cc283b69 100644 --- a/test/unit/testSparseState.cxx +++ b/test/unit/testSparseState.cxx @@ -13,6 +13,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test SparseState. TEST_CASE("SparseState") { diff --git a/test/unit/testSparseVector.cxx b/test/unit/testSparseVector.cxx index c4c3a6ab1..94f96c0df 100644 --- a/test/unit/testSparseVector.cxx +++ b/test/unit/testSparseVector.cxx @@ -18,6 +18,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test SparseVector. // Helper to produce a string representation of a SparseVector<const char *> diff --git a/test/unit/testSplitVector.cxx b/test/unit/testSplitVector.cxx index e01810d33..9b25de600 100644 --- a/test/unit/testSplitVector.cxx +++ b/test/unit/testSplitVector.cxx @@ -14,6 +14,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test SplitVector. struct StringSetHolder { diff --git a/test/unit/testUnicodeFromUTF8.cxx b/test/unit/testUnicodeFromUTF8.cxx index 116f4cf19..941a08a16 100644 --- a/test/unit/testUnicodeFromUTF8.cxx +++ b/test/unit/testUnicodeFromUTF8.cxx @@ -10,6 +10,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test UnicodeFromUTF8. // Use examples from Wikipedia: // http://en.wikipedia.org/wiki/UTF-8 diff --git a/test/unit/testWordList.cxx b/test/unit/testWordList.cxx index 7abedd157..22025d6e5 100644 --- a/test/unit/testWordList.cxx +++ b/test/unit/testWordList.cxx @@ -6,6 +6,8 @@ #include "catch.hpp" +using namespace Scintilla; + // Test WordList. TEST_CASE("WordList") { diff --git a/test/unit/unitTest.cxx b/test/unit/unitTest.cxx index eb554abc2..254f2ada6 100644 --- a/test/unit/unitTest.cxx +++ b/test/unit/unitTest.cxx @@ -49,6 +49,8 @@ #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file #include "catch.hpp" +using namespace Scintilla; + // Needed for PLATFORM_ASSERT in code being tested void Platform::Assert(const char *c, const char *file, int line) { diff --git a/win32/HanjaDic.cxx b/win32/HanjaDic.cxx index d9640be7e..ccc303a99 100644 --- a/win32/HanjaDic.cxx +++ b/win32/HanjaDic.cxx @@ -13,9 +13,7 @@ #include "UniConversion.h" #include "HanjaDic.h" -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif namespace HanjaDict { @@ -126,6 +124,4 @@ int GetHangulOfHanja(wchar_t *inout) { } } -#ifdef SCI_NAMESPACE } -#endif diff --git a/win32/HanjaDic.h b/win32/HanjaDic.h index d58735dca..3aafdf8ed 100644 --- a/win32/HanjaDic.h +++ b/win32/HanjaDic.h @@ -9,9 +9,7 @@ #ifndef HANJADIC_H #define HANJADIC_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif namespace HanjaDict { @@ -19,8 +17,6 @@ int GetHangulOfHanja(wchar_t *inout); } -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 355a35145..3c0d44f6b 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -72,9 +72,7 @@ static HINSTANCE hinstPlatformRes = 0; static HCURSOR reverseArrowCursor = NULL; -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif static RECT RectFromPRectangle(PRectangle prc) { RECT rc = {static_cast<LONG>(prc.left), static_cast<LONG>(prc.top), @@ -3088,6 +3086,4 @@ void Platform_Finalise(bool fromDllMain) { ::DeleteCriticalSection(&crPlatformLock); } -#ifdef SCI_NAMESPACE } -#endif diff --git a/win32/PlatWin.h b/win32/PlatWin.h index e5913ba17..eff1fea01 100644 --- a/win32/PlatWin.h +++ b/win32/PlatWin.h @@ -8,9 +8,7 @@ #ifndef PLATWIN_H #define PLATWIN_H -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif extern void Platform_Initialise(void *hInstance); extern void Platform_Finalise(bool fromDllMain); @@ -21,8 +19,6 @@ extern ID2D1Factory *pD2DFactory; extern IDWriteFactory *pIDWriteFactory; #endif -#ifdef SCI_NAMESPACE } -#endif #endif diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index de1d6b8b4..2d2fc266c 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -137,9 +137,7 @@ typedef UINT_PTR (WINAPI *SetCoalescableTimerSig)(HWND hwnd, UINT_PTR nIDEvent, const TCHAR callClassName[] = TEXT("CallTip"); -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static void *PointerFromWindow(HWND hWnd) { return reinterpret_cast<void *>(::GetWindowLongPtr(hWnd, 0)); |