root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-21 10:10:49 +01:00
Code Issues Projects Releases Activity

Fixed symbol name collision

Browse Source
This commit is contained in:
Martin Tůma 2019-10-17 22:37:21 +02:00
parent 21de5e22e4
commit 0a6d575b21
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/GUI/popup.cpp
View File

@ -10,18 +10,18 @@
#include "popup.h" #include "popup.h"
class Label : public QLabel class PopupLabel : public QLabel
{ {
public: public:
Label(const QString &text, QWidget *parent = 0); PopupLabel(const QString &text, QWidget *parent = 0);
~Label(); ~PopupLabel();
bool eventFilter(QObject *o, QEvent *ev); bool eventFilter(QObject *o, QEvent *ev);
void place(const QPoint &pos, QWidget *w); void place(const QPoint &pos, QWidget *w);
void deleteAfterTimer(); void deleteAfterTimer();
void stopTimer() {_timer.stop();} void stopTimer() {_timer.stop();}
static Label *_instance; static PopupLabel *_instance;
protected: protected:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event);
@ -32,9 +32,9 @@ private:
QBasicTimer _timer; QBasicTimer _timer;
}; };
Label *Label::_instance = 0; PopupLabel *PopupLabel::_instance = 0;
Label::Label(const QString &text, QWidget *parent) PopupLabel::PopupLabel(const QString &text, QWidget *parent)
: QLabel(text, parent, Qt::ToolTip | Qt::BypassGraphicsProxyWidget : QLabel(text, parent, Qt::ToolTip | Qt::BypassGraphicsProxyWidget
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
| Qt::WindowDoesNotAcceptFocus | Qt::WindowDoesNotAcceptFocus
@ -65,12 +65,12 @@ Label::Label(const QString &text, QWidget *parent)
qApp->installEventFilter(this); qApp->installEventFilter(this);
} }
Label::~Label() PopupLabel::~PopupLabel()
{ {
_instance = 0; _instance = 0;
} }
void Label::paintEvent(QPaintEvent *event) void PopupLabel::paintEvent(QPaintEvent *event)
{ {
QStylePainter p(this); QStylePainter p(this);
QStyleOptionFrame opt; QStyleOptionFrame opt;
@ -80,7 +80,7 @@ void Label::paintEvent(QPaintEvent *event)
QLabel::paintEvent(event); QLabel::paintEvent(event);
} }
void Label::timerEvent(QTimerEvent *event) void PopupLabel::timerEvent(QTimerEvent *event)
{ {
if (event->timerId() == _timer.timerId()) { if (event->timerId() == _timer.timerId()) {
_timer.stop(); _timer.stop();
@ -88,7 +88,7 @@ void Label::timerEvent(QTimerEvent *event)
} }
} }
bool Label::eventFilter(QObject *o, QEvent *ev) bool PopupLabel::eventFilter(QObject *o, QEvent *ev)
{ {
Q_UNUSED(o); Q_UNUSED(o);
@ -123,7 +123,7 @@ bool Label::eventFilter(QObject *o, QEvent *ev)
return false; return false;
} }
void Label::place(const QPoint &pos, QWidget *w) void PopupLabel::place(const QPoint &pos, QWidget *w)
{ {
QRect screen = QApplication::desktop()->screenGeometry(w); QRect screen = QApplication::desktop()->screenGeometry(w);
QPoint p(pos.x() + 2, pos.y() + 16); QPoint p(pos.x() + 2, pos.y() + 16);
@ -144,7 +144,7 @@ void Label::place(const QPoint &pos, QWidget *w)
this->move(p); this->move(p);
} }
void Label::deleteAfterTimer() void PopupLabel::deleteAfterTimer()
{ {
if (!_timer.isActive()) if (!_timer.isActive())
_timer.start(300, this); _timer.start(300, this);
@ -153,13 +153,13 @@ void Label::deleteAfterTimer()
void Popup::show(const QPoint &pos, const QString &text, QWidget *w) void Popup::show(const QPoint &pos, const QString &text, QWidget *w)
{ {
if (Label::_instance) { if (PopupLabel::_instance) {
Label::_instance->stopTimer(); PopupLabel::_instance->stopTimer();
Label::_instance->setText(text); PopupLabel::_instance->setText(text);
} else } else
Label::_instance = new Label(text); PopupLabel::_instance = new PopupLabel(text);
Label::_instance->resize(Label::_instance->sizeHint()); PopupLabel::_instance->resize(PopupLabel::_instance->sizeHint());
Label::_instance->place(pos, w); PopupLabel::_instance->place(pos, w);
Label::_instance->showNormal(); PopupLabel::_instance->showNormal();
} }