Merge ff1021db4d into f52935791c

CMakeLists.txt

@@ -78,10 +78,10 @@ ELSEIF (CMAKE_COMPILER_IS_GNUCXX)
     # linux/gcc, bsd/gcc, windows/mingw
     include(CheckCXXCompilerFlag)
 
-    set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
+    set(CMAKE_CXX_FLAGS_RELEASE "-s -std=c++98 -pedantic -O3")
-    set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0 -Wall -Wextra -pedantic -Werror")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wextra -std=c++98 -pedantic -Werror")
 
-    set(ADDITIONAL_DEBUG_FLAGS -Wcast-align -Wmissing-declarations -Winline -Wno-long-long -Wno-error=extra -Wno-error=unused-parameter -Wno-inline -Wno-error=delete-non-virtual-dtor -Wno-error=sign-compare -Wno-error=reorder -Wno-error=missing-declarations)
+    set(ADDITIONAL_DEBUG_FLAGS -Wcast-align -Wmissing-declarations -Wno-long-long -Wno-error=extra -Wno-error=sign-compare -Wno-error=missing-declarations)
 
     FOREACH(FLAG ${ADDITIONAL_DEBUG_FLAGS})
         CHECK_CXX_COMPILER_FLAG("${FLAG}" CXX_HAS_WARNING_${FLAG})
@@ -90,9 +90,21 @@ ELSEIF (CMAKE_COMPILER_IS_GNUCXX)
         ENDIF()
     ENDFOREACH()
 ELSE()
-    # other: osx/llvm, bsd/llvm
+    # osx/llvm, bsd/llvm
-    set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+    # linux/gcc, bsd/gcc, windows/mingw
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+    include(CheckCXXCompilerFlag)
+
+    set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -pedantic -O3")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wextra -std=c++11 -pedantic -Werror")
+
+    set(ADDITIONAL_DEBUG_FLAGS -Wcast-align -Wmissing-declarations -Wno-long-long -Wno-error=extra -Wno-error=sign-compare -Wno-error=missing-declarations)
+
+    FOREACH(FLAG ${ADDITIONAL_DEBUG_FLAGS})
+        CHECK_CXX_COMPILER_FLAG("${FLAG}" CXX_HAS_WARNING_${FLAG})
+        IF(CXX_HAS_WARNING_${FLAG})
+            SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}")
+        ENDIF()
+    ENDFOREACH()
 ENDIF()
 
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning

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();
 }

cockatrice/src/dlg_connect.cpp

@@ -75,6 +75,7 @@ DlgConnect::DlgConnect(QWidget *parent)
 
 void DlgConnect::passwordSaved(int state)
 {
+    Q_UNUSED(state);
     if(savePasswordCheckBox->isChecked()) {
        autoConnectCheckBox->setEnabled(true);
     } else {

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;

cockatrice/src/playerlistwidget.cpp

@@ -70,13 +70,13 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient
     setMinimumHeight(60);
     setIconSize(QSize(20, 15));
     setColumnCount(6);
+    setColumnWidth(0, 20);
+    setColumnWidth(1, 20);
+    setColumnWidth(2, 20);
+    setColumnWidth(3, 20);
+    setColumnWidth(5, 20);
     setHeaderHidden(true);
     setRootIsDecorated(false);
-#if QT_VERSION < 0x050000
-    header()->setResizeMode(QHeaderView::ResizeToContents);
-#else
-    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-#endif
     retranslateUi();
 }
 
@@ -116,6 +116,7 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
         player->setData(3, Qt::UserRole, prop.user_info().user_level());
         player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(prop.user_info().user_level()))));
         player->setText(4, QString::fromStdString(prop.user_info().name()));
+	resizeColumnToContents(4);
         const QString country = QString::fromStdString(prop.user_info().country());
         if (!country.isEmpty())
             player->setIcon(4, QIcon(CountryPixmapGenerator::generatePixmap(12, country)));
@@ -123,8 +124,10 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
     }
     if (prop.has_player_id())
         player->setData(4, Qt::UserRole + 1, prop.player_id());
-    if (prop.has_deck_hash())
+    if (prop.has_deck_hash()) {
         player->setText(5, QString::fromStdString(prop.deck_hash()));
+	resizeColumnToContents(5);
+    }
     if (prop.has_sideboard_locked())
         player->setIcon(5, prop.sideboard_locked() ? lockIcon : QIcon());
     if (prop.has_ping_seconds())

cockatrice/src/setsmodel.h

@@ -29,7 +29,7 @@ public:
     SetsModel(CardDatabase *_db, QObject *parent = 0);
     ~SetsModel();
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const { return NUM_COLS; }
+    int columnCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent); return NUM_COLS; }
     QVariant data(const QModelIndex &index, int role) const;
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     Qt::ItemFlags flags(const QModelIndex &index) const;

oracle/src/oracleimporter.h

@@ -21,7 +21,7 @@ public:
     bool getImport() const { return import; }
     void setImport(bool _import) { import = _import; }
     SetToDownload(const QString &_shortName, const QString &_longName, const QVariant &_cards, bool _import, const QString &_setType = QString(), const QDate &_releaseDate = QDate())
-        : shortName(_shortName), longName(_longName), import(_import), cards(_cards), setType(_setType), releaseDate(_releaseDate)  { }
+        : shortName(_shortName), longName(_longName), import(_import), cards(_cards), releaseDate(_releaseDate), setType(_setType)  { }
     bool operator<(const SetToDownload &set) const { return longName.compare(set.longName, Qt::CaseInsensitive) < 0; }
 };
 

servatrice/src/servatrice.cpp

@@ -108,7 +108,11 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor)
     QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(int, socketDescriptor));
 }
 
+#if QT_VERSION < 0x050000
 void Servatrice_IslServer::incomingConnection(int socketDescriptor)
+#else
+void Servatrice_IslServer::incomingConnection(qintptr socketDescriptor)
+#endif
 {
     QThread *thread = new QThread;
     connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));

servatrice/src/servatrice.h

@@ -68,7 +68,11 @@ public:
 	Servatrice_IslServer(Servatrice *_server, const QSslCertificate &_cert, const QSslKey &_privateKey, QObject *parent = 0)
 		: QTcpServer(parent), server(_server), cert(_cert), privateKey(_privateKey) { }
 protected:
+#if QT_VERSION < 0x050000
 	void incomingConnection(int socketDescriptor);
+#else
+	void incomingConnection(qintptr socketDescriptor);
+#endif
 };
 
 class ServerProperties {