projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Maintenance French Translation without missing Qt main translation.
[quassel.git]
/
src
/
qtopia
/
chatwidget.cpp
diff --git
a/src/qtopia/chatwidget.cpp
b/src/qtopia/chatwidget.cpp
index
9f8eabb
..
b6950c6
100644
(file)
--- a/
src/qtopia/chatwidget.cpp
+++ b/
src/qtopia/chatwidget.cpp
@@
-53,7
+53,7
@@
void ChatWidget::appendChatLine(ChatLine *line) {
if(!document()->isEmpty()) insertPlainText("\n");
insertStyledText(line->styledSender());
insertPlainText(" ");
if(!document()->isEmpty()) insertPlainText("\n");
insertStyledText(line->styledSender());
insertPlainText(" ");
- insertStyledText(line->styled
Text
());
+ insertStyledText(line->styled
Contents
());
setTextCursor(cursor);
}
setTextCursor(cursor);
}
@@
-69,7
+69,7
@@
void ChatWidget::prependChatLine(ChatLine *line) {
bool flg = document()->isEmpty();
insertStyledText(line->styledSender());
insertPlainText(" ");
bool flg = document()->isEmpty();
insertStyledText(line->styledSender());
insertPlainText(" ");
- insertStyledText(line->styled
Text
());
+ insertStyledText(line->styled
Contents
());
if(!flg) insertPlainText("\n");
setTextCursor(cursor);
}
if(!flg) insertPlainText("\n");
setTextCursor(cursor);
}
@@
-84,14
+84,14
@@
void ChatWidget::insertChatLine(ChatLine *line) {
if(!document()->isEmpty()) insertPlainText("\n");
insertStyledText(line->styledSender());
insertPlainText(" ");
if(!document()->isEmpty()) insertPlainText("\n");
insertStyledText(line->styledSender());
insertPlainText(" ");
- insertStyledText(line->styled
Text
());
+ insertStyledText(line->styled
Contents
());
}
void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
QTextCursor cursor = textCursor();
}
void ChatWidget::insertStyledText(const QtopiaUiStyle::StyledText &stext) {
QTextCursor cursor = textCursor();
- foreach(QTextLayout::FormatRange format, stext.format
s
) {
+ foreach(QTextLayout::FormatRange format, stext.format
List
) {
cursor.setCharFormat(format.format);
setTextCursor(cursor);
cursor.setCharFormat(format.format);
setTextCursor(cursor);
- insertPlainText(stext.
t
ext.mid(format.start, format.length));
+ insertPlainText(stext.
plainT
ext.mid(format.start, format.length));
}
}
}
}