From bafbe601f060d78911ae34803d7b5fb0096ef72b Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 16 Mar 2008 17:23:34 +0100 Subject: [PATCH] Fixed bug in HistoryModel::headerData(). --- src/core/AbstractSettings.h | 4 ++-- src/core/SettingsManager.h | 4 ++-- src/gui/HistoryModel.cpp | 17 +++++++++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/core/AbstractSettings.h b/src/core/AbstractSettings.h index 8fc05e1..cb93933 100644 --- a/src/core/AbstractSettings.h +++ b/src/core/AbstractSettings.h @@ -29,7 +29,8 @@ class AbstractSettings { public: - inline AbstractSettings(){}; + inline AbstractSettings() {} + inline virtual ~AbstractSettings() {} virtual void setLanguage(QString lang) = 0; virtual void setGeometry(QByteArray geom) = 0; virtual void setDockState(QByteArray state) = 0; @@ -40,7 +41,6 @@ class AbstractSettings virtual QByteArray dockState() const = 0; virtual QColor defaultCubeColor() const = 0; virtual QColor backgroundColor() const = 0; - inline virtual ~AbstractSettings(){}; }; #endif diff --git a/src/core/SettingsManager.h b/src/core/SettingsManager.h index 162e7eb..91d8cff 100644 --- a/src/core/SettingsManager.h +++ b/src/core/SettingsManager.h @@ -30,14 +30,14 @@ class SettingsManager : virtual public AbstractSettings { public: - inline SettingsManager(){}; + inline SettingsManager() {} + inline virtual ~SettingsManager() {} virtual void setPlayersInfo(QList info) = 0; virtual void setDifficulty1(int d1) = 0; virtual void setDifficulty2(int d2) = 0; virtual QList playersInfo() const = 0; virtual int difficulty1() const = 0; virtual int difficulty2() const = 0; - inline virtual ~SettingsManager(){}; }; #endif diff --git a/src/gui/HistoryModel.cpp b/src/gui/HistoryModel.cpp index 8e13cd9..86c1a7a 100644 --- a/src/gui/HistoryModel.cpp +++ b/src/gui/HistoryModel.cpp @@ -60,12 +60,17 @@ QVariant HistoryModel::data(const QModelIndex &index, int role) const QVariant HistoryModel::headerData(int section, Qt::Orientation orientation, int role) const { - Q_UNUSED(orientation) - if (role == Qt::DisplayRole && section == 0) { - return QVariant(QString("Player")); - } - if (role == Qt::DisplayRole && section == 1) { - return QVariant(QString("Move")); + if (orientation == Qt::Horizontal) { + if (role == Qt::DisplayRole && section == 0) { + return QVariant(QString("Player")); + } + if (role == Qt::DisplayRole && section == 1) { + return QVariant(QString("Move")); + } + } else { + if (role == Qt::DisplayRole) { + return QVariant(QString::number(section + 1)); + } } return QVariant(); } -- 2.11.4.GIT