diff options
Diffstat (limited to 'src')
64 files changed, 0 insertions, 232 deletions
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 |