X-Git-Url: http://git.maemo.org/git/?p=qtrapids;a=blobdiff_plain;f=src%2Fengine%2FQTorrentHandle.cpp;fp=src%2Fengine%2FQTorrentHandle.cpp;h=d2470c7355fcf9a19390b4f111f54855ecea3728;hp=3fb6ec088248dd31e9d2b19fbd02358e359c8aed;hb=3b087a27d415059adf505d398ffe0b9fbd5ed0ba;hpb=521566ad342423822a7e0353c2cc6ec639a10c63

diff --git a/src/engine/QTorrentHandle.cpp b/src/engine/QTorrentHandle.cpp
index 3fb6ec0..d2470c7 100644
--- a/src/engine/QTorrentHandle.cpp
+++ b/src/engine/QTorrentHandle.cpp
@@ -61,11 +61,33 @@ size_t QTorrentHandle::getTotalSize() const
 	return static_cast<size_t> (info.total_size());
 }
 
-QString QTorrentHandle::state() const
+
+QTorrentHandle::State QTorrentHandle::state() const
 {
-	return GetStatusString(status());
+	TorrentStatus statusTmp = status();
+	
+		switch (statusTmp.state) {
+		case TorrentStatus::queued_for_checking :
+			return QTorrentHandle::QUEUED_FOR_CHECKING;
+		case TorrentStatus::checking_files :
+			return QTorrentHandle::CHECKING_FILES;
+		case TorrentStatus::downloading_metadata :
+			return QTorrentHandle::DOWNLOADING_METADATA;
+		case TorrentStatus::downloading :
+			return QTorrentHandle::DOWNLOADING;
+		case TorrentStatus::finished :
+			return QTorrentHandle::FINISHED;
+		case TorrentStatus::seeding :
+			return QTorrentHandle::SEEDING; 
+		case TorrentStatus::allocating :
+			return QTorrentHandle::ALLOCATING;
+		default:
+			return QTorrentHandle::UNSPECIFIED;
+	}
+	
 }
 
+
 float QTorrentHandle::progress() const
 {
 	TorrentStatus statusTmp = status();
@@ -133,27 +155,7 @@ bool QTorrentHandle::operator<(QTorrentHandle const& h) const
 
 
 
-QString QTorrentHandle::GetStatusString(TorrentStatus const& status) const
-{
-	switch (status.state) {
-		case TorrentStatus::queued_for_checking :
-			return "Queued";
-		case TorrentStatus::checking_files :
-			return "Checking";
-		case TorrentStatus::downloading_metadata :
-			return "DL meta";
-		case TorrentStatus::downloading :
-			return "DL";
-		case TorrentStatus::finished :
-			return "Finished";
-		case TorrentStatus::seeding :
-			return "Seeding"; 
-		case TorrentStatus::allocating :
-			return "Allocating";
-		default:
-			return "N/A";
-	}
-}
+
 
 
 				
\ No newline at end of file