FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified data setting for messages.

Browse Source
This commit is contained in:
Martin Rotter 2014-01-17 07:23:18 +01:00
parent 742eff13f2
commit 40dec8c043
3 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/messagesmodel.cpp
View File

@ -52,8 +52,6 @@ void MessagesModel::setupFonts() {
m_boldFont.setBold(true); m_boldFont.setBold(true);
} }
void MessagesModel::loadMessages(const QList<int> feed_ids) { void MessagesModel::loadMessages(const QList<int> feed_ids) {
m_currentFeeds = feed_ids; m_currentFeeds = feed_ids;
@ -110,17 +108,7 @@ void MessagesModel::setupHeaderData() {
Qt::ItemFlags MessagesModel::flags(const QModelIndex &index) const { Qt::ItemFlags MessagesModel::flags(const QModelIndex &index) const {
Q_UNUSED(index) Q_UNUSED(index)
#if QT_VERSION >= 0x050000
if (m_isInEditingMode) {
// NOTE: Editing of model must be temporarily enabled here.
return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable; return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
}
else {
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
}
#else
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
#endif
} }
QVariant MessagesModel::data(int row, int column, int role) const { QVariant MessagesModel::data(int row, int column, int role) const {
@ -182,22 +170,6 @@ QVariant MessagesModel::data(const QModelIndex &index, int role) const {
} }
} }
bool MessagesModel::setData(const QModelIndex &index,
const QVariant &value,
int role) {
#if QT_VERSION >= 0x050000
m_isInEditingMode = true;
#endif
bool set_data_result = QSqlTableModel::setData(index, value, role);
#if QT_VERSION >= 0x050000
m_isInEditingMode = false;
#endif
return set_data_result;
}
bool MessagesModel::setMessageRead(int row_index, int read) { bool MessagesModel::setMessageRead(int row_index, int read) {
if (data(row_index, MSG_DB_READ_INDEX, Qt::EditRole).toInt() == read) { if (data(row_index, MSG_DB_READ_INDEX, Qt::EditRole).toInt() == read) {
// Read status is the same is the one currently set. // Read status is the same is the one currently set.

5
src/core/messagesmodel.h
View File

@ -32,7 +32,6 @@ class MessagesModel : public QSqlTableModel {
virtual ~MessagesModel(); virtual ~MessagesModel();
// Model implementation. // Model implementation.
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QVariant data(int row, int column, int role = Qt::DisplayRole) const; QVariant data(int row, int column, int role = Qt::DisplayRole) const;
QVariant headerData(int section, Qt::Orientation orientation, int role) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const;
@ -104,10 +103,6 @@ class MessagesModel : public QSqlTableModel {
QList<QString> m_headerData; QList<QString> m_headerData;
QList<QString> m_tooltipData; QList<QString> m_tooltipData;
#if QT_VERSION >= 0x050000
bool m_isInEditingMode;
#endif
QFont m_normalFont; QFont m_normalFont;
QFont m_boldFont; QFont m_boldFont;

1
src/gui/iconthemefactory.h
View File

@ -7,6 +7,7 @@
#include <QIcon> #include <QIcon>
#include <QPointer> #include <QPointer>
#include <QHash> #include <QHash>
#include <QApplication>
#include <QDir> #include <QDir>