head	1.4;
access;
symbols
	pkgsrc-2013Q3:1.3.0.4
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.2
	pkgsrc-2013Q2-base:1.3;
locks; strict;
comment	@// @;


1.4
date	2013.11.07.12.49.19;	author markd;	state dead;
branches;
next	1.3;
commitid	ZIyNaDNidnPxrlcx;

1.3
date	2013.05.23.15.06.48;	author joerg;	state Exp;
branches;
next	1.2;
commitid	Ukz6XPq2k2asBLQw;

1.2
date	2013.05.21.12.06.58;	author markd;	state dead;
branches;
next	1.1;
commitid	jbVZ5PChd9LGFuQw;

1.1
date	2013.05.06.14.54.57;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to KDE SC 4.11.3

bugfixes, many new features, improved stability and performance.
@
text
@$NetBSD: patch-gui_viewdockareapopup.cpp,v 1.3 2013/05/23 15:06:48 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 && 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 )
 		{
 			kDebug() << "ADD? mixerId=" << mixer->id() << ", md=" << dockMD->id();
 			if ( !dockMD->isApplicationStream() && dockMD->playbackVolume().hasVolume())
@


1.3
log
@Use bool conversion operator to check for defined. More compatible
version of the original nullptr fix.
@
text
@d1 1
a1 1
$NetBSD: patch-gui_viewdockareapopup.cpp,v 1.1 2013/05/06 14:54:57 joerg Exp $
@


1.2
log
@Backout nullptr patches - g++ doesn't have support until 4.6.
@
text
@d10 1
a10 1
+		if ( dockMD == nullptr && mixer->size() > 0 )
d16 1
a16 1
+		if ( dockMD != nullptr )
@


1.1
log
@Use nullptr, 0 is ambigious. Prefer C++11 interfaces over tr1.
@
text
@d1 1
a1 1
$NetBSD$
@