summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
51b28ba)
Most of these are just about conversion from double to int.
Of note also the replacement of an horrible reinterpret_cast by a proper solution.
static_cast<char_type>(row.sel_end),
row.begin_margin_sel,
row.end_margin_sel,
static_cast<char_type>(row.sel_end),
row.begin_margin_sel,
row.end_margin_sel,
- reinterpret_cast<char_type const *>(&row.separator)[0],
- reinterpret_cast<char_type const *>(&row.separator)[1],
d.wid, d.asc, d.des };
crc.process_bytes(b, sizeof(b));
d.wid, d.asc, d.des };
crc.process_bytes(b, sizeof(b));
+ crc.process_bytes(&row.separator, sizeof(row.separator));
QFontMetrics fm(font);
int w = fm.width(category);
int x = opt.rect.x() + (opt.rect.width() - w) / 2;
QFontMetrics fm(font);
int w = fm.width(category);
int x = opt.rect.x() + (opt.rect.width() - w) / 2;
- int y = opt.rect.y() + 1.5 * fm.ascent();
+ int y = opt.rect.y() + 3 * fm.ascent() / 2;
int left = x;
int right = x + w;
painter->drawText(x, y, category);
int left = x;
int right = x + w;
painter->drawText(x, y, category);
{
QTextLayout tl;
setTextLayout(tl, s, font_, rtl);
{
QTextLayout tl;
setTextLayout(tl, s, font_, rtl);
- return tl.lineForTextPosition(pos).cursorToX(pos);
+ return static_cast<int>(tl.lineForTextPosition(pos).cursorToX(pos));
setTextLayout(tl, s, font_, rtl);
int pos = tl.lineForTextPosition(0).xToCursor(x);
// correct x value to the actual cursor position.
setTextLayout(tl, s, font_, rtl);
int pos = tl.lineForTextPosition(0).xToCursor(x);
// correct x value to the actual cursor position.
- x = tl.lineForTextPosition(0).cursorToX(pos);
+ x = static_cast<int>(tl.lineForTextPosition(0).cursorToX(pos));
int const mD = fm.maxDescent();
int const h = mA + mD;
if (w > 0 && h > 0) {
int const mD = fm.maxDescent();
int const h = mA + mD;
if (w > 0 && h > 0) {
- pm = QPixmap(pixelRatio() * w , pixelRatio() * h);
+ pm = QPixmap(static_cast<int>(pixelRatio() * w),
+ static_cast<int>(pixelRatio() * h));
#if QT_VERSION >= 0x050000
pm.setDevicePixelRatio(pixelRatio());
#endif
#if QT_VERSION >= 0x050000
pm.setDevicePixelRatio(pixelRatio());
#endif
QPainter pain(&splash_);
pain.setPen(QColor(0, 0, 0));
double const multiplier = splashPixelRatio() / pixelRatio();
QPainter pain(&splash_);
pain.setPen(QColor(0, 0, 0));
double const multiplier = splashPixelRatio() / pixelRatio();
- int const size = toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble() * multiplier;
- int const x = 190 * multiplier;
- int const y = 225 * multiplier;
+ int const size = static_cast<int>(toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble() * multiplier);
+ int const x = static_cast<int>(190 * multiplier);
+ int const y = static_cast<int>(225 * multiplier);
LYXERR(Debug::GUI,
"widget pixel ratio: " << pixelRatio() <<
" splash pixel ratio: " << splashPixelRatio() <<
LYXERR(Debug::GUI,
"widget pixel ratio: " << pixelRatio() <<
" splash pixel ratio: " << splashPixelRatio() <<
void paintEvent(QPaintEvent *)
{
void paintEvent(QPaintEvent *)
{
- int const w = splash_.width() / splashPixelRatio();
- int const h = splash_.height() / splashPixelRatio();
+ int const w = static_cast<int>(splash_.width() / splashPixelRatio());
+ int const h = static_cast<int>(splash_.height() / splashPixelRatio());
int const x = (width() - w) / 2;
int const y = (height() - h) / 2;
LYXERR(Debug::GUI,
int const x = (width() - w) / 2;
int const y = (height() - h) / 2;
LYXERR(Debug::GUI,
delete screen_;
pixel_ratio_ = p->pixelRatio();
if (lyxrc.use_qimage) {
delete screen_;
pixel_ratio_ = p->pixelRatio();
if (lyxrc.use_qimage) {
- QImage *x = new QImage(pixel_ratio_ * p->viewport()->width(),
- pixel_ratio_ * p->viewport()->height(), QImage::Format_ARGB32_Premultiplied);
+ QImage *x =
+ new QImage(static_cast<int>(pixel_ratio_ * p->viewport()->width()),
+ static_cast<int>(pixel_ratio_ * p->viewport()->height()),
+ QImage::Format_ARGB32_Premultiplied);
#if QT_VERSION >= 0x050000
x->setDevicePixelRatio(pixel_ratio_);
#endif
screen_ = x;
} else {
#if QT_VERSION >= 0x050000
x->setDevicePixelRatio(pixel_ratio_);
#endif
screen_ = x;
} else {
- QPixmap *x = new QPixmap(pixel_ratio_ * p->viewport()->width(),
- pixel_ratio_ * p->viewport()->height());
+ QPixmap *x =
+ new QPixmap(static_cast<int>(pixel_ratio_ * p->viewport()->width()),
+ static_cast<int>(pixel_ratio_ * p->viewport()->height()));
#if QT_VERSION >= 0x050000
x->setDevicePixelRatio(pixel_ratio_);
#endif
#if QT_VERSION >= 0x050000
x->setDevicePixelRatio(pixel_ratio_);
#endif