From: <ibr...@us...> - 2014-11-24 18:29:07
|
Revision: 5159 http://sourceforge.net/p/tora/code/5159 Author: ibre5041 Date: 2014-11-24 18:28:57 +0000 (Mon, 24 Nov 2014) Log Message: ----------- fromAscii is deprecated, use fromLatin1 instead Modified Paths: -------------- trunk/tora/src/editor/toscintilla.cpp trunk/tora/src/editor/tosqltext.cpp trunk/tora/src/ts_log/toostream.h trunk/tora/src/ts_log/ts_log_utils.h Modified: trunk/tora/src/editor/toscintilla.cpp =================================================================== --- trunk/tora/src/editor/toscintilla.cpp 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/editor/toscintilla.cpp 2014-11-24 18:28:57 UTC (rev 5159) @@ -112,7 +112,7 @@ super::setUtf8(true); setAcceptDrops(true); // QWidget::setAcceptDrops - super::setMarginWidth(0, QString::fromAscii("00")); + super::setMarginWidth(0, QString::fromLatin1("00")); } toScintilla::~toScintilla() @@ -637,7 +637,7 @@ if (lexer() == NULL) return QString::null; - static const QString SPAN_CLASS = QString::fromAscii("<span class=\"S%1\">"); + static const QString SPAN_CLASS = QString::fromLatin1("<span class=\"S%1\">"); clearIndicatorRange(0, 0, lines(), lineLength(lines()-1), m_searchIndicator); recolor(); Modified: trunk/tora/src/editor/tosqltext.cpp =================================================================== --- trunk/tora/src/editor/tosqltext.cpp 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/editor/tosqltext.cpp 2014-11-24 18:28:57 UTC (rev 5159) @@ -71,7 +71,7 @@ // QsciScintilla::setFolding(QsciScintilla::BoxedFoldStyle); QsciScintilla::setMarginType(2, TextMarginRightJustified); - QsciScintilla::setMarginWidth(2, QString::fromAscii("009")); + QsciScintilla::setMarginWidth(2, QString::fromLatin1("009")); m_parserTimer->setInterval(5000); // every 5s m_parserTimer->setSingleShot(true); // repeat only if bg thread responded Modified: trunk/tora/src/ts_log/toostream.h =================================================================== --- trunk/tora/src/ts_log/toostream.h 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/ts_log/toostream.h 2014-11-24 18:28:57 UTC (rev 5159) @@ -98,7 +98,7 @@ void putChars(char const* begin, std::streamsize len) { - QString s = QString::fromAscii(begin, len); + QString s = QString::fromLatin1(begin, len); sender.emit_send(s); } Modified: trunk/tora/src/ts_log/ts_log_utils.h =================================================================== --- trunk/tora/src/ts_log/ts_log_utils.h 2014-11-24 18:16:39 UTC (rev 5158) +++ trunk/tora/src/ts_log/ts_log_utils.h 2014-11-24 18:28:57 UTC (rev 5159) @@ -7,12 +7,12 @@ #ifdef __GNUC__ #include <string.h> -#define __QHERE__ QString::fromAscii(((strrchr(__FILE__, '/') ?: __FILE__ - 1) + 1)) + ":" __HERE1__(__LINE__) +#define __QHERE__ QString::fromLatin1(((strrchr(__FILE__, '/') ?: __FILE__ - 1) + 1)) + ":" __HERE1__(__LINE__) #define __HERE__ std::string(((strrchr(__FILE__, '/') ?: __FILE__ - 1) + 1)) + ":" __HERE1__(__LINE__) #define __HERE1__(x) STR(x)"\t" + __PRETTY_FUNCTION__ #define STR(a) #a #else -#define __QHERE__ QString::fromAscii(__FILE__) + ":"__HERE1__(__LINE__) +#define __QHERE__ QString::fromLatin1(__FILE__) + ":"__HERE1__(__LINE__) #define __HERE__ std::string(__FILE__) + ":"__HERE1__(__LINE__) #define __HERE1__(x) STR(x)"\t" + __FUNCSIG__ #define STR(a) #a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |