aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lexlib/LexerModule.h2
-rw-r--r--src/ContractionState.cxx18
-rw-r--r--src/ContractionState.h4
-rw-r--r--src/Document.h2
-rw-r--r--src/Editor.h10
-rw-r--r--src/PositionCache.h2
-rw-r--r--win32/PlatWin.cxx8
7 files changed, 23 insertions, 23 deletions
diff --git a/lexlib/LexerModule.h b/lexlib/LexerModule.h
index ee092e68f..675e2a700 100644
--- a/lexlib/LexerModule.h
+++ b/lexlib/LexerModule.h
@@ -67,7 +67,7 @@ inline int Maximum(int a, int b) {
// Shut up annoying Visual C++ warnings:
#ifdef _MSC_VER
-#pragma warning(disable: 4244 4309)
+#pragma warning(disable: 4244 4309 4456 4457)
#endif
#ifdef SCI_NAMESPACE
diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx
index a5ecfe113..7b7655420 100644
--- a/src/ContractionState.cxx
+++ b/src/ContractionState.cxx
@@ -150,8 +150,8 @@ bool ContractionState::GetVisible(int lineDoc) const {
}
}
-bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible_) {
- if (OneToOne() && visible_) {
+bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool isVisible) {
+ if (OneToOne() && isVisible) {
return false;
} else {
EnsureData();
@@ -159,9 +159,9 @@ bool ContractionState::SetVisible(int lineDocStart, int lineDocEnd, bool visible
Check();
if ((lineDocStart <= lineDocEnd) && (lineDocStart >= 0) && (lineDocEnd < LinesInDoc())) {
for (int line = lineDocStart; line <= lineDocEnd; line++) {
- if (GetVisible(line) != visible_) {
- int difference = visible_ ? heights->ValueAt(line) : -heights->ValueAt(line);
- visible->SetValueAt(line, visible_ ? 1 : 0);
+ if (GetVisible(line) != isVisible) {
+ int difference = isVisible ? heights->ValueAt(line) : -heights->ValueAt(line);
+ visible->SetValueAt(line, isVisible ? 1 : 0);
displayLines->InsertText(line, difference);
delta += difference;
}
@@ -191,13 +191,13 @@ bool ContractionState::GetExpanded(int lineDoc) const {
}
}
-bool ContractionState::SetExpanded(int lineDoc, bool expanded_) {
- if (OneToOne() && expanded_) {
+bool ContractionState::SetExpanded(int lineDoc, bool isExpanded) {
+ if (OneToOne() && isExpanded) {
return false;
} else {
EnsureData();
- if (expanded_ != (expanded->ValueAt(lineDoc) == 1)) {
- expanded->SetValueAt(lineDoc, expanded_ ? 1 : 0);
+ if (isExpanded != (expanded->ValueAt(lineDoc) == 1)) {
+ expanded->SetValueAt(lineDoc, isExpanded ? 1 : 0);
Check();
return true;
} else {
diff --git a/src/ContractionState.h b/src/ContractionState.h
index 1c9109c69..96cbf0763 100644
--- a/src/ContractionState.h
+++ b/src/ContractionState.h
@@ -48,11 +48,11 @@ public:
void DeleteLines(int lineDoc, int lineCount);
bool GetVisible(int lineDoc) const;
- bool SetVisible(int lineDocStart, int lineDocEnd, bool visible);
+ bool SetVisible(int lineDocStart, int lineDocEnd, bool isVisible);
bool HiddenLines() const;
bool GetExpanded(int lineDoc) const;
- bool SetExpanded(int lineDoc, bool expanded);
+ bool SetExpanded(int lineDoc, bool isExpanded);
int ContractedNext(int lineDocStart) const;
int GetHeight(int lineDoc) const;
diff --git a/src/Document.h b/src/Document.h
index 0f2985f89..b63962086 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -374,7 +374,7 @@ public:
void SetDefaultCharClasses(bool includeWordClass);
void SetCharClasses(const unsigned char *chars, CharClassify::cc newCharClass);
- int GetCharsOfClass(CharClassify::cc charClass, unsigned char *buffer);
+ int GetCharsOfClass(CharClassify::cc characterClass, unsigned char *buffer);
void SCI_METHOD StartStyling(int position, char mask);
bool SCI_METHOD SetStyleFor(int length, char style);
bool SCI_METHOD SetStyles(int length, const char *styles);
diff --git a/src/Editor.h b/src/Editor.h
index f36cb9b99..7e505bb09 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -322,8 +322,8 @@ protected: // ScintillaBase subclass needs access to much of Editor
bool SelectionContainsProtected();
int MovePositionOutsideChar(int pos, int moveDir, bool checkLineEnd=true) const;
SelectionPosition MovePositionOutsideChar(SelectionPosition pos, int moveDir, bool checkLineEnd=true) const;
- int MovePositionTo(SelectionPosition newPos, Selection::selTypes sel=Selection::noSel, bool ensureVisible=true);
- int MovePositionTo(int newPos, Selection::selTypes sel=Selection::noSel, bool ensureVisible=true);
+ int MovePositionTo(SelectionPosition newPos, Selection::selTypes selt=Selection::noSel, bool ensureVisible=true);
+ int MovePositionTo(int newPos, Selection::selTypes selt=Selection::noSel, bool ensureVisible=true);
SelectionPosition MovePositionSoVisible(SelectionPosition pos, int moveDir);
SelectionPosition MovePositionSoVisible(int pos, int moveDir);
Point PointMainCaret();
@@ -446,7 +446,7 @@ protected: // ScintillaBase subclass needs access to much of Editor
void NotifyMacroRecord(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
void ContainerNeedsUpdate(int flags);
- void PageMove(int direction, Selection::selTypes sel=Selection::noSel, bool stuttered = false);
+ void PageMove(int direction, Selection::selTypes selt=Selection::noSel, bool stuttered = false);
enum { cmSame, cmUpper, cmLower };
virtual std::string CaseMapString(const std::string &s, int caseMapping);
void ChangeCaseOfSelection(int caseMapping);
@@ -454,8 +454,8 @@ protected: // ScintillaBase subclass needs access to much of Editor
void Duplicate(bool forLine);
virtual void CancelModes();
void NewLine();
- void CursorUpOrDown(int direction, Selection::selTypes sel=Selection::noSel);
- void ParaUpOrDown(int direction, Selection::selTypes sel=Selection::noSel);
+ void CursorUpOrDown(int direction, Selection::selTypes selt=Selection::noSel);
+ void ParaUpOrDown(int direction, Selection::selTypes selt=Selection::noSel);
int StartEndDisplayLine(int pos, bool start);
virtual int KeyCommand(unsigned int iMessage);
virtual int KeyDefault(int /* key */, int /*modifiers*/);
diff --git a/src/PositionCache.h b/src/PositionCache.h
index c81740ee3..9d9821f8f 100644
--- a/src/PositionCache.h
+++ b/src/PositionCache.h
@@ -104,7 +104,7 @@ class PositionCacheEntry {
public:
PositionCacheEntry();
~PositionCacheEntry();
- void Set(unsigned int styleNumber_, const char *s_, unsigned int len_, XYPOSITION *positions_, unsigned int clock);
+ 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);
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index fda07875a..0f0279bcb 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -1547,9 +1547,9 @@ void SurfaceD2D::DrawRGBAImage(PRectangle rc, int width, int height, const unsig
rc.bottom = rc.top + height;
std::vector<unsigned char> image(height * width * 4);
- for (int y=0; y<height; y++) {
- for (int x=0; x<width; x++) {
- unsigned char *pixel = &image[0] + (y*width+x) * 4;
+ for (int yPixel=0; yPixel<height; yPixel++) {
+ for (int xPixel = 0; xPixel<width; xPixel++) {
+ unsigned char *pixel = &image[0] + (yPixel*width + xPixel) * 4;
unsigned char alpha = pixelsImage[3];
// Input is RGBA, output is BGRA with premultiplied alpha
pixel[2] = (*pixelsImage++) * alpha / 255;
@@ -2180,7 +2180,7 @@ public:
}
}
virtual void SetFont(Font &font);
- virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_);
+ virtual void Create(Window &parent_, int ctrlID_, Point location_, int lineHeight_, bool unicodeMode_, int technology_);
virtual void SetAverageCharWidth(int width);
virtual void SetVisibleRows(int rows);
virtual int GetVisibleRows() const;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 19:12:29 +0000