From 2a92703a6941fb7aa85f5876c51b360878475f01 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 6 Aug 2008 03:14:17 +0200
Subject: [PATCH] Apply colors to BufferView and NickView again

---
 src/uisupport/bufferviewfilter.cpp | 24 ++++++++++++------------
 src/uisupport/nickviewfilter.cpp   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 6b81c38f..d3a1b521 100644
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -46,7 +46,7 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
 {
   setConfig(config);
   setSourceModel(model);
-			
+
   setDynamicSortFilter(true);
 
   loadColors();
@@ -56,7 +56,7 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
 }
 
 void BufferViewFilter::loadColors() {
-  UiSettings s("QtUi/Colors");
+  UiSettings s("QtUiStyle/Colors");
   _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
   _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
   _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
@@ -67,7 +67,7 @@ void BufferViewFilter::loadColors() {
 void BufferViewFilter::setConfig(BufferViewConfig *config) {
   if(_config == config)
     return;
-  
+
   if(_config) {
     disconnect(_config, 0, this, 0);
   }
@@ -90,7 +90,7 @@ void BufferViewFilter::setConfig(BufferViewConfig *config) {
 void BufferViewFilter::configInitialized() {
   if(!config())
     return;
-    
+
   connect(config(), SIGNAL(bufferViewNameSet(const QString &)), this, SLOT(invalidate()));
   connect(config(), SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(invalidate()));
   connect(config(), SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(invalidate()));
@@ -171,7 +171,7 @@ void BufferViewFilter::sort(int column, Qt::SortOrder order) {
 void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
   if(!config() || config()->bufferList().contains(bufferId))
     return;
-  
+
   int pos = config()->bufferList().count();
   bool lt;
   for(int i = 0; i < config()->bufferList().count(); i++) {
@@ -179,7 +179,7 @@ void BufferViewFilter::addBuffer(const BufferId &bufferId) const {
       lt = bufferIdLessThan(bufferId, config()->bufferList()[i]);
     else
       lt = bufferId < config()->bufferList()[i];
-    
+
     if(lt) {
       pos = i;
       break;
@@ -208,7 +208,7 @@ bool BufferViewFilter::filterAcceptBuffer(const QModelIndex &source_bufferIndex)
     // note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
     return false;
   }
-  
+
   if(config()->networkId().isValid() && config()->networkId() != sourceModel()->data(source_bufferIndex, NetworkModel::NetworkIdRole).value<NetworkId>())
     return false;
 
@@ -239,7 +239,7 @@ bool BufferViewFilter::filterAcceptNetwork(const QModelIndex &source_index) cons
 
 bool BufferViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
   QModelIndex child = sourceModel()->index(source_row, 0, source_parent);
-  
+
   if(!child.isValid()) {
     qWarning() << "filterAcceptsRow has been called with an invalid Child";
     return false;
@@ -259,7 +259,7 @@ bool BufferViewFilter::lessThan(const QModelIndex &source_left, const QModelInde
   case NetworkModel::BufferItemType:
     return bufferLessThan(source_left, source_right);
   default:
-    return QSortFilterProxyModel::lessThan(source_left, source_right);    
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
   }
 }
 
@@ -325,10 +325,10 @@ void BufferViewFilter::checkPreviousCurrentForRemoval(const QModelIndex &current
 void BufferViewFilter::customEvent(QEvent *event) {
   if(event->type() != QEvent::User)
     return;
-  
+
   CheckRemovalEvent *removalEvent = static_cast<CheckRemovalEvent *>(event);
   checkItemForRemoval(removalEvent->index);
-  
+
   event->accept();
 }
 
@@ -345,7 +345,7 @@ bool bufferIdLessThan(const BufferId &left, const BufferId &right) {
   Q_CHECK_PTR(Client::networkModel());
   if(!Client::networkModel())
     return true;
-  
+
   QModelIndex leftIndex = Client::networkModel()->bufferIndex(left);
   QModelIndex rightIndex = Client::networkModel()->bufferIndex(right);
 
diff --git a/src/uisupport/nickviewfilter.cpp b/src/uisupport/nickviewfilter.cpp
index 53327691..0fd88459 100644
--- a/src/uisupport/nickviewfilter.cpp
+++ b/src/uisupport/nickviewfilter.cpp
@@ -37,7 +37,7 @@ NickViewFilter::NickViewFilter(const BufferId &bufferId, NetworkModel *parent)
 }
 
 void NickViewFilter::loadColors() {
-  UiSettings s("QtUi/Colors");
+  UiSettings s("QtUiStyle/Colors");
   _FgOnlineStatus = s.value("onlineStatusFG", QVariant(QColor(Qt::black))).value<QColor>();
   _FgAwayStatus = s.value("awayStatusFG", QVariant(QColor(Qt::gray))).value<QColor>();
   // FIXME: use the style interface instead of qsettings
-- 
2.20.1