Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 10:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kget: port to the new knetworkmanager library

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-08 08:54:23 +03:00
parent d834d633d5
commit 3cbd1dc700
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kget/CMakeLists.txt
View file

@ -129,7 +129,7 @@ add_library(kgetcore SHARED ${kgetcore_SRCS})
target_link_libraries(kgetcore
KDE4::kio
KDE4::solid
KDE4::knetworkmanager
)
if (KDE4WORKSPACE_FOUND)

16
kget/core/kget.cpp
View file

@ -788,12 +788,13 @@ TransferGroupScheduler * KGet::m_scheduler = 0;
MainWindow * KGet::m_mainWindow = 0;
KUiServerJobs * KGet::m_jobManager = 0;
TransferHistoryStore * KGet::m_store = 0;
KNetworkManager * KGet::m_networkManager = 0;
bool KGet::m_hasConnection = true;
// ------ PRIVATE FUNCTIONS ------
KGet::KGet()
{
m_networkManager = new KNetworkManager();
m_scheduler = new TransferGroupScheduler();
m_transferTreeModel = new TransferTreeModel(m_scheduler);
m_selectionModel = new TransferTreeSelectionModel(m_transferTreeModel);
@ -806,8 +807,8 @@ KGet::KGet()
m_jobManager, SLOT(slotTransfersChanged(QMap<TransferHandler*,Transfer::ChangesFlags>)));
//check if there is a connection
const Solid::Networking::Status status = Solid::Networking::status();
KGet::setHasNetworkConnection((status == Solid::Networking::Connected) || (status == Solid::Networking::Unknown));
const KNetworkManager::KNetworkStatus status = m_networkManager->status();
KGet::setHasNetworkConnection((status == KNetworkManager::ConnectedStatus) || (status == KNetworkManager::UnknownStatus));
//Load all the available plugins
loadPlugins();
@ -816,6 +817,7 @@ KGet::KGet()
KGet::~KGet()
{
kDebug();
delete m_networkManager;
delete m_transferTreeModel;
delete m_jobManager; //This one must always be before the scheduler otherwise the job manager can't remove the notifications when deleting.
delete m_scheduler;
@ -1272,8 +1274,8 @@ GenericObserver::GenericObserver(QObject *parent)
SLOT(groupsChangedEvent(QMap<TransferGroupHandler*,TransferGroup::ChangesFlags>)));
connect(KGet::model(), SIGNAL(transferMovedEvent(TransferHandler*,TransferGroupHandler*)),
SLOT(transferMovedEvent(TransferHandler*,TransferGroupHandler*)));
connect(Solid::Networking::notifier(), SIGNAL(statusChanged(Solid::Networking::Status)),
this, SLOT(slotNetworkStatusChanged(Solid::Networking::Status)));
connect(KGet::m_networkManager, SIGNAL(statusChanged(KNetworkManager::KNetworkStatus)),
this, SLOT(slotNetworkStatusChanged(KNetworkManager::KNetworkStatus)));
}
@ -1471,9 +1473,9 @@ void GenericObserver::slotNotificationClosed()
m_notifications.remove(notification);
}
void GenericObserver::slotNetworkStatusChanged(const Solid::Networking::Status &status)
void GenericObserver::slotNetworkStatusChanged(const KNetworkManager::KNetworkStatus status)
{
KGet::setHasNetworkConnection((status == Solid::Networking::Connected) || (status == Solid::Networking::Unknown));
KGet::setHasNetworkConnection((status == KNetworkManager::ConnectedStatus) || (status == KNetworkManager::UnknownStatus));
}
void GenericObserver::groupsChangedEvent(QMap<TransferGroupHandler*, TransferGroup::ChangesFlags> groups)

7
kget/core/kget.h
View file

@ -22,9 +22,9 @@
#include <kurl.h>
#include <kactioncollection.h>
#include <KNotification>
#include <KNetworkManager>
#include <ktabwidget.h>
#include <Solid/Networking>
#include <QtXml/qdom.h>
#include "kuiserverjobs.h"
@ -208,7 +208,7 @@ class KGET_EXPORT KGet
* @returns a pointer to the TransferTreeModel object
*/
static TransferTreeModel * model();
/**
* @returns a pointer to the QItemSelectionModel object
*/
@ -441,6 +441,7 @@ class KGET_EXPORT KGet
//pointer to the used TransferHistoryStore
static TransferHistoryStore *m_store;
static KNetworkManager *m_networkManager;
static bool m_hasConnection;
};
@ -479,7 +480,7 @@ class GenericObserver : public QObject
void slotAbortAfterFinishAction();
void slotResolveTransferError();
void slotNotificationClosed();
void slotNetworkStatusChanged(const Solid::Networking::Status &status);
void slotNetworkStatusChanged(const KNetworkManager::KNetworkStatus status);
private:
bool allTransfersFinished();