Remove superfluous QObject inheritance

QObject is a special, non-copyable Qt class. Classes which
just need the translation features shall not be derived
from QObject but can use Q_DECLARE_TR_FUNCTIONS instead.
Note that class 'Problem' needs an explicitly declared
virtual destructor now.

Author: dg0yt

src/layout.h

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -26,9 +27,9 @@
 #include <Qt>
 #include <QtGlobal>
 #include <QColor>
+#include <QCoreApplication>
 #include <QFont>
 #include <QMap>
-#include <QObject>
 #include <QPointF>
 #include <QRectF>
 #include <QString>
@@ -40,9 +41,10 @@ class QWidget;
 class QXmlStreamAttributes;
 QT_END_NAMESPACE
 
-class Layout : public QObject
+class Layout
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(Layout)
+	
 public:
 
 	struct Font

src/mainWindow.h

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -24,6 +25,7 @@
 #include <vector>
 
 #include <QtGlobal>
+#include <QCoreApplication>
 #include <QDialog>
 #include <QObject>
 #include <QSize>
@@ -220,7 +222,8 @@ public slots:
 
 class SimilarClubProblem : public Problem
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(SimilarClubProblem)
+	
 public:
 	SimilarClubProblem(Club* club, std::vector<Club*>& similarClubs, ResultList* results);
 	virtual int getNumSolutions();
@@ -235,7 +238,8 @@ Q_OBJECT
 
 class SimilarRunnerProblem : public Problem
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(SimilarRunnerProblem)
+	
 public:
 	SimilarRunnerProblem(Runner* runner, std::vector<Runner*>& similarRunners, ResultList* results);
 	virtual int getNumSolutions();

src/problemWidget.cpp

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -48,6 +49,8 @@ Problem::Problem()
 	selection = 0;
 }
 
+Problem::~Problem() = default;
+
 ProblemWidget::ProblemWidget(QWidget* parent) : QTableWidget(parent)
 {
 	verticalHeader()->setVisible(false);

src/problemWidget.h

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -41,9 +42,8 @@ QT_END_NAMESPACE
 
 class ActionSelectionDelegate;
 
-class Problem : public QObject
+class Problem
 {
-Q_OBJECT
 public:
 
 	enum SolutionType
@@ -54,6 +54,7 @@ Q_OBJECT
 	};
 
 	Problem();
+	virtual ~Problem();
 
 	virtual int getNumSolutions() = 0;
 	virtual QString getSolutionDescription(int i) = 0;

src/runner.h

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -31,6 +32,7 @@
 #include <QtGlobal>
 
 #include <QAbstractTableModel>
+#include <QCoreApplication>
 #include <QModelIndex>
 #include <QObject>
 #include <QString>
@@ -49,9 +51,10 @@ class ComboBoxDelegate;
 
 /// Stores runner data
 /// TODO: Chip list
-class Runner : public QObject
+class Runner
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(Runner)
+	
 public:
 
 	Runner();

src/scoring.h

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -27,8 +28,8 @@
 #include <vector>
 
 #include <QtGlobal>
+#include <QCoreApplication>
 #include <QMap>
-#include <QObject>
 #include <QString>
 #include <QStringList>
 
@@ -54,9 +55,10 @@ enum RuleType
 	TimePoints = 3
 };
 
-struct Ruleset : public QObject
+struct Ruleset
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(Ruleset)
+	
 public:
 
 	struct TimeRatioSettings
@@ -116,9 +118,10 @@ class CustomCategory : public AbstractCategory
 };
 
 /// Scorings take race results as input and calculate handicapped times or points for every runner (and possibly team)
-class Scoring : public QObject
+class Scoring
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(Scoring)
+	
 public:
 
 	enum CalculationFlags
@@ -268,7 +271,8 @@ class ScoringDB
 
 class ClubDifferentProblem : public Problem
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(ClubDifferentProblem)
+	
 public:
 
 	ClubDifferentProblem(Club* club, const QString& country_text, Location* country, const QString& province_text, Location* province);

src/seriesScoring.h

@@ -1,5 +1,6 @@
 /*
     Copyright 2011 Thomas Schöps
+    Copyright 2019 Kai Pastor
     
     This file is part of OpenOrienteering's scoring tool.
 
@@ -26,8 +27,8 @@
 #include <vector>
 
 #include <QtGlobal>
+#include <QCoreApplication>
 #include <QMap>
-#include <QObject>
 #include <QString>
 
 #include "problemWidget.h"
@@ -58,9 +59,10 @@ struct SeriesRaceResult
 };
 
 /// Aggregates result lists from multiple races and calculates a series scoring, possibly also taking into account some organizer bonus
-class SeriesScoring : public QObject
+class SeriesScoring
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(SeriesScoring)
+	
 public:
 
 	typedef std::map< int, SeriesRaceResult* > ResultMap;
@@ -195,7 +197,8 @@ class SeriesScoringDB
 
 class OrganizerMissingProblem : public Problem
 {
-Q_OBJECT
+	Q_DECLARE_TR_FUNCTIONS(OrganizerMissingProblem)
+	
 public:
 
 	OrganizerMissingProblem(SeriesRaceResult* result, const QString& first_name, const QString& last_name, int year, bool isMale);