projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing BR #147. Needs core update.
[quassel.git]
/
src
/
uisupport
/
old-uistyle.cpp
diff --git
a/src/uisupport/old-uistyle.cpp
b/src/uisupport/old-uistyle.cpp
index
94c9742
..
bbbe48e
100644
(file)
--- a/
src/uisupport/old-uistyle.cpp
+++ b/
src/uisupport/old-uistyle.cpp
@@
-139,7
+139,7
@@
UiStyle::StyledText UiStyle::styleString(const QString &_s) {
QTextLayout::FormatRange curFmtRng;
curFmtRng.format = format(None);
curFmtRng.start = 0;
QTextLayout::FormatRange curFmtRng;
curFmtRng.format = format(None);
curFmtRng.start = 0;
- result.format
s
.append(curFmtRng);
+ result.format
List
.append(curFmtRng);
int pos = 0; int length = 0;
int fgCol = -1, bgCol = -1; // marks current mIRC color
for(;;) {
int pos = 0; int length = 0;
int fgCol = -1, bgCol = -1; // marks current mIRC color
for(;;) {
@@
-199,7
+199,7
@@
UiStyle::StyledText UiStyle::styleString(const QString &_s) {
if(s[pos+1] == 'D') code += s[pos+2];
FormatType ftype = formatType(code);
if(ftype == Invalid) {
if(s[pos+1] == 'D') code += s[pos+2];
FormatType ftype = formatType(code);
if(ftype == Invalid) {
- qWarning(qPrintable(QString("Invalid format code in string: %1").arg(s)));
+ qWarning(
"%s",
qPrintable(QString("Invalid format code in string: %1").arg(s)));
continue;
}
//Q_ASSERT(ftype != Invalid);
continue;
}
//Q_ASSERT(ftype != Invalid);
@@
-216,20
+216,20
@@
UiStyle::StyledText UiStyle::styleString(const QString &_s) {
}
s.remove(pos, length); // remove format code from string
// now see if something changed and else insert the format
}
s.remove(pos, length); // remove format code from string
// now see if something changed and else insert the format
- if(curFmtRng.format == result.format
s
.last().format) continue; // no change, so we just ignore
+ if(curFmtRng.format == result.format
List
.last().format) continue; // no change, so we just ignore
curFmtRng.start = pos;
curFmtRng.start = pos;
- if(pos == result.format
s
.last().start) {
+ if(pos == result.format
List
.last().start) {
// same starting point -> we just overwrite the old format
// same starting point -> we just overwrite the old format
- result.format
s
.last() = curFmtRng;
+ result.format
List
.last() = curFmtRng;
} else {
// fix length of last format
} else {
// fix length of last format
- result.format
s.last().length = pos - result.formats
.last().start;
- result.format
s
.append(curFmtRng);
+ result.format
List.last().length = pos - result.formatList
.last().start;
+ result.format
List
.append(curFmtRng);
}
}
}
}
- result.format
s.last().length = s.length() - result.formats
.last().start;
- if(result.format
s.last().length == 0) result.formats
.removeLast();
- result.
t
ext = s;
+ result.format
List.last().length = s.length() - result.formatList
.last().start;
+ if(result.format
List.last().length == 0) result.formatList
.removeLast();
+ result.
plainT
ext = s;
return result;
}
return result;
}