Final refactoring

src/models/filemodel.cpp

@@ -233,7 +233,7 @@ void FileListModel::setQuery(QSqlQuery &query)
 
 void FileListModel::setQueryWithFileContent(QSqlQuery &query)
 {
-	if (query.record().count() != 4) {
+	if (query.record().count() != 3) {
 		return;
 	}
 
@@ -244,8 +244,8 @@ void FileListModel::setQueryWithFileContent(QSqlQuery &query)
 	query.first();
 	while (query.isActive() && query.isValid()) {
 		m_files.append(Entry(query.value(0).toInt(),
-		    query.value(1).toString(), query.value(2).toString(), QString(),
-		    QByteArray::fromBase64(query.value(3).toByteArray()).size(),
+		    query.value(1).toString(), QString(), QString(),
+		    QByteArray::fromBase64(query.value(2).toByteArray()).size(),
 		    QString()));
 		query.next();
 	}

src/sqlite/file_db.cpp

@@ -152,8 +152,8 @@ void FileDb::setFileModelFromDbWithFileContent(FileListModel &model,
 {
 	QSqlQuery query(m_db);
 
-	QString queryStr = "SELECT id, dmFileDescr, _dmFileSize, "
-	    "dmEncodedContent FROM files WHERE dmID = :dmID";
+	QString queryStr = "SELECT id, dmFileDescr, dmEncodedContent "
+	    "FROM files WHERE dmID = :dmID";
 	if (!query.prepare(queryStr)) {
 		logErrorNL("Cannot prepare SQL query: %s",
 		    query.lastError().text().toUtf8().constData());