Skip to content

Commit

Permalink
Fix warnings produced by new flags (take 2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Akeru
Akeru committed Oct 31, 2011
1 parent 4ee7ae3 commit 4d420aa
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions src/gui/BookletPrintEngine.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ void BookletPrintEngine::drawPageLayout()
QRectF window = painter->window();
// Draw the page rectangle
painter->drawRect(window);
painter->drawLine(QPoint(window.center().x(), window.top()), QPoint(window.center().x(), window.bottom()));
painter->drawLine(QPoint(window.left(), window.top() + _subPageWidth), QPoint(window.right(), window.top() + _subPageWidth));
painter->drawLine(QPoint(window.left(), window.top() + _subPageWidth * 2), QPoint(window.right(), window.top() + _subPageWidth * 2));
painter->drawLine(QPoint(window.left(), window.top() + _subPageWidth * 3), QPoint(window.right(), window.top() + _subPageWidth * 3));
painter->drawLine(QPoint((int) window.center().x(), (int) window.top()), QPoint((int) window.center().x(), (int) window.bottom()));
painter->drawLine(QPoint((int) window.left(), (int) (window.top() + _subPageWidth)), QPoint((int) window.right(), (int) (window.top() + _subPageWidth)));
painter->drawLine(QPoint((int) window.left(), (int) (window.top() + _subPageWidth * 2)), QPoint((int) window.right(), (int) (window.top() + _subPageWidth * 2)));
painter->drawLine(QPoint((int) window.left(), (int) (window.top() + _subPageWidth * 3)), QPoint((int) window.right(), (int) (window.top() + _subPageWidth * 3)));
}

bool BookletPrintEngine::newPage()
Expand Down
6 changes: 3 additions & 3 deletions src/gui/EntriesPrinter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void EntriesPrinter::prepareAndPrintJob(QPrinter* printer)
picPainter.setFont(font);
picPainter.drawText(pageRect, Qt::TextWordWrap | Qt::TextExpandTabs, label);
usedSpace = picPainter.boundingRect(pageRect, Qt::TextWordWrap | Qt::TextExpandTabs, label);
picPainter.drawLine(usedSpace.bottomLeft(), QPoint(pageRect.right(), usedSpace.bottomRight().y()));
picPainter.drawLine(usedSpace.bottomLeft(), QPoint((int) pageRect.right(), (int) usedSpace.bottomRight().y()));
usedSpace.moveBottom(usedSpace.bottom() + 3);
picPainter.restore();
}
Expand All @@ -113,7 +113,7 @@ void EntriesPrinter::prepareAndPrintJob(QPrinter* printer)
if (fromPage == -1 || (pageNbr >= fromPage && pageNbr <= toPage)) {
// If not on the first page, get a new page
if (pageNbr > 1 && pageNbr > fromPage) printer->newPage();
printPageOfEntries(waitingEntries, &painter, pageRect.height());
printPageOfEntries(waitingEntries, &painter, (int) pageRect.height());
}
remainingSpace = pageRect;
waitingEntries.clear();
Expand All @@ -130,7 +130,7 @@ void EntriesPrinter::prepareAndPrintJob(QPrinter* printer)

if (fromPage == -1 || (pageNbr >= fromPage && pageNbr <= toPage)) {
if (pageNbr > 1 && pageNbr > fromPage) printer->newPage();
printPageOfEntries(waitingEntries, &painter, pageRect.height());
printPageOfEntries(waitingEntries, &painter, (int) pageRect.height());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/jmdict/JMdictEntryFormatter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void JMdictEntryFormatter::drawCustom(const ConstEntryPointer& _entry, QPainter&
if (printOnlyStudiedKanjis && !kanji->trained()) continue;
QString s = QString(c) + ": " + kanji->meanings().join(", ");
QFontMetrics metrics(painter.font(), painter.device());
s = metrics.elidedText(s, Qt::ElideRight, leftArea.width());
s = metrics.elidedText(s, Qt::ElideRight, (int) leftArea.width());
textBB = painter.boundingRect(leftArea, Qt::AlignLeft, s);
painter.drawText(leftArea, Qt::AlignLeft, s);
if (!printOnlyStudiedKanjis && kanji->trained()) painter.drawLine(textBB.topLeft() + QPoint(0, metrics.ascent() + metrics.underlinePos()), textBB.topRight() + QPoint(0, metrics.ascent() + metrics.underlinePos()));
Expand Down
4 changes: 2 additions & 2 deletions src/gui/kanjidic2/KanjiRenderer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ void KanjiRenderer::renderStrokeNumber(const KanjiStroke &stroke, QPainter *pain
//line = line.normalVector();
line.setLength(-baseSize * 1.5);
//line.setAngle(path.angleAtPercent(0.05));
QRectF elipseRect(line.p2() - QPointF(baseSize, baseSize), QSize(baseSize * 2, baseSize * 2));
QRectF elipseRect(line.p2() - QPointF(baseSize, baseSize), QSize( (int) (baseSize * 2), (int) (baseSize * 2)));
painter->drawEllipse(elipseRect);
pen.setColor(Qt::black);
painter->setPen(pen);
Expand All @@ -217,7 +217,7 @@ void KanjiRenderer::renderStrokeNumber(const KanjiStroke &stroke, QPainter *pain
// Find the index of the stroke
int pos = _strokes.indexOf(*(_strokesMap[&stroke])) + 1;
QFont font;
font.setPixelSize(baseSize * 2 - 2);
font.setPixelSize((int) (baseSize * 2 - 2));
painter->setFont(font);
painter->drawText(elipseRect, Qt::AlignHCenter | Qt::AlignVCenter, QString::number(pos));
painter->restore();
Expand Down
14 changes: 7 additions & 7 deletions src/gui/kanjidic2/Kanjidic2EntryFormatter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void Kanjidic2EntryFormatter::drawCustom(const ConstKanjidic2EntryPointer& entry
QString meanings(original->meaningsString());
if (!meanings.isEmpty()) s += ": " + meanings;
QFontMetrics metrics(painter.font(), painter.device());
s = metrics.elidedText(s, Qt::ElideRight, leftArea.width());
s = metrics.elidedText(s, Qt::ElideRight, (int) leftArea.width());
textBB = painter.boundingRect(leftArea, Qt::AlignLeft, s);
painter.drawText(leftArea, Qt::AlignLeft, s);
if (!printOnlyStudiedComponents && original->trained()) painter.drawLine(textBB.topLeft() + QPoint(0, metrics.ascent() + metrics.underlinePos()), textBB.topRight() + QPoint(0, metrics.ascent() + metrics.underlinePos()));
Expand All @@ -226,7 +226,7 @@ void Kanjidic2EntryFormatter::drawCustom(const ConstKanjidic2EntryPointer& entry
painter.setFont(italFont);
str = entry->meaningsString();
if (!str.isEmpty()) str[0] = str[0].toUpper();
str = QFontMetrics(painter.font(), painter.device()).elidedText(str, Qt::ElideRight, rightArea.width());
str = QFontMetrics(painter.font(), painter.device()).elidedText(str, Qt::ElideRight, (int) rightArea.width());
textBB = painter.boundingRect(rightArea, Qt::AlignHCenter, str);
painter.drawText(textBB, Qt::AlignHCenter, str);
rightArea.setTop(textBB.bottom());
Expand All @@ -240,14 +240,14 @@ void Kanjidic2EntryFormatter::drawCustom(const ConstKanjidic2EntryPointer& entry
painter.setFont(boldFont);
str = "On:";
textBB = painter.boundingRect(rightArea, Qt::AlignLeft, str);
onLength += textBB.width();
onLength += (int) textBB.width();
painter.drawText(textBB, Qt::AlignLeft, str);
painter.setFont(textFont);
tempBox.setLeft(textBB.right());
tempBox.setRight(rightArea.center().x());
str = " " + onRead.join(", ");
str = QFontMetrics(painter.font(), painter.device()).elidedText(str, Qt::ElideRight, tempBox.width());
onLength += painter.boundingRect(tempBox, Qt::AlignLeft, str).width();
str = QFontMetrics(painter.font(), painter.device()).elidedText(str, Qt::ElideRight, (int) tempBox.width());
onLength += (int) (painter.boundingRect(tempBox, Qt::AlignLeft, str).width());
painter.drawText(tempBox, Qt::AlignLeft, str);
rightArea.setTop(textBB.bottom());
}
Expand All @@ -265,7 +265,7 @@ void Kanjidic2EntryFormatter::drawCustom(const ConstKanjidic2EntryPointer& entry
painter.setFont(textFont);
tempBox.setLeft(textBB.right());
str = " " + kunRead.join(", ");
str = QFontMetrics(painter.font(), painter.device()).elidedText(str, Qt::ElideRight, tempBox.width());
str = QFontMetrics(painter.font(), painter.device()).elidedText(str, Qt::ElideRight, (int) tempBox.width());
painter.drawText(tempBox, Qt::AlignLeft, str);
rightArea.setTop(textBB.bottom());
}
Expand All @@ -279,7 +279,7 @@ void Kanjidic2EntryFormatter::drawCustom(const ConstKanjidic2EntryPointer& entry
while (query.next()) {
ConstJMdictEntryPointer jmEntry(JMdictEntryRef(query.valueInt(1)).get());

QString str = QFontMetrics(painter.font(), painter.device()).elidedText(jmEntry->shortVersion(Entry::TinyVersion), Qt::ElideRight, rightArea.width());
QString str = QFontMetrics(painter.font(), painter.device()).elidedText(jmEntry->shortVersion(Entry::TinyVersion), Qt::ElideRight, (int) rightArea.width());
textBB = painter.boundingRect(rightArea, Qt::AlignLeft, str);
painter.drawText(textBB, Qt::AlignLeft, str);
rightArea.setTop(textBB.bottom());
Expand Down

0 comments on commit 4d420aa

Please sign in to comment.