From 01d2adf68e58825977e395931b7631d75fdd4369 Mon Sep 17 00:00:00 2001 From: Michael Callahan Date: Mon, 29 Dec 2014 14:40:10 -0700 Subject: [PATCH 1/2] Better Icon packing in PlayerListWidget --- cockatrice/src/playerlistwidget.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/playerlistwidget.cpp b/cockatrice/src/playerlistwidget.cpp index b535c2c1c..4349c50d0 100644 --- a/cockatrice/src/playerlistwidget.cpp +++ b/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()) From fe1ad8f27ce296749a3f4af784521d24f600b3e3 Mon Sep 17 00:00:00 2001 From: Michael Callahan Date: Mon, 29 Dec 2014 23:45:34 -0700 Subject: [PATCH 2/2] Fix unused and reorder warnings. --- CMakeLists.txt | 2 +- cockatrice/src/carddatabase.cpp | 2 +- cockatrice/src/dlg_connect.cpp | 1 + cockatrice/src/filtertree.h | 2 +- cockatrice/src/setsmodel.h | 2 +- oracle/src/oracleimporter.h | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cf8857ad..d41993a1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ ELSEIF (CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS_RELEASE "-s -O2") set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0 -Wall -Wextra -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 -Winline -Wno-long-long -Wno-error=extra -Wno-inline -Wno-error=delete-non-virtual-dtor -Wno-error=sign-compare -Wno-error=missing-declarations) FOREACH(FLAG ${ADDITIONAL_DEBUG_FLAGS}) CHECK_CXX_COMPILER_FLAG("${FLAG}" CXX_HAS_WARNING_${FLAG}) 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/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp index 152d62b9f..d3bc40276 100644 --- a/cockatrice/src/dlg_connect.cpp +++ b/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 { 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/setsmodel.h b/cockatrice/src/setsmodel.h index 17911db18..8655fe886 100644 --- a/cockatrice/src/setsmodel.h +++ b/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; diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index e8fe9e9db..27d890854 100644 --- a/oracle/src/oracleimporter.h +++ b/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; } };