X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fcoreconnection.h;h=ba33f178041064115a23024061d60ccb80596451;hb=465e723c31d36f28eff7665ca2a8e0fb34427c29;hp=9d3f353a15c00a2dff5eeb07f8f4e9b6a57f5145;hpb=921e54680da16fcf2adb7a90506875aceb6633a4;p=quassel.git diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h index 9d3f353a..ba33f178 100644 --- a/src/client/coreconnection.h +++ b/src/client/coreconnection.h @@ -18,11 +18,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef CORECONNECTION_H_ -#define CORECONNECTION_H_ +#pragma once -#include "QPointer" -#include "QTimer" +#include +#include +#include #ifdef HAVE_SSL # include @@ -30,10 +30,6 @@ # include #endif -#ifdef HAVE_KDE -# include -#endif - #include "coreaccount.h" #include "remotepeer.h" #include "types.h" @@ -77,6 +73,8 @@ public: //! Check if we consider the last connect as reconnect bool wasReconnect() const { return _wasReconnect; } + QPointer peer() { return _peer; } + public slots: bool connectToCore(AccountId = 0); void reconnectToCore(); @@ -148,9 +146,7 @@ private slots: void reconnectIntervalChanged(const QVariant &interval); void reconnectTimeout(); -#ifdef HAVE_KDE - void solidNetworkStatusChanged(Solid::Networking::Status status); -#endif + void onlineStateChanged(bool isOnline); private: QPointer _authHandler; @@ -171,6 +167,8 @@ private: CoreAccount _account; CoreAccountModel *accountModel() const; + QPointer _qNetworkConfigurationManager; + friend class CoreConfigWizard; }; @@ -186,5 +184,3 @@ inline QString CoreConnection::progressText() const { return _progressText; } inline CoreConnection::ConnectionState CoreConnection::state() const { return _state; } inline bool CoreConnection::isConnected() const { return state() >= Connected; } inline CoreAccount CoreConnection::currentAccount() const { return _account; } - -#endif