浏览代码

Small changes

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

+ 4 - 8
source/fb2save.cpp

@@ -80,17 +80,13 @@ QByteArray Fb2SaveWriter::downloadFile(const QString &src)
 
 QString Fb2SaveWriter::getFileName(const QString &path)
 {
-    StringHash::const_iterator it = m_files.find(path);
-    if (it != m_files.end()) return it.value();
-
     QString hash = m_view.files().hash(path);
     if (hash.isEmpty()) return QString();
 
     QString name = m_view.files().name(hash);
     if (name.isEmpty()) return QString();
 
-    m_files[name] = path;
-    m_names << name;
+    m_names.append(name);
     return name;
 }
 
@@ -101,9 +97,9 @@ QString Fb2SaveWriter::getFileData(const QString &name)
 
 void Fb2SaveWriter::writeFiles()
 {
-    StringList::const_iterator it;
-    for (it = m_names.constBegin(); it != m_names.constEnd(); it++) {
-        QString name = *it;
+    QStringListIterator it(m_names);
+    while (it.hasNext()) {
+        QString name = it.next();
         if (name.isEmpty()) continue;
         QString data = getFileData(name);
         if (data.isEmpty()) continue;

+ 5 - 7
source/fb2save.h

@@ -5,13 +5,13 @@
 #include "fb2temp.hpp"
 
 #include <QByteArray>
-#include <QHash>
-#include <QList>
-#include <QMutex>
+#include <QStringList>
 #include <QThread>
 #include <QXmlDefaultHandler>
 #include <QXmlStreamWriter>
 
+#include "fb2temp.hpp"
+
 class Fb2WebView;
 
 class Fb2SaveWriter : public QXmlStreamWriter
@@ -34,10 +34,8 @@ private:
 private:
     QList<int> *m_folds;
     Fb2WebView &m_view;
-    typedef QHash<QString, QString> StringHash;
-    typedef QList<QString> StringList;
-    StringHash m_files;
-    StringList m_names;
+    Fb2TemporaryList m_files;
+    QStringList m_names;
     int m_line;
 };