[Pkg-owncloud-commits] [owncloud-client] 106/332: SyncJournalDb: use QByteArray for etag and fileid

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit f4ea34e63bc31686b05e3a76383f7f4a30ccd8b5
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Jun 19 14:27:04 2014 +0200

    SyncJournalDb: use QByteArray for etag and fileid
---
 src/mirall/syncjournaldb.cpp       | 4 ++--
 src/mirall/syncjournalfilerecord.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index edb88d5..4abf340 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -482,8 +482,8 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord( const QString& filename )
             rec._mode    = _getFileRecordQuery->value(4).toInt(&ok);
             rec._modtime = Utility::qDateTimeFromTime_t(_getFileRecordQuery->value(5).toLongLong(&ok));
             rec._type    = _getFileRecordQuery->value(6).toInt(&ok);
-            rec._etag    = _getFileRecordQuery->value(7).toString();
-            rec._fileId  = _getFileRecordQuery->value(8).toString();
+            rec._etag    = _getFileRecordQuery->value(7).toByteArray();
+            rec._fileId  = _getFileRecordQuery->value(8).toByteArray();
             rec._remotePerm = _getFileRecordQuery->value(9).toByteArray();
 
             _getFileRecordQuery->finish();
diff --git a/src/mirall/syncjournalfilerecord.h b/src/mirall/syncjournalfilerecord.h
index 8ac7513..7ba8c3b 100644
--- a/src/mirall/syncjournalfilerecord.h
+++ b/src/mirall/syncjournalfilerecord.h
@@ -35,8 +35,8 @@ public:
     quint64   _inode;
     QDateTime _modtime;
     int       _type;
-    QString   _etag; // FIXME Why not QByteArray?
-    QString   _fileId; // FIXME Why not QByteArray?
+    QByteArray _etag;
+    QByteArray _fileId;
     QByteArray _remotePerm;
     int       _mode;
 };

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git