Git commit 18031aef84df4f975e53a1171a2d6a5048c9869a by Johannes Obermayr, o=
n behalf of Mark Davies.
Committed on 15/11/2014 at 03:35.
Pushed by jobermayr into branch '2.0'.

Import new NetBSD patches.

CCMAIL: markd@NetBSD.org

M  +1    -1    libk3b/jobs/k3bdatatrackreader.cpp
M  +4    -4    libk3b/tools/k3bcdparanoialib.cpp
M  +4    -4    libk3bdevice/k3bdevice.cpp
M  +3    -3    libk3bdevice/k3bdevicemanager.cpp

http://commits.kde.org/k3b/18031aef84df4f975e53a1171a2d6a5048c9869a

diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackr=
eader.cpp
index 7f96f6f..c09abfb 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -256,7 +256,7 @@ bool K3b::DataTrackReader::run()
     //
     d->device->setSpeed( 0xffff, 0xffff );
 =

-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
     s_bufferSizeSectors =3D 31;
 #else
     s_bufferSizeSectors =3D 128;
diff --git a/libk3b/tools/k3bcdparanoialib.cpp b/libk3b/tools/k3bcdparanoia=
lib.cpp
index e8d05d5..8876e1d 100644
--- a/libk3b/tools/k3bcdparanoialib.cpp
+++ b/libk3b/tools/k3bcdparanoialib.cpp
@@ -68,7 +68,7 @@ typedef short int int16_t;
 #define LIBCDIO_CDDA "cdio_cdda.dll"
 #define LIBCDIO_PARANOIA "cdio_paranoia.dll"
 #else
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
 #define CDDA_LIBCDDA_INTERFACE "cdda/libcdda_interace.so"
 #define CDDA_LIBCDDA_PARANOIA "cdda/libcdda_paranoia.so"
 #define LIBCDDA_INTERFACE "libcdda_interface.so"
@@ -555,7 +555,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::create()
 =

 #ifndef Q_OS_WIN32
         if( !s_libInterface ) {
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
             s_libInterface =3D dlopen( LIBCDIO_CDDA_1, RTLD_NOW|RTLD_GLOBA=
L );
             if( !s_libInterface ) {
                 s_libInterface =3D dlopen( LIBCDIO_CDDA_0, RTLD_NOW|RTLD_G=
LOBAL );
@@ -566,7 +566,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::create()
                     // try the redhat & Co. location
                     if( !s_libInterface )
                         s_libInterface =3D dlopen( CDDA_LIBCDDA_INTERFACE,=
 RTLD_NOW|RTLD_GLOBAL );
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
                 }
             }
 #endif
@@ -581,7 +581,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::create()
 #ifndef Q_OS_WIN32
         if( s_haveLibCdio ) {
             s_libParanoia =3D dlopen( LIBCDIO_PARANOIA, RTLD_NOW );
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
             if( !s_libParanoia ) {
                 s_libParanoia =3D dlopen( LIBCDIO_PARANOIA_1, RTLD_NOW );
                 if( !s_libParanoia )
diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp
index 09b1a62..d37edbf 100644
--- a/libk3bdevice/k3bdevice.cpp
+++ b/libk3bdevice/k3bdevice.cpp
@@ -35,7 +35,7 @@
 #include <Solid/OpticalDrive>
 #include <Solid/Block>
 #include <Solid/StorageAccess>
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
 #include <Solid/GenericInterface>
 #endif
 =

@@ -245,12 +245,12 @@ K3b::Device::Device::Handle K3b::Device::openDevice( =
const char* name, bool writ
 =

 K3b::Device::Device::Device( const Solid::Device& dev )
 {
-#ifdef __NETBSD__
-    const Solid::GenericInterace *gi =3D dev.as<Solid::GenericInterface>();
+#ifdef Q_OS_NETBSD
+    const Solid::GenericInterface *gi =3D dev.as<Solid::GenericInterface>(=
);
 #endif
     d =3D new Private;
     d->solidDevice =3D dev;
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
     d->blockDevice =3D dev.as<Solid::Block>()->device();
 #else
     if (gi->propertyExists("block.netbsd.raw_device"))
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemana=
ger.cpp
index dc84df6..0515aa3 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -39,7 +39,7 @@
 #include <Solid/OpticalDrive>
 #include <Solid/Block>
 #include <Solid/Device>
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
 #include <Solid/GenericInterface>
 #endif
 =

@@ -359,10 +359,10 @@ bool K3b::Device::DeviceManager::saveConfig( KConfigG=
roup c )
 K3b::Device::Device* K3b::Device::DeviceManager::addDevice( const Solid::D=
evice& solidDevice )
 {
     if( const Solid::Block* blockDevice =3D solidDevice.as<Solid::Block>()=
 ) {
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
         if( !findDevice( blockDevice->device() ) )
 #else
-        if( !findDevice( solidDevice.as<Solid::GenericInterface>()->proper=
tyExists("block.netbsd.raw_device") ? solidDevice.as<Solid::GenericInterfac=
e>()->property("block.netbsd.raw_device").toString() : blockDevice->device(=
) ) );
+        if( !findDevice( solidDevice.as<Solid::GenericInterface>()->proper=
tyExists("block.netbsd.raw_device") ? solidDevice.as<Solid::GenericInterfac=
e>()->property("block.netbsd.raw_device").toString() : blockDevice->device(=
) ) )
 #endif
             return addDevice( new K3b::Device::Device( solidDevice ) );
         else