From 5f545e7fe369aa9bc13496fe9e469c33f4219e04 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 5 Dec 2017 15:56:47 -0500 Subject: Rename the OSInterface files according to the new format ("framework-*") --- src-qt5/src-cpp/OSInterface-template.cpp | 100 ------------- src-qt5/src-cpp/OSInterface.h | 154 --------------------- src-qt5/src-cpp/OSInterface_private.cpp | 56 -------- src-qt5/src-cpp/framework-OSInterface-template.cpp | 100 +++++++++++++ src-qt5/src-cpp/framework-OSInterface.h | 154 +++++++++++++++++++++ src-qt5/src-cpp/framework-OSInterface_private.cpp | 56 ++++++++ 6 files changed, 310 insertions(+), 310 deletions(-) delete mode 100644 src-qt5/src-cpp/OSInterface-template.cpp delete mode 100644 src-qt5/src-cpp/OSInterface.h delete mode 100644 src-qt5/src-cpp/OSInterface_private.cpp create mode 100644 src-qt5/src-cpp/framework-OSInterface-template.cpp create mode 100644 src-qt5/src-cpp/framework-OSInterface.h create mode 100644 src-qt5/src-cpp/framework-OSInterface_private.cpp diff --git a/src-qt5/src-cpp/OSInterface-template.cpp b/src-qt5/src-cpp/OSInterface-template.cpp deleted file mode 100644 index 96b01e60..00000000 --- a/src-qt5/src-cpp/OSInterface-template.cpp +++ /dev/null @@ -1,100 +0,0 @@ -//=========================================== -// Lumina desktop source code -// Copyright (c) 2017, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -#include - -//=========== -// PUBLIC -//=========== - -//Simple functions used to determine if the current OS supports using this class, and what levels of support -QList OSInterface::supportedNotifications(){ - //Which interfaces provide change notifications - return QList< OSInterface::Interface >(); -} - -QList OSInterface::supportedStatus(){ - //Which interfaces are available for "status" requests - return QList< OSInterface::Interface >(); -} - -QList OSInterface::supportedModify(){ - //Which interfaces are available for "modify" requests - return QList< OSInterface::Interface >(); -} - -//Start/stop interface watchers/notifications (each only called once per session) -void OSInterface::start(){ - //nothing to do -} - -void OSInterface::stop(){ - //nothing to do -} - -//Generic status update -QList OSInterface::status(OSInterface::Interface){ - // ==== Interface status output lists ==== - // Battery: [ float (percent charge), bool (is Charging), double (seconds remaining) ]; - // Volume: [int (percent volume) ] - // Devices: [ QStringList[ name, mountpoint, type (optional)] ] (List length depends on number of devices) - // Network: [bool (network access available)] - // PowerOff: [bool (can power off system)] - // Reboot: [bool (can reboot system)] - // Suspend: [bool (can suspend system)] - // Updates: [bool (is updating), bool (reboot required)] - // ========== - return QList(); -} - -//Individual Interface interactions -bool OSInterface::modify(OSInterface::Interface, QList){ //returns: success/failure - // ==== Interface modification argument lists ==== - // Battery: - // Volume: [int (set percent volume) ] - // Devices: - // Network: - // PowerOff: [bool (skip updates - optional)] - // Reboot: [bool (skip updates - optional)] - // Suspend: [] (No input arguments) - // Updates: - // ========== - return false; -} - -//================= -// PRIVATE SLOTS -//================= -//FileSystemWatcher slots -void OSInterface::watcherFileChanged(QString){ - -} - -void OSInterface::watcherDirChanged(QString){ - -} - -//IO Device slots -void OSInterface::iodeviceReadyRead(){ - -} - -void OSInterface::iodeviceAboutToClose(){ - -} - -//NetworkAccessManager slots -void OSInterface::netAccessChanged(QNetworkAccessManager::NetworkAccessibility){ - -} - -void OSInterface::netRequestFinished(QNetworkReply*){ - -} - -void OSInterface::netSslErrors(QNetworkReply*, const QList&){ - -} diff --git a/src-qt5/src-cpp/OSInterface.h b/src-qt5/src-cpp/OSInterface.h deleted file mode 100644 index bbf9e2c2..00000000 --- a/src-qt5/src-cpp/OSInterface.h +++ /dev/null @@ -1,154 +0,0 @@ -//=========================================== -// Lumina desktop source code -// Copyright (c) 2017, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -// This is the main interface for any OS-specific system calls -// To port Lumina to a different operating system, just create a file -// called "OSInterface-.cpp" -//=========================================== -#ifndef _LUMINA_LIBRARY_OS_INTERFACE_H -#define _LUMINA_LIBRARY_OS_INTERFACE_H - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -class OSInterface : public QObject{ - Q_OBJECT - // == QML ACCESSIBLE PROPERTIES == - //Battery - Q_PROPERTY( float batteryCharge READ batteryCharge NOTIFY batteryChargeChanged) - Q_PROPERTY( bool batteryCharging READ batteryCharging NOTIFY batteryChargingChanged) - Q_PROPERTY( double batterySecondsLeft READ batterySecondsLeft NOTIFY batterySecondsLeftChanged) - //Volume - Q_PROPERTY( int volume READ volume WRITE setVolume NOTIFY volumeChanged) - //Network - Q_PROPERTY( bool networkAvailable READ networkAvailable NOTIFY networkStatusChanged) - Q_PROPERTY( QString networkType READ networkType NOTIFY networkStatusChanged) - Q_PROPERTY( float networkStrength READ networkStrength NOTIFY networkStatusChanged) - Q_PROPERTY( QString networkHostname READ networkHostname NOTIFY networkStatusChanged) - Q_PROPERTY( QHostAddress networkAddress READ networkAddress NOTIFY networkStatusChanged) - //Media - Q_PROPERTY( QStringList mediaShortcuts READ mediaShortcuts NOTIFY mediaShortcutsChanged) - //Updates - Q_PROPERTY( bool updatesAvailable READ updatesAvailable NOTIFY updateStatusChanged) - Q_PROPERTY( bool updatesRunning READ updatesRunning NOTIFY updateStatusChanged) - Q_PROPERTY( bool updatesFinished READ updatesFinished NOTIFY updateStatusChanged) - //Power options - Q_PROPERTY( bool canReboot READ canReboot NOTIFY powerAvailableChanged) - Q_PROPERTY( bool canShutdown READ canShutdown NOTIFY powerAvailableChanged) - Q_PROPERTY( bool canSuspend READ canSuspend NOTIFY powerAvailableChanged) -public: - // ================ - // SEMI-VIRTUAL FUNCTIONS - NEED TO BE DEFINED IN THE OS-SPECIFIC FILES - // ================ - //Start/stop interface watchers/notifications - void start(); - void stop(); - bool isRunning(); //status of the object - whether it has been started yet - - // = Battery = - Q_INVOKABLE bool batteryAvailable(); - Q_INVOKABLE float batteryCharge(); - Q_INVOKABLE bool batteryCharging(); - Q_INVOKABLE double batterySecondsLeft(); - // = Volume = - Q_INVOKABLE bool volumeAvailable(); - Q_INVOKABLE int volume(); - Q_INVOKABLE void setVolume(int); - // = Network Information = - Q_INVOKABLE bool networkAvailable(); - Q_INVOKABLE QString networkType(); //"wifi", "wired", or "cell" - Q_INVOKABLE float networkStrength(); //percentage. ("wired" type should always be 100%) - Q_INVOKABLE QString networkHostname(); - Q_INVOKABLE QHostAddress networkAddress(); - // = Network Modification = - - // = Media Shortcuts = - Q_INVOKABLE QStringList mediaDirectories(); //directory where XDG shortcuts are placed for interacting with media (local/remote) - Q_INVOKABLE QStringList mediaShortcuts(); //List of currently-available XDG shortcut file paths - // = Updates = - Q_INVOKABLE bool updatesAvailable(); - Q_INVOKABLE QString updateDetails(); //Information about any available updates - Q_INVOKABLE bool updatesRunning(); - Q_INVOKABLE QString updateLog(); //Information about any currently-running update - Q_INVOKABLE bool updatesFinished(); - Q_INVOKABLE QString updateResults(); //Information about any finished update - Q_INVOKABLE void startUpdates(); - Q_INVOKABLE bool updateOnlyOnReboot(); //Should the startUpdates function be called only when rebooting the system? - Q_INVOKABLE QDateTime lastUpdate(); //The date/time of the previous updates - Q_INVOKABLE QString lastUpdateResults(); //Information about the previously-finished update - // = System Power = - Q_INVOKABLE bool canReboot(); - Q_INVOKABLE void startReboot(); - Q_INVOKABLE bool canShutdown(); - Q_INVOKABLE void startShutdown(); - Q_INVOKABLE bool canSuspend(); - Q_INVOKABLE void startSuspend(); - -private slots: - // ================ - // SEMI-VIRTUAL FUNCTIONS - NEED TO BE DEFINED IN THE OS-SPECIFIC FILES - // ================ - //FileSystemWatcher slots - void watcherFileChanged(QString); - void watcherDirChanged(QString); - //IO Device slots - void iodeviceReadyRead(); - void iodeviceAboutToClose(); - //NetworkAccessManager slots - void netAccessChanged(QNetworkAccessManager::NetworkAccessibility); - void netRequestFinished(QNetworkReply*); - void netSslErrors(QNetworkReply*, const QList&); - -signals: - void interfaceChanged(OSInterface::Interface); - void batteryChargeChanged(); - void batteryChargingChanged(); - void batterySecondsLeftChanged(); - void volumeChanged(); - void networkStatusChanged(); - void mediaShortcutsChanged(); - void updateStatusChanged(); - void powerAvailableChanged(); - -private: - //Internal persistant data storage, OS-specific usage implementation - enum Interface{ Battery, Volume, Media, Network, PowerOff, Reboot, Suspend, Updates }; - QHash< OSInterface::Interface, QList > INFO; - - // ============ - // Internal possibilities for watching the system (OS-Specific usage/implementation) - // ============ - //File System Watcher - QFileSystemWatcher *watcher; - //IO Device (QLocalSocket, QTcpConnection, QFile, etc) - QIODevice *iodevice; - //Network Access Manager (check network connectivity, etc) - QNetworkAccessManager *netman; - - // Internal implifications for connecting the various watcher objects to their respective slots - // (OS-agnostic - defined in the "OSInterface_private.cpp" file) - void connectWatcher(); - void connectIodevice(); - void connectNetman(); - -public: - OSInterface(QObject *parent = 0); - ~OSInterface(); - - static OSInterface* instance(); //Get the currently-active instance of this class (or make a new one) - -}; -#endif diff --git a/src-qt5/src-cpp/OSInterface_private.cpp b/src-qt5/src-cpp/OSInterface_private.cpp deleted file mode 100644 index bd2d17b5..00000000 --- a/src-qt5/src-cpp/OSInterface_private.cpp +++ /dev/null @@ -1,56 +0,0 @@ -//=========================================== -// Lumina desktop source code -// Copyright (c) 2017, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -// Internal, OS-agnostic functionality for managing the object itself -//=========================================== -#include - -OSInterface::OSInterface(QObject *parent) : QObject(parent){ - watcher = 0; - iodevice = 0; - netman = 0; -} - -OSInterface::~OSInterface(){ - if(watcher!=0){ - QStringList paths; paths << watcher->files() << watcher->directories(); - if(!paths.isEmpty()){ watcher->removePaths(paths); } - watcher->deleteLater(); - } - if(iodevice!=0){ - if(iodevice->isOpen()){ iodevice->close(); } - iodevice->deleteLater(); - } - if(netman!=0){ - netman->deleteLater(); - } -} - -OSInterface::OSInterface* instance(){ - static OSInterface* m_os_object = 0; - if(m_os_object==0){ - m_os_object = new OSInterface(); - } - return m_os_object; -} - -void OSInterface::connectWatcher(){ - if(watcher==0){ return; } - connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherFileChanged(QString)) ); - connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(watcherDirChanged(QString)) ); -} - -void OSInterface::connectIodevice(){ - if(iodevice==0){ return; } - connect(iodevice, SIGNAL(readyRead()), this, SLOT(iodeviceReadyRead()) ); -} - -void OSInterface::connectNetman(){ - if(netman==0){ return; } - connect(netman, SIGNAL(networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility)), this, SLOT(netAccessChanged(QNetworkAccessManager::NetworkAccessibility)) ); - connect(netman, SIGNAL(requestFinished(QNetworkReply*)), this, SLOT(netRequestFinished(QNetworkReply*)) ); - connect(netman, SIGNAL(sslErrors(QNetworkReply*, const QList&)), this, SLOT(netSslErrors(QNetworkReply*, const QList&)) ); -} diff --git a/src-qt5/src-cpp/framework-OSInterface-template.cpp b/src-qt5/src-cpp/framework-OSInterface-template.cpp new file mode 100644 index 00000000..96b01e60 --- /dev/null +++ b/src-qt5/src-cpp/framework-OSInterface-template.cpp @@ -0,0 +1,100 @@ +//=========================================== +// Lumina desktop source code +// Copyright (c) 2017, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include + +//=========== +// PUBLIC +//=========== + +//Simple functions used to determine if the current OS supports using this class, and what levels of support +QList OSInterface::supportedNotifications(){ + //Which interfaces provide change notifications + return QList< OSInterface::Interface >(); +} + +QList OSInterface::supportedStatus(){ + //Which interfaces are available for "status" requests + return QList< OSInterface::Interface >(); +} + +QList OSInterface::supportedModify(){ + //Which interfaces are available for "modify" requests + return QList< OSInterface::Interface >(); +} + +//Start/stop interface watchers/notifications (each only called once per session) +void OSInterface::start(){ + //nothing to do +} + +void OSInterface::stop(){ + //nothing to do +} + +//Generic status update +QList OSInterface::status(OSInterface::Interface){ + // ==== Interface status output lists ==== + // Battery: [ float (percent charge), bool (is Charging), double (seconds remaining) ]; + // Volume: [int (percent volume) ] + // Devices: [ QStringList[ name, mountpoint, type (optional)] ] (List length depends on number of devices) + // Network: [bool (network access available)] + // PowerOff: [bool (can power off system)] + // Reboot: [bool (can reboot system)] + // Suspend: [bool (can suspend system)] + // Updates: [bool (is updating), bool (reboot required)] + // ========== + return QList(); +} + +//Individual Interface interactions +bool OSInterface::modify(OSInterface::Interface, QList){ //returns: success/failure + // ==== Interface modification argument lists ==== + // Battery: + // Volume: [int (set percent volume) ] + // Devices: + // Network: + // PowerOff: [bool (skip updates - optional)] + // Reboot: [bool (skip updates - optional)] + // Suspend: [] (No input arguments) + // Updates: + // ========== + return false; +} + +//================= +// PRIVATE SLOTS +//================= +//FileSystemWatcher slots +void OSInterface::watcherFileChanged(QString){ + +} + +void OSInterface::watcherDirChanged(QString){ + +} + +//IO Device slots +void OSInterface::iodeviceReadyRead(){ + +} + +void OSInterface::iodeviceAboutToClose(){ + +} + +//NetworkAccessManager slots +void OSInterface::netAccessChanged(QNetworkAccessManager::NetworkAccessibility){ + +} + +void OSInterface::netRequestFinished(QNetworkReply*){ + +} + +void OSInterface::netSslErrors(QNetworkReply*, const QList&){ + +} diff --git a/src-qt5/src-cpp/framework-OSInterface.h b/src-qt5/src-cpp/framework-OSInterface.h new file mode 100644 index 00000000..bbf9e2c2 --- /dev/null +++ b/src-qt5/src-cpp/framework-OSInterface.h @@ -0,0 +1,154 @@ +//=========================================== +// Lumina desktop source code +// Copyright (c) 2017, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// This is the main interface for any OS-specific system calls +// To port Lumina to a different operating system, just create a file +// called "OSInterface-.cpp" +//=========================================== +#ifndef _LUMINA_LIBRARY_OS_INTERFACE_H +#define _LUMINA_LIBRARY_OS_INTERFACE_H + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +class OSInterface : public QObject{ + Q_OBJECT + // == QML ACCESSIBLE PROPERTIES == + //Battery + Q_PROPERTY( float batteryCharge READ batteryCharge NOTIFY batteryChargeChanged) + Q_PROPERTY( bool batteryCharging READ batteryCharging NOTIFY batteryChargingChanged) + Q_PROPERTY( double batterySecondsLeft READ batterySecondsLeft NOTIFY batterySecondsLeftChanged) + //Volume + Q_PROPERTY( int volume READ volume WRITE setVolume NOTIFY volumeChanged) + //Network + Q_PROPERTY( bool networkAvailable READ networkAvailable NOTIFY networkStatusChanged) + Q_PROPERTY( QString networkType READ networkType NOTIFY networkStatusChanged) + Q_PROPERTY( float networkStrength READ networkStrength NOTIFY networkStatusChanged) + Q_PROPERTY( QString networkHostname READ networkHostname NOTIFY networkStatusChanged) + Q_PROPERTY( QHostAddress networkAddress READ networkAddress NOTIFY networkStatusChanged) + //Media + Q_PROPERTY( QStringList mediaShortcuts READ mediaShortcuts NOTIFY mediaShortcutsChanged) + //Updates + Q_PROPERTY( bool updatesAvailable READ updatesAvailable NOTIFY updateStatusChanged) + Q_PROPERTY( bool updatesRunning READ updatesRunning NOTIFY updateStatusChanged) + Q_PROPERTY( bool updatesFinished READ updatesFinished NOTIFY updateStatusChanged) + //Power options + Q_PROPERTY( bool canReboot READ canReboot NOTIFY powerAvailableChanged) + Q_PROPERTY( bool canShutdown READ canShutdown NOTIFY powerAvailableChanged) + Q_PROPERTY( bool canSuspend READ canSuspend NOTIFY powerAvailableChanged) +public: + // ================ + // SEMI-VIRTUAL FUNCTIONS - NEED TO BE DEFINED IN THE OS-SPECIFIC FILES + // ================ + //Start/stop interface watchers/notifications + void start(); + void stop(); + bool isRunning(); //status of the object - whether it has been started yet + + // = Battery = + Q_INVOKABLE bool batteryAvailable(); + Q_INVOKABLE float batteryCharge(); + Q_INVOKABLE bool batteryCharging(); + Q_INVOKABLE double batterySecondsLeft(); + // = Volume = + Q_INVOKABLE bool volumeAvailable(); + Q_INVOKABLE int volume(); + Q_INVOKABLE void setVolume(int); + // = Network Information = + Q_INVOKABLE bool networkAvailable(); + Q_INVOKABLE QString networkType(); //"wifi", "wired", or "cell" + Q_INVOKABLE float networkStrength(); //percentage. ("wired" type should always be 100%) + Q_INVOKABLE QString networkHostname(); + Q_INVOKABLE QHostAddress networkAddress(); + // = Network Modification = + + // = Media Shortcuts = + Q_INVOKABLE QStringList mediaDirectories(); //directory where XDG shortcuts are placed for interacting with media (local/remote) + Q_INVOKABLE QStringList mediaShortcuts(); //List of currently-available XDG shortcut file paths + // = Updates = + Q_INVOKABLE bool updatesAvailable(); + Q_INVOKABLE QString updateDetails(); //Information about any available updates + Q_INVOKABLE bool updatesRunning(); + Q_INVOKABLE QString updateLog(); //Information about any currently-running update + Q_INVOKABLE bool updatesFinished(); + Q_INVOKABLE QString updateResults(); //Information about any finished update + Q_INVOKABLE void startUpdates(); + Q_INVOKABLE bool updateOnlyOnReboot(); //Should the startUpdates function be called only when rebooting the system? + Q_INVOKABLE QDateTime lastUpdate(); //The date/time of the previous updates + Q_INVOKABLE QString lastUpdateResults(); //Information about the previously-finished update + // = System Power = + Q_INVOKABLE bool canReboot(); + Q_INVOKABLE void startReboot(); + Q_INVOKABLE bool canShutdown(); + Q_INVOKABLE void startShutdown(); + Q_INVOKABLE bool canSuspend(); + Q_INVOKABLE void startSuspend(); + +private slots: + // ================ + // SEMI-VIRTUAL FUNCTIONS - NEED TO BE DEFINED IN THE OS-SPECIFIC FILES + // ================ + //FileSystemWatcher slots + void watcherFileChanged(QString); + void watcherDirChanged(QString); + //IO Device slots + void iodeviceReadyRead(); + void iodeviceAboutToClose(); + //NetworkAccessManager slots + void netAccessChanged(QNetworkAccessManager::NetworkAccessibility); + void netRequestFinished(QNetworkReply*); + void netSslErrors(QNetworkReply*, const QList&); + +signals: + void interfaceChanged(OSInterface::Interface); + void batteryChargeChanged(); + void batteryChargingChanged(); + void batterySecondsLeftChanged(); + void volumeChanged(); + void networkStatusChanged(); + void mediaShortcutsChanged(); + void updateStatusChanged(); + void powerAvailableChanged(); + +private: + //Internal persistant data storage, OS-specific usage implementation + enum Interface{ Battery, Volume, Media, Network, PowerOff, Reboot, Suspend, Updates }; + QHash< OSInterface::Interface, QList > INFO; + + // ============ + // Internal possibilities for watching the system (OS-Specific usage/implementation) + // ============ + //File System Watcher + QFileSystemWatcher *watcher; + //IO Device (QLocalSocket, QTcpConnection, QFile, etc) + QIODevice *iodevice; + //Network Access Manager (check network connectivity, etc) + QNetworkAccessManager *netman; + + // Internal implifications for connecting the various watcher objects to their respective slots + // (OS-agnostic - defined in the "OSInterface_private.cpp" file) + void connectWatcher(); + void connectIodevice(); + void connectNetman(); + +public: + OSInterface(QObject *parent = 0); + ~OSInterface(); + + static OSInterface* instance(); //Get the currently-active instance of this class (or make a new one) + +}; +#endif diff --git a/src-qt5/src-cpp/framework-OSInterface_private.cpp b/src-qt5/src-cpp/framework-OSInterface_private.cpp new file mode 100644 index 00000000..bd2d17b5 --- /dev/null +++ b/src-qt5/src-cpp/framework-OSInterface_private.cpp @@ -0,0 +1,56 @@ +//=========================================== +// Lumina desktop source code +// Copyright (c) 2017, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// Internal, OS-agnostic functionality for managing the object itself +//=========================================== +#include + +OSInterface::OSInterface(QObject *parent) : QObject(parent){ + watcher = 0; + iodevice = 0; + netman = 0; +} + +OSInterface::~OSInterface(){ + if(watcher!=0){ + QStringList paths; paths << watcher->files() << watcher->directories(); + if(!paths.isEmpty()){ watcher->removePaths(paths); } + watcher->deleteLater(); + } + if(iodevice!=0){ + if(iodevice->isOpen()){ iodevice->close(); } + iodevice->deleteLater(); + } + if(netman!=0){ + netman->deleteLater(); + } +} + +OSInterface::OSInterface* instance(){ + static OSInterface* m_os_object = 0; + if(m_os_object==0){ + m_os_object = new OSInterface(); + } + return m_os_object; +} + +void OSInterface::connectWatcher(){ + if(watcher==0){ return; } + connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherFileChanged(QString)) ); + connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(watcherDirChanged(QString)) ); +} + +void OSInterface::connectIodevice(){ + if(iodevice==0){ return; } + connect(iodevice, SIGNAL(readyRead()), this, SLOT(iodeviceReadyRead()) ); +} + +void OSInterface::connectNetman(){ + if(netman==0){ return; } + connect(netman, SIGNAL(networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility)), this, SLOT(netAccessChanged(QNetworkAccessManager::NetworkAccessibility)) ); + connect(netman, SIGNAL(requestFinished(QNetworkReply*)), this, SLOT(netRequestFinished(QNetworkReply*)) ); + connect(netman, SIGNAL(sslErrors(QNetworkReply*, const QList&)), this, SLOT(netSslErrors(QNetworkReply*, const QList&)) ); +} -- cgit