aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlib
diff options
context:
space:
mode:
Diffstat (limited to 'lexlib')
-rw-r--r--lexlib/Accessor.cxx2
-rw-r--r--lexlib/Accessor.h4
-rw-r--r--lexlib/CharacterCategory.cxx4
-rw-r--r--lexlib/CharacterCategory.h4
-rw-r--r--lexlib/CharacterSet.cxx6
-rw-r--r--lexlib/CharacterSet.h4
-rw-r--r--lexlib/DefaultLexer.cxx2
-rw-r--r--lexlib/DefaultLexer.h4
-rw-r--r--lexlib/LexAccessor.h4
-rw-r--r--lexlib/LexerBase.cxx2
-rw-r--r--lexlib/LexerBase.h4
-rw-r--r--lexlib/LexerModule.cxx2
-rw-r--r--lexlib/LexerModule.h4
-rw-r--r--lexlib/LexerNoExceptions.cxx2
-rw-r--r--lexlib/LexerNoExceptions.h4
-rw-r--r--lexlib/LexerSimple.cxx2
-rw-r--r--lexlib/LexerSimple.h4
-rw-r--r--lexlib/OptionSet.h4
-rw-r--r--lexlib/PropSetSimple.cxx2
-rw-r--r--lexlib/PropSetSimple.h4
-rw-r--r--lexlib/SparseState.h4
-rw-r--r--lexlib/StringCopy.h4
-rw-r--r--lexlib/StyleContext.cxx2
-rw-r--r--lexlib/StyleContext.h4
-rw-r--r--lexlib/SubStyles.h4
-rw-r--r--lexlib/WordList.cxx2
-rw-r--r--lexlib/WordList.h4
27 files changed, 0 insertions, 92 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-30 04:20:50 +0000