Changeset 14185
- Timestamp:
- Aug 29, 2013, 12:37:37 AM (9 years ago)
- Location:
- trunk/qt
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/qt/app.cc
r14177 r14185 478 478 args.append (QStringList ()); // actions - unused for plain passive popups 479 479 args.append (QVariantMap ()); // hints - unused atm 480 args.append ( qint32(-1)); // use the default timeout period480 args.append (int32_t (-1)); // use the default timeout period 481 481 m.setArguments (args); 482 482 QDBusMessage replyMsg = QDBusConnection::sessionBus ().call (m); -
trunk/qt/details.cc
r14177 r14185 413 413 double leftUntilDone = 0; 414 414 double available = 0; 415 qint64haveTotal = 0;416 qint64haveVerified = 0;417 qint64haveUnverified = 0;418 qint64verifiedPieces = 0;415 int64_t haveTotal = 0; 416 int64_t haveVerified = 0; 417 int64_t haveUnverified = 0; 418 int64_t verifiedPieces = 0; 419 419 if (torrents.empty ()) 420 420 { … … 429 429 haveTotal += t->haveTotal (); 430 430 haveUnverified += t->haveUnverified (); 431 const quint64v = t->haveVerified ();431 const uint64_t v = t->haveVerified (); 432 432 haveVerified += v; 433 433 if (t->pieceSize ()) … … 481 481 else 482 482 { 483 quint64d = 0;484 quint64f = 0;483 uint64_t d = 0; 484 uint64_t f = 0; 485 485 foreach (const Torrent * t, torrents) 486 486 { … … 504 504 else 505 505 { 506 quint64u = 0;507 quint64d = 0;506 uint64_t u = 0; 507 uint64_t d = 0; 508 508 foreach (const Torrent * t, torrents) 509 509 { … … 634 634 { 635 635 int pieces = 0; 636 quint64size = 0;637 quint32pieceSize = torrents[0]->pieceSize ();636 uint64_t size = 0; 637 uint32_t pieceSize = torrents[0]->pieceSize (); 638 638 foreach (const Torrent * t, torrents) 639 639 { -
trunk/qt/file-tree.cc
r14177 r14185 164 164 165 165 void 166 FileTreeItem :: getSubtreeWantedSize ( quint64& have, quint64& total) const166 FileTreeItem :: getSubtreeWantedSize (uint64_t& have, uint64_t& total) const 167 167 { 168 168 if (myIsWanted) … … 180 180 { 181 181 double d(0); 182 quint64have(0), total(0);182 uint64_t have(0), total(0); 183 183 184 184 getSubtreeWantedSize (have, total); … … 200 200 else 201 201 { 202 quint64have = 0;203 quint64total = 0;202 uint64_t have = 0; 203 uint64_t total = 0; 204 204 getSubtreeWantedSize (have, total); 205 205 str = Formatter::sizeToString (total); … … 213 213 bool wanted, 214 214 int priority, 215 quint64haveSize,215 uint64_t haveSize, 216 216 bool updateFields) 217 217 { … … 606 606 bool wanted, 607 607 int priority, 608 quint64totalSize,609 quint64have,608 uint64_t totalSize, 609 uint64_t have, 610 610 QList<QModelIndex> & rowsAdded, 611 611 bool updateFields) -
trunk/qt/file-tree.h
r14177 r14185 44 44 virtual ~FileTreeItem(); 45 45 46 FileTreeItem (const QString& name="", int fileIndex=-1, quint64size=0):46 FileTreeItem (const QString& name="", int fileIndex=-1, uint64_t size=0): 47 47 myFileIndex (fileIndex), 48 48 myParent (0), … … 64 64 const QString& name () const { return myName; } 65 65 QVariant data (int column, int role) const; 66 std::pair<int,int> update (const QString& name, bool want, int priority, quint64have, bool updateFields);66 std::pair<int,int> update (const QString& name, bool want, int priority, uint64_t have, bool updateFields); 67 67 void twiddleWanted (QSet<int>& fileIds, bool&); 68 68 void twiddlePriority (QSet<int>& fileIds, int&); 69 69 int fileIndex () const { return myFileIndex; } 70 quint64totalSize () const { return myTotalSize; }70 uint64_t totalSize () const { return myTotalSize; } 71 71 72 72 private: … … 75 75 QString priorityString () const; 76 76 QString sizeString () const; 77 void getSubtreeWantedSize ( quint64& have, quint64& total) const;77 void getSubtreeWantedSize (uint64_t& have, uint64_t& total) const; 78 78 double progress () const; 79 79 int priority () const; … … 88 88 int myPriority; 89 89 bool myIsWanted; 90 quint64myHaveSize;91 const quint64myTotalSize;90 uint64_t myHaveSize; 91 const uint64_t myTotalSize; 92 92 size_t myFirstUnhashedRow; 93 93 }; … … 121 121 void addFile (int index, const QString& filename, 122 122 bool wanted, int priority, 123 quint64 size, quint64have,123 uint64_t size, uint64_t have, 124 124 QList<QModelIndex>& rowsAdded, 125 125 bool torrentChanged); -
trunk/qt/formatter.cc
r14177 r14185 93 93 94 94 QString 95 Formatter :: memToString ( qint64bytes)95 Formatter :: memToString (int64_t bytes) 96 96 { 97 97 if (bytes < 0) … … 107 107 108 108 QString 109 Formatter :: sizeToString ( qint64bytes)109 Formatter :: sizeToString (int64_t bytes) 110 110 { 111 111 if (bytes < 0) -
trunk/qt/formatter.h
r14177 r14185 31 31 public: 32 32 33 static QString memToString ( qint64bytes);34 static QString sizeToString ( qint64bytes);33 static QString memToString (int64_t bytes); 34 static QString sizeToString (int64_t bytes); 35 35 static QString speedToString (const Speed& speed); 36 36 static QString percentToString (double x); -
trunk/qt/freespace-label.cc
r14177 r14185 37 37 connect (&myTimer, SIGNAL(timeout()), this, SLOT(onTimer())); 38 38 39 connect (&mySession, SIGNAL(executed( qint64, const QString&, struct tr_variant*)),40 this, SLOT(onSessionExecuted( qint64, const QString&, struct tr_variant*)));39 connect (&mySession, SIGNAL(executed(int64_t, const QString&, struct tr_variant*)), 40 this, SLOT(onSessionExecuted(int64_t, const QString&, struct tr_variant*))); 41 41 42 42 setPath (path); … … 57 57 FreespaceLabel :: onTimer () 58 58 { 59 const qint64tag = mySession.getUniqueTag ();59 const int64_t tag = mySession.getUniqueTag (); 60 60 const QByteArray myPathUtf8 = myPath.toUtf8 (); 61 61 … … 72 72 73 73 void 74 FreespaceLabel :: onSessionExecuted ( qint64tag, const QString& result, struct tr_variant * arguments)74 FreespaceLabel :: onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments) 75 75 { 76 76 Q_UNUSED (result); … … 82 82 83 83 // update the label 84 qint64bytes = -1;84 int64_t bytes = -1; 85 85 tr_variantDictFindInt (arguments, TR_KEY_size_bytes, &bytes); 86 86 if (bytes >= 0) -
trunk/qt/freespace-label.h
r14177 r14185 32 32 private: 33 33 Session& mySession; 34 qint64myTag;34 int64_t myTag; 35 35 QString myPath; 36 36 QTimer myTimer; 37 37 38 38 private slots: 39 void onSessionExecuted ( qint64tag, const QString& result, struct tr_variant * arguments);39 void onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments); 40 40 void onTimer (); 41 41 }; -
trunk/qt/options.cc
r14177 r14185 48 48 49 49 void 50 FileAdded :: executed ( qint64tag, const QString& result, struct tr_variant * arguments)50 FileAdded :: executed (int64_t tag, const QString& result, struct tr_variant * arguments) 51 51 { 52 52 Q_UNUSED (arguments); … … 376 376 // rpc spec section 3.4 "adding a torrent" 377 377 378 const qint64tag = mySession.getUniqueTag ();378 const int64_t tag = mySession.getUniqueTag (); 379 379 tr_variant top; 380 380 tr_variantInitDict (&top, 3); … … 456 456 if (myTrashCheck->isChecked () && (myAdd.type==AddData::FILENAME)) 457 457 fileAdded->setFileToDelete (myAdd.filename); 458 connect (&mySession, SIGNAL (executed ( qint64,const QString&, struct tr_variant*)),459 fileAdded, SLOT (executed ( qint64,const QString&, struct tr_variant*)));458 connect (&mySession, SIGNAL (executed (int64_t,const QString&, struct tr_variant*)), 459 fileAdded, SLOT (executed (int64_t,const QString&, struct tr_variant*))); 460 460 461 461 mySession.exec (&top); … … 569 569 namespace 570 570 { 571 quint64getPieceSize (const tr_info * info, tr_piece_index_t pieceIndex)571 uint64_t getPieceSize (const tr_info * info, tr_piece_index_t pieceIndex) 572 572 { 573 573 if (pieceIndex != info->pieceCount - 1) … … 595 595 } 596 596 597 qint64leftInPiece = getPieceSize (&myInfo, myVerifyPieceIndex) - myVerifyPiecePos;598 qint64leftInFile = file->length - myVerifyFilePos;599 qint64bytesThisPass = std::min (leftInFile, leftInPiece);600 bytesThisPass = std::min (bytesThisPass, ( qint64)sizeof (myVerifyBuf));597 int64_t leftInPiece = getPieceSize (&myInfo, myVerifyPieceIndex) - myVerifyPiecePos; 598 int64_t leftInFile = file->length - myVerifyFilePos; 599 int64_t bytesThisPass = std::min (leftInFile, leftInPiece); 600 bytesThisPass = std::min (bytesThisPass, (int64_t)sizeof (myVerifyBuf)); 601 601 602 602 if (myVerifyFile.isOpen () && myVerifyFile.seek (myVerifyFilePos)) 603 603 { 604 qint64numRead = myVerifyFile.read (myVerifyBuf, bytesThisPass);604 int64_t numRead = myVerifyFile.read (myVerifyBuf, bytesThisPass); 605 605 if (numRead == bytesThisPass) 606 606 myVerifyHash.addData (myVerifyBuf, numRead); … … 650 650 if (done) 651 651 { 652 quint64have = 0;652 uint64_t have = 0; 653 653 foreach (const TrFile& f, myFiles) 654 654 have += f.have; -
trunk/qt/options.h
r14177 r14185 56 56 57 57 public slots: 58 void executed ( qint64tag, const QString& result, struct tr_variant * arguments);58 void executed (int64_t tag, const QString& result, struct tr_variant * arguments); 59 59 60 60 private: 61 const qint64myTag;61 const int64_t myTag; 62 62 QString myName; 63 63 QString myDelFile; … … 118 118 char myVerifyBuf[2048*4]; 119 119 QFile myVerifyFile; 120 quint64myVerifyFilePos;120 uint64_t myVerifyFilePos; 121 121 int myVerifyFileIndex; 122 quint32myVerifyPieceIndex;123 quint32myVerifyPiecePos;122 uint32_t myVerifyPieceIndex; 123 uint32_t myVerifyPiecePos; 124 124 void clearVerify (); 125 125 QVector<bool> myVerifyFlags; 126 126 QCryptographicHash myVerifyHash; 127 typedef QMap< quint32,qint32> mybins_t;127 typedef QMap<uint32_t,int32_t> mybins_t; 128 128 mybins_t myVerifyBins; 129 129 QTimer myEditTimer; -
trunk/qt/prefs.cc
r14177 r14185 152 152 double d; 153 153 bool boolVal; 154 qint64intVal;154 int64_t intVal; 155 155 const char * str; 156 156 size_t strLen; -
trunk/qt/session.cc
r14177 r14185 700 700 QNetworkReply * reply = networkAccessManager ()->post (request, requestData); 701 701 reply->setProperty (REQUEST_DATA_PROPERTY_KEY, requestData); 702 connect (reply, SIGNAL (downloadProgress ( qint64,qint64)), this, SIGNAL (dataReadProgress ()));703 connect (reply, SIGNAL (uploadProgress ( qint64,qint64)), this, SIGNAL (dataSendProgress ()));702 connect (reply, SIGNAL (downloadProgress (int64_t,int64_t)), this, SIGNAL (dataReadProgress ())); 703 connect (reply, SIGNAL (uploadProgress (int64_t,int64_t)), this, SIGNAL (dataSendProgress ())); 704 704 705 705 #ifdef DEBUG_HTTP … … 765 765 if (!err) 766 766 { 767 qint64tag = -1;767 int64_t tag = -1; 768 768 const char * result = NULL; 769 769 tr_variant * args = NULL; … … 803 803 804 804 case TAG_BLOCKLIST_UPDATE: { 805 qint64intVal = 0;805 int64_t intVal = 0; 806 806 if (tr_variantDictFindDict (&top, TR_KEY_arguments, &args)) 807 807 if (tr_variantDictFindInt (args, TR_KEY_blocklist_size, &intVal)) … … 812 812 case TAG_RENAME_PATH: 813 813 { 814 qint64id = 0;814 int64_t id = 0; 815 815 const char * result = 0; 816 816 if (tr_variantDictFindStr (&top, TR_KEY_result, &result, 0) && strcmp (result, "success")) … … 886 886 Session :: updateStats (tr_variant * d, struct tr_session_stats * stats) 887 887 { 888 qint64i;888 int64_t i; 889 889 890 890 if (tr_variantDictFindInt (d, TR_KEY_uploadedBytes, &i)) … … 919 919 Session :: updateInfo (tr_variant * d) 920 920 { 921 qint64i;921 int64_t i; 922 922 const char * str; 923 923 … … 950 950 case QVariant :: Int: 951 951 { 952 qint64val;952 int64_t val; 953 953 if (tr_variantGetInt (b, &val)) 954 954 myPrefs.set (i, (int)val); … … 1015 1015 1016 1016 void 1017 Session :: setBlocklistSize ( qint64i)1017 Session :: setBlocklistSize (int64_t i) 1018 1018 { 1019 1019 myBlocklistSize = i; -
trunk/qt/session.h
r14177 r14185 60 60 61 61 public: 62 qint64blocklistSize () const { return myBlocklistSize; }63 void setBlocklistSize ( qint64i);62 int64_t blocklistSize () const { return myBlocklistSize; } 63 void setBlocklistSize (int64_t i); 64 64 void updateBlocklist (); 65 65 void portTest (); … … 85 85 86 86 public: 87 qint64getUniqueTag () { return nextUniqueTag++; }87 int64_t getUniqueTag () { return nextUniqueTag++; } 88 88 89 89 private: … … 135 135 signals: 136 136 void responseReceived (const QByteArray& json); 137 void executed ( qint64tag, const QString& result, struct tr_variant * arguments);137 void executed (int64_t tag, const QString& result, struct tr_variant * arguments); 138 138 void sourceChanged (); 139 139 void portTested (bool isOpen); … … 148 148 149 149 private: 150 qint64nextUniqueTag;151 qint64myBlocklistSize;150 int64_t nextUniqueTag; 151 int64_t myBlocklistSize; 152 152 Prefs& myPrefs; 153 153 tr_session * mySession; -
trunk/qt/torrent-delegate.cc
r14177 r14185 81 81 const bool isDone( tor.isDone( ) ); 82 82 const bool isSeed( tor.isSeed( ) ); 83 const quint64haveTotal( tor.haveTotal( ) );83 const uint64_t haveTotal( tor.haveTotal( ) ); 84 84 QString str; 85 85 double seedRatio; -
trunk/qt/torrent-model.cc
r14177 r14185 132 132 tr_variant * child; 133 133 while(( child = tr_variantListChild( torrents, i++ ))) { 134 qint64intVal;134 int64_t intVal; 135 135 if( tr_variantGetInt( child, &intVal ) ) 136 136 removeTorrent( intVal ); … … 156 156 while(( child = tr_variantListChild( torrents, i++ ))) 157 157 { 158 qint64id;158 int64_t id; 159 159 if( tr_variantDictFindInt( child, TR_KEY_id, &id ) ) 160 160 { -
trunk/qt/torrent.cc
r14177 r14185 467 467 bool changed = false; 468 468 const bool was_seed = isSeed (); 469 const quint64old_verified_size = haveVerified ();469 const uint64_t old_verified_size = haveVerified (); 470 470 471 471 if (!lookup_initialized) … … 493 493 case QVariant :: Int: 494 494 { 495 qint64val;495 int64_t val; 496 496 if (tr_variantGetInt (child, &val)) 497 497 changed |= setInt (property_index, val); … … 514 514 case QVariant :: ULongLong: 515 515 { 516 qint64val;516 int64_t val; 517 517 if (tr_variantGetInt (child, &val)) 518 518 changed |= setSize (property_index, val); … … 528 528 case QVariant :: DateTime: 529 529 { 530 qint64val;530 int64_t val; 531 531 if (tr_variantGetInt (child, &val) && val) 532 532 changed |= setDateTime (property_index, QDateTime :: fromTime_t(val)); … … 550 550 { 551 551 const char * str; 552 qint64intVal;552 int64_t intVal; 553 553 int i = 0; 554 554 tr_variant * child; … … 581 581 for (int i=0; i<n && i<myFiles.size(); ++i) 582 582 { 583 qint64intVal;583 int64_t intVal; 584 584 bool boolVal; 585 585 tr_variant * child = tr_variantListChild (files, i); … … 641 641 { 642 642 bool b; 643 qint64i;643 int64_t i; 644 644 size_t len; 645 645 const char * str; … … 718 718 double d; 719 719 bool b; 720 qint64i;720 int64_t i; 721 721 size_t len; 722 722 const char * str; -
trunk/qt/torrent.h
r14177 r14185 104 104 int priority; 105 105 QString filename; 106 quint64size;107 quint64have;106 uint64_t size; 107 uint64_t have; 108 108 }; 109 109 … … 254 254 bool isPrivate( ) const { return getBool( IS_PRIVATE ); } 255 255 bool getSeedRatio( double& setme ) const; 256 quint64haveVerified( ) const { return getSize( HAVE_VERIFIED ); }257 quint64haveUnverified( ) const { return getSize( HAVE_UNCHECKED ); }258 quint64desiredAvailable( ) const { return getSize( DESIRED_AVAILABLE ); }259 quint64haveTotal( ) const { return haveVerified( ) + haveUnverified(); }260 quint64totalSize( ) const { return getSize( TOTAL_SIZE ); }261 quint64sizeWhenDone( ) const { return getSize( SIZE_WHEN_DONE ); }262 quint64leftUntilDone( ) const { return getSize( LEFT_UNTIL_DONE ); }263 quint64pieceSize( ) const { return getSize( PIECE_SIZE ); }256 uint64_t haveVerified( ) const { return getSize( HAVE_VERIFIED ); } 257 uint64_t haveUnverified( ) const { return getSize( HAVE_UNCHECKED ); } 258 uint64_t desiredAvailable( ) const { return getSize( DESIRED_AVAILABLE ); } 259 uint64_t haveTotal( ) const { return haveVerified( ) + haveUnverified(); } 260 uint64_t totalSize( ) const { return getSize( TOTAL_SIZE ); } 261 uint64_t sizeWhenDone( ) const { return getSize( SIZE_WHEN_DONE ); } 262 uint64_t leftUntilDone( ) const { return getSize( LEFT_UNTIL_DONE ); } 263 uint64_t pieceSize( ) const { return getSize( PIECE_SIZE ); } 264 264 bool hasMetadata( ) const { return getDouble( METADATA_PERCENT_DONE ) >= 1.0; } 265 265 bool isMagnet( ) const { return magnetTorrent; } … … 269 269 double percentDone( ) const { return getDouble( PERCENT_DONE ); } 270 270 double metadataPercentDone( ) const { return getDouble( METADATA_PERCENT_DONE ); } 271 quint64downloadedEver( ) const { return getSize( DOWNLOADED_EVER ); }272 quint64uploadedEver( ) const { return getSize( UPLOADED_EVER ); }273 quint64failedEver( ) const { return getSize( FAILED_EVER ); }271 uint64_t downloadedEver( ) const { return getSize( DOWNLOADED_EVER ); } 272 uint64_t uploadedEver( ) const { return getSize( UPLOADED_EVER ); } 273 uint64_t failedEver( ) const { return getSize( FAILED_EVER ); } 274 274 int compareTracker( const Torrent& ) const; 275 275 int compareSeedRatio( const Torrent& ) const;
Note: See TracChangeset
for help on using the changeset viewer.