[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: 2007-04-30 21:30:00
Message-ID: 1177968600.112912.22299.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 659828 by ervin:
Kill the Display interface, useless and unused.
M +1 -5 solid/CMakeLists.txt
M +0 -10 solid/backends/fakehw/fakecomputer.xml
M +0 -4 solid/backends/fakehw/fakedevice.cpp
D solid/backends/fakehw/fakedisplay.cpp
D solid/backends/fakehw/fakedisplay.h
M +0 -4 solid/backends/hal/haldevice.cpp
M +0 -5 solid/backends/hal/haldeviceinterface.h
D solid/backends/hal/haldisplay.cpp
D solid/backends/hal/haldisplay.h
M +0 -5 solid/device.cpp
M +1 -3 solid/deviceinterface.h
D solid/display.cpp
D solid/display.h
D solid/display_p.h
D solid/ifaces/display.cpp
D solid/ifaces/display.h
M +0 -1 tests/solidhwtest.cpp
--- trunk/KDE/kdelibs/solid/solid/CMakeLists.txt #659827:659828
@@ -22,7 +22,6 @@
acadapter.cpp
battery.cpp
button.cpp
- display.cpp
audiohw.cpp
dvbhw.cpp
predicate.cpp
@@ -42,7 +41,6 @@
ifaces/device.cpp
ifaces/deviceinterface.cpp
ifaces/devicemanager.cpp
- ifaces/display.cpp
ifaces/dvbhw.cpp
ifaces/genericinterface.cpp
ifaces/networkhw.cpp
@@ -60,7 +58,6 @@
backends/hal/halcamera.cpp
backends/hal/halcdrom.cpp
backends/hal/haldeviceinterface.cpp
- backends/hal/haldisplay.cpp
backends/hal/haldvbhw.cpp
backends/hal/halgenericinterface.cpp
backends/hal/halcalljob.cpp
@@ -82,7 +79,6 @@
backends/fakehw/fakecdrom.cpp
backends/fakehw/fakedevice.cpp
backends/fakehw/fakedeviceinterface.cpp
- backends/fakehw/fakedisplay.cpp
backends/fakehw/fakedvbhw.cpp
backends/fakehw/fakegenericinterface.cpp
backends/fakehw/fakejob.cpp
@@ -119,7 +115,7 @@
########### install files ###############
-install( FILES solid_export.h device.h devicenotifier.h deviceinterface.h \
genericinterface.h processor.h block.h storagedrive.h opticaldrive.h storagevolume.h \
opticaldisc.h camera.h portablemediaplayer.h networkhw.h acadapter.h battery.h \
button.h display.h audiohw.h dvbhw.h predicate.h powermanagement.h networking.h \
DESTINATION ${INCLUDE_INSTALL_DIR}/solid) +install( FILES solid_export.h device.h \
devicenotifier.h deviceinterface.h genericinterface.h processor.h block.h \
storagedrive.h opticaldrive.h storagevolume.h opticaldisc.h camera.h \
portablemediaplayer.h networkhw.h acadapter.h battery.h button.h audiohw.h dvbhw.h \
predicate.h powermanagement.h networking.h DESTINATION ${INCLUDE_INSTALL_DIR}/solid) \
########### parser build ###############
--- trunk/KDE/kdelibs/solid/solid/backends/fakehw/fakecomputer.xml #659827:659828
@@ -616,14 +616,4 @@
-
- <!-- TODO: Probably needs more work... -->
- <device udi="/org/kde/solid/fakehw/display0">
- <property key="name">Display #0</property>
- <property key="vendor">Acme Corporation</property>
- <property key="interfaces">Display</property>
- <property key="parent">/org/kde/solid/fakehw/computer</property>
- <property key="type">lcd</property>
- <property key="lcdBrightness">50</property>
- </device>
</machine>
--- trunk/KDE/kdelibs/solid/solid/backends/fakehw/fakedevice.cpp #659827:659828
@@ -32,7 +32,6 @@
#include "backends/fakehw/fakeacadapter.h"
#include "backends/fakehw/fakebattery.h"
#include "backends/fakehw/fakebutton.h"
-#include "backends/fakehw/fakedisplay.h"
#include "backends/fakehw/fakeaudiohw.h"
#include "backends/fakehw/fakedvbhw.h"
@@ -249,9 +248,6 @@
case Solid::DeviceInterface::Button:
iface = new FakeButton(this);
break;
- case Solid::DeviceInterface::Display:
- iface = new FakeDisplay(this);
- break;
case Solid::DeviceInterface::AudioHw:
iface = new FakeAudioHw(this);
break;
--- trunk/KDE/kdelibs/solid/solid/backends/hal/haldevice.cpp #659827:659828
@@ -41,7 +41,6 @@
#include "backends/hal/halacadapter.h"
#include "backends/hal/halbattery.h"
#include "backends/hal/halbutton.h"
-#include "backends/hal/haldisplay.h"
#include "backends/hal/halaudiohw.h"
#include "backends/hal/haldvbhw.h"
@@ -320,9 +319,6 @@
case Solid::DeviceInterface::Button:
iface = new Button(this);
break;
- case Solid::DeviceInterface::Display:
- iface = new Display(this);
- break;
case Solid::DeviceInterface::AudioHw:
iface = new AudioHw(this);
break;
--- trunk/KDE/kdelibs/solid/solid/backends/hal/haldeviceinterface.h #659827:659828
@@ -84,9 +84,6 @@
case Solid::DeviceInterface::Button:
list << "button";
break;
- case Solid::DeviceInterface::Display:
- list << "display_device";
- break;
case Solid::DeviceInterface::AudioHw:
list << "alsa" << "oss";
break;
@@ -126,8 +123,6 @@
return Solid::DeviceInterface::Battery;
else if (capability == "button")
return Solid::DeviceInterface::Button;
- else if (capability == "display_device")
- return Solid::DeviceInterface::Display;
else if (capability == "alsa" || capability == "oss")
return Solid::DeviceInterface::AudioHw;
else if (capability == "dvb")
--- trunk/KDE/kdelibs/solid/solid/device.cpp #659827:659828
@@ -53,8 +53,6 @@
#include <solid/ifaces/battery.h>
#include <solid/button.h>
#include <solid/ifaces/button.h>
-#include <solid/display.h>
-#include <solid/ifaces/display.h>
#include <solid/audiohw.h>
#include <solid/ifaces/audiohw.h>
#include <solid/dvbhw.h>
@@ -205,9 +203,6 @@
case DeviceInterface::Button:
iface = deviceinterface_cast<Ifaces::Button, Button>(dev_iface);
break;
- case DeviceInterface::Display:
- iface = deviceinterface_cast<Ifaces::Display, Display>(dev_iface);
- break;
case DeviceInterface::AudioHw:
iface = deviceinterface_cast<Ifaces::AudioHw, AudioHw>(dev_iface);
break;
--- trunk/KDE/kdelibs/solid/solid/deviceinterface.h #659827:659828
@@ -58,15 +58,13 @@
* - Camera : A digital camera
* - PortableMediaPlayer: A portable media player
* - NetworkHw: A network interface
- * - Display : A video display
*/
enum Type { Unknown = 0, GenericInterface = 1, Processor = 2,
Block = 3, StorageDrive = 4, OpticalDrive = 5,
StorageVolume = 6, OpticalDisc = 7,
Camera = 8, PortableMediaPlayer = 9,
NetworkHw = 10, AcAdapter = 11, Battery = 12,
- Button = 13, Display = 14, AudioHw = 15,
- DvbHw = 16 };
+ Button = 13, AudioHw = 14, DvbHw = 15 };
/**
* Destroys a DeviceInterface object.
--- trunk/KDE/kdelibs/solid/tests/solidhwtest.cpp #659827:659828
@@ -290,7 +290,6 @@
QTest::newRow("DeviceInterface: AcAdapter") << "AcAdapter" << \
(int)Solid::DeviceInterface::AcAdapter;
QTest::newRow("DeviceInterface: Battery") << "Battery" << \
(int)Solid::DeviceInterface::Battery;
QTest::newRow("DeviceInterface: Button") << "Button" << \
(int)Solid::DeviceInterface::Button;
- QTest::newRow("DeviceInterface: Display") << "Display" << \
(int)Solid::DeviceInterface::Display;
QTest::newRow("DeviceInterface: AudioHw") << "AudioHw" << \
(int)Solid::DeviceInterface::AudioHw; }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic