From kde-commits  Wed Nov 30 22:49:38 2016
From: Johannes Zarl-Zierl <johannes () zarl-zierl ! at>
Date: Wed, 30 Nov 2016 22:49:38 +0000
To: kde-commits
Subject: [kphotoalbum/area_workflow_improvement] AnnotationDialog: Minor tweaks for the AreaTagSelectDialog
Message-Id: <E1cCDh4-000894-My () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=148054618830473

Git commit 9ca18137d5bd0c1c185961a879db12073c00c3e6 by Johannes Zarl-Zierl.
Committed on 30/11/2016 at 22:49.
Pushed by johanneszarl into branch 'area_workflow_improvement'.

Minor tweaks for the AreaTagSelectDialog

M  +1    -1    AnnotationDialog/AreaTagSelectDialog.cpp
M  +2    -2    AnnotationDialog/AreaTagSelectDialog.h

https://commits.kde.org/kphotoalbum/9ca18137d5bd0c1c185961a879db12073c00c3e6

diff --git a/AnnotationDialog/AreaTagSelectDialog.cpp b/AnnotationDialog/Ar=
eaTagSelectDialog.cpp
index d9b772a..50188ff 100644
--- a/AnnotationDialog/AreaTagSelectDialog.cpp
+++ b/AnnotationDialog/AreaTagSelectDialog.cpp
@@ -45,7 +45,7 @@ AnnotationDialog::AreaTagSelectDialog::AreaTagSelectDialo=
g(AnnotationDialog::Res
     , m_usedTags(dialog->positionableTags(ls->category()))
     , m_category(ls->category())
 {
-    setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::Tool);
+    setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
     setAttribute(Qt::WA_TranslucentBackground);
     setModal(true);
 =

diff --git a/AnnotationDialog/AreaTagSelectDialog.h b/AnnotationDialog/Area=
TagSelectDialog.h
index aec78b0..6bc073a 100644
--- a/AnnotationDialog/AreaTagSelectDialog.h
+++ b/AnnotationDialog/AreaTagSelectDialog.h
@@ -26,8 +26,8 @@
 #include <QString>
 =

 // Qt classes
-class QKeyEvent;
 class QLabel;
+class QPaintEvent;
 =

 namespace AnnotationDialog {
 =

@@ -51,7 +51,7 @@ public:
     void moveToArea(QPoint areaTopLeft);
 =

 protected:
-    void paintEvent(QPaintEvent*);
+    void paintEvent(QPaintEvent*) override;
 =

 private slots:
     void slotSetTag(const QString& tag);