instead of inttypes, use Qt integral types -- eg, s/uint64_t/quint64/

diff --git a/qt/add-data.cc b/qt/add-data.cc
index d7accdf9b00e0740e7691653f5523732e4044c63..bf2371fb62d5c7069c742406a521fe97e4c848b6 100644 (file)
--- a/qt/add-data.cc
+++ b/qt/add-data.cc
@@ -94,7 +94,7 @@ AddData :: readableName( ) const
         case METAINFO: {
             tr_info inf;
             tr_ctor * ctor = tr_ctorNew( NULL );
-            tr_ctorSetMetainfo( ctor, (const uint8_t*)metainfo.constData(), metainfo.size() );
+            tr_ctorSetMetainfo( ctor, (const quint8*)metainfo.constData(), metainfo.size() );
             if( tr_torrentParse( ctor, &inf ) == TR_PARSE_OK  ) {
                 ret = QString::fromUtf8( inf.name ); // metainfo is required to be UTF-8
                 tr_metainfoFree( &inf );

diff --git a/qt/app.cc b/qt/app.cc
index 139a647778e2b8447d4811cdc74926a21f9362e3..49ce0975204dbdf8fa443c5d7d91eb5b7e5868a9 100644 (file)
--- a/qt/app.cc
+++ b/qt/app.cc
@@ -477,7 +477,7 @@ MyApp :: notify (const QString& title, const QString& body) const
   args.append (body);                                 // body
   args.append (QStringList ());                       // actions - unused for plain passive popups
   args.append (QVariantMap ());                       // hints - unused atm
-  args.append (int32_t (-1));                          // use the default timeout period
+  args.append (qint32 (-1));                          // use the default timeout period
   m.setArguments (args);
   QDBusMessage replyMsg = QDBusConnection::sessionBus ().call (m);
   //std::cerr << qPrintable (replyMsg.errorName ()) << std::endl;

diff --git a/qt/details.cc b/qt/details.cc
index ef40f0a9c282407cd1d219c4e4db241172966723..7d2170420b32c8c1f0a27b4994b293c4fa720797 100644 (file)
--- a/qt/details.cc
+++ b/qt/details.cc
@@ -412,10 +412,10 @@ Details :: refresh ()
   double sizeWhenDone = 0;
   double leftUntilDone = 0;
   double available = 0;
-  int64_t haveTotal = 0;
-  int64_t haveVerified = 0;
-  int64_t haveUnverified = 0;
-  int64_t verifiedPieces = 0;
+  qint64 haveTotal = 0;
+  qint64 haveVerified = 0;
+  qint64 haveUnverified = 0;
+  qint64 verifiedPieces = 0;
   if (torrents.empty ())
     {
       string = none;
@@ -428,7 +428,7 @@ Details :: refresh ()
             {
               haveTotal += t->haveTotal ();
               haveUnverified += t->haveUnverified ();
-              const uint64_t v = t->haveVerified ();
+              const quint64 v = t->haveVerified ();
               haveVerified += v;
               if (t->pieceSize ())
                 verifiedPieces += v / t->pieceSize ();
@@ -480,8 +480,8 @@ Details :: refresh ()
     }
   else
     {
-      uint64_t d = 0;
-      uint64_t f = 0;
+      quint64 d = 0;
+      quint64 f = 0;
       foreach (const Torrent * t, torrents)
         {
           d += t->downloadedEver ();
@@ -503,8 +503,8 @@ Details :: refresh ()
     }
   else
     {
-      uint64_t u = 0;
-      uint64_t d = 0;
+      quint64 u = 0;
+      quint64 d = 0;
       foreach (const Torrent * t, torrents)
         {
           u += t->uploadedEver ();
@@ -633,8 +633,8 @@ Details :: refresh ()
   else
     {
       int pieces = 0;
-      uint64_t size = 0;
-      uint32_t pieceSize = torrents[0]->pieceSize ();
+      quint64 size = 0;
+      quint32 pieceSize = torrents[0]->pieceSize ();
       foreach (const Torrent * t, torrents)
         {
           pieces += t->pieceCount ();

diff --git a/qt/file-tree.cc b/qt/file-tree.cc
index 8075aa25968497f07149e52f28b1713f0bace2ea..4832b006d691c1d62f4502ee68734b71e10e3e97 100644 (file)
--- a/qt/file-tree.cc
+++ b/qt/file-tree.cc
@@ -163,7 +163,7 @@ FileTreeItem :: data (int column, int role) const
 }
 
 void
-FileTreeItem :: getSubtreeWantedSize (uint64_t& have, uint64_t& total) const
+FileTreeItem :: getSubtreeWantedSize (quint64& have, quint64& total) const
 {
   if (myIsWanted)
     {
@@ -179,7 +179,7 @@ double
 FileTreeItem :: progress () const
 {
   double d(0);
-  uint64_t have(0), total(0);
+  quint64 have(0), total(0);
 
   getSubtreeWantedSize (have, total);
   if (total)
@@ -199,8 +199,8 @@ FileTreeItem :: sizeString () const
     }
   else
     {
-      uint64_t have = 0;
-      uint64_t total = 0;
+      quint64 have = 0;
+      quint64 total = 0;
       getSubtreeWantedSize (have, total);
       str = Formatter::sizeToString (total);
     }
@@ -212,7 +212,7 @@ std::pair<int,int>
 FileTreeItem :: update (const QString& name,
                         bool           wanted,
                         int            priority,
-                        uint64_t       haveSize,
+                        quint64       haveSize,
                         bool           updateFields)
 {
   int changed_count = 0;
@@ -605,8 +605,8 @@ FileTreeModel :: addFile (int                   fileIndex,
                           const QString       & filename,
                           bool                  wanted,
                           int                   priority,
-                          uint64_t              totalSize,
-                          uint64_t              have,
+                          quint64              totalSize,
+                          quint64              have,
                           QList<QModelIndex>  & rowsAdded,
                           bool                  updateFields)
 {

diff --git a/qt/file-tree.h b/qt/file-tree.h
index c65000953ba15d4aa51a086e8010961a3d34ad01..6a61cb32c935976c189672129e35be78844a0547 100644 (file)
--- a/qt/file-tree.h
+++ b/qt/file-tree.h
@@ -43,7 +43,7 @@ class FileTreeItem: public QObject
 
     virtual ~FileTreeItem();
 
-    FileTreeItem (const QString& name="", int fileIndex=-1, uint64_t size=0):
+    FileTreeItem (const QString& name="", int fileIndex=-1, quint64 size=0):
       myFileIndex (fileIndex),
       myParent (0),
       myName (name),
@@ -63,18 +63,18 @@ class FileTreeItem: public QObject
     int row () const;
     const QString& name () const { return myName; }
     QVariant data (int column, int role) const;
-    std::pair<int,int> update (const QString& name, bool want, int priority, uint64_t have, bool updateFields);
+    std::pair<int,int> update (const QString& name, bool want, int priority, quint64 have, bool updateFields);
     void twiddleWanted (QSet<int>& fileIds, bool&);
     void twiddlePriority (QSet<int>& fileIds, int&);
     int fileIndex () const { return myFileIndex; }
-    uint64_t totalSize () const { return myTotalSize; }
+    quint64 totalSize () const { return myTotalSize; }
 
   private:
     void setSubtreePriority (int priority, QSet<int>& fileIds);
     void setSubtreeWanted (bool, QSet<int>& fileIds);
     QString priorityString () const;
     QString sizeString () const;
-    void getSubtreeWantedSize (uint64_t& have, uint64_t& total) const;
+    void getSubtreeWantedSize (quint64& have, quint64& total) const;
     double progress () const;
     int priority () const;
     int isSubtreeWanted () const;
@@ -87,8 +87,8 @@ class FileTreeItem: public QObject
     QString myName;
     int myPriority;
     bool myIsWanted;
-    uint64_t myHaveSize;
-    const uint64_t myTotalSize;
+    quint64 myHaveSize;
+    const quint64 myTotalSize;
     size_t myFirstUnhashedRow;
 };
 
@@ -120,7 +120,7 @@ class FileTreeModel: public QAbstractItemModel
     void clear ();
     void addFile (int index, const QString& filename,
                   bool wanted, int priority,
-                  uint64_t size, uint64_t have,
+                  quint64 size, quint64 have,
                   QList<QModelIndex>& rowsAdded,
                   bool torrentChanged);
 

diff --git a/qt/formatter.cc b/qt/formatter.cc
index a6e5272755917d9f96009bef70d59450eb16abc9..ff25c4e24950d26c29230b3b54a02e6521b7eb98 100644 (file)
--- a/qt/formatter.cc
+++ b/qt/formatter.cc
@@ -92,7 +92,7 @@ Speed :: fromKBps (double KBps)
 ***/
 
 QString
-Formatter :: memToString (int64_t bytes)
+Formatter :: memToString (qint64 bytes)
 {
   if (bytes < 0)
     return tr ("Unknown");
@@ -106,7 +106,7 @@ Formatter :: memToString (int64_t bytes)
 }
 
 QString
-Formatter :: sizeToString (int64_t bytes)
+Formatter :: sizeToString (qint64 bytes)
 {
   if (bytes < 0)
     return tr ("Unknown");

diff --git a/qt/formatter.h b/qt/formatter.h
index d1270ab86cdaffb51477f239f159fcd6b3241c20..129a97ef78a7ada0e00dcbaf1154d4bc62bce4c7 100644 (file)
--- a/qt/formatter.h
+++ b/qt/formatter.h
@@ -13,8 +13,6 @@
 #ifndef QTR_UNITS
 #define QTR_UNITS
 
-#include <inttypes.h> /* uint64_t */
-
 #include <QString>
 #include <QObject>
 #include <QIcon>
@@ -32,8 +30,8 @@ class Formatter: public QObject
 
   public:
 
-    static QString memToString (int64_t bytes);
-    static QString sizeToString (int64_t bytes);
+    static QString memToString (qint64 bytes);
+    static QString sizeToString (qint64 bytes);
     static QString speedToString (const Speed& speed);
     static QString percentToString (double x);
     static QString ratioToString (double ratio);

diff --git a/qt/freespace-label.cc b/qt/freespace-label.cc
index 3a612d3c2c11f10999d1d2a39971b2cf81c6a47e..d38500338b6e6d91df44bfd77b5786aa7cfa04c8 100644 (file)
--- a/qt/freespace-label.cc
+++ b/qt/freespace-label.cc
@@ -36,8 +36,8 @@ FreespaceLabel :: FreespaceLabel (Session        & session,
 
   connect (&myTimer, SIGNAL(timeout()), this, SLOT(onTimer()));
 
-  connect (&mySession, SIGNAL(executed(int64_t, const QString&, struct tr_variant*)),
-           this,       SLOT(onSessionExecuted(int64_t, const QString&, struct tr_variant*)));
+  connect (&mySession, SIGNAL(executed(qint64, const QString&, struct tr_variant*)),
+           this,       SLOT(onSessionExecuted(qint64, const QString&, struct tr_variant*)));
 
   setPath (path);
 }
@@ -56,7 +56,7 @@ FreespaceLabel :: setPath (const QString& path)
 void
 FreespaceLabel :: onTimer ()
 {
-  const int64_t tag = mySession.getUniqueTag ();
+  const qint64 tag = mySession.getUniqueTag ();
   const QByteArray myPathUtf8 = myPath.toUtf8 ();
 
   myTag = tag;
@@ -71,7 +71,7 @@ FreespaceLabel :: onTimer ()
 }
 
 void
-FreespaceLabel :: onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments)
+FreespaceLabel :: onSessionExecuted (qint64 tag, const QString& result, struct tr_variant * arguments)
 {
   Q_UNUSED (result);
 
@@ -81,7 +81,7 @@ FreespaceLabel :: onSessionExecuted (int64_t tag, const QString& result, struct
   QString str;
 
   // update the label
-  int64_t bytes = -1;
+  qint64 bytes = -1;
   tr_variantDictFindInt (arguments, TR_KEY_size_bytes, &bytes);
   if (bytes >= 0)
     setText (tr("%1 free").arg(Formatter::sizeToString (bytes)));

diff --git a/qt/freespace-label.h b/qt/freespace-label.h
index e79cc9c46184f4cf0f6591a73ae399cd4fd131da..d24ff661ad197b93be2b3a18cf84a1bf43a4fe6c 100644 (file)
--- a/qt/freespace-label.h
+++ b/qt/freespace-label.h
@@ -31,12 +31,12 @@ class FreespaceLabel: public QLabel
 
   private:
     Session& mySession;
-    int64_t myTag;
+    qint64 myTag;
     QString myPath;
     QTimer myTimer;
 
   private slots:
-    void onSessionExecuted (int64_t tag, const QString& result, struct tr_variant * arguments);
+    void onSessionExecuted (qint64 tag, const QString& result, struct tr_variant * arguments);
     void onTimer ();
 };
 

diff --git a/qt/mainwin.cc b/qt/mainwin.cc
index 64df5cdd3cdf1e4cb6540da658a5420257ccc8dd..26281a80cfb111290ccb2c7f2cc2eebeda5c5416 100644 (file)
--- a/qt/mainwin.cc
+++ b/qt/mainwin.cc
@@ -1010,7 +1010,7 @@ void
 TrMainWindow :: trayActivated (QSystemTrayIcon::ActivationReason reason)
 {
   if ((reason == QSystemTrayIcon::Trigger) ||
-      (reason == QSystemTrayIcon::DoubleClick)
+      (reason == QSystemTrayIcon::DoubleClick))
     {
       if (isMinimized ())
         toggleWindows (true);

diff --git a/qt/options.cc b/qt/options.cc
index 6984ff488570aeb44b5e90388334e7860ae74504..630a8093a624ffc23e99a534280f3e1fc07e1323 100644 (file)
--- a/qt/options.cc
+++ b/qt/options.cc
@@ -47,7 +47,7 @@
 ***/
 
 void
-FileAdded :: executed (int64_t tag, const QString& result, struct tr_variant * arguments)
+FileAdded :: executed (qint64 tag, const QString& result, struct tr_variant * arguments)
 {
   Q_UNUSED (arguments);
 
@@ -315,7 +315,7 @@ Options :: reload ()
         break;
 
       case AddData::METAINFO:
-        tr_ctorSetMetainfo (ctor, (const uint8_t*)myAdd.metainfo.constData (), myAdd.metainfo.size ());
+        tr_ctorSetMetainfo (ctor, (const quint8*)myAdd.metainfo.constData (), myAdd.metainfo.size ());
         break;
 
       default:
@@ -375,7 +375,7 @@ Options :: onAccepted ()
 {
   // rpc spec section 3.4 "adding a torrent"
 
-  const int64_t tag = mySession.getUniqueTag ();
+  const qint64 tag = mySession.getUniqueTag ();
   tr_variant top;
   tr_variantInitDict (&top, 3);
   tr_variantDictAddStr (&top, TR_KEY_method, "torrent-add");
@@ -455,8 +455,8 @@ Options :: onAccepted ()
   FileAdded * fileAdded = new FileAdded (tag, myAdd.readableName ());
   if (myTrashCheck->isChecked () && (myAdd.type==AddData::FILENAME))
     fileAdded->setFileToDelete (myAdd.filename);
-  connect (&mySession, SIGNAL (executed (int64_t,const QString&, struct tr_variant*)),
-           fileAdded, SLOT (executed (int64_t,const QString&, struct tr_variant*)));
+  connect (&mySession, SIGNAL (executed (qint64,const QString&, struct tr_variant*)),
+           fileAdded, SLOT (executed (qint64,const QString&, struct tr_variant*)));
 
   mySession.exec (&top);
 
@@ -568,7 +568,7 @@ Options :: onVerify ()
 
 namespace
 {
-  uint64_t getPieceSize (const tr_info * info, tr_piece_index_t pieceIndex)
+  quint64 getPieceSize (const tr_info * info, tr_piece_index_t pieceIndex)
   {
     if (pieceIndex != info->pieceCount - 1)
       return info->pieceSize;
@@ -594,14 +594,14 @@ Options :: onTimeout ()
       myVerifyFile.open (QIODevice::ReadOnly);
     }
 
-  int64_t leftInPiece = getPieceSize (&myInfo, myVerifyPieceIndex) - myVerifyPiecePos;
-  int64_t leftInFile = file->length - myVerifyFilePos;
-  int64_t bytesThisPass = std::min (leftInFile, leftInPiece);
-  bytesThisPass = std::min (bytesThisPass, (int64_t)sizeof (myVerifyBuf));
+  qint64 leftInPiece = getPieceSize (&myInfo, myVerifyPieceIndex) - myVerifyPiecePos;
+  qint64 leftInFile = file->length - myVerifyFilePos;
+  qint64 bytesThisPass = std::min (leftInFile, leftInPiece);
+  bytesThisPass = std::min (bytesThisPass, (qint64)sizeof (myVerifyBuf));
 
   if (myVerifyFile.isOpen () && myVerifyFile.seek (myVerifyFilePos))
     {
-      int64_t numRead = myVerifyFile.read (myVerifyBuf, bytesThisPass);
+      qint64 numRead = myVerifyFile.read (myVerifyBuf, bytesThisPass);
       if (numRead == bytesThisPass)
         myVerifyHash.addData (myVerifyBuf, numRead);
     }
@@ -649,7 +649,7 @@ Options :: onTimeout ()
   bool done = myVerifyPieceIndex >= myInfo.pieceCount;
   if (done)
     {
-      uint64_t have = 0;
+      quint64 have = 0;
       foreach (const TrFile& f, myFiles)
         have += f.have;
 

diff --git a/qt/options.h b/qt/options.h
index 658a7b297e19a4f084fbe13f64f73277b8d6b6b5..84316ed6dc341b272256000ebe9e806c57401039 100644 (file)
--- a/qt/options.h
+++ b/qt/options.h
@@ -55,10 +55,10 @@ class FileAdded: public QObject
     void setFileToDelete (const QString& file) { myDelFile = file; }
 
   public slots:
-    void executed (int64_t tag, const QString& result, struct tr_variant * arguments);
+    void executed (qint64 tag, const QString& result, struct tr_variant * arguments);
 
   private:
-    const int64_t myTag;
+    const qint64 myTag;
     QString myName;
     QString myDelFile;
 };
@@ -117,14 +117,14 @@ class Options: public QDialog
     QTimer myVerifyTimer;
     char myVerifyBuf[2048*4];
     QFile myVerifyFile;
-    uint64_t myVerifyFilePos;
+    quint64 myVerifyFilePos;
     int myVerifyFileIndex;
-    uint32_t myVerifyPieceIndex;
-    uint32_t myVerifyPiecePos;
+    quint32 myVerifyPieceIndex;
+    quint32 myVerifyPiecePos;
     void clearVerify ();
     QVector<bool> myVerifyFlags;
     QCryptographicHash myVerifyHash;
-    typedef QMap<uint32_t,int32_t> mybins_t;
+    typedef QMap<quint32,qint32> mybins_t;
     mybins_t myVerifyBins;
     QTimer myEditTimer;
 };

diff --git a/qt/prefs.cc b/qt/prefs.cc
index 0a7c0791a77d3c243a1195e14f74555f07d7d768..68414d93c02a4b51828a6d67e930b0dcaa160ee3 100644 (file)
--- a/qt/prefs.cc
+++ b/qt/prefs.cc
@@ -151,7 +151,7 @@ Prefs :: Prefs (const char * configDir):
     {
       double d;
       bool boolVal;
-      int64_t intVal;
+      qint64 intVal;
       const char * str;
       size_t strLen;
       tr_variant * b (tr_variantDictFind (&top, myItems[i].key));

diff --git a/qt/session.cc b/qt/session.cc
index 374ec9c99bae0a2280470896f243de3a705ffc35..ef5cbe0119d3f6ce7db1138ea57a0069be9d39b6 100644 (file)
--- a/qt/session.cc
+++ b/qt/session.cc
@@ -764,7 +764,7 @@ Session :: parseResponse (const char * json, size_t jsonLength)
     const int err (tr_variantFromJson (&top, json, jsonLength));
     if (!err)
     {
-        int64_t tag = -1;
+        qint64 tag = -1;
         const char * result = NULL;
         tr_variant * args = NULL;
 
@@ -802,7 +802,7 @@ Session :: parseResponse (const char * json, size_t jsonLength)
                     break;
 
                 case TAG_BLOCKLIST_UPDATE: {
-                    int64_t intVal = 0;
+                    qint64 intVal = 0;
                     if (tr_variantDictFindDict (&top, TR_KEY_arguments, &args))
                         if (tr_variantDictFindInt (args, TR_KEY_blocklist_size, &intVal))
                             setBlocklistSize (intVal);
@@ -811,7 +811,7 @@ Session :: parseResponse (const char * json, size_t jsonLength)
 
                 case TAG_RENAME_PATH:
                   {
-                    int64_t id = 0;
+                    qint64 id = 0;
                     const char * result = 0;
                     if (tr_variantDictFindStr (&top, TR_KEY_result, &result, 0) && strcmp (result, "success"))
                       {
@@ -885,7 +885,7 @@ Session :: parseResponse (const char * json, size_t jsonLength)
 void
 Session :: updateStats (tr_variant * d, struct tr_session_stats * stats)
 {
-  int64_t i;
+  qint64 i;
 
   if (tr_variantDictFindInt (d, TR_KEY_uploadedBytes, &i))
     stats->uploadedBytes = i;
@@ -918,7 +918,7 @@ Session :: updateStats (tr_variant * d)
 void
 Session :: updateInfo (tr_variant * d)
 {
-  int64_t i;
+  qint64 i;
   const char * str;
 
   disconnect (&myPrefs, SIGNAL (changed (int)), this, SLOT (updatePref (int)));
@@ -949,7 +949,7 @@ Session :: updateInfo (tr_variant * d)
         {
           case QVariant :: Int:
             {
-              int64_t val;
+              qint64 val;
               if (tr_variantGetInt (b, &val))
                 myPrefs.set (i, (int)val);
               break;
@@ -1014,7 +1014,7 @@ Session :: updateInfo (tr_variant * d)
 }
 
 void
-Session :: setBlocklistSize (int64_t i)
+Session :: setBlocklistSize (qint64 i)
 {
   myBlocklistSize = i;
 

diff --git a/qt/session.h b/qt/session.h
index 3fd30ef99cbde29acdaca80c5239a46da9d3457b..54c94a89c239ad239eee90d6d42ed1352822b956 100644 (file)
--- a/qt/session.h
+++ b/qt/session.h
@@ -59,8 +59,8 @@ class Session: public QObject
     const QString& sessionVersion () const { return mySessionVersion; }
 
   public:
-    int64_t blocklistSize () const { return myBlocklistSize; }
-    void setBlocklistSize (int64_t i);
+    qint64 blocklistSize () const { return myBlocklistSize; }
+    void setBlocklistSize (qint64 i);
     void updateBlocklist ();
     void portTest ();
     void copyMagnetLinkToClipboard (int torrentId);
@@ -84,7 +84,7 @@ class Session: public QObject
     void exec (const struct tr_variant * request);
 
   public:
-    int64_t getUniqueTag () { return nextUniqueTag++; }
+    qint64 getUniqueTag () { return nextUniqueTag++; }
 
   private:
     void sessionSet (const tr_quark key, const QVariant& variant);
@@ -134,7 +134,7 @@ class Session: public QObject
 
   signals:
     void responseReceived (const QByteArray& json);
-    void executed (int64_t tag, const QString& result, struct tr_variant * arguments);
+    void executed (qint64 tag, const QString& result, struct tr_variant * arguments);
     void sourceChanged ();
     void portTested (bool isOpen);
     void statsUpdated ();
@@ -147,8 +147,8 @@ class Session: public QObject
     void httpAuthenticationRequired ();
 
   private:
-    int64_t nextUniqueTag;
-    int64_t myBlocklistSize;
+    qint64 nextUniqueTag;
+    qint64 myBlocklistSize;
     Prefs& myPrefs;
     tr_session * mySession;
     QString myConfigDir;

diff --git a/qt/torrent-delegate.cc b/qt/torrent-delegate.cc
index 91f1a5ae34bae93a6e4e259e3e73ef1d6ace540e..897c8df580e8850072662f855f0e7c6de0419170 100644 (file)
--- a/qt/torrent-delegate.cc
+++ b/qt/torrent-delegate.cc
@@ -80,7 +80,7 @@ TorrentDelegate :: progressString( const Torrent& tor ) const
     const bool isMagnet( !tor.hasMetadata( ) );
     const bool isDone( tor.isDone( ) );
     const bool isSeed( tor.isSeed( ) );
-    const uint64_t haveTotal( tor.haveTotal( ) );
+    const quint64 haveTotal( tor.haveTotal( ) );
     QString str;
     double seedRatio;
     const bool hasSeedRatio( tor.getSeedRatio( seedRatio ) );

diff --git a/qt/torrent-model.cc b/qt/torrent-model.cc
index fe347ce8e63833e59df7b2db23bb16b4311dbcf2..988dacc7c6c11c71de183a4953b7b727280340d7 100644 (file)
--- a/qt/torrent-model.cc
+++ b/qt/torrent-model.cc
@@ -131,7 +131,7 @@ TorrentModel :: removeTorrents( tr_variant * torrents )
     int i = 0;
     tr_variant * child;
     while(( child = tr_variantListChild( torrents, i++ ))) {
-        int64_t intVal;
+        qint64 intVal;
         if( tr_variantGetInt( child, &intVal ) )
             removeTorrent( intVal );
     }
@@ -155,7 +155,7 @@ TorrentModel :: updateTorrents( tr_variant * torrents, bool isCompleteList )
         tr_variant * child;
         while(( child = tr_variantListChild( torrents, i++ )))
         {
-            int64_t id;
+            qint64 id;
             if( tr_variantDictFindInt( child, TR_KEY_id, &id ) )
             {
                 newIds.insert( id );

diff --git a/qt/torrent.cc b/qt/torrent.cc
index 10456262de8d73d8651ec914e8221d99c47a7498..9a5250aeca3f99a156faf2e21c69f80d6271f7c0 100644 (file)
--- a/qt/torrent.cc
+++ b/qt/torrent.cc
@@ -466,7 +466,7 @@ Torrent :: update (tr_variant * d)
   static int key_to_property_index[TR_N_KEYS];
   bool changed = false;
   const bool was_seed = isSeed ();
-  const uint64_t old_verified_size = haveVerified ();
+  const quint64 old_verified_size = haveVerified ();
 
   if (!lookup_initialized)
     {
@@ -492,7 +492,7 @@ Torrent :: update (tr_variant * d)
         {
           case QVariant :: Int:
             {
-              int64_t val;
+              qint64 val;
               if (tr_variantGetInt (child, &val))
                 changed |= setInt (property_index, val);
               break;
@@ -513,7 +513,7 @@ Torrent :: update (tr_variant * d)
             }
           case QVariant :: ULongLong:
             {
-              int64_t val;
+              qint64 val;
               if (tr_variantGetInt (child, &val))
                 changed |= setSize (property_index, val);
               break;
@@ -527,7 +527,7 @@ Torrent :: update (tr_variant * d)
             }
           case QVariant :: DateTime:
             {
-              int64_t val;
+              qint64 val;
               if (tr_variantGetInt (child, &val) && val)
                 changed |= setDateTime (property_index, QDateTime :: fromTime_t(val));
               break;
@@ -549,7 +549,7 @@ Torrent :: update (tr_variant * d)
   if (tr_variantDictFindList (d, TR_KEY_files, &files))
     {
       const char * str;
-      int64_t intVal;
+      qint64 intVal;
       int i = 0;
       tr_variant * child;
 
@@ -580,7 +580,7 @@ Torrent :: update (tr_variant * d)
 
       for (int i=0; i<n && i<myFiles.size(); ++i)
         {
-          int64_t intVal;
+          qint64 intVal;
           bool boolVal;
           tr_variant * child = tr_variantListChild (files, i);
           TrFile& file (myFiles[i]);
@@ -640,7 +640,7 @@ Torrent :: update (tr_variant * d)
       while ((child = tr_variantListChild (trackerStats, childNum++)))
         {
           bool b;
-          int64_t i;
+          qint64 i;
           size_t len;
           const char * str;
           TrackerStat trackerStat;
@@ -717,7 +717,7 @@ Torrent :: update (tr_variant * d)
         {
           double d;
           bool b;
-          int64_t i;
+          qint64 i;
           size_t len;
           const char * str;
           Peer peer;

diff --git a/qt/torrent.h b/qt/torrent.h
index 0b6470313b12768dd9f02349b080b7ce2ddb410a..8e0ce72bc728bc70988b3760cea4c6a7b4ddf8c5 100644 (file)
--- a/qt/torrent.h
+++ b/qt/torrent.h
@@ -103,8 +103,8 @@ struct TrFile
   int index;
   int priority;
   QString filename;
-  uint64_t size;
-  uint64_t have;
+  quint64 size;
+  quint64 have;
 };
 
 typedef QList<TrFile> FileList;
@@ -253,14 +253,14 @@ class Torrent: public QObject
         bool isSeed( ) const { return haveVerified() >= totalSize(); }
         bool isPrivate( ) const { return getBool( IS_PRIVATE ); }
         bool getSeedRatio( double& setme ) const;
-        uint64_t haveVerified( ) const { return getSize( HAVE_VERIFIED ); }
-        uint64_t haveUnverified( ) const { return getSize( HAVE_UNCHECKED ); }
-        uint64_t desiredAvailable( ) const { return getSize( DESIRED_AVAILABLE ); }
-        uint64_t haveTotal( ) const { return haveVerified( ) + haveUnverified(); }
-        uint64_t totalSize( ) const { return getSize( TOTAL_SIZE ); }
-        uint64_t sizeWhenDone( ) const { return getSize( SIZE_WHEN_DONE ); }
-        uint64_t leftUntilDone( ) const { return getSize( LEFT_UNTIL_DONE ); }
-        uint64_t pieceSize( ) const { return getSize( PIECE_SIZE ); }
+        quint64 haveVerified( ) const { return getSize( HAVE_VERIFIED ); }
+        quint64 haveUnverified( ) const { return getSize( HAVE_UNCHECKED ); }
+        quint64 desiredAvailable( ) const { return getSize( DESIRED_AVAILABLE ); }
+        quint64 haveTotal( ) const { return haveVerified( ) + haveUnverified(); }
+        quint64 totalSize( ) const { return getSize( TOTAL_SIZE ); }
+        quint64 sizeWhenDone( ) const { return getSize( SIZE_WHEN_DONE ); }
+        quint64 leftUntilDone( ) const { return getSize( LEFT_UNTIL_DONE ); }
+        quint64 pieceSize( ) const { return getSize( PIECE_SIZE ); }
         bool hasMetadata( ) const { return getDouble( METADATA_PERCENT_DONE ) >= 1.0; }
         bool isMagnet( ) const { return magnetTorrent; }
         int  pieceCount( ) const { return getInt( PIECE_COUNT ); }
@@ -268,9 +268,9 @@ class Torrent: public QObject
         double percentComplete( ) const { return haveTotal() / (double)totalSize(); }
         double percentDone( ) const { return getDouble( PERCENT_DONE ); }
         double metadataPercentDone( ) const { return getDouble( METADATA_PERCENT_DONE ); }
-        uint64_t downloadedEver( ) const { return getSize( DOWNLOADED_EVER ); }
-        uint64_t uploadedEver( ) const { return getSize( UPLOADED_EVER ); }
-        uint64_t failedEver( ) const { return getSize( FAILED_EVER ); }
+        quint64 downloadedEver( ) const { return getSize( DOWNLOADED_EVER ); }
+        quint64 uploadedEver( ) const { return getSize( UPLOADED_EVER ); }
+        quint64 failedEver( ) const { return getSize( FAILED_EVER ); }
         int compareTracker( const Torrent& ) const;
         int compareSeedRatio( const Torrent& ) const;
         int compareRatio( const Torrent& ) const;