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

List:       kde-commits
Subject:    KDE/kdelibs/solid
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-02-25 0:00:38
Message-ID: 1267056038.802190.24952.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1095762 by ervin:

Make deviceExists() public again, and remove the fugly "#define private
public" hack.


 M  +1 -1      solid/backends/hal/halmanager.h  
 M  +0 -2      tests/halbasictest.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/hal/halmanager.h #1095761:1095762
@@ -45,6 +45,7 @@
     virtual QString udiPrefix() const ;
     virtual QSet<Solid::DeviceInterface::Type> supportedInterfaces() const;
 
+    bool deviceExists(const QString &udi);
     virtual QStringList allDevices();
 
     virtual QStringList devicesFromQuery(const QString &parentUdi,
@@ -57,7 +58,6 @@
     void slotDeviceRemoved(const QString &udi);
 
 private:
-    bool deviceExists(const QString &udi);
     QStringList findDeviceStringMatch(const QString &key, const QString &value);
     QStringList findDeviceByDeviceInterface(const Solid::DeviceInterface::Type &type);
 
--- trunk/KDE/kdelibs/solid/tests/halbasictest.cpp #1095761:1095762
@@ -21,9 +21,7 @@
 
 #include <QtTest/QtTest>
 
-#define private public
 #include "solid/backends/hal/halmanager.h"
-#undef private
 
 #include <solid/device.h>
 #include <solid/ifaces/device.h>
[prev in list] [next in list] [prev in thread] [next in thread]