Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use proper types for QWidgetPrivate members

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-10-24 23:11:05 +03:00
parent f216a5920d
commit adb34e6eba
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/kernel/qwidget.cpp
View file

@ -10138,13 +10138,13 @@ QWindowSurface *QWidget::windowSurface() const
void QWidgetPrivate::getLayoutItemMargins(int *left, int *top, int *right, int *bottom) const
{
if (left)
*left = (int)leftLayoutItemMargin;
*left = leftLayoutItemMargin;
if (top)
*top = (int)topLayoutItemMargin;
*top = topLayoutItemMargin;
if (right)
*right = (int)rightLayoutItemMargin;
*right = rightLayoutItemMargin;
if (bottom)
*bottom = (int)bottomLayoutItemMargin;
*bottom = bottomLayoutItemMargin;
}
void QWidgetPrivate::setLayoutItemMargins(int left, int top, int right, int bottom)
@ -10156,10 +10156,10 @@ void QWidgetPrivate::setLayoutItemMargins(int left, int top, int right, int bott
return;
Q_Q(QWidget);
leftLayoutItemMargin = (signed char)left;
topLayoutItemMargin = (signed char)top;
rightLayoutItemMargin = (signed char)right;
bottomLayoutItemMargin = (signed char)bottom;
leftLayoutItemMargin = left;
topLayoutItemMargin = top;
rightLayoutItemMargin = right;
bottomLayoutItemMargin = bottom;
q->updateGeometry();
}
@ -10175,10 +10175,10 @@ void QWidgetPrivate::setLayoutItemMargins(QStyle::SubElement element, const QSty
QRect liRect = q->style()->subElementRect(element, opt, q);
if (liRect.isValid()) {
leftLayoutItemMargin = (signed char)(opt->rect.left() - liRect.left());
topLayoutItemMargin = (signed char)(opt->rect.top() - liRect.top());
rightLayoutItemMargin = (signed char)(liRect.right() - opt->rect.right());
bottomLayoutItemMargin = (signed char)(liRect.bottom() - opt->rect.bottom());
leftLayoutItemMargin = (opt->rect.left() - liRect.left());
topLayoutItemMargin = (opt->rect.top() - liRect.top());
rightLayoutItemMargin = (liRect.right() - opt->rect.right());
bottomLayoutItemMargin = (liRect.bottom() - opt->rect.bottom());
} else {
leftLayoutItemMargin = 0;
topLayoutItemMargin = 0;

8
src/gui/kernel/qwidget_p.h
View file

@ -564,10 +564,10 @@ public:
short topmargin;
short rightmargin;
short bottommargin;
signed char leftLayoutItemMargin;
signed char topLayoutItemMargin;
signed char rightLayoutItemMargin;
signed char bottomLayoutItemMargin;
int leftLayoutItemMargin;
int topLayoutItemMargin;
int rightLayoutItemMargin;
int bottomLayoutItemMargin;
static int instanceCounter; // Current number of widget instances
static int maxInstances; // Maximum number of widget instances
Qt::HANDLE hd;