Ticket #8572: mythtv-trunk-r26286-compile.patch

File mythtv-trunk-r26286-compile.patch, 2.6 KB (added by James.Dutton@…, 14 years ago)

Same patch as above, but modified to work against mythtv trunk

  • libs/libmythtv/recordingprofile.h

     
    8484
    8585  public:
    8686    // initializers
    87     RecordingProfile(QString profName = NULL);
     87    RecordingProfile(QString profName = QString());
    8888    ~RecordingProfile();
    8989    virtual void loadByID(int id);
    9090    virtual bool loadByType(const QString &name, const QString &cardtype);
  • libs/libmythtv/tv_rec.h

     
    9393class TuningRequest
    9494{
    9595  public:
    96     TuningRequest(uint f) :
     96    TuningRequest(uint f = 0) :
    9797        flags(f), program(NULL), channel(QString::null),
    9898        input(QString::null), majorChan(0), minorChan(0), progNum(-1) {;}
    9999    TuningRequest(uint f, RecordingInfo *p) :
  • libs/libmyth/mythdeque.h

     
    1919    T dequeue()
    2020    {
    2121        if (deque<T>::empty())
    22             return (T)(0);
     22            return T();
    2323        T item = deque<T>::front();
    2424        deque<T>::pop_front();
    2525        return item;
  • libs/libmyth/audiooutputbase.cpp

     
    7676    source_bytes_per_frame(0),
    7777    needs_upmix(false),         needs_downmix(false),
    7878    surround_mode(QUALITY_LOW), old_stretchfactor(1.0f),
    79     volume(80),                 volumeControl(NULL),
     79    volume(80),                 volumeControl(QString()),
    8080
    8181    processing(false),
    8282
  • libs/libmythupnp/eventing.h

     
    233233        {
    234234            SVMap::iterator it = m_map.find(sName);
    235235            if (it == m_map.end())
    236                 return T(0);
     236                return T();
    237237
    238238            StateVariable< T > *pVariable =
    239239                dynamic_cast< StateVariable< T > *>( *it );
     
    241241            if (pVariable != NULL)
    242242                return pVariable->GetValue();
    243243
    244             return T(0);
     244            return T();
    245245        }
    246246
    247247        uint BuildNotifyBody(QTextStream &ts, TaskTime ttLastNotified) const;