Ticket #6426: libs_libmythupnp-krazy2-explicit-ctor.patch

File libs_libmythupnp-krazy2-explicit-ctor.patch, 3.5 KB (added by Erik Hovland <erik@…>, 17 years ago)

use explicit on ctors

  • mythtv/libs/libmythupnp/bufferedsocketdevice.h 

    Four different classes have ctors that could use explicit

From: Erik Hovland <erik@hovland.org>

Since the classes StateVariablesBase, MythXMLClient, Property and
CDSObject all use default arguments for some of their ctor
parameters. This means that is possible for the compiler to produce
implicit calls to these ctors w/out their being code for them. By
putting explicit there the compiler knows not to implicitly use
these ctors.
---

 mythtv/libs/libmythupnp/bufferedsocketdevice.h |    4 ++--
 mythtv/libs/libmythupnp/eventing.h             |    2 +-
 mythtv/libs/libmythupnp/mythxmlclient.h        |    2 +-
 mythtv/libs/libmythupnp/upnpcdsobjects.h       |   10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)


diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.h b/mythtv/libs/libmythupnp/bufferedsocketdevice.h
index 0fda701..4475916 100644
    a b class BufferedSocketDevice  
    7070    public:
    7171
    7272        BufferedSocketDevice( int nSocket );
    73         BufferedSocketDevice( MSocketDevice *pSocket = NULL,
    74                               bool    bTakeOwnership = false );
     73        explicit BufferedSocketDevice( MSocketDevice *pSocket = NULL,
     74                                       bool bTakeOwnership    = false );
    7575
    7676        virtual ~BufferedSocketDevice( );
    7777

  • mythtv/libs/libmythupnp/eventing.h 

    diff --git a/mythtv/libs/libmythupnp/eventing.h b/mythtv/libs/libmythupnp/eventing.h
index 0385cda..db7fe8e 100644
    a b class StateVariableBase  
    114114
    115115    public:
    116116
    117         StateVariableBase( const QString &sName, bool bNotify = false )
     117        explicit StateVariableBase( const QString &sName, bool bNotify = false )
    118118        {
    119119            m_bNotify = bNotify;
    120120            m_sName   = sName;

  • mythtv/libs/libmythupnp/mythxmlclient.h 

    diff --git a/mythtv/libs/libmythupnp/mythxmlclient.h b/mythtv/libs/libmythupnp/mythxmlclient.h
index 62b0e3f..a27a33e 100644
    a b class MythXMLClient : public SOAPClient  
    4949
    5050    public:
    5151
    52                 MythXMLClient( const QUrl &url, bool bInQtThread = true );
     52        explicit MythXMLClient( const QUrl &url, bool bInQtThread = true );
    5353        virtual ~MythXMLClient( );
    5454       
    5555        UPnPResultCode GetConnectionInfo( const QString &sPin, DatabaseParams *pParams, QString &sMsg );

  • mythtv/libs/libmythupnp/upnpcdsobjects.h 

    diff --git a/mythtv/libs/libmythupnp/upnpcdsobjects.h b/mythtv/libs/libmythupnp/upnpcdsobjects.h
index a035c70..2daa63e 100644
    a b class Property  
    6060
    6161    public:
    6262
    63         Property( const QString &sName,
    64                   const QString &sNameSpace = "",
    65                   bool           bRequired  = false,
    66                   const QString &sValue     = "" )
     63        explicit Property( const QString &sName,
     64                           const QString &sNameSpace = "",
     65                           bool           bRequired  = false,
     66                           const QString &sValue     = "" )
    6767        {
    6868            m_sName      = sName;
    6969            m_sNameSpace = sNameSpace;
    … … class CDSObject  
    173173
    174174    public:
    175175
    176                       CDSObject( const QString sId = "-1",
     176        explicit      CDSObject( const QString sId = "-1",
    177177                                 const QString sTitle = "",
    178178                                 const QString sParentId = "-1" );
    179179        virtual      ~CDSObject();