- Namespaced QBittorrentSession and QTorrentHandle to avoid possible future conflicts

[qtrapids] / src / gui / DownloadView.cpp

diff --git a/src/gui/DownloadView.cpp b/src/gui/DownloadView.cpp
index ede3b66..d6c9183 100644 (file)
--- a/src/gui/DownloadView.cpp
+++ b/src/gui/DownloadView.cpp
@@ -47,7 +47,7 @@ DownloadView::~DownloadView()
 }
 
 
-void DownloadView::newItem(QTorrentHandle handle)
+void DownloadView::newItem(qtrapids::QTorrentHandle handle)
 {
 #ifdef QTRAPIDS_DEBUG
        qDebug() << "DownloadView::newItem() " << items_.count(handle);
@@ -74,7 +74,7 @@ void DownloadView::newItem(QTorrentHandle handle)
 }
 
 
-void DownloadView::updateItem(QTorrentHandle handle)
+void DownloadView::updateItem(qtrapids::QTorrentHandle handle)
 {
        //qDebug() << "DownloadView::updateItem() "  << items_.count(handle);
                
@@ -114,7 +114,7 @@ void DownloadView::updateItem(QTorrentHandle handle)
 }
 
 
-QTorrentHandle DownloadView::removeSelected()
+qtrapids::QTorrentHandle DownloadView::removeSelected()
 {
 #ifdef QTRAPIDS_DEBUG
        qDebug() << "DownloadView::removeSelected() " <<  topLevelItemCount() ;
@@ -122,9 +122,9 @@ QTorrentHandle DownloadView::removeSelected()
 
        DownloadViewItem *item = dynamic_cast<DownloadViewItem*> (currentItem());
        
-       std::map<QTorrentHandle, DownloadViewItem*>::iterator listIter
+       std::map<qtrapids::QTorrentHandle, DownloadViewItem*>::iterator listIter
                        = items_.begin();
-       std::map<QTorrentHandle, DownloadViewItem*>::iterator listEnd
+       std::map<qtrapids::QTorrentHandle, DownloadViewItem*>::iterator listEnd
                        = items_.end();
        
        while (listIter != listEnd) {
@@ -134,7 +134,7 @@ QTorrentHandle DownloadView::removeSelected()
                ++listIter;
        }
        
-       QTorrentHandle handle = listIter->first;
+       qtrapids::QTorrentHandle handle = listIter->first;
        items_.erase(listIter);
 
        
@@ -151,7 +151,7 @@ QTorrentHandle DownloadView::removeSelected()
 }
 
 
-void DownloadView::removeItem(QTorrentHandle handle)
+void DownloadView::removeItem(qtrapids::QTorrentHandle handle)
 {
 }
 
@@ -183,22 +183,22 @@ void DownloadView::on_timeout() {
 
 
 
-QString DownloadView::GetStatusString(QTorrentHandle::State const& status) const
+QString DownloadView::GetStatusString(qtrapids::QTorrentHandle::State const& status) const
 {
        switch (status) {
-               case QTorrentHandle::QUEUED_FOR_CHECKING :
+               case qtrapids::QTorrentHandle::QUEUED_FOR_CHECKING :
                        return tr("Queued");
-               case QTorrentHandle::CHECKING_FILES :
+               case qtrapids::QTorrentHandle::CHECKING_FILES :
                        return tr("Checking");
-               case QTorrentHandle::DOWNLOADING_METADATA :
+               case qtrapids::QTorrentHandle::DOWNLOADING_METADATA :
                        return tr("DL meta");
-               case QTorrentHandle::DOWNLOADING :
+               case qtrapids::QTorrentHandle::DOWNLOADING :
                        return tr("Downloading");
-               case QTorrentHandle::FINISHED :
+               case qtrapids::QTorrentHandle::FINISHED :
                        return tr("Finished");
-               case QTorrentHandle::SEEDING :
+               case qtrapids::QTorrentHandle::SEEDING :
                        return tr("Seeding"); 
-               case QTorrentHandle::ALLOCATING :
+               case qtrapids::QTorrentHandle::ALLOCATING :
                        return tr("Allocating");
                default:
                        return tr("N/A");
@@ -206,20 +206,20 @@ QString DownloadView::GetStatusString(QTorrentHandle::State const& status) const
 }
 
 
-QColor DownloadView::GetStatusColor(QTorrentHandle::State const& status) const
+QColor DownloadView::GetStatusColor(qtrapids::QTorrentHandle::State const& status) const
 {
        QColor green(40,205,40);
        QColor yellow(255,174,0);
 
        switch (status) {
-               case QTorrentHandle::QUEUED_FOR_CHECKING :
-               case QTorrentHandle::CHECKING_FILES :
-               case QTorrentHandle::DOWNLOADING_METADATA :
-               case QTorrentHandle::ALLOCATING :
+               case qtrapids::QTorrentHandle::QUEUED_FOR_CHECKING :
+               case qtrapids::QTorrentHandle::CHECKING_FILES :
+               case qtrapids::QTorrentHandle::DOWNLOADING_METADATA :
+               case qtrapids::QTorrentHandle::ALLOCATING :
                        return yellow;
-               case QTorrentHandle::DOWNLOADING :
-               case QTorrentHandle::FINISHED :
-               case QTorrentHandle::SEEDING :
+               case qtrapids::QTorrentHandle::DOWNLOADING :
+               case qtrapids::QTorrentHandle::FINISHED :
+               case qtrapids::QTorrentHandle::SEEDING :
                                return green;
                default:
                        return QColor();
@@ -230,9 +230,9 @@ void DownloadView::UpdateView()
 {
        DownloadViewItem *item = dynamic_cast<DownloadViewItem*> (currentItem());
        
-       std::map<QTorrentHandle, DownloadViewItem*>::iterator listIter
+       std::map<qtrapids::QTorrentHandle, DownloadViewItem*>::iterator listIter
                        = items_.begin();
-       std::map<QTorrentHandle, DownloadViewItem*>::iterator listEnd
+       std::map<qtrapids::QTorrentHandle, DownloadViewItem*>::iterator listEnd
                        = items_.end();
        
        while (listIter != listEnd) {