Naming++

diff --git a/src/qtui/chatmonitorfilter.cpp b/src/qtui/chatmonitorfilter.cpp
index e51b2cd..bbf3918 100644 (file)
--- a/src/qtui/chatmonitorfilter.cpp
+++ b/src/qtui/chatmonitorfilter.cpp
@@ -29,25 +29,25 @@ ChatMonitorFilter::ChatMonitorFilter(MessageModel *model, QObject *parent)
   : MessageFilter(model, parent)
 {
   ChatViewSettings viewSettings(idString());
   : MessageFilter(model, parent)
 {
   ChatViewSettings viewSettings(idString());

-  _showFields = viewSettings.value("showFields", AllFields).toInt();
-  _showOwnMessages = viewSettings.value("showOwnMsgs", true).toBool();
-  viewSettings.notify("showFields", this, SLOT(showFieldsSettingsChanged(const QVariant &)));
-  viewSettings.notify("showOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));
+  _showFields = viewSettings.value("ShowFields", AllFields).toInt();
+  _showOwnMessages = viewSettings.value("ShowOwnMsgs", true).toBool();
+  viewSettings.notify("ShowFields", this, SLOT(showFieldsSettingChanged(const QVariant &)));
+  viewSettings.notify("ShowOwnMsgs", this, SLOT(showOwnMessagesSettingChanged(const QVariant &)));

 
   // ChatMonitorSettingsPage
 
   // ChatMonitorSettingsPage

-  QString highlightAlwaysSettingsId = "HighlightAlways";
+  QString showHighlightsSettingsId = "ShowHighlights";

   QString operationModeSettingsId = "OperationMode";
   QString buffersSettingsId = "Buffers";
 
   QString operationModeSettingsId = "OperationMode";
   QString buffersSettingsId = "Buffers";
 

-  _highlightAlways = viewSettings.value(highlightAlwaysSettingsId, false).toBool();
+  _showHighlights = viewSettings.value(showHighlightsSettingsId, false).toBool();

   _operationMode = viewSettings.value(operationModeSettingsId, 0).toInt();
   // read configured list of buffers to monitor/ignore
   foreach(QVariant v, viewSettings.value(buffersSettingsId, QVariant()).toList())
     _bufferIds << v.value<BufferId>();
 
   _operationMode = viewSettings.value(operationModeSettingsId, 0).toInt();
   // read configured list of buffers to monitor/ignore
   foreach(QVariant v, viewSettings.value(buffersSettingsId, QVariant()).toList())
     _bufferIds << v.value<BufferId>();
 

-  viewSettings.notify(highlightAlwaysSettingsId, this, SLOT(highlightAlwaysSettingsChanged(const QVariant &)));
-  viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingsChanged(const QVariant &)));
-  viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingsChanged(const QVariant &)));
+  viewSettings.notify(showHighlightsSettingsId, this, SLOT(showHighlightsSettingChanged(const QVariant &)));
+  viewSettings.notify(operationModeSettingsId, this, SLOT(operationModeSettingChanged(const QVariant &)));
+  viewSettings.notify(buffersSettingsId, this, SLOT(buffersSettingChanged(const QVariant &)));

 }
 
 bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {
 }
 
 bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const {


@@ -62,9 +62,13 @@ bool ChatMonitorFilter::filterAcceptsRow(int sourceRow, const QModelIndex &sourc
     return false;
 
   // ChatMonitorSettingsPage
     return false;
 
   // ChatMonitorSettingsPage

-  if (_operationMode == ChatViewSettings::OptOut && !(_highlightAlways && flags & Message::Highlight) &&  _bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+  if(_operationMode == ChatViewSettings::OptOut
+    && !(_showHighlights && flags & Message::Highlight)
+    &&  _bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))

     return false;
     return false;

-  if (_operationMode == ChatViewSettings::OptIn && !(_highlightAlways && flags & Message::Highlight) && !_bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))
+  if(_operationMode == ChatViewSettings::OptIn
+    && !(_showHighlights && flags & Message::Highlight)
+    && !_bufferIds.contains(sourceModel()->data(sourceModel()->index(sourceRow, 0), MessageModel::BufferIdRole).value<BufferId>()))

     return false;
 
   return true;
     return false;
 
   return true;


@@ -103,30 +107,30 @@ void ChatMonitorFilter::addShowField(int field) {
   if(_showFields & field)
     return;
 
   if(_showFields & field)
     return;
 

-  ChatViewSettings(idString()).setValue("showFields", _showFields | field); 
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields | field);

 }
 
 void ChatMonitorFilter::removeShowField(int field) {
   if(!(_showFields & field))
     return;
 
 }
 
 void ChatMonitorFilter::removeShowField(int field) {
   if(!(_showFields & field))
     return;
 

-  ChatViewSettings(idString()).setValue("showFields", _showFields ^ field);
+  ChatViewSettings(idString()).setValue("ShowFields", _showFields ^ field);

 }
 
 void ChatMonitorFilter::setShowOwnMessages(bool show) {
   if(_showOwnMessages == show)
     return;
 
 }
 
 void ChatMonitorFilter::setShowOwnMessages(bool show) {
   if(_showOwnMessages == show)
     return;
 

-  ChatViewSettings(idString()).setValue("showOwnMsgs", show);
+  ChatViewSettings(idString()).setValue("ShowOwnMsgs", show);

 }
 
 }
 

-void ChatMonitorFilter::showFieldsSettingsChanged(const QVariant &newValue) {
+void ChatMonitorFilter::showFieldsSettingChanged(const QVariant &newValue) {

   int newFields = newValue.toInt();
   if(_showFields == newFields)
     return;
 
   _showFields = newFields;
   int newFields = newValue.toInt();
   if(_showFields == newFields)
     return;
 
   _showFields = newFields;

-  
+

   int rows = rowCount();
   if(rows == 0)
     return;
   int rows = rowCount();
   if(rows == 0)
     return;


@@ -138,15 +142,15 @@ void ChatMonitorFilter::showOwnMessagesSettingChanged(const QVariant &newValue)
   _showOwnMessages = newValue.toBool();
 }
 
   _showOwnMessages = newValue.toBool();
 }
 

-void ChatMonitorFilter::highlightAlwaysSettingsChanged(const QVariant &newValue) {
-  _highlightAlways = newValue.toBool();
+void ChatMonitorFilter::showHighlightsSettingChanged(const QVariant &newValue) {
+  _showHighlights = newValue.toBool();

 }
 
 }
 

-void ChatMonitorFilter::operationModeSettingsChanged(const QVariant &newValue) {
+void ChatMonitorFilter::operationModeSettingChanged(const QVariant &newValue) {

   _operationMode = newValue.toInt();
 }
 
   _operationMode = newValue.toInt();
 }
 

-void ChatMonitorFilter::buffersSettingsChanged(const QVariant &newValue) {
+void ChatMonitorFilter::buffersSettingChanged(const QVariant &newValue) {

   _bufferIds.clear();
   foreach (QVariant v, newValue.toList()) {
     _bufferIds << v.value<BufferId>();
   _bufferIds.clear();
   foreach (QVariant v, newValue.toList()) {
     _bufferIds << v.value<BufferId>();

diff --git a/src/qtui/chatmonitorfilter.h b/src/qtui/chatmonitorfilter.h
index 7501663..154ce92 100644 (file)
--- a/src/qtui/chatmonitorfilter.h
+++ b/src/qtui/chatmonitorfilter.h
@@ -34,7 +34,7 @@ public:
     NetworkField = 0x01,
     BufferField = 0x02,
     SenderField = 0x04,
     NetworkField = 0x01,
     BufferField = 0x02,
     SenderField = 0x04,

-    AllFields = 0xFF
+    AllFields = 0xff

   };
 
   ChatMonitorFilter(MessageModel *model, QObject *parent = 0);
   };
 
   ChatMonitorFilter(MessageModel *model, QObject *parent = 0);


@@ -52,17 +52,17 @@ public slots:
   void setShowOwnMessages(bool show);
 
 private slots:
   void setShowOwnMessages(bool show);
 
 private slots:

-  void showFieldsSettingsChanged(const QVariant &newValue);
+  void showFieldsSettingChanged(const QVariant &newValue);

   void showOwnMessagesSettingChanged(const QVariant &newValue);
   void showOwnMessagesSettingChanged(const QVariant &newValue);

-  void highlightAlwaysSettingsChanged(const QVariant &newValue);
-  void operationModeSettingsChanged(const QVariant &newValue);
-  void buffersSettingsChanged(const QVariant &newValue);
+  void showHighlightsSettingChanged(const QVariant &newValue);
+  void operationModeSettingChanged(const QVariant &newValue);
+  void buffersSettingChanged(const QVariant &newValue);

 
 private:
   int _showFields;
   bool _showOwnMessages;
   QList<BufferId> _bufferIds;
 
 private:
   int _showFields;
   bool _showOwnMessages;
   QList<BufferId> _bufferIds;

-  bool _highlightAlways;
+  bool _showHighlights;

   int _operationMode;
 };
 
   int _operationMode;
 };