diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-27 15:33:00 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-27 09:11:38 +0300 |
| commit | 16c1eca8a29c7cde0eee5658d06a451fa2f41388 (patch) | |
| tree | 1f579961c3777bfd46cac4d3125883b3ed8ad887 /scintilla/lexlib | |
| parent | a73c531429b9f860f58385943ada28cec11c44ec (diff) | |
| download | notepad2-mod-16c1eca8a29c7cde0eee5658d06a451fa2f41388.zip notepad2-mod-16c1eca8a29c7cde0eee5658d06a451fa2f41388.tar.gz notepad2-mod-16c1eca8a29c7cde0eee5658d06a451fa2f41388.tar.bz2 | |
update Scintilla to v3.3.3 1cd0eb
Diffstat (limited to 'scintilla/lexlib')
| -rw-r--r-- | scintilla/lexlib/Accessor.cxx | 2 | ||||
| -rw-r--r-- | scintilla/lexlib/Accessor.h | 2 | ||||
| -rw-r--r-- | scintilla/lexlib/LexAccessor.h | 12 | ||||
| -rw-r--r-- | scintilla/lexlib/OptionSet.h | 6 | ||||
| -rw-r--r-- | scintilla/lexlib/StyleContext.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/scintilla/lexlib/Accessor.cxx b/scintilla/lexlib/Accessor.cxx index 7491166..7c8ffe4 100644 --- a/scintilla/lexlib/Accessor.cxx +++ b/scintilla/lexlib/Accessor.cxx @@ -28,7 +28,7 @@ using namespace Scintilla; Accessor::Accessor(IDocument *pAccess_, PropSetSimple *pprops_) : LexAccessor(pAccess_), pprops(pprops_) {
}
-int Accessor::GetPropertyInt(const char *key, int defaultValue) {
+int Accessor::GetPropertyInt(const char *key, int defaultValue) const {
return pprops->GetInt(key, defaultValue);
}
diff --git a/scintilla/lexlib/Accessor.h b/scintilla/lexlib/Accessor.h index 74d42e0..8b65d55 100644 --- a/scintilla/lexlib/Accessor.h +++ b/scintilla/lexlib/Accessor.h @@ -24,7 +24,7 @@ class Accessor : public LexAccessor { public:
PropSetSimple *pprops;
Accessor(IDocument *pAccess_, PropSetSimple *pprops_);
- int GetPropertyInt(const char *, int defaultValue=0);
+ int GetPropertyInt(const char *, int defaultValue=0) const;
int IndentAmount(int line, int *flags, PFNIsCommentLeader pfnIsCommentLeader = 0);
};
diff --git a/scintilla/lexlib/LexAccessor.h b/scintilla/lexlib/LexAccessor.h index ed4725f..ee238a6 100644 --- a/scintilla/lexlib/LexAccessor.h +++ b/scintilla/lexlib/LexAccessor.h @@ -90,7 +90,7 @@ public: }
return buf[position - startPos];
}
- bool IsLeadByte(char ch) {
+ bool IsLeadByte(char ch) const {
return pAccess->IsDBCSLeadByte(ch);
}
EncodingType Encoding() const {
@@ -104,13 +104,13 @@ public: }
return true;
}
- char StyleAt(int position) {
+ char StyleAt(int position) const {
return static_cast<char>(pAccess->StyleAt(position) & mask);
}
- int GetLine(int position) {
+ int GetLine(int position) const {
return pAccess->LineFromPosition(position);
}
- int LineStart(int line) {
+ int LineStart(int line) const {
return pAccess->LineStart(line);
}
int LineEnd(int line) {
@@ -126,7 +126,7 @@ public: return startNext - 1;
}
}
- int LevelAt(int line) {
+ int LevelAt(int line) const {
return pAccess->GetLevel(line);
}
int Length() const {
@@ -140,7 +140,7 @@ public: validLen = 0;
}
}
- int GetLineState(int line) {
+ int GetLineState(int line) const {
return pAccess->GetLineState(line);
}
int SetLineState(int line, int state) {
diff --git a/scintilla/lexlib/OptionSet.h b/scintilla/lexlib/OptionSet.h index ee3092c..8ff0bad 100644 --- a/scintilla/lexlib/OptionSet.h +++ b/scintilla/lexlib/OptionSet.h @@ -40,7 +40,7 @@ class OptionSet { Option(plcos ps_, std::string description_) :
opType(SC_TYPE_STRING), ps(ps_), description(description_) {
}
- bool Set(T *base, const char *val) {
+ bool Set(T *base, const char *val) const {
switch (opType) {
case SC_TYPE_BOOLEAN: {
bool option = atoi(val) != 0;
@@ -94,7 +94,7 @@ public: nameToDef[name] = Option(ps, description);
AppendName(name);
}
- const char *PropertyNames() {
+ const char *PropertyNames() const {
return names.c_str();
}
int PropertyType(const char *name) {
@@ -130,7 +130,7 @@ public: }
}
- const char *DescribeWordListSets() {
+ const char *DescribeWordListSets() const {
return wordLists.c_str();
}
};
diff --git a/scintilla/lexlib/StyleContext.h b/scintilla/lexlib/StyleContext.h index 1799793..2af34cd 100644 --- a/scintilla/lexlib/StyleContext.h +++ b/scintilla/lexlib/StyleContext.h @@ -188,7 +188,7 @@ public: styler.ColourTo(currentPos - ((currentPos > lengthDocument) ? 2 : 1), state);
state = state_;
}
- int LengthCurrent() {
+ int LengthCurrent() const {
return currentPos - styler.GetStartSegment();
}
int GetRelative(int n) {
|