X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=232c7f8a836e13846d66a44ad02dbf3b65d2d755;hb=9d919506679e00fcdf47ab3cbebad414d77bda7d;hp=bb6499f0841b37dbdc19ff1dfcd6d40a43d47e9e;hpb=48ed2b53aeb10bcbda6cdc46696bf649c0f6e670;p=quassel.git

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index bb6499f0..232c7f8a 100644
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -18,20 +18,19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _NETWORKSSETTINGSPAGE_H_
-#define _NETWORKSSETTINGSPAGE_H_
+#ifndef NETWORKSSETTINGSPAGE_H
+#define NETWORKSSETTINGSPAGE_H
 
-#include <QIcon>
+#include <QPixmap>
 
+#include "network.h"
 #include "settingspage.h"
+
 #include "ui_networkssettingspage.h"
 #include "ui_networkeditdlg.h"
 #include "ui_servereditdlg.h"
 #include "ui_saveidentitiesdlg.h"
 
-#include "network.h"
-#include "types.h"
-
 class NetworksSettingsPage : public SettingsPage {
   Q_OBJECT
 
@@ -81,8 +80,9 @@ class NetworksSettingsPage : public SettingsPage {
 
     NetworkId currentId;
     QHash<NetworkId, NetworkInfo> networkInfos;
+    bool _ignoreWidgetChanges;
 
-    QIcon connectedIcon, connectingIcon, disconnectedIcon;
+    QPixmap connectedIcon, connectingIcon, disconnectedIcon;
 
     void reset();
     bool testHasChanged();
@@ -114,16 +114,16 @@ class NetworkEditDlg : public QDialog {
 class ServerEditDlg : public QDialog {
   Q_OBJECT
 
-  public:
-    ServerEditDlg(const QVariant &serverData = QVariant(), QWidget *parent = 0);
+public:
+  ServerEditDlg(const Network::Server &server = Network::Server(), QWidget *parent = 0);
 
-    QVariant serverData() const;
+  Network::Server serverData() const;
 
-  private slots:
-    void on_host_textChanged();
+private slots:
+  void on_host_textChanged();
 
-  private:
-    Ui::ServerEditDlg ui;
+private:
+  Ui::ServerEditDlg ui;
 };