From ecb5c5a494a6155ff4c8d9ccaa07a68fcf136b73 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Tue, 23 Dec 2014 22:27:32 +0100
Subject: [PATCH] Fix minor compilation warnings

---
 cockatrice/src/carddatabase.cpp | 2 +-
 cockatrice/src/filtertree.h     | 2 +-
 cockatrice/src/priceupdater.h   | 1 +
 oracle/src/oracleimporter.h     | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index 2d311900e..e2020dd95 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -31,7 +31,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSet *set)
 }
 
 CardSet::CardSet(const QString &_shortName, const QString &_longName, const QString &_setType, const QDate &_releaseDate)
-    : shortName(_shortName), longName(_longName), setType(_setType), releaseDate(_releaseDate)
+    : shortName(_shortName), longName(_longName), releaseDate(_releaseDate), setType(_setType)
 {
     updateSortKey();
 }
diff --git a/cockatrice/src/filtertree.h b/cockatrice/src/filtertree.h
index d945e5679..68f8fafb1 100644
--- a/cockatrice/src/filtertree.h
+++ b/cockatrice/src/filtertree.h
@@ -154,7 +154,7 @@ public:
     FilterTreeNode *termNode(const CardFilter *f);
     FilterTreeNode *attrTypeNode(CardFilter::Attr attr,
                                 CardFilter::Type type);
-    const char *textCStr() { return "root"; }
+    const char *textCStr() const { return "root"; }
     int index() const { return 0; }
 
     bool acceptsCard(const CardInfo *info) const;
diff --git a/cockatrice/src/priceupdater.h b/cockatrice/src/priceupdater.h
index 5e67ac46c..824caac1d 100644
--- a/cockatrice/src/priceupdater.h
+++ b/cockatrice/src/priceupdater.h
@@ -2,6 +2,7 @@
 #define PRICEUPDATER_H
 
 #include <QNetworkAccessManager>
+#include <QWidget>
 #include "decklist.h"
 
 class QNetworkAccessManager;
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index e8fe9e9db..b2bdbd020 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -10,8 +10,8 @@ private:
     QString shortName, longName;
     bool import;
     QVariant cards;
-    QDate releaseDate;
-    QString setType;
+	QString setType;
+	QDate releaseDate;
 public:
     const QString &getShortName() const { return shortName; }
     const QString &getLongName() const { return longName; }