aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CallTip.h2
-rw-r--r--src/CellBuffer.h4
-rw-r--r--src/CharClassify.h2
-rw-r--r--src/Document.h4
-rw-r--r--src/EditView.h2
-rw-r--r--src/Editor.cxx10
-rw-r--r--src/Editor.h6
-rw-r--r--src/LineMarker.h2
-rw-r--r--src/PerLine.h2
-rw-r--r--src/PositionCache.h6
10 files changed, 20 insertions, 20 deletions
diff --git a/src/CallTip.h b/src/CallTip.h
index 787941ded..28d815bbd 100644
--- a/src/CallTip.h
+++ b/src/CallTip.h
@@ -34,7 +34,7 @@ class CallTip {
int posStart, int posEnd, int ytext, PRectangle rcClient,
bool highlight, bool draw);
int PaintContents(Surface *surfaceWindow, bool draw);
- bool IsTabCharacter(char c) const;
+ bool IsTabCharacter(char ch) const;
int NextTabPos(int x) const;
public:
diff --git a/src/CellBuffer.h b/src/CellBuffer.h
index 60842ba95..f0b77e162 100644
--- a/src/CellBuffer.h
+++ b/src/CellBuffer.h
@@ -90,7 +90,7 @@ public:
UndoHistory();
~UndoHistory();
- const char *AppendAction(actionType at, Sci::Position position, const char *data, Sci::Position length, bool &startSequence, bool mayCoalesce=true);
+ const char *AppendAction(actionType at, Sci::Position position, const char *data, Sci::Position lengthData, bool &startSequence, bool mayCoalesce=true);
void BeginUndoAction();
void EndUndoAction();
@@ -173,7 +173,7 @@ public:
/// Setting styles for positions outside the range of the buffer is safe and has no effect.
/// @return true if the style of a character is changed.
bool SetStyleAt(Sci::Position position, char styleValue);
- bool SetStyleFor(Sci::Position position, Sci::Position length, char styleValue);
+ bool SetStyleFor(Sci::Position position, Sci::Position lengthStyle, char styleValue);
const char *DeleteChars(Sci::Position position, Sci::Position deleteLength, bool &startSequence);
diff --git a/src/CharClassify.h b/src/CharClassify.h
index 63e8e8be2..26ab546b2 100644
--- a/src/CharClassify.h
+++ b/src/CharClassify.h
@@ -19,7 +19,7 @@ public:
enum cc { ccSpace, ccNewLine, ccWord, ccPunctuation };
void SetDefaultCharClasses(bool includeWordClass);
void SetCharClasses(const unsigned char *chars, cc newCharClass);
- int GetCharsOfClass(cc charClass, unsigned char *buffer) const;
+ int GetCharsOfClass(cc characterClass, unsigned char *buffer) const;
cc GetClass(unsigned char ch) const { return static_cast<cc>(charClass[ch]);}
bool IsWord(unsigned char ch) const { return static_cast<cc>(charClass[ch]) == ccWord;}
diff --git a/src/Document.h b/src/Document.h
index f6ab8b0d3..b8a88c0df 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -334,7 +334,7 @@ public:
int SCI_METHOD GetLineIndentation(Sci_Position line);
Sci::Position SetLineIndentation(Sci::Line line, Sci::Position indent);
Sci::Position GetLineIndentPosition(Sci::Line line) const;
- Sci::Position GetColumn(Sci::Position position);
+ Sci::Position GetColumn(Sci::Position pos);
Sci::Position CountCharacters(Sci::Position startPos, Sci::Position endPos) const;
Sci::Position CountUTF16(Sci::Position startPos, Sci::Position endPos) const;
Sci::Position FindColumn(Sci::Line line, Sci::Position column);
@@ -377,7 +377,7 @@ public:
void ClearLevels();
Sci::Line GetLastChild(Sci::Line lineParent, int level=-1, Sci::Line lastLine=-1);
Sci::Line GetFoldParent(Sci::Line line) const;
- void GetHighlightDelimiters(HighlightDelimiter &hDelimiter, Sci::Line line, Sci::Line lastLine);
+ void GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, Sci::Line line, Sci::Line lastLine);
Sci::Position ExtendWordSelect(Sci::Position pos, int delta, bool onlyWordCharacters=false) const;
Sci::Position NextWordStart(Sci::Position pos, int delta) const;
diff --git a/src/EditView.h b/src/EditView.h
index b80885330..9eb3146dd 100644
--- a/src/EditView.h
+++ b/src/EditView.h
@@ -128,7 +128,7 @@ public:
Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase);
void DrawAnnotation(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
Sci::Line line, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
- void DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line,
+ void DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line lineDoc,
int xStart, PRectangle rcLine, int subLine) const;
void DrawBackground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine,
Range lineRange, Sci::Position posLineStart, int xStart,
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 6a6e7c7d7..4335e6386 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -1627,18 +1627,18 @@ void Editor::LinesSplit(int pixelWidth) {
}
}
-void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
+void Editor::PaintSelMargin(Surface *surfaceWindow, PRectangle &rc) {
if (vs.fixedColumnWidth == 0)
return;
AllocateGraphics();
RefreshStyleData();
- RefreshPixMaps(surfWindow);
+ RefreshPixMaps(surfaceWindow);
// On GTK+ with Ubuntu overlay scroll bars, the surface may have been finished
// at this point. The Initialised call checks for this case and sets the status
// to be bad which avoids crashes in following calls.
- if (!surfWindow->Initialised()) {
+ if (!surfaceWindow->Initialised()) {
return;
}
@@ -1655,7 +1655,7 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
if (view.bufferedDraw) {
surface = marginView.pixmapSelMargin;
} else {
- surface = surfWindow;
+ surface = surfaceWindow;
}
// Clip vertically to paint area to avoid drawing line numbers
@@ -1667,7 +1667,7 @@ void Editor::PaintSelMargin(Surface *surfWindow, PRectangle &rc) {
marginView.PaintMargin(surface, topLine, rc, rcMargin, *this, vs);
if (view.bufferedDraw) {
- surfWindow->Copy(rcMargin, Point(rcMargin.left, rcMargin.top), *marginView.pixmapSelMargin);
+ surfaceWindow->Copy(rcMargin, Point(rcMargin.left, rcMargin.top), *marginView.pixmapSelMargin);
}
}
diff --git a/src/Editor.h b/src/Editor.h
index 6e4e6474c..976d538ab 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -292,7 +292,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
SelectionPosition SPositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false, bool virtualSpace=true);
Sci::Position PositionFromLocation(Point pt, bool canReturnInvalid = false, bool charPosition = false);
SelectionPosition SPositionFromLineX(Sci::Line lineDoc, int x);
- Sci::Position PositionFromLineX(Sci::Line line, int x);
+ Sci::Position PositionFromLineX(Sci::Line lineDoc, int x);
Sci::Line LineFromLocation(Point pt) const;
void SetTopLine(Sci::Line topLineNew);
@@ -377,7 +377,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void LinesJoin();
void LinesSplit(int pixelWidth);
- void PaintSelMargin(Surface *surface, PRectangle &rc);
+ void PaintSelMargin(Surface *surfaceWindow, PRectangle &rc);
void RefreshPixMaps(Surface *surfaceWindow);
void Paint(Surface *surfaceWindow, PRectangle rcArea);
long FormatRange(bool draw, Sci_RangeToFormat *pfr);
@@ -449,7 +449,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void CheckModificationForWrap(DocModification mh);
void NotifyModified(Document *document, DocModification mh, void *userData) override;
void NotifyDeleted(Document *document, void *userData) override;
- void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos) override;
+ void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endStyleNeeded) override;
void NotifyLexerChanged(Document *doc, void *userData) override;
void NotifyErrorOccurred(Document *doc, void *userData, int status) override;
void NotifyMacroRecord(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
diff --git a/src/LineMarker.h b/src/LineMarker.h
index 6a5fe7492..fde11da0d 100644
--- a/src/LineMarker.h
+++ b/src/LineMarker.h
@@ -76,7 +76,7 @@ public:
void SetXPM(const char *textForm);
void SetXPM(const char *const *linesForm);
void SetRGBAImage(Point sizeRGBAImage, float scale, const unsigned char *pixelsRGBAImage);
- void Draw(Surface *surface, PRectangle &rc, Font &fontForCharacter, typeOfFold tFold, int marginStyle) const;
+ void Draw(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, typeOfFold tFold, int marginStyle) const;
};
#ifdef SCI_NAMESPACE
diff --git a/src/PerLine.h b/src/PerLine.h
index 86e6a10e0..9f945114a 100644
--- a/src/PerLine.h
+++ b/src/PerLine.h
@@ -54,7 +54,7 @@ public:
int MarkValue(Sci::Line line);
Sci::Line MarkerNext(Sci::Line lineStart, int mask) const;
- int AddMark(Sci::Line line, int marker, Sci::Line lines);
+ int AddMark(Sci::Line line, int markerNum, Sci::Line lines);
void MergeMarkers(Sci::Line line);
bool DeleteMark(Sci::Line line, int markerNum, bool all);
void DeleteMarkFromHandle(int markerHandle);
diff --git a/src/PositionCache.h b/src/PositionCache.h
index b80edd880..56018c141 100644
--- a/src/PositionCache.h
+++ b/src/PositionCache.h
@@ -83,7 +83,7 @@ public:
void Invalidate(validLevel validity_);
int LineStart(int line) const;
int LineLastVisible(int line) const;
- Range SubLineRange(int line) const;
+ Range SubLineRange(int subLine) const;
bool InLine(int offset, int line) const;
void SetLineStart(int line, int start);
void SetBracesHighlight(Range rangeLine, const Sci::Position braces[],
@@ -134,7 +134,7 @@ public:
void Set(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_, unsigned int clock_);
void Clear();
bool Retrieve(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_) const;
- static unsigned int Hash(unsigned int styleNumber_, const char *s, unsigned int len);
+ static unsigned int Hash(unsigned int styleNumber_, const char *s, unsigned int len_);
bool NewerThan(const PositionCacheEntry &other) const;
void ResetClock();
};
@@ -194,7 +194,7 @@ public:
enum { lengthStartSubdivision = 300 };
// Try to make each subdivided run lengthEachSubdivision or shorter.
enum { lengthEachSubdivision = 100 };
- BreakFinder(const LineLayout *ll_, const Selection *psel, Range rangeLine_, Sci::Position posLineStart_,
+ BreakFinder(const LineLayout *ll_, const Selection *psel, Range lineRange_, Sci::Position posLineStart_,
int xStart, bool breakForSelection, const Document *pdoc_, const SpecialRepresentations *preprs_, const ViewStyle *pvsDraw);
~BreakFinder();
TextSegment Next();
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 10:57:06 +0000