---
 libs/libmyth/mythdeque.h    |    9 	8 +	1 -	0 !
 libs/libmythtv/tv_rec.h     |    6 	5 +	1 -	0 !
 libs/libmythupnp/eventing.h |    9 	7 +	2 -	0 !
 3 files changed, 20 insertions(+), 4 deletions(-)

Index: mythtv/libs/libmyth/mythdeque.h
===================================================================
--- mythtv.orig/libs/libmyth/mythdeque.h	2009-09-11 15:07:19.000000000 -0400
+++ mythtv/libs/libmyth/mythdeque.h	2010-09-18 23:20:26.000000000 -0400
@@ -16,10 +16,17 @@ class MythDeque : public deque<T>
 {
   public:
     /// \brief Removes item from front of list and returns a copy. O(1).
+// TODO: QString(0) or QString(NULL) is ambiguous in Qt4.7 and deprecated since
+// Qt4.  Instead, QString() or QString((const char *)0) should be used.
+// This template is used with T of AVFrame*, XvMCOSD*, TVState, DBEventEIT*,
+// TuningRequest, DSMCCPacket*, int, VideoFrame*, AVSubtitle, QString,
+// QKeyEvent*, UDPNotifyOSDSet*, ProcessRequestThread, and
+// DeferredDeleteStruct.
     T dequeue()
     {
         if (deque<T>::empty())
-            return (T)(0);
+            return T();
+//            return (T)(0);
         T item = deque<T>::front();
         deque<T>::pop_front();
         return item;
Index: mythtv/libs/libmythupnp/eventing.h
===================================================================
--- mythtv.orig/libs/libmythupnp/eventing.h	2010-01-10 08:49:06.000000000 -0500
+++ mythtv/libs/libmythupnp/eventing.h	2010-09-18 23:20:26.000000000 -0400
@@ -228,12 +228,16 @@ class UPNP_PUBLIC StateVariables
 
         // ------------------------------------------------------------------
 
+// TODO: QString(0) or QString(NULL) is ambiguous in Qt4.7 and deprecated since
+// Qt4.  Instead, QString() or QString((const char *)0) should be used.
+// This template is used with T of QString and unsigned short.
         template < class T >
         T GetValue( const QString &sName )
         {
             SVMap::iterator it = m_map.find(sName);
             if (it == m_map.end())
-                return T(0);
+                return T();
+//                return T(0);
 
             StateVariable< T > *pVariable =
                 dynamic_cast< StateVariable< T > *>( *it );
@@ -241,7 +245,8 @@ class UPNP_PUBLIC StateVariables
             if (pVariable != NULL)
                 return pVariable->GetValue();
 
-            return T(0);
+            return T();
+//            return T(0);
         }
 
         uint BuildNotifyBody(QTextStream &ts, TaskTime ttLastNotified) const;
Index: mythtv/libs/libmythtv/tv_rec.h
===================================================================
--- mythtv.orig/libs/libmythtv/tv_rec.h	2010-09-08 19:55:49.000000000 -0400
+++ mythtv/libs/libmythtv/tv_rec.h	2010-09-18 23:31:02.000000000 -0400
@@ -93,7 +93,11 @@ class FireWireDBOptions
 class TuningRequest
 {
   public:
-    TuningRequest(uint f) :
+// TODO: This hack is only required to allow use of MythDeque<T>::dequeue()
+// with T = TuningRequest because of the hack used to make
+// MythDeque<T>::dequeue() compile with Qt 4.7
+//    TuningRequest(uint f) :
+    TuningRequest(uint f = 0) :
         flags(f), program(NULL), channel(QString::null),
         input(QString::null), majorChan(0), minorChan(0), progNum(-1) {;}
     TuningRequest(uint f, RecordingInfo *p) :