X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=1b3b0fdaa4badf0a46679a8ba7165e0258bf70a1;hp=0c10a574d4a77d05674035829d621b7309027de7;hb=a54a7c410fa99f63fbb79d608cfe0c211cfee1df;hpb=6623fd2d46dadd0168e4e28d1db6944c26c2a773

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index 0c10a574..1b3b0fda 100644
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -21,17 +21,16 @@
 #ifndef _NETWORKSSETTINGSPAGE_H_
 #define _NETWORKSSETTINGSPAGE_H_
 
-#include <QIcon>
+#include <QPixmap>
 
+#include "network.h"
 #include "settingspage.h"
+
 #include "ui_networkssettingspage.h"
-#include "ui_networkeditdlgnew.h"
-#include "ui_servereditdlgnew.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();
@@ -92,11 +92,11 @@ class NetworksSettingsPage : public SettingsPage {
     void saveToNetworkInfo(NetworkInfo &);
 };
 
-class NetworkEditDlgNew : public QDialog {
+class NetworkEditDlg : public QDialog {
   Q_OBJECT
 
   public:
-    NetworkEditDlgNew(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
+    NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = 0);
 
     QString networkName() const;
 
@@ -104,18 +104,18 @@ class NetworkEditDlgNew : public QDialog {
     void on_networkEdit_textChanged(const QString &);
 
   private:
-    Ui::NetworkEditDlgNew ui;
+    Ui::NetworkEditDlg ui;
 
     QStringList existing;
 };
 
 
 
-class ServerEditDlgNew : public QDialog {
+class ServerEditDlg : public QDialog {
   Q_OBJECT
 
   public:
-    ServerEditDlgNew(const QVariant &serverData = QVariant(), QWidget *parent = 0);
+    ServerEditDlg(const QVariant &serverData = QVariant(), QWidget *parent = 0);
 
     QVariant serverData() const;
 
@@ -123,7 +123,7 @@ class ServerEditDlgNew : public QDialog {
     void on_host_textChanged();
 
   private:
-    Ui::ServerEditDlgNew ui;
+    Ui::ServerEditDlg ui;
 };