From: <mrj...@us...> - 2007-02-10 20:52:07
|
Revision: 2098 http://svn.sourceforge.net/tora/?rev=2098&view=rev Author: mrjohnson0 Date: 2007-02-10 12:52:03 -0800 (Sat, 10 Feb 2007) Log Message: ----------- insert shouldn't add newlines Modified Paths: -------------- trunk/tora/src/toeditextensions.cpp trunk/tora/src/tomarkedtext.cpp Modified: trunk/tora/src/toeditextensions.cpp =================================================================== --- trunk/tora/src/toeditextensions.cpp 2007-02-10 19:32:42 UTC (rev 2097) +++ trunk/tora/src/toeditextensions.cpp 2007-02-10 20:52:03 UTC (rev 2098) @@ -171,6 +171,11 @@ QString t = Current->text(i); int chars = 0; int level = toSQLParse::countIndent(t, chars); + + // trim newline, if present. we have to do this because + // qscintilla returns newlines, the old code didn't. + t.remove('\n'); + res += toSQLParse::indentString(std::max(0, level + delta)); if (i < line2) res += t.mid(chars) + "\n"; Modified: trunk/tora/src/tomarkedtext.cpp =================================================================== --- trunk/tora/src/tomarkedtext.cpp 2007-02-10 19:32:42 UTC (rev 2097) +++ trunk/tora/src/tomarkedtext.cpp 2007-02-10 20:52:03 UTC (rev 2098) @@ -622,9 +622,7 @@ // the inserted text. Now I'm not really sure what the heck that // means. - QextScintilla::insert(str); - // get new position and select if requested if(select) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |