Merge pull request #97 from Bombe/focus-host-input

[quassel.git] / src / qtui / settingspages / highlightsettingspage.h

diff --git a/src/qtui/settingspages/highlightsettingspage.h b/src/qtui/settingspages/highlightsettingspage.h
index 60996f1..423e1b4 100644 (file)
--- a/src/qtui/settingspages/highlightsettingspage.h
+++ b/src/qtui/settingspages/highlightsettingspage.h
@@ -1,21 +1,21 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Highlight Public License as published by  *
+ *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Highlight Public License for more details.                          *
+ *   GNU General Public License for more details.                          *
  *                                                                         *
- *   You should have received a copy of the GNU Highlight Public License     *
+ *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef _HIGHLIGHTSETTINGSPAGE_H_
@@ -27,40 +27,41 @@
 #include "settingspage.h"
 #include "ui_highlightsettingspage.h"
 
-class HighlightSettingsPage : public SettingsPage {
-  Q_OBJECT
+class HighlightSettingsPage : public SettingsPage
+{
+    Q_OBJECT
 
-  public:
+public:
     HighlightSettingsPage(QWidget *parent = 0);
 
     bool hasDefaults() const;
 
-  public slots:
+public slots:
     void save();
     void load();
     void defaults();
 
-  private slots:
+private slots:
     void widgetHasChanged();
-    void addNewRow(QString name = tr("highlight rule"), bool regex = false, bool cs = true, bool enable = true, QString chanName = "");
+    void addNewRow(QString name = tr("highlight rule"), bool regex = false, bool cs = false, bool enable = true, QString chanName = "", bool self = false);
     void removeSelectedRows();
     void selectRow(QTableWidgetItem *item);
     void tableChanged(QTableWidgetItem *item);
 
-  private:
+private:
     Ui::HighlightSettingsPage ui;
-    QVariantList  highlightList;
+    QVariantList highlightList;
     // QVariant -> QHash<QString, QVariant>:
     //    regex:  bool
     //    name:   QString
     //    enable: bool
     enum column {
-      NameColumn = 0,
-      RegExColumn = 1,
-      CsColumn = 2,
-      EnableColumn = 3,
-      ChanColumn = 4,
-      ColumnCount = 5
+        NameColumn = 0,
+        RegExColumn = 1,
+        CsColumn = 2,
+        EnableColumn = 3,
+        ChanColumn = 4,
+        ColumnCount = 5
     };
 
     void emptyTable();
@@ -68,4 +69,5 @@ class HighlightSettingsPage : public SettingsPage {
     bool testHasChanged();
 };
 
+
 #endif