diff -r 217ed62e872c -r 970389573788 QTfrontend/model/MapModel.h --- a/QTfrontend/model/MapModel.h Fri Apr 27 11:47:37 2012 +0200 +++ b/QTfrontend/model/MapModel.h Fri Apr 27 22:22:04 2012 +0200 @@ -25,7 +25,7 @@ #ifndef HEDGEWARS_MAPMODEL_H #define HEDGEWARS_MAPMODEL_H -#include +#include #include #include #include @@ -40,7 +40,7 @@ * @author sheepluva * @since 0.9.18 */ -class MapModel : public QAbstractListModel +class MapModel : public QStandardItemModel { Q_OBJECT @@ -64,13 +64,6 @@ QString weapons; }; - static MapInfo mapInfoFromData(const QVariant data); - - explicit MapModel(QObject *parent = 0); - - int rowCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role) const; - int generatorCount() const; int missionCount() const; @@ -80,9 +73,19 @@ private: - QList > m_data; - int m_nGenerators; int m_nMissions; + + QStandardItem * infoToItem( + const QIcon & icon, + const QString caption, + MapType type = Invalid, + QString name = "", + QString theme = "", + quint32 limit = 0, + QString scheme = "", + QString weapons = "") const; }; +Q_DECLARE_METATYPE(MapModel::MapInfo) + #endif // HEDGEWARS_MAPMODEL_H