Ticket #5781: libs_libmythupnp-krazy2-TRUE-FALSE.patch

mythtv/libs/libmythupnp/bufferedsocketdevice.cpp

@@ -214 +214 @@
 bool BufferedSocketDevice::ConsumeWriteBuf( qulonglong nbytes )
 {
     if ( !nbytes || ((qlonglong)nbytes > m_nWriteSize) )
-        return FALSE;
+        return false;
 
     m_nWriteSize -= nbytes;
 
@@ -240 +240 @@
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -253 +253 @@
     if ((m_pSocket == NULL) || !m_pSocket->isValid())
         return;
 
-    bool osBufferFull = FALSE;
+    bool osBufferFull = false;
     int  consumed     = 0;
 
     while ( !osBufferFull && ( m_nWriteSize > 0 ) && m_pSocket->isValid())
@@ -306 +306 @@
         }
 
         if ( nwritten < i )
-            osBufferFull = TRUE;
+            osBufferFull = true;
     }
 }
 
@@ -338 +338 @@
     ReadBytes();
 
     if ( index > m_bufRead.size() )
-        return FALSE;
+        return false;
 
     // throw away data 0..index-1
     m_bufRead.consumeBytes( (qulonglong)index, 0 );
 
-    return TRUE;
+    return true;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -353 +353 @@
 bool BufferedSocketDevice::AtEnd()
 {
     if ( !m_pSocket->isValid() )
-        return TRUE;
+        return true;
 
     ReadBytes();
 
@@ -590 +590 @@
     ReadBytes();
 
     if (( BytesAvailable() > 0 ) && m_bufRead.scanNewline( 0 ) )
-        return TRUE;
+        return true;
 
-    return FALSE;
+    return false;
 }
                                
 /////////////////////////////////////////////////////////////////////////////

mythtv/libs/libmythupnp/configuration.cpp

@@ -210 +210 @@
 void XmlConfiguration::SetValue( const QString &sSetting, int nValue ) 
 {
     QString  sValue = QString::number( nValue );
-    QDomNode node   = FindNode( sSetting, TRUE );
+    QDomNode node   = FindNode( sSetting, true );
 
     if (!node.isNull())
     {
@@ -236 +236 @@
 
 void XmlConfiguration::SetValue( const QString &sSetting, QString sValue ) 
 {
-    QDomNode node   = FindNode( sSetting, TRUE );
+    QDomNode node   = FindNode( sSetting, true );
 
     if (!node.isNull())
     {

mythtv/libs/libmythupnp/configuration.h

@@ -52 +52 @@
         QDomDocument m_config;
         QDomNode     m_rootNode;
 
-        QDomNode FindNode( const QString &sName, bool bCreate = FALSE );
-        QDomNode FindNode( QStringList &sParts, QDomNode &curNode, bool bCreate = FALSE );
+        QDomNode FindNode( const QString &sName, bool bCreate = false );
+        QDomNode FindNode( QStringList &sParts, QDomNode &curNode, bool bCreate = false );
 
     public:
 

mythtv/libs/libmythupnp/eventing.h

@@ -101 +101 @@
 
     public:
 
-        StateVariableBase( const QString &sName, bool bNotify = FALSE ) 
+        StateVariableBase( const QString &sName, bool bNotify = false ) 
         {
             m_bNotify = bNotify;
             m_sName   = sName;
@@ -124 +124 @@
 
         // ------------------------------------------------------------------
 
-        StateVariable( const QString &sName, bool bNotify = FALSE )
+        StateVariable( const QString &sName, bool bNotify = false )
             : StateVariableBase( sName, bNotify ), m_value( T( ) )
         {
         }
 
         // ------------------------------------------------------------------
 
-        StateVariable( const QString &sName, T value, bool bNotify = FALSE )
+        StateVariable( const QString &sName, T value, bool bNotify = false )
             : StateVariableBase( sName, bNotify ), m_value(value)
         {
         }

mythtv/libs/libmythupnp/threadpool.cpp

@@ -27 +27 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-CEvent::CEvent( bool bInitiallyOwn /*= FALSE */ ) 
+CEvent::CEvent( bool bInitiallyOwn /*= false */ ) 
 {
     m_bSignaled = bInitiallyOwn;
 }

mythtv/libs/libmythupnp/threadpool.h

@@ -39 +39 @@
 
     public:
 
-                  CEvent( bool bInitiallyOwn = FALSE );
+                  CEvent( bool bInitiallyOwn = false );
          virtual ~CEvent();
 
         bool      SetEvent    ();

mythtv/libs/libmythupnp/upnp.h

@@ -137 +137 @@
         static SSDPCacheEntries *Find( const QString &sURI );
         static DeviceLocation   *Find( const QString &sURI, const QString &sUSN );
 
-        static UPnpDeviceDesc *GetDeviceDesc( QString &sURL, bool bInQtThread = TRUE);
+        static UPnpDeviceDesc *GetDeviceDesc( QString &sURL, bool bInQtThread = true);
 
         static QString         GetResultDesc( UPnPResultCode eCode );
         static void            FormatErrorResponse( HTTPRequest   *pRequest, 

mythtv/libs/libmythupnp/upnpdevice.h

@@ -181 +181 @@
         UPnpDevice *FindDevice( const QString &sURI );
 
         static UPnpDevice     *FindDevice( UPnpDevice *pDevice, const QString &sURI );
-        static UPnpDeviceDesc *Retrieve  ( QString &sURL, bool bInQtThread = TRUE   );
+        static UPnpDeviceDesc *Retrieve  ( QString &sURL, bool bInQtThread = true   );
 
 };
 
@@ -249 +249 @@
 
         // ==================================================================
 
-        UPnpDeviceDesc *GetDeviceDesc( bool bInQtThread = TRUE )
+        UPnpDeviceDesc *GetDeviceDesc( bool bInQtThread = true )
         {
             if (m_pDeviceDesc == NULL)
                 m_pDeviceDesc = UPnpDeviceDesc::Retrieve( m_sLocation, bInQtThread );
@@ -259 +259 @@
 
         // ==================================================================
 
-        QString GetFriendlyName( bool bInQtThread = TRUE )
+        QString GetFriendlyName( bool bInQtThread = true )
         {
             UPnpDeviceDesc *pDevice = GetDeviceDesc( bInQtThread );
 
@@ -274 +274 @@
             return sName;
         }
 
-        QString GetNameAndDetails( bool bInQtThread = TRUE )
+        QString GetNameAndDetails( bool bInQtThread = true )
         {
             UPnpDeviceDesc *pDevice = GetDeviceDesc( bInQtThread );