Use nullptr, 0 is ambigious. Prefer C++11 interfaces over tr1.

10 files changed, 162 insertions, 1 deletions

diff --git a/multimedia/kmix/distinfo b/multimedia/kmix/distinfo
index 85203ad2b68..aaf17bd9a60 100644
--- a/multimedia/kmix/distinfo
+++ b/multimedia/kmix/distinfo
@@ -1,7 +1,16 @@
-$NetBSD: distinfo,v 1.1 2013/04/03 11:13:10 markd Exp $
+$NetBSD: distinfo,v 1.2 2013/05/06 14:54:57 joerg Exp $
 
 SHA1 (kmix-4.10.2.tar.xz) = 26617eeac172e3375cd097c8350ebdb32412e9fa
 RMD160 (kmix-4.10.2.tar.xz) = a09bcba9375863b42cd415a7e9ece2f60b4cb425
 Size (kmix-4.10.2.tar.xz) = 385736 bytes
 SHA1 (patch-CMakeLists.txt) = be774815cf3c8ae99f6bae31d5de010f37a6ef29
+SHA1 (patch-apps_kmixd.cpp) = c43b33328d398ce47ae6c9d0803af7ed10dcdd1e
+SHA1 (patch-backends_mixer__backend.cpp) = d5c24ee2d7d2154df22a4ed203625b36d7e41eb9
+SHA1 (patch-backends_mixer__mpris2.cpp) = 64d7a988d5ded5651aad2208f421e35b0ca1aa79
+SHA1 (patch-core_ControlPool.h) = fba837f300478e015941fa5aa7355372b294bb38
+SHA1 (patch-core_MasterControl.h) = ab348a5ffc440650c9f1fd529335f87e5c81ed12
+SHA1 (patch-core_mixdevice.h) = 75dd0c84517ec0e8fe647a2b8e84370b1e8afea9
+SHA1 (patch-core_mixertoolbox.cpp) = c2559b56b998c78e8f25c667c8c91a180a90622f
+SHA1 (patch-gui_kmixdockwidget.cpp) = 756358740a958c49b6c94432dece885822b6fd25
+SHA1 (patch-gui_viewdockareapopup.cpp) = cd36f687336cabdecb9387b88be989f8b3ed553b
 SHA1 (patch-tests_CMakeLists.txt) = 4c39d6268e6c690099d06a8ba6946cb90242791e
diff --git a/multimedia/kmix/patches/patch-apps_kmixd.cpp b/multimedia/kmix/patches/patch-apps_kmixd.cpp
new file mode 100644
index 00000000000..7cac242b139
--- /dev/null
+++ b/multimedia/kmix/patches/patch-apps_kmixd.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-apps_kmixd.cpp,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- apps/kmixd.cpp.orig	2013-05-04 01:50:10.000000000 +0000
++++ apps/kmixd.cpp
+@@ -156,7 +156,7 @@ void KMixD::saveBaseConfig()
+       config.writeEntry( "MasterMixer", mixerMasterCard->id() );
+    }
+    shared_ptr<MixDevice> mdMaster = Mixer::getGlobalMasterMD();
+-   if ( mdMaster != 0 ) {
++   if ( mdMaster != nullptr ) {
+       config.writeEntry( "MasterMixerDevice", mdMaster->id() );
+    }
+    QString mixerIgnoreExpression = MixerToolBox::instance()->mixerIgnoreExpression();
diff --git a/multimedia/kmix/patches/patch-backends_mixer__backend.cpp b/multimedia/kmix/patches/patch-backends_mixer__backend.cpp
new file mode 100644
index 00000000000..55b90f55dcd
--- /dev/null
+++ b/multimedia/kmix/patches/patch-backends_mixer__backend.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-backends_mixer__backend.cpp,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- backends/mixer_backend.cpp.orig	2013-05-04 01:47:44.000000000 +0000
++++ backends/mixer_backend.cpp
+@@ -237,7 +237,7 @@ void Mixer_Backend::readSetFromHW()
+  */
+ shared_ptr<MixDevice> Mixer_Backend::recommendedMaster()
+ {
+-	if ( m_recommendedMaster != 0 )
++	if ( m_recommendedMaster != nullptr )
+ 	{
+ 		// Backend has set a recommended master. Thats fine. Using it.
+ 		return m_recommendedMaster;
diff --git a/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp b/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp
new file mode 100644
index 00000000000..a9f7418e05c
--- /dev/null
+++ b/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-backends_mixer__mpris2.cpp,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- backends/mixer_mpris2.cpp.orig	2013-05-04 01:48:09.000000000 +0000
++++ backends/mixer_mpris2.cpp
+@@ -394,7 +394,7 @@ void Mixer_MPRIS2::newMediaPlayer(QStrin
+ 			QString id = ( lastDot == -1 ) ? name : name.mid(lastDot+1);
+ 			apps.remove(id);
+ 			shared_ptr<MixDevice> md = m_mixDevices.get(id);
+-			if (md != 0)
++			if (md != nullptr)
+ 			{
+ 				// We know about the player that is unregistering => remove internally
+ 				md->close();
diff --git a/multimedia/kmix/patches/patch-core_ControlPool.h b/multimedia/kmix/patches/patch-core_ControlPool.h
new file mode 100644
index 00000000000..d6ae865864e
--- /dev/null
+++ b/multimedia/kmix/patches/patch-core_ControlPool.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-core_ControlPool.h,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- core/ControlPool.h.orig	2013-05-04 01:52:19.000000000 +0000
++++ core/ControlPool.h
+@@ -25,9 +25,12 @@
+ 
+ // std::shared_ptr
+ #include <memory>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
+-
+ using namespace ::std::tr1;
++#endif
+ 
+ #include "core/mixdevice.h"
+ 
diff --git a/multimedia/kmix/patches/patch-core_MasterControl.h b/multimedia/kmix/patches/patch-core_MasterControl.h
new file mode 100644
index 00000000000..2df03742f0a
--- /dev/null
+++ b/multimedia/kmix/patches/patch-core_MasterControl.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-core_MasterControl.h,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- core/MasterControl.h.orig	2013-05-04 01:44:08.000000000 +0000
++++ core/MasterControl.h
+@@ -12,8 +12,12 @@
+ 
+ // std::shared_ptr
+ #include <memory>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
+ using namespace ::std::tr1;
++#endif
+ 
+ class MasterControl
+ {
diff --git a/multimedia/kmix/patches/patch-core_mixdevice.h b/multimedia/kmix/patches/patch-core_mixdevice.h
new file mode 100644
index 00000000000..e5ebb5dce5e
--- /dev/null
+++ b/multimedia/kmix/patches/patch-core_mixdevice.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-core_mixdevice.h,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- core/mixdevice.h.orig	2013-05-04 01:42:48.000000000 +0000
++++ core/mixdevice.h
+@@ -23,8 +23,12 @@
+ 
+ // std::shared_ptr
+ #include <memory>
++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
++using std::shared_ptr;
++#else
+ #include <tr1/memory>
+ using namespace ::std::tr1;
++#endif
+ 
+ //KMix
+ class Mixer;
diff --git a/multimedia/kmix/patches/patch-core_mixertoolbox.cpp b/multimedia/kmix/patches/patch-core_mixertoolbox.cpp
new file mode 100644
index 00000000000..51c7b50cb7e
--- /dev/null
+++ b/multimedia/kmix/patches/patch-core_mixertoolbox.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-core_mixertoolbox.cpp,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- core/mixertoolbox.cpp.orig	2013-05-04 01:52:48.000000000 +0000
++++ core/mixertoolbox.cpp
+@@ -249,13 +249,13 @@ void MixerToolBox::initMixerInternal(Mul
+ 
+    
+     // Add a master device (if we haven't defined one yet)
+-   if ( Mixer::getGlobalMasterMD(false) == 0 ) {
++   if ( Mixer::getGlobalMasterMD(false) == nullptr ) {
+       // We have no master card yet. This actually only happens when there was
+       // not one defined in the kmixrc.
+       // So lets just set the first card as master card.
+       if ( Mixer::mixers().count() > 0 ) {
+     	  shared_ptr<MixDevice> master = Mixer::mixers().first()->getLocalMasterMD();
+-         if ( master != 0 ) {
++         if ( master != nullptr ) {
+              QString controlId = master->id();
+              Mixer::setGlobalMaster( Mixer::mixers().first()->id(), controlId, true);
+          }
diff --git a/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp b/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp
new file mode 100644
index 00000000000..c11b0500645
--- /dev/null
+++ b/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-gui_kmixdockwidget.cpp,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- gui/kmixdockwidget.cpp.orig	2013-05-04 01:54:44.000000000 +0000
++++ gui/kmixdockwidget.cpp
+@@ -217,7 +217,7 @@ void KMixDockWidget::updatePixmap()
+ 	shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD();
+ 
+     char newPixmapType;
+-    if ( md == 0 )
++    if ( md == nullptr )
+     {
+         newPixmapType = 'e';
+     }
+@@ -407,7 +407,7 @@ void KMixDockWidget::contextMenuAboutToS
+ void KMixDockWidget::updateDockMuteAction ( KToggleAction* dockMuteAction )
+ {  
+     shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD();
+-    if ( md != 0 && dockMuteAction != 0 )
++    if ( md != nullptr && dockMuteAction != 0 )
+     {
+     	Volume& vol = md->playbackVolume().hasVolume() ? md->playbackVolume() : md->captureVolume();
+     	bool isInactive =  vol.isCapture() ? !md->isRecSource() : md->isMuted();
diff --git a/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp b/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp
new file mode 100644
index 00000000000..406dacaaba0
--- /dev/null
+++ b/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-gui_viewdockareapopup.cpp,v 1.1 2013/05/06 14:54:57 joerg Exp $
+
+--- gui/viewdockareapopup.cpp.orig	2013-05-04 01:56:15.000000000 +0000
++++ gui/viewdockareapopup.cpp
+@@ -244,12 +244,12 @@ Application: KMix (kmix), signal: Segmen
+ 	{
+ 		kDebug() << "ADD? mixerId=" << mixer->id();
+ 		shared_ptr<MixDevice>dockMD = mixer->getLocalMasterMD();
+-		if ( dockMD == 0 && mixer->size() > 0 )
++		if ( dockMD == nullptr && mixer->size() > 0 )
+ 		{
+ 			// If we have no dock device yet, we will take the first available mixer device.
+ 			dockMD = (*mixer)[0];
+ 		}
+-		if ( dockMD != 0 )
++		if ( dockMD != nullptr )
+ 		{
+ 			kDebug() << "ADD? mixerId=" << mixer->id() << ", md=" << dockMD->id();
+ 			if ( !dockMD->isApplicationStream() && dockMD->playbackVolume().hasVolume())