[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid: Convert to cmakedefine01 for tiers1/solid
From:       Nicolas_Lécureuil <neoclust.kde () free ! fr>
Date:       2012-08-22 11:33:32
Message-ID: 20120822113332.EC12AA6042 () git ! kde ! org
[Download RAW message or body]

Git commit ec41a895316c47e485eb1c55c0d98f6861b01c08 by Nicolas L=C3=A9cureu=
il.
Committed on 22/08/2012 at 15:24.
Pushed by nlecureuil into branch 'frameworks'.

Convert to cmakedefine01 for tiers1/solid

M  +2    -2    tier1/solid/src/solid/config-solid.h.cmake
M  +4    -4    tier1/solid/src/solid/managerbase.cpp

http://commits.kde.org/kdelibs/ec41a895316c47e485eb1c55c0d98f6861b01c08

diff --git a/tier1/solid/src/solid/config-solid.h.cmake b/tier1/solid/src/s=
olid/config-solid.h.cmake
index 3698f82..14c9d6d 100644
--- a/tier1/solid/src/solid/config-solid.h.cmake
+++ b/tier1/solid/src/solid/config-solid.h.cmake
@@ -18,8 +18,8 @@
     License along with this library. If not, see <http://www.gnu.org/licen=
ses/>.
 */
 =

-#cmakedefine UDEV_FOUND
-#cmakedefine HUPNP_FOUND
+#cmakedefine01 UDEV_FOUND
+#cmakedefine01 HUPNP_FOUND
 =

 #cmakedefine01 HAVE_SYS_TYPES_H
 #cmakedefine01 HAVE_SYS_PARAM_H
diff --git a/tier1/solid/src/solid/managerbase.cpp b/tier1/solid/src/solid/=
managerbase.cpp
index e228b48..57c973b 100644
--- a/tier1/solid/src/solid/managerbase.cpp
+++ b/tier1/solid/src/solid/managerbase.cpp
@@ -34,11 +34,11 @@
 #include "backends/udisks/udisksmanager.h"
 #include "backends/upower/upowermanager.h"
 =

-#if defined (HUPNP_FOUND)
+#if HUPNP_FOUND
 #include "backends/upnp/upnpdevicemanager.h"
 #endif
 =

-#if defined (UDEV_FOUND)
+#if UDEV_FOUND
 #include "backends/udev/udevmanager.h"
 #endif
 =

@@ -80,7 +80,7 @@ void Solid::ManagerBasePrivate::loadBackends()
             if (solidHalLegacyEnabled) {
                 m_backends << new Solid::Backends::Hal::HalManager(0);
             } else {
-#               if defined(UDEV_FOUND)
+#               if UDEV_FOUND
                     m_backends << new Solid::Backends::UDev::UDevManager(0=
);
 #               endif
                 m_backends << new Solid::Backends::UDisks::UDisksManager(0)
@@ -89,7 +89,7 @@ void Solid::ManagerBasePrivate::loadBackends()
             }
 #        endif
 =

-#        if defined (HUPNP_FOUND)
+#        if HUPNP_FOUND
             m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
 #        endif
     }

[prev in list] [next in list] [prev in thread] [next in thread]