SVN commit 659862 by ervin:

Port the *Hw rename to *Interface.


 M  +3 -3      soliddatacollector/steps/stepcomment.cpp  
 M  +29 -50    solidhardwarebrowser/devicetabwidget.cpp  
 M  +4 -5      solidhardwarebrowser/devicetabwidget.h  
 M  +3 -3      solidhardwarebrowser/solidhardwarebrowser.cpp  


--- branches/work/kdehw/apps/soliddatacollector/steps/stepcomment.cpp #659861:659862
@@ -64,13 +64,13 @@
                 << "OpticalDisc" 
                 << "Camera"
                 << "PortableMediaPlayer"
-                << "NetworkHw"
+                << "NetworkInterface"
                 << "AcAdapter"
                 << "Battery"
                 << "Button"
                 << "Display"
-                << "AudioHw"
-                << "DvbHw";
+                << "AudioInterface"
+                << "DvbInterface";
     QString predicate = QString("[ IS %1").arg(capabilities.join(" OR [ IS "));
     predicate = predicate.remove(predicate.lastIndexOf('['), 1);
     for( int i = 1; i < capabilities.size(); i++ ) {
--- branches/work/kdehw/apps/solidhardwarebrowser/devicetabwidget.cpp #659861:659862
@@ -24,14 +24,13 @@
 #include <solid/genericinterface.h>
 #include <solid/device.h>
 #include <solid/acadapter.h>
-#include <solid/audiohw.h>
+#include <solid/audiointerface.h>
 #include <solid/battery.h>
 #include <solid/block.h>
 #include <solid/button.h>
 #include <solid/camera.h>
 #include <solid/opticaldrive.h>
-#include <solid/display.h>
-#include <solid/networkhw.h>
+#include <solid/networkinterface.h>
 #include <solid/opticaldisc.h>
 #include <solid/portablemediaplayer.h>
 #include <solid/processor.h>
@@ -172,9 +171,9 @@
         items << i18n( "PortableMediaPlayer" );
         addPortableMediaPlayerTab(d->device.as<PortableMediaPlayer>());
     }
-    if (d->device.queryDeviceInterface(DeviceInterface::NetworkHw)) {
-        items << i18n( "NetworkHw" );
-        addNetworkHwTab(d->device.as<NetworkHw>());
+    if (d->device.queryDeviceInterface(DeviceInterface::NetworkInterface)) {
+        items << i18n( "NetworkInterface" );
+        addNetworkInterfaceTab(d->device.as<NetworkInterface>());
     }
     if (d->device.queryDeviceInterface(DeviceInterface::AcAdapter)) {
         items << i18n( "AcAdapter" );
@@ -188,14 +187,10 @@
         items << i18n( "Button" );
         addButtonTab(d->device.as<Button>());
     }
-    if (d->device.queryDeviceInterface(DeviceInterface::Display)) {
-        items << i18n( "Display" );
-        addDisplayTab(d->device.as<Solid::Display>());
+    if (d->device.queryDeviceInterface(DeviceInterface::AudioInterface)) {
+        items << i18n( "AudioInterface" );
+        addAudioInterfaceTab(d->device.as<Solid::AudioInterface>());
     }
-    if (d->device.queryDeviceInterface(DeviceInterface::AudioHw)) {
-        items << i18n( "AudioHw" );
-        addAudioHwTab(d->device.as<Solid::AudioHw>());
-    }
     return items;
 }
 
@@ -376,14 +371,14 @@
     d->view->tabWidget->addTab( d->view->tabPortableMediaPlayer, i18n("Portable media player ") );
 }
 
-void DeviceTabWidget::addNetworkHwTab(const NetworkHw *networkHw)
+void DeviceTabWidget::addNetworkInterfaceTab(const NetworkInterface *networkHw)
 {
     d->view->lblIfaceName->setText( networkHw->ifaceName() );
     d->view->cbIsWireless->setChecked( networkHw->isWireless() );
     d->view->lblHwAddress->setText( networkHw->hwAddress() );
     d->view->lblMacAddress->setText( QString("%1").arg(networkHw->macAddress()) );
 
-    d->view->tabWidget->addTab( d->view->tabNetworkHw, i18n("Network Hw ") );
+    d->view->tabWidget->addTab( d->view->tabNetworkHw, i18n("Network Interface ") );
 }
 
 void DeviceTabWidget::addAcAdapterTab(const AcAdapter *acAdapter)
@@ -456,49 +451,33 @@
     d->view->tabWidget->addTab( d->view->tabButton, i18n("Button ") );
 }
 
-void DeviceTabWidget::addDisplayTab(const Solid::Display *display)
+void DeviceTabWidget::addAudioInterfaceTab(Solid::AudioInterface *audioHw)
 {
-    QMap<Solid::Display::DisplayType, QString> displayTypes;
-    displayTypes[Solid::Display::Lcd] = i18n("lcd");
-    displayTypes[Solid::Display::Crt] = i18n("crt");
-    displayTypes[Solid::Display::TvOut] = i18n("tv out");
-    displayTypes[Solid::Display::UnknownDisplayType] = i18n("unknown display type");
+    QMap<AudioInterface::AudioDriver, QString> audioDrivers;
+    audioDrivers[AudioInterface::Alsa] = i18n("alsa");
+    audioDrivers[AudioInterface::OpenSoundSystem] = i18n("oss");
+    audioDrivers[AudioInterface::UnknownAudioDriver] = i18n("unknown audio driver");
 
-    d->view->lblDisplayType->setText( displayTypes[display->type()] );
-    if (display->type()==Solid::Display::Lcd) {
-        d->view->lblLcdBrightness->setText( QString("%1%").arg(display->lcdBrightness()) );
-    } else d->view->lblLcdBrightness->setText( QString("unavailable") );
+    QMap<AudioInterface::AudioInterfaceType, QString> audioHwTypes;
+    audioHwTypes[AudioInterface::UnknownAudioInterfaceType] = i18n("unknown audio type");
+    audioHwTypes[AudioInterface::AudioControl] = i18n("audio control/mixer interface");
+    audioHwTypes[AudioInterface::AudioInput] = i18n("audio source");
+    audioHwTypes[AudioInterface::AudioOutput] = i18n("audio sink");
 
-    d->view->tabWidget->addTab( d->view->tabDisplay, i18n("Display ") );
-}
+    QMap<AudioInterface::SoundcardType, QString> soundcardTypes;
+    soundcardTypes[AudioInterface::InternalSoundcard] = i18n("internal soundcard (onboard or PCI card)");
+    soundcardTypes[AudioInterface::UsbSoundcard] = i18n("external USB soundcard");
+    soundcardTypes[AudioInterface::FirewireSoundcard] = i18n("external Firewire soundcard");
+    soundcardTypes[AudioInterface::Headset] = i18n("headset");
+    soundcardTypes[AudioInterface::Modem] = i18n("modem device");
 
-void DeviceTabWidget::addAudioHwTab(Solid::AudioHw *audioHw)
-{
-    QMap<AudioHw::AudioDriver, QString> audioDrivers;
-    audioDrivers[AudioHw::Alsa] = i18n("alsa");
-    audioDrivers[AudioHw::OpenSoundSystem] = i18n("oss");
-    audioDrivers[AudioHw::UnknownAudioDriver] = i18n("unknown audio driver");
-
-    QMap<AudioHw::AudioHwType, QString> audioHwTypes;
-    audioHwTypes[AudioHw::UnknownAudioHwType] = i18n("unknown audio type");
-    audioHwTypes[AudioHw::AudioControl] = i18n("audio control/mixer interface");
-    audioHwTypes[AudioHw::AudioInput] = i18n("audio source");
-    audioHwTypes[AudioHw::AudioOutput] = i18n("audio sink");
-
-    QMap<AudioHw::SoundcardType, QString> soundcardTypes;
-    soundcardTypes[AudioHw::InternalSoundcard] = i18n("internal soundcard (onboard or PCI card)");
-    soundcardTypes[AudioHw::UsbSoundcard] = i18n("external USB soundcard");
-    soundcardTypes[AudioHw::FirewireSoundcard] = i18n("external Firewire soundcard");
-    soundcardTypes[AudioHw::Headset] = i18n("headset");
-    soundcardTypes[AudioHw::Modem] = i18n("modem device");
-
     d->view->lblAudioDriver->setText( audioDrivers[audioHw->driver()] );
     d->view->lblDriverHandles->setText( audioHw->driverHandles().join(", ") );
     d->view->lblAudioHwName->setText( audioHw->name() );
 
     QStringList deviceTypes;
-    AudioHw::AudioHwTypes supportedTypes = audioHw->deviceType();
-    foreach( AudioHw::AudioHwType type, audioHwTypes.keys() ) {
+    AudioInterface::AudioInterfaceTypes supportedTypes = audioHw->deviceType();
+    foreach( AudioInterface::AudioInterfaceType type, audioHwTypes.keys() ) {
         if (supportedTypes.testFlag(type)) {
             deviceTypes << audioHwTypes[type];
         }
@@ -507,7 +486,7 @@
 
     d->view->lblSoundcardType->setText( soundcardTypes[audioHw->soundcardType()] );
 
-    d->view->tabWidget->addTab( d->view->tabAudioHw, i18n("Audio hardware ") );
+    d->view->tabWidget->addTab( d->view->tabAudioHw, i18n("Audio interface ") );
 }
 
 void DeviceTabWidget::showDevice(const Device &device)
--- branches/work/kdehw/apps/solidhardwarebrowser/devicetabwidget.h #659861:659862
@@ -31,12 +31,12 @@
     class OpticalDisc;
     class Camera;
     class PortableMediaPlayer;
-    class NetworkHw;
+    class NetworkInterface;
     class AcAdapter;
     class Battery;
     class Button;
     class Display;
-    class AudioHw;
+    class AudioInterface;
 }
 
 class QModelIndex;
@@ -78,12 +78,11 @@
     void addOpticalDiscTab(const Solid::OpticalDisc *opticalDisc);
     void addCameraTab(const Solid::Camera *camera);
     void addPortableMediaPlayerTab(const Solid::PortableMediaPlayer *portableMediaPlayer);
-    void addNetworkHwTab(const Solid::NetworkHw *networkHw);
+    void addNetworkInterfaceTab(const Solid::NetworkInterface *networkHw);
     void addAcAdapterTab(const Solid::AcAdapter *acAdapter);
     void addBatteryTab(const Solid::Battery *battery);
     void addButtonTab(const Solid::Button *button);
-    void addDisplayTab(const Solid::Display *display);
-    void addAudioHwTab(Solid::AudioHw *audioHw);
+    void addAudioInterfaceTab(Solid::AudioInterface *audioHw);
 
     /**
      * @brief Return the product name of the device.
--- branches/work/kdehw/apps/solidhardwarebrowser/solidhardwarebrowser.cpp #659861:659862
@@ -65,13 +65,13 @@
                 << "OpticalDisc"
                 << "Camera"
                 << "PortableMediaPlayer"
-                << "NetworkHw"
+                << "NetworkInterface"
                 << "AcAdapter"
                 << "Battery"
                 << "Button"
                 << "Display"
-                << "AudioHw"
-                << "DvbHw";
+                << "AudioInterface"
+                << "DvbInterface";
     QString predicate = QString("[ IS %1").arg(capabilities.join(" OR [ IS "));
     predicate = predicate.remove(predicate.lastIndexOf('['), 1);
     for( int i = 1; i < capabilities.size(); i++ ) predicate += " ]";