X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.h;h=ef9b0dbe426ff9fd29a668e8bd9f6f760e74f7b0;hp=22a9e337ec1eabb2563f745d70299f90fb6f2b20;hb=f824db0e31b54969e0b7fa0b5405b1e9173d482c;hpb=28f1a9d9d96645757691cdea19500aefce4bcdac

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index 22a9e337..ef9b0dbe 100644
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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
 
@@ -83,7 +82,7 @@ class NetworksSettingsPage : public SettingsPage {
     QHash<NetworkId, NetworkInfo> networkInfos;
     bool _ignoreWidgetChanges;
 
-    QIcon connectedIcon, connectingIcon, disconnectedIcon;
+    QPixmap connectedIcon, connectingIcon, disconnectedIcon;
 
     void reset();
     bool testHasChanged();
@@ -115,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;
 };