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

List:       kde-commits
Subject:    KDE/kdelibs/solid/examples
From:       Christopher Blauvelt <cblauvelt () gmail ! com>
Date:       2007-06-10 5:47:36
Message-ID: 1181454456.113485.6779.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 673391 by cblauvelt:

Make the examples work again.



 M  +3 -3      tutorial1/tutorial1.cpp  
 M  +3 -3      tutorial2/tutorial2.cpp  
 M  +3 -3      tutorial3/tutorial3.cpp  


--- trunk/KDE/kdelibs/solid/examples/tutorial1/tutorial1.cpp #673390:673391
@@ -21,7 +21,7 @@
 #include <QList>
 
 //solid specific includes
-#include <solid/devicemanager.h>
+#include <solid/devicenotifier.h>
 #include <solid/device.h>
 
 //kde specific includes
@@ -38,9 +38,9 @@
 {
     KComponentData componentData("tutorial1");
     
-    Solid::DeviceManager &manager = Solid::DeviceManager::self();
+    Solid::DeviceNotifier *notifier = Solid::DeviceNotifier::instance();
     
-    foreach (Solid::Device device, manager.allDevices())
+    foreach (Solid::Device device, Solid::Device::allDevices())
     {
         kDebug() << device.udi().toLatin1().constData() << endl;
     }
--- trunk/KDE/kdelibs/solid/examples/tutorial2/tutorial2.cpp #673390:673391
@@ -21,7 +21,7 @@
 #include <QList>
 
 //solid specific includes
-#include <solid/devicemanager.h>
+#include <solid/devicenotifier.h>
 #include <solid/device.h>
 #include <solid/deviceinterface.h>
 
@@ -39,10 +39,10 @@
 {
     KComponentData componentData("tutorial2");
     
-    Solid::DeviceManager &manager = Solid::DeviceManager::self();
+    Solid::DeviceNotifier *notifier = Solid::DeviceNotifier::instance();
     
     //get a list of all devices that are AudioInterface
-    foreach (Solid::Device device, \
manager.findDevicesFromQuery(Solid::DeviceInterface::AudioInterface, QString())) +    \
foreach (Solid::Device device, \
Solid::Device::listFromType(Solid::DeviceInterface::AudioInterface, QString()))  {
         kDebug() << device.udi().toLatin1().constData() << endl;
     }
--- trunk/KDE/kdelibs/solid/examples/tutorial3/tutorial3.cpp #673390:673391
@@ -21,7 +21,7 @@
 #include <QList>
 
 //solid specific includes
-#include <solid/devicemanager.h>
+#include <solid/devicenotifier.h>
 #include <solid/device.h>
 #include <solid/deviceinterface.h>
 #include <solid/processor.h>
@@ -40,10 +40,10 @@
 {
     KComponentData componentData("tutorial3");
     
-    Solid::DeviceManager &manager = Solid::DeviceManager::self();
+    Solid::DeviceNotifier *notifier = Solid::DeviceNotifier::instance();
     
     //get a Processor
-    Solid::DeviceList list = \
manager.findDevicesFromQuery(Solid::DeviceInterface::Processor, QString()); +    \
QList<Solid::Device> list = \
Solid::Device::listFromType(Solid::DeviceInterface::Processor, QString());  
     //take the first processor
     Solid::Device device = list[0];


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