浏览代码

Optimize class Fb2TemporaryList

Kandrashin Denis 13 年之前
父节点
当前提交
bcef7caaa2
共有 3 个文件被更改,包括 6 次插入5 次删除
  1. 4 4
      source/fb2save.cpp
  2. 1 1
      source/fb2save.h
  3. 1 0
      source/fb2temp.cpp

+ 4 - 4
source/fb2save.cpp

@@ -124,10 +124,10 @@ QString Fb2SaveWriter::getFileName(const QString &path)
     }
 }
 
-QString Fb2SaveWriter::getFileData(const QString &name)
+QByteArray Fb2SaveWriter::getFileData(const QString &name)
 {
-    QString data = m_view.files().data(name).toBase64();
-    if (data.isEmpty()) data = m_files.data(name);
+    QByteArray data = m_view.files().data(name);
+    if (data.size() == 0) data = m_files.data(name);
     return data;
 }
 
@@ -137,7 +137,7 @@ void Fb2SaveWriter::writeFiles()
     while (it.hasNext()) {
         QString name = it.next();
         if (name.isEmpty()) continue;
-        QString data = getFileData(name);
+        QString data = getFileData(name).toBase64();
         if (data.isEmpty()) continue;
         writeStartElement("binary", 2);
         if (m_folds) m_folds->append(m_line);

+ 1 - 1
source/fb2save.h

@@ -29,7 +29,7 @@ public:
 private:
     void Init();
     QByteArray downloadFile(const QUrl &url);
-    QString getFileData(const QString &name);
+    QByteArray getFileData(const QString &name);
     QString newFileName(const QString &path);
 private:
     QList<int> *m_folds;

+ 1 - 0
source/fb2temp.cpp

@@ -136,6 +136,7 @@ Fb2ImageReply::Fb2ImageReply(QNetworkAccessManager::Operation op, const QNetwork
     setUrl(request.url());
     open(ReadOnly | Unbuffered);
     setHeader(QNetworkRequest::ContentLengthHeader, QVariant(content.size()));
+    setAttribute(QNetworkRequest::CacheSaveControlAttribute, QVariant(false));
     QMetaObject::invokeMethod(this, "readyRead", Qt::QueuedConnection);
     QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
 }