eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Qt6 migration

Browse source
This commit is contained in:
eelke 2021-03-06 13:13:31 +01:00
parent 87553b2554
commit 423043d431
19 changed files with 64 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ctk/ctkBasePopupWidget.cpp
View file

@ -21,7 +21,6 @@
// Qt includes
#include <QApplication>
#include <QDebug>
#include <QDesktopWidget>
#include <QDir>
#include <QEvent>
#include <QLabel>

4
ctk/ctkPopupWidget.cpp
View file

@ -20,7 +20,7 @@
// Qt includes
#include <QApplication>
#include <QDesktopWidget>
//#include <QDesktopWidget>
#include <QDialog>
#include <QDir>
#include <QEvent>
@ -416,7 +416,7 @@ void ctkPopupWidget::leaveEvent(QEvent* event)
}
// --------------------------------------------------------------------------
void ctkPopupWidget::enterEvent(QEvent* event)
void ctkPopupWidget::enterEvent(QEnterEvent* event)
{
Q_D(ctkPopupWidget);
QTimer::singleShot(d->ShowDelay, this, SLOT(updatePopup()));

12
ctk/ctkPopupWidget.h
View file

@ -109,21 +109,21 @@ public Q_SLOTS:
public:
/// Reimplemented for internal reasons
virtual void hidePopup();
virtual void hidePopup() override;
protected:
virtual void leaveEvent(QEvent* event);
virtual void enterEvent(QEvent* event);
virtual bool eventFilter(QObject* obj, QEvent* event);
virtual void leaveEvent(QEvent* event) override;
virtual void enterEvent(QEnterEvent* event) override;
virtual bool eventFilter(QObject* obj, QEvent* event) override;
/// Widget the popup is attached to. It opens right under \a baseWidget
/// and if the ctkPopupWidget sizepolicy contains the growFlag/shrinkFlag,
/// it tries to resize itself to fit the same width of \a baseWidget.
virtual void setBaseWidget(QWidget* baseWidget);
virtual void setBaseWidget(QWidget* baseWidget) override;
protected Q_SLOTS:
void updatePopup();
virtual void onEffectFinished();
virtual void onEffectFinished() override;
private:
Q_DECLARE_PRIVATE(ctkPopupWidget);