Ticket #6340: DVBStreamHandler_replaceQMap.diff

mythtv/libs/libmythtv/dvbstreamhandler.h

@@ -6 +6 @@
 #include <vector>
 using namespace std;
 
-#include <qmap.h>
-#include <qmutex.h>
+#include <QMap>
+#include <QHash>
+#include <QMutex>
 
 #include "util.h"
 #include "DeviceReadBuffer.h"
@@ -19 +20 @@
 class DVBChannel;
 class DeviceReadBuffer;
 
-typedef QMap<uint,int> FilterMap;
-
 //#define RETUNE_TIMEOUT 5000
 
 class PIDInfo
@@ -119 +118 @@
     vector<MPEGStreamData*> _stream_data_list;
 
     // for caching TS monitoring supported value.
-    static QMutex             _rec_supports_ts_monitoring_lock;
-    static QMap<QString,bool> _rec_supports_ts_monitoring;
+    static QMutex              _rec_supports_ts_monitoring_lock;
+    static QHash<QString,bool> _rec_supports_ts_monitoring;
 
     // for implementing Get & Return
-    static QMutex                          _handlers_lock;
-    static QMap<QString,DVBStreamHandler*> _handlers;
-    static QMap<QString,uint>              _handlers_refcnt;
+    static QMutex                           _handlers_lock;
+    static QHash<QString,DVBStreamHandler*> _handlers;
+    static QHash<QString,uint>              _handlers_refcnt;
 };
 
 #endif // _DVBSTREAMHANDLER_H_

mythtv/libs/libmythtv/dvbstreamhandler.cpp

@@ -10 +10 @@
 #include <sys/ioctl.h>
 
 // Qt headers
-#include <qstring.h>
+#include <QString>
+#include <QHash>
 
 // MythTV headers
 #include "dvbstreamhandler.h"
@@ -26 +27 @@
 #define LOC_WARN QString("DVBSH(%1) Warning: ").arg(_dvb_dev)
 #define LOC_ERR  QString("DVBSH(%1) Error: ").arg(_dvb_dev)
 
-QMap<QString,bool> DVBStreamHandler::_rec_supports_ts_monitoring;
-QMutex             DVBStreamHandler::_rec_supports_ts_monitoring_lock;
+QHash<QString,bool> DVBStreamHandler::_rec_supports_ts_monitoring;
+QMutex              DVBStreamHandler::_rec_supports_ts_monitoring_lock;
 
-QMap<QString,DVBStreamHandler*> DVBStreamHandler::_handlers;
-QMap<QString,uint>              DVBStreamHandler::_handlers_refcnt;
-QMutex                          DVBStreamHandler::_handlers_lock;
+QHash<QString,DVBStreamHandler*> DVBStreamHandler::_handlers;
+QHash<QString,uint>              DVBStreamHandler::_handlers_refcnt;
+QMutex                           DVBStreamHandler::_handlers_lock;
 
 DVBStreamHandler *DVBStreamHandler::Get(const QString &dvb_device)
 {
     QMutexLocker locker(&_handlers_lock);
 
-    QMap<QString,DVBStreamHandler*>::iterator it =
+    QHash<QString,DVBStreamHandler*>::iterator it =
         _handlers.find(dvb_device);
 
     if (it == _handlers.end())
@@ -59 +60 @@
 
     QString dvb_dev = ref->_dvb_dev;
 
-    QMap<QString,uint>::iterator rit = _handlers_refcnt.find(dvb_dev);
+    QHash<QString,uint>::iterator rit = _handlers_refcnt.find(dvb_dev);
     if (rit == _handlers_refcnt.end())
         return;
 
@@ -69 +70 @@
         return;
     }
 
-    QMap<QString,DVBStreamHandler*>::iterator it = _handlers.find(dvb_dev);
+    QHash<QString,DVBStreamHandler*>::iterator it = _handlers.find(dvb_dev);
     if ((it != _handlers.end()) && (*it == ref))
     {
         ref = NULL;
@@ -482 +483 @@
 void DVBStreamHandler::CycleFiltersByPriority(void)
 {
     QMutexLocker writing_locker(&_pid_lock);
-    QMap<PIDPriority, pid_list_t> priority_queue;
-    QMap<PIDPriority, uint> priority_open_cnt;
+    QHash<PIDPriority, pid_list_t> priority_queue;
+    QHash<PIDPriority, uint> priority_open_cnt;
 
     PIDInfoMap::const_iterator cit = _pid_info.begin();
     for (; cit != _pid_info.end(); ++cit)
@@ -494 +495 @@
             priority_open_cnt[priority]++;
     }
 
-    QMap<PIDPriority, pid_list_t>::iterator it = priority_queue.begin();
+    QHash<PIDPriority, pid_list_t>::iterator it = priority_queue.begin();
     for (; it != priority_queue.end(); ++it)
         sort((*it).begin(), (*it).end());
 
@@ -677 +678 @@
             _stream_data_list[i]->GetPIDs(pids);
     }
 
-    QMap<uint, PIDInfo*> add_pids;
+    QHash<uint, PIDInfo*> add_pids;
     vector<uint>         del_pids;
 
     {
@@ -711 +712 @@
         ok &= RemovePIDFilter(*dit);
 
     // Add PIDs
-    QMap<uint, PIDInfo*>::iterator ait = add_pids.begin();
+    QHash<uint, PIDInfo*>::iterator ait = add_pids.begin();
     for (; ait != add_pids.end(); ++ait)
         ok &= AddPIDFilter(*ait);
 
@@ -787 +788 @@
 
     {
         QMutexLocker locker(&_rec_supports_ts_monitoring_lock);
-        QMap<QString,bool>::const_iterator it;
+        QHash<QString,bool>::const_iterator it;
         it = _rec_supports_ts_monitoring.find(_dvb_dev);
         if (it != _rec_supports_ts_monitoring.end())
             return *it;