From 119871d114ba254991bb9844af0c415f9808a37f Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Fri, 24 Jul 2015 19:29:06 +0200 Subject: [PATCH] fix compilation with gcc in paranoic mode deckview.cpp:244:6: warning: no previous declaration for 'bool sortCardsByName(DeckViewCard*, DeckViewCard*)' [-Wmissing-declarations] --- cockatrice/src/deckview.cpp | 4 ++-- cockatrice/src/deckview.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/deckview.cpp b/cockatrice/src/deckview.cpp index 6093af35..9cda1524 100644 --- a/cockatrice/src/deckview.cpp +++ b/cockatrice/src/deckview.cpp @@ -241,7 +241,7 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList return QSizeF(getCardTypeTextWidth() + totalWidth, totalHeight + separatorY + paddingY); } -bool sortCardsByName(DeckViewCard * c1, DeckViewCard * c2) +bool DeckViewCardContainer::sortCardsByName(DeckViewCard * c1, DeckViewCard * c2) { if (c1 && c2) return c1->getName() < c2->getName(); @@ -264,7 +264,7 @@ void DeckViewCardContainer::rearrangeItems(const QList > &rowsAn QList cardTypeList = cardsByType.uniqueKeys(); QList row = cardsByType.values(cardTypeList[i]); - qSort( row.begin(), row.end(), sortCardsByName); + qSort( row.begin(), row.end(), DeckViewCardContainer::sortCardsByName); for (int j = 0; j < row.size(); ++j) { DeckViewCard *card = row[j]; card->setPos(x + (j % tempCols) * CARD_WIDTH, yUntilNow + (j / tempCols) * CARD_HEIGHT); diff --git a/cockatrice/src/deckview.h b/cockatrice/src/deckview.h index 059afa2a..cc064ef6 100644 --- a/cockatrice/src/deckview.h +++ b/cockatrice/src/deckview.h @@ -46,6 +46,7 @@ class DeckViewCardContainer : public QGraphicsItem { private: static const int separatorY = 20; static const int paddingY = 10; + static bool sortCardsByName(DeckViewCard * c1, DeckViewCard * c2); QString name; QList cards;