Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unused and redundant QWidgetResizeHandler members

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-28 07:42:53 +02:00
parent eb54726226
commit dee2273432
4 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dbus/qdbusxmlgenerator.cpp
View file

@ -37,7 +37,6 @@ extern Q_DBUS_EXPORT QString qDBusGenerateMetaObjectXml(QString interface, const
// implement the D-Bus org.freedesktop.DBus.Introspectable interface
// we do that by analysing the metaObject of all the adaptor interfaces
static QString generateInterfaceXml(const QMetaObject *mo, int flags, int methodOffset, int propOffset)
{
QString retval;

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

@ -3891,8 +3891,7 @@ void QWidgetPrivate::updateFont(const QFont &font)
{
Q_Q(QWidget);
#ifndef QT_NO_STYLE_STYLESHEET
const QStyleSheetStyle* cssStyle;
cssStyle = extra ? qobject_cast<const QStyleSheetStyle*>(extra->style) : 0;
const QStyleSheetStyle* cssStyle = extra ? qobject_cast<const QStyleSheetStyle*>(extra->style) : nullptr;
#endif
QFont old = data.fnt;

19
src/gui/widgets/qwidgetresizehandler.cpp
View file

@ -40,7 +40,7 @@ static bool resizeVerticalDirectionFixed = false;
QWidgetResizeHandler::QWidgetResizeHandler(QWidget *parent, QWidget *cw)
: QObject(parent), widget(parent), childWidget(cw ? cw : parent),
fw(0), extrahei(0), buttonDown(false), moveResizeMode(false), sizeprotect(true), movingEnabled(true)
buttonDown(false), moveResizeMode(false), movingEnabled(true)
{
mode = Nowhere;
widget->setMouseTracking(true);
@ -223,9 +223,9 @@ void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e)
globalPos.rx() = 0;
if (globalPos.y() < 0)
globalPos.ry() = 0;
if (sizeprotect && globalPos.x() > widget->parentWidget()->width())
if (globalPos.x() > widget->parentWidget()->width())
globalPos.rx() = widget->parentWidget()->width();
if (sizeprotect && globalPos.y() > widget->parentWidget()->height())
if (globalPos.y() > widget->parentWidget()->height())
globalPos.ry() = widget->parentWidget()->height();
}
@ -242,19 +242,10 @@ void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e)
#endif
QSize ms = qSmartMinSize(childWidget);
int mw = ms.width();
int mh = ms.height();
if (childWidget != widget) {
mw += 2 * fw;
mh += 2 * fw + extrahei;
}
QSize maxsize(childWidget->maximumSize());
if (childWidget != widget)
maxsize += QSize(2 * fw, 2 * fw + extrahei);
QSize mpsize(widget->geometry().right() - pp.x() + 1,
widget->geometry().bottom() - pp.y() + 1);
mpsize = mpsize.expandedTo(widget->minimumSize()).expandedTo(QSize(mw, mh))
mpsize = mpsize.expandedTo(widget->minimumSize()).expandedTo(ms)
.boundedTo(maxsize);
QPoint mp(widget->geometry().right() - mpsize.width() + 1,
widget->geometry().bottom() - mpsize.height() + 1);
@ -295,7 +286,7 @@ void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e)
geom = QRect(geom.topLeft(),
geom.size().expandedTo(widget->minimumSize())
.expandedTo(QSize(mw, mh))
.expandedTo(ms)
.boundedTo(maxsize));
if (geom != widget->geometry() &&

8
src/gui/widgets/qwidgetresizehandler_p.h
View file

@ -64,11 +64,6 @@ public:
bool isButtonDown() const { return buttonDown; }
void setExtraHeight(int h) { extrahei = h; }
void setSizeProtection(bool b) { sizeprotect = b; }
void setFrameWidth(int w) { fw = w; }
void doResize();
void doMove();
@ -95,13 +90,10 @@ private:
QPoint moveOffset;
QPoint invertedMoveOffset;
MousePosition mode;
int fw;
int extrahei;
int range;
bool buttonDown;
bool moveResizeMode;
bool activeForResize;
bool sizeprotect;
bool movingEnabled;
bool activeForMove;