diff options
Diffstat (limited to 'src/Fl_Text_Buffer.cxx')
| -rw-r--r-- | src/Fl_Text_Buffer.cxx | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index 9aa099208..8411342d1 100644 --- a/src/Fl_Text_Buffer.cxx +++ b/src/Fl_Text_Buffer.cxx @@ -181,7 +181,8 @@ public: void clear() { if (locked_) return; if (list_) { - for (int i=0; i<list_size_; i++) { + int i; + for (i =0; i<list_size_; i++) { delete list_[i]; } ::free(list_); @@ -887,7 +888,8 @@ void Fl_Text_Buffer::add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, Fl_Text_Modify_Cb *newModifyProcs = new Fl_Text_Modify_Cb[mNModifyProcs + 1]; void **newCBArgs = new void *[mNModifyProcs + 1]; - for (int i = 0; i < mNModifyProcs; i++) { + int i; + for (i = 0; i < mNModifyProcs; i++) { newModifyProcs[i + 1] = mModifyProcs[i]; newCBArgs[i + 1] = mCbArgs[i]; } @@ -963,7 +965,8 @@ void Fl_Text_Buffer::add_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, Fl_Text_Predelete_Cb *newPreDeleteProcs = new Fl_Text_Predelete_Cb[mNPredeleteProcs + 1]; void **newCBArgs = new void *[mNPredeleteProcs + 1]; - for (int i = 0; i < mNPredeleteProcs; i++) { + int i; + for (i = 0; i < mNPredeleteProcs; i++) { newPreDeleteProcs[i + 1] = mPredeleteProcs[i]; newCBArgs[i + 1] = mPredeleteCbArgs[i]; } @@ -1127,7 +1130,8 @@ int Fl_Text_Buffer::skip_displayed_characters(int lineStartPos, int nChars) int pos = lineStartPos; - for (int charCount = 0; charCount < nChars && pos < mLength; charCount++) { + int charCount; + for (charCount = 0; charCount < nChars && pos < mLength; charCount++) { unsigned int c = char_at(pos); if (c == '\n') return pos; @@ -1633,7 +1637,8 @@ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, int nInserted, int nRestyled, const char *deletedText) const { IS_UTF8_ALIGNED2(this, pos) - for (int i = 0; i < mNModifyProcs; i++) + int i; + for (i = 0; i < mNModifyProcs; i++) (*mModifyProcs[i]) (pos, nInserted, nDeleted, nRestyled, deletedText, mCbArgs[i]); } @@ -1644,7 +1649,8 @@ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, Unicode safe. */ void Fl_Text_Buffer::call_predelete_callbacks(int pos, int nDeleted) const { - for (int i = 0; i < mNPredeleteProcs; i++) + int i; + for (i = 0; i < mNPredeleteProcs; i++) (*mPredeleteProcs[i]) (pos, nDeleted, mPredeleteCbArgs[i]); } @@ -2078,7 +2084,8 @@ int Fl_Text_Buffer::prev_char_clipped(int pos) const const int l_t = 40; char t[l_t + 1]; t[l_t] = 0; int len = l_t, p = pos, ll; - for (int i = l_t; i > 0 && p > 0; i--) { + int i; + for (i = l_t; i > 0 && p > 0; i--) { t[--len] = byte_at(--p); ll = fl_utf8len(t[len]); if (ll == 1 || ll == 2) break; @@ -2123,7 +2130,8 @@ int Fl_Text_Buffer::next_char(int pos) const { t[len++] = b; ll = fl_utf8len1(b); count_points++; - for (int i = 1; i < ll && len < (int)sizeof(t); i++) t[len++] = byte_at(p++); + int i; + for (i = 1; i < ll && len < (int)sizeof(t); i++) t[len++] = byte_at(p++); if (count_points > 1 && (ll == 1 || ll == 2)) { // stop after short codepoint but not if it's the 1st codepoint which can be inside // emoji sequence (e.g. 9️⃣ "keycap 9") |