From e0dcf585888685b631a10661d21a73389063e8cf Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 11 Jul 2016 21:34:05 +0200
Subject: [PATCH] Change usage of DECLARE_ENUM macro

---
 application/knownfieldmodel.h  |  2 +-
 application/targetlevelmodel.h |  2 +-
 dbquery/dbquery.h              |  2 +-
 gui/mainwindow.h               |  2 +-
 gui/picturepreviewselection.h  |  4 ++--
 gui/tagedit.h                  |  2 +-
 gui/tageditorwidget.cpp        |  2 +-
 gui/tageditorwidget.h          |  2 +-
 gui/tagfieldedit.h             | 14 ++++++--------
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/application/knownfieldmodel.h b/application/knownfieldmodel.h
index 8d875c3..25edd18 100644
--- a/application/knownfieldmodel.h
+++ b/application/knownfieldmodel.h
@@ -7,7 +7,7 @@
 #include <QList>
 
 namespace Media {
-DECLARE_ENUM(KnownField, unsigned int)
+DECLARE_ENUM_CLASS(KnownField, unsigned int);
 }
 
 namespace Settings {
diff --git a/application/targetlevelmodel.h b/application/targetlevelmodel.h
index c8087d0..b9f6c92 100644
--- a/application/targetlevelmodel.h
+++ b/application/targetlevelmodel.h
@@ -7,7 +7,7 @@
 #include <QList>
 
 namespace Media {
-DECLARE_ENUM(TagTargetLevel, unsigned char)
+DECLARE_ENUM_CLASS(TagTargetLevel, unsigned char);
 }
 
 namespace Settings {
diff --git a/dbquery/dbquery.h b/dbquery/dbquery.h
index 84a6563..cb888cf 100644
--- a/dbquery/dbquery.h
+++ b/dbquery/dbquery.h
@@ -9,7 +9,7 @@ QT_FORWARD_DECLARE_CLASS(QNetworkReply)
 
 namespace Media {
 class TagValue;
-DECLARE_ENUM(KnownField, unsigned int)
+DECLARE_ENUM_CLASS(KnownField, unsigned int);
 }
 
 namespace QtGui {
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 8a1c82e..ec7f8af 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -15,7 +15,7 @@ QT_FORWARD_DECLARE_CLASS(QItemSelectionModel)
 QT_FORWARD_DECLARE_CLASS(QMutex)
 
 namespace Media {
-DECLARE_ENUM(TagType, unsigned int)
+DECLARE_ENUM_CLASS(TagType, unsigned int);
 }
 
 namespace Dialogs {
diff --git a/gui/picturepreviewselection.h b/gui/picturepreviewselection.h
index 99b4562..8d34f98 100644
--- a/gui/picturepreviewselection.h
+++ b/gui/picturepreviewselection.h
@@ -17,13 +17,13 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsRectItem)
 
 namespace Media {
 class Tag;
-DECLARE_ENUM(KnownField, unsigned int)
 class TagValue;
+DECLARE_ENUM_CLASS(KnownField, unsigned int);
 }
 
 namespace QtGui {
 
-DECLARE_ENUM(PreviousValueHandling, int)
+DECLARE_ENUM_CLASS(PreviousValueHandling, int);
 
 namespace Ui {
 class PicturePreviewSelection;
diff --git a/gui/tagedit.h b/gui/tagedit.h
index 43bf561..ecc8a15 100644
--- a/gui/tagedit.h
+++ b/gui/tagedit.h
@@ -17,7 +17,7 @@ QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
 namespace Media {
 class Tag;
 class TagValue;
-DECLARE_ENUM(KnownField, unsigned int)
+DECLARE_ENUM_CLASS(KnownField, unsigned int);
 }
 
 namespace QtGui {
diff --git a/gui/tageditorwidget.cpp b/gui/tageditorwidget.cpp
index 627bccc..18acaea 100644
--- a/gui/tageditorwidget.cpp
+++ b/gui/tageditorwidget.cpp
@@ -65,7 +65,7 @@ namespace QtGui {
 /*!
  * \brief The LoadingResult enum specifies whether the file could be parsed.
  */
-enum LoadingResult : char
+DECLARE_ENUM(LoadingResult, char)
 {
     ParsingSuccessful,
     FatalParsingError,
diff --git a/gui/tageditorwidget.h b/gui/tageditorwidget.h
index 80bc2f7..f95f0d9 100644
--- a/gui/tageditorwidget.h
+++ b/gui/tageditorwidget.h
@@ -28,7 +28,7 @@ QT_FORWARD_DECLARE_CLASS(WEB_VIEW_PROVIDER)
 #endif
 
 namespace Media {
-DECLARE_ENUM(TagType, unsigned int)
+DECLARE_ENUM_CLASS(TagType, unsigned int);
 }
 
 namespace QtGui {
diff --git a/gui/tagfieldedit.h b/gui/tagfieldedit.h
index b87ed6f..5110af1 100644
--- a/gui/tagfieldedit.h
+++ b/gui/tagfieldedit.h
@@ -8,17 +8,15 @@
 #include <QPair>
 #include <QWidget>
 
-QT_BEGIN_NAMESPACE
-class QVBoxLayout;
-class QLabel;
-QT_END_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
+QT_FORWARD_DECLARE_CLASS(QLabel)
 
 namespace Media {
-class Tag;
-DECLARE_ENUM(KnownField, unsigned int)
-DECLARE_ENUM(TagDataType, unsigned int)
-DECLARE_ENUM(TagTextEncoding, unsigned int)
 class TagValue;
+class Tag;
+DECLARE_ENUM_CLASS(KnownField, unsigned int);
+DECLARE_ENUM_CLASS(TagDataType, unsigned int);
+DECLARE_ENUM_CLASS(TagTextEncoding, unsigned int);
 }
 
 namespace Widgets {