From 40dec8c04317da2c46817906634345f9ac382b6c Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 17 Jan 2014 07:23:18 +0100
Subject: [PATCH] Simplified data setting for messages.

---
 src/core/messagesmodel.cpp | 30 +-----------------------------
 src/core/messagesmodel.h   |  5 -----
 src/gui/iconthemefactory.h |  1 +
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp
index 14a50e6c5..ec0d494bb 100644
--- a/src/core/messagesmodel.cpp
+++ b/src/core/messagesmodel.cpp
@@ -52,8 +52,6 @@ void MessagesModel::setupFonts() {
   m_boldFont.setBold(true);
 }
 
-
-
 void MessagesModel::loadMessages(const QList<int> feed_ids) { 
   m_currentFeeds = feed_ids;
 
@@ -110,17 +108,7 @@ void MessagesModel::setupHeaderData() {
 Qt::ItemFlags MessagesModel::flags(const QModelIndex &index) const {
   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;
-  }
-  else {
-    return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-  }
-#else
-  return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-#endif
+  return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
 }
 
 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) {  
   if (data(row_index, MSG_DB_READ_INDEX, Qt::EditRole).toInt() == read) {
     // Read status is the same is the one currently set.
diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h
index 88a354c3c..9dc9968d3 100644
--- a/src/core/messagesmodel.h
+++ b/src/core/messagesmodel.h
@@ -32,7 +32,6 @@ class MessagesModel : public QSqlTableModel {
     virtual ~MessagesModel();
 
     // 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(int row, int column, int role = Qt::DisplayRole) 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_tooltipData;
 
-#if QT_VERSION >= 0x050000
-    bool m_isInEditingMode;
-#endif
-
     QFont m_normalFont;
     QFont m_boldFont;
 
diff --git a/src/gui/iconthemefactory.h b/src/gui/iconthemefactory.h
index d7e86192e..3e8bb4bee 100755
--- a/src/gui/iconthemefactory.h
+++ b/src/gui/iconthemefactory.h
@@ -7,6 +7,7 @@
 #include <QIcon>
 #include <QPointer>
 #include <QHash>
+#include <QApplication>
 #include <QDir>