diff --git a/CMakeLists.txt b/CMakeLists.txt index 77585113..edb083ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,9 +37,6 @@ endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED) ############### Give the user the option to build the udisks2 solid backend instead of the udisks backend ############### option(WITH_SOLID_UDISKS2 "Enable the udisks2 solid backend instead" "ON") -############### Give the user the option to build the deprecated WMI solid backend instead of the new win backend ############### -option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows") - ############### Load the CTest options ############### # CTestCustom.cmake has to be in the CTEST_BINARY_DIR. # in the KDE build system, this is the same as CMAKE_BINARY_DIR. diff --git a/solid/Mainpage.dox b/solid/Mainpage.dox index 79993535..8ffa6cb1 100644 --- a/solid/Mainpage.dox +++ b/solid/Mainpage.dox @@ -11,16 +11,6 @@ Currently the following backends are implemented on Linux:
  • udev
  • -on MacOS X: - - -on Windows: - - See the documentation for the Solid namespace, and the tutorial on TechBase. diff --git a/solid/solid/managerbase.cpp b/solid/solid/managerbase.cpp index 4bce1266..1daa4c5f 100644 --- a/solid/solid/managerbase.cpp +++ b/solid/solid/managerbase.cpp @@ -27,9 +27,6 @@ #include "backends/fakehw/fakemanager.h" -#if defined (Q_OS_MAC) -#include "backends/iokit/iokitmanager.h" -#elif defined (Q_OS_UNIX) #if defined (WITH_SOLID_UDISKS2) #include "backends/udisks2/udisksmanager.h" #else @@ -47,13 +44,6 @@ #include "backends/fstab/fstabmanager.h" -#elif defined (Q_WS_WIN) && !defined(_WIN32_WCE) -#include "backends/win/windevicemanager.h" -#ifdef WITH_SOLID_WMI -#include "backends/wmi/wmimanager.h" -#endif -#endif - Solid::ManagerBasePrivate::ManagerBasePrivate() { @@ -71,25 +61,16 @@ void Solid::ManagerBasePrivate::loadBackends() if (!solidFakeXml.isEmpty()) { m_backends << new Solid::Backends::Fake::FakeManager(0, solidFakeXml); } else { -# if defined(Q_OS_MAC) - m_backends << new Solid::Backends::IOKit::IOKitManager(0); - -# elif defined(Q_WS_WIN) && defined(WITH_SOLID_WMI) && !defined(_WIN32_WCE) - m_backends << new Solid::Backends::Wmi::WmiManager(0); -# elif defined(Q_WS_WIN) && !defined(_WIN32_WCE) - m_backends << new Solid::Backends::Win::WinDeviceManager(0); -# elif defined(Q_OS_LINUX) -# if defined(UDEV_FOUND) - m_backends << new Solid::Backends::UDev::UDevManager(0); -# endif -# if defined(WITH_SOLID_UDISKS2) - m_backends << new Solid::Backends::UDisks2::Manager(0) -# else - m_backends << new Solid::Backends::UDisks::UDisksManager(0) -# endif - << new Solid::Backends::UPower::UPowerManager(0) - << new Solid::Backends::Fstab::FstabManager(0); -# endif +# if defined(UDEV_FOUND) + m_backends << new Solid::Backends::UDev::UDevManager(0); +# endif +# if defined(WITH_SOLID_UDISKS2) + m_backends << new Solid::Backends::UDisks2::Manager(0) +# else + m_backends << new Solid::Backends::UDisks::UDisksManager(0) +# endif + << new Solid::Backends::UPower::UPowerManager(0) + << new Solid::Backends::Fstab::FstabManager(0); # if defined (HUPNP_FOUND) m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);