Ticket #8572: mythtv-compile_fixes_for_qt_4_7.patch
File mythtv-compile_fixes_for_qt_4_7.patch, 3.3 KB (added by , 14 years ago) |
---|
-
libs/libmythupnp/eventing.h
--- libs/libmyth/audiooutputbase.cpp | 2 1 + 1 - 0 ! libs/libmyth/mythdeque.h | 2 1 + 1 - 0 ! libs/libmythtv/recordingprofile.h | 2 1 + 1 - 0 ! libs/libmythtv/tv_rec.h | 2 1 + 1 - 0 ! libs/libmythupnp/eventing.h | 4 2 + 2 - 0 ! 5 files changed, 6 insertions(+), 6 deletions(-)
old new 233 233 { 234 234 SVMap::iterator it = m_map.find(sName); 235 235 if (it == m_map.end()) 236 return T( 0);236 return T(); 237 237 238 238 StateVariable< T > *pVariable = 239 239 dynamic_cast< StateVariable< T > *>( *it ); … … 241 241 if (pVariable != NULL) 242 242 return pVariable->GetValue(); 243 243 244 return T( 0);244 return T(); 245 245 } 246 246 247 247 uint BuildNotifyBody(QTextStream &ts, TaskTime ttLastNotified) const; -
libs/libmyth/audiooutputbase.cpp
old new 75 75 source_bytes_per_frame(0), 76 76 needs_upmix(false), needs_downmix(false), 77 77 surround_mode(QUALITY_LOW), old_stretchfactor(1.0f), 78 volume(80), volumeControl( NULL),78 volume(80), volumeControl(QString()), 79 79 80 80 processing(false), 81 81 -
libs/libmyth/mythdeque.h
old new 19 19 T dequeue() 20 20 { 21 21 if (deque<T>::empty()) 22 return (T)(0);22 return T(); 23 23 T item = deque<T>::front(); 24 24 deque<T>::pop_front(); 25 25 return item; -
libs/libmythtv/recordingprofile.h
old new 84 84 85 85 public: 86 86 // initializers 87 RecordingProfile(QString profName = NULL);87 RecordingProfile(QString profName = QString()); 88 88 virtual void loadByID(int id); 89 89 virtual bool loadByType(const QString &name, const QString &cardtype); 90 90 virtual bool loadByGroup(const QString &name, const QString &group); -
libs/libmythtv/tv_rec.h
old new 93 93 class TuningRequest 94 94 { 95 95 public: 96 TuningRequest(uint f ) :96 TuningRequest(uint f = 0) : 97 97 flags(f), program(NULL), channel(QString::null), 98 98 input(QString::null), majorChan(0), minorChan(0), progNum(-1) {;} 99 99 TuningRequest(uint f, RecordingInfo *p) :