mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-24 01:54:22 +00:00
Code Activity

Changes for VC6 compatibility; added a couple of trimming methods to String; added a parameter to Socket::createConnection

Browse source
This commit is contained in:
Julian Storer 2009-11-16 18:12:17 +00:00
parent d3ff5d9c4b
commit 93e4236b57
13 changed files with 142 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gui/components/code_editor/juce_CodeDocument.cpp
View file

@ -778,8 +778,8 @@ void CodeDocument::insert (const String& text, const int insertPos, const bool u
lastAffectedLine = lines.size();
}
int lineStart = newFirstLine->lineStartInFile;
for (int i = firstAffectedLine; i < lines.size(); ++i)
int i, lineStart = newFirstLine->lineStartInFile;
for (i = firstAffectedLine; i < lines.size(); ++i)
{
CodeDocumentLine* const l = lines.getUnchecked (i);
l->lineStartInFile = lineStart;
@ -787,7 +787,7 @@ void CodeDocument::insert (const String& text, const int insertPos, const bool u
}
const int newTextLength = text.length();
for (int i = 0; i < positionsToMaintain.size(); ++i)
for (i = 0; i < positionsToMaintain.size(); ++i)
{
CodeDocument::Position* const p = positionsToMaintain.getUnchecked(i);
@ -879,7 +879,8 @@ void CodeDocument::remove (const int startPos, const int endPos, const bool undo
lines.removeRange (firstAffectedLine + 1, numLinesToRemove);
}
for (int i = firstAffectedLine + 1; i < lines.size(); ++i)
int i;
for (i = firstAffectedLine + 1; i < lines.size(); ++i)
{
CodeDocumentLine* const l = lines.getUnchecked (i);
const CodeDocumentLine* const previousLine = lines.getUnchecked (i - 1);
@ -888,7 +889,7 @@ void CodeDocument::remove (const int startPos, const int endPos, const bool undo
const int totalChars = getNumCharacters();
for (int i = 0; i < positionsToMaintain.size(); ++i)
for (i = 0; i < positionsToMaintain.size(); ++i)
{
CodeDocument::Position* p = positionsToMaintain.getUnchecked(i);

7
src/gui/components/code_editor/juce_CodeDocument.h
View file

@ -302,8 +302,8 @@ public:
/** Called by a CodeDocument when it is altered.
*/
virtual void codeDocumentChanged (const CodeDocument::Position& affectedTextStart,
const CodeDocument::Position& affectedTextEnd) = 0;
virtual void codeDocumentChanged (const Position& affectedTextStart,
const Position& affectedTextEnd) = 0;
};
/** Registers a listener object to receive callbacks when the document changes.
@ -372,7 +372,8 @@ public:
private:
friend class CodeDocumentInsertAction;
friend class CodeDocumentDeleteAction;
friend class CodeDocument::Iterator;
friend class Iterator;
friend class Position;
OwnedArray <CodeDocumentLine> lines;
Array <Position*> positionsToMaintain;