diff --git a/network/ioslave/main.cpp b/network/ioslave/main.cpp --- a/network/ioslave/main.cpp +++ b/network/ioslave/main.cpp @@ -22,8 +22,6 @@ #include "networkslave.h" -// KDE -#include // Qt #include @@ -33,8 +31,8 @@ int Q_DECL_EXPORT kdemain( int argc, char** argv ) { - KComponentData componentData( "kio_network" ); QCoreApplication app( argc, argv ); + app.setApplicationName(QLatin1String("kio_network")); NetworkSlave slave( argv[1], argv[2], argv[3] ); slave.dispatchLoop(); diff --git a/network/ioslave/networkinitwatcher.h b/network/ioslave/networkinitwatcher.h --- a/network/ioslave/networkinitwatcher.h +++ b/network/ioslave/networkinitwatcher.h @@ -28,8 +28,7 @@ //Qt #include #include - -#include +#include using namespace Mollet; @@ -57,16 +56,16 @@ } inline NetworkInitWatcher::~NetworkInitWatcher() { -kDebug(); +qDebug(); } inline void NetworkInitWatcher::onNetworkInitDone() { -kDebug()<<"before unlock"; +qDebug()<<"before unlock"; mMutex->unlock(); -kDebug()<<"after unlock"; +qDebug()<<"after unlock"; deleteLater(); -kDebug()<<"after deleteLater"; +qDebug()<<"after deleteLater"; } #endif diff --git a/network/ioslave/networkslave.cpp b/network/ioslave/networkslave.cpp --- a/network/ioslave/networkslave.cpp +++ b/network/ioslave/networkslave.cpp @@ -29,12 +29,9 @@ // network #include #include -// KDE -#include // Qt #include - -#include +#include // static const char NetworkIconName[] = "network-workgroup"; diff --git a/network/network/CMakeLists.txt b/network/network/CMakeLists.txt --- a/network/network/CMakeLists.txt +++ b/network/network/CMakeLists.txt @@ -57,7 +57,7 @@ KF5::DNSSD Qt5::Network Qt5::Gui - KF5::KDELibs4Support # KSharedPtr + Qt5::DBus ) if(SLP_FOUND) target_link_libraries( molletnetwork5 PRIVATE ${SLP_LIBRARIES} ) diff --git a/network/network/molletnetwork_export.h b/network/network/molletnetwork_export.h --- a/network/network/molletnetwork_export.h +++ b/network/network/molletnetwork_export.h @@ -23,22 +23,18 @@ #ifndef MOLLETNETWORK_EXPORT_H #define MOLLETNETWORK_EXPORT_H -// KDE -#include - - #ifndef MOLLETNETWORK_EXPORT // building the library? # if defined(MAKE_MOLLETNETWORK_LIB) # define MOLLETNETWORK_EXPORT Q_DECL_EXPORT // using the library # else -# define MOLLETNETWORK_EXPORT KDE_IMPORT +# define MOLLETNETWORK_EXPORT Q_DECL_IMPORT # endif #endif # ifndef MOLLETNETWORK_EXPORT_DEPRECATED -# define MOLLETNETWORK_EXPORT_DEPRECATED KDE_DEPRECATED MOLLETNETWORK_EXPORT +# define MOLLETNETWORK_EXPORT_DEPRECATED QT_DEPRECATED MOLLETNETWORK_EXPORT # endif #endif diff --git a/network/network/netdevice.h b/network/network/netdevice.h --- a/network/network/netdevice.h +++ b/network/network/netdevice.h @@ -25,8 +25,8 @@ // lib #include "molletnetwork_export.h" -// KDE -#include +// Qt +#include namespace Mollet { class NetService; @@ -82,7 +82,7 @@ NetDevicePrivate* dPtr() const; private: - KSharedPtr d; + QSharedPointer d; }; typedef QList NetDeviceList; diff --git a/network/network/netdevice.cpp b/network/network/netdevice.cpp --- a/network/network/netdevice.cpp +++ b/network/network/netdevice.cpp @@ -23,13 +23,10 @@ #include "netdevice.h" #include "netdevice_p.h" -// KDE -#include - namespace Mollet { -K_GLOBAL_STATIC_WITH_ARGS(KSharedPtr< NetDevicePrivate >, dummyNetDevicePrivate, ( new NetDevicePrivate(QString()) )) +Q_GLOBAL_STATIC_WITH_ARGS(QSharedPointer, dummyNetDevicePrivate, ( new NetDevicePrivate(QString()) )) QString NetDevice::iconName( Type type ) @@ -73,7 +70,7 @@ void NetDevice::setDPtr( NetDevicePrivate* _d ) { - d = _d; + d.reset(_d); } NetDevice::~NetDevice() diff --git a/network/network/netservice.h b/network/network/netservice.h --- a/network/network/netservice.h +++ b/network/network/netservice.h @@ -25,8 +25,8 @@ // lib #include "molletnetwork_export.h" -// KDE -#include +// Qt +#include namespace Mollet { class NetDevice; @@ -78,7 +78,7 @@ NetServicePrivate* dPtr() const; private: - KSharedPtr d; + QSharedPointer d; }; typedef QList NetServiceList; diff --git a/network/network/netservice.cpp b/network/network/netservice.cpp --- a/network/network/netservice.cpp +++ b/network/network/netservice.cpp @@ -25,15 +25,15 @@ // lib #include "netdevice.h" -// KDE -#include +// Qt +#include namespace Mollet { // -K_GLOBAL_STATIC_WITH_ARGS(KSharedPtr< NetServicePrivate >, +Q_GLOBAL_STATIC_WITH_ARGS(QSharedPointer, defaultEmptyNetServicePrivate, ( new NetServicePrivate(QString(),QString(),QString(),NetDevice(),QString(),QString()) )) @@ -69,7 +69,7 @@ void NetService::setDPtr( NetServicePrivate* _d ) { - d = _d; + d.reset(_d); } NetService::~NetService() diff --git a/network/network/network.h b/network/network/network.h --- a/network/network/network.h +++ b/network/network/network.h @@ -49,6 +49,7 @@ static Network* network(); public: + Network(); virtual ~Network(); public: @@ -63,7 +64,6 @@ void initDone(); private: - Network(); Q_PRIVATE_SLOT( d, void onBuilderInit() ) private: diff --git a/network/network/network.cpp b/network/network/network.cpp --- a/network/network/network.cpp +++ b/network/network/network.cpp @@ -23,18 +23,18 @@ #include "network.h" #include "network_p.h" -// KDE -#include // Qt +#include #include namespace Mollet { +Q_GLOBAL_STATIC( Network, networkSingleton ) + Network* Network::network() { - K_GLOBAL_STATIC( Network, networkSingleton ) return networkSingleton; }