fixing gcc warning and removing redundand includes

diff --git a/src/common/network.h b/src/common/network.h
index d94502e..1371231 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -117,7 +117,7 @@ public:
   inline const QString &networkName() const { return _networkName; }
   inline const QString &currentServer() const { return _currentServer; }
   inline const QString &myNick() const { return _myNick; }
-  inline const int latency() const { return _latency; }
+  inline int latency() const { return _latency; }
   inline IrcUser *me() const { return ircUser(myNick()); }
   inline IdentityId identity() const { return _identity; }
   QStringList nicks() const;

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index e4cc3aa..760dcb3 100644 (file)
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -29,7 +29,6 @@
 
 #include "ircchannel.h"
 #include "ircuser.h"
-#include "network.h"
 #include "identity.h"
 
 #include "ircserverhandler.h"

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index a02997f..a8e0b27 100644 (file)
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -39,8 +39,6 @@
 #include "network.h"
 #include "signalproxy.h"
 
-class Network;
-
 class IrcServerHandler;
 class UserInputHandler;
 class CtcpHandler;