Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup solid

Browse source
This commit is contained in:
Ivailo Monev 2014-11-17 18:55:00 +00:00
parent afb7003ef7
commit 44f26d6ffa
3 changed files with 10 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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 ############### ############### 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") 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 ############### ############### Load the CTest options ###############
# CTestCustom.cmake has to be in the CTEST_BINARY_DIR. # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
# in the KDE build system, this is the same as CMAKE_BINARY_DIR. # in the KDE build system, this is the same as CMAKE_BINARY_DIR.

10
solid/Mainpage.dox
View file

@ -11,16 +11,6 @@ Currently the following backends are implemented on Linux:
<li><a href="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">udev</a></li> <li><a href="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">udev</a></li>
</ul> </ul>
on MacOS X:
<ul>
<li><a href="http://developer.apple.com/mac/library/documentation/DeviceDrivers/Conceptual/IOKitFundamentals/Introduction/Introduction.html">IOKit</a></li>
</ul>
on Windows:
<ul>
<li><a href="http://msdn.microsoft.com/en-us/library/aa384642(v=VS.85).aspx">WMI</a></li>
</ul>
See the documentation for the Solid namespace, and the See the documentation for the Solid namespace, and the
<a href="http://techbase.kde.org/Development/Tutorials/Solid_Tutorials">tutorial <a href="http://techbase.kde.org/Development/Tutorials/Solid_Tutorials">tutorial
on TechBase</a>. on TechBase</a>.

39
solid/solid/managerbase.cpp
View file

@ -27,9 +27,6 @@
#include "backends/fakehw/fakemanager.h" #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) #if defined (WITH_SOLID_UDISKS2)
#include "backends/udisks2/udisksmanager.h" #include "backends/udisks2/udisksmanager.h"
#else #else
@ -47,13 +44,6 @@
#include "backends/fstab/fstabmanager.h" #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() Solid::ManagerBasePrivate::ManagerBasePrivate()
{ {
@ -71,25 +61,16 @@ void Solid::ManagerBasePrivate::loadBackends()
if (!solidFakeXml.isEmpty()) { if (!solidFakeXml.isEmpty()) {
m_backends << new Solid::Backends::Fake::FakeManager(0, solidFakeXml); m_backends << new Solid::Backends::Fake::FakeManager(0, solidFakeXml);
} else { } else {
# if defined(Q_OS_MAC) # if defined(UDEV_FOUND)
m_backends << new Solid::Backends::IOKit::IOKitManager(0); m_backends << new Solid::Backends::UDev::UDevManager(0);
# endif
# elif defined(Q_WS_WIN) && defined(WITH_SOLID_WMI) && !defined(_WIN32_WCE) # if defined(WITH_SOLID_UDISKS2)
m_backends << new Solid::Backends::Wmi::WmiManager(0); m_backends << new Solid::Backends::UDisks2::Manager(0)
# elif defined(Q_WS_WIN) && !defined(_WIN32_WCE) # else
m_backends << new Solid::Backends::Win::WinDeviceManager(0); m_backends << new Solid::Backends::UDisks::UDisksManager(0)
# elif defined(Q_OS_LINUX) # endif
# if defined(UDEV_FOUND) << new Solid::Backends::UPower::UPowerManager(0)
m_backends << new Solid::Backends::UDev::UDevManager(0); << new Solid::Backends::Fstab::FstabManager(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 (HUPNP_FOUND) # if defined (HUPNP_FOUND)
m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0); m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);