소스 검색

Small changes

Kandrashin Denis 12 년 전
부모
커밋
e91fdcc531
2개의 변경된 파일3개의 추가작업 그리고 13개의 파일을 삭제
  1. 3 8
      source/fb2head.cpp
  2. 0 5
      source/fb2head.hpp

+ 3 - 8
source/fb2head.cpp

@@ -99,10 +99,6 @@ QString FbScheme::info() const
 QString FbScheme::type() const
 {
     if (isNull()) return QString();
-    if (attribute("name") == "last-name") {
-        QString result = attribute("type");
-        return result;
-    }
     QString result = attribute("type");
     if (!result.isEmpty()) return result;
     FbScheme child = firstChildElement("xs:complexType").firstChildElement();
@@ -200,7 +196,6 @@ FbHeadItem::FbHeadItem(QWebElement &element, FbHeadItem *parent)
     , m_parent(parent)
 {
     m_name = element.tagName().toLower();
-    m_id = element.attribute("id");
     if (m_name == "div") {
         QString style = element.attribute("class").toLower();
         if (!style.isEmpty()) m_name = style;
@@ -306,8 +301,8 @@ QString FbHeadItem::value() const
             return m_element.attribute("src");
         } break;
         case Seqn : {
-            QString text = m_element.attribute("fb2_name");
-            QString numb = m_element.attribute("fb2_number");
+            QString text = m_element.attribute("name");
+            QString numb = m_element.attribute("number");
             if (numb.isEmpty() || numb == "0") return text;
             return text + ", " + tr("#") + numb;
         } break;
@@ -348,7 +343,7 @@ FbHeadModel::FbHeadModel(QWebView &view, QObject *parent)
     , m_root(NULL)
 {
     QWebElement doc = view.page()->mainFrame()->documentElement();
-    QWebElement head = doc.findFirst("div.description");
+    QWebElement head = doc.findFirst("fb\\:description");
     if (head.isNull()) return;
     m_root = new FbHeadItem(head);
 }

+ 0 - 5
source/fb2head.hpp

@@ -96,10 +96,6 @@ public:
 
     void setText(const QString &text);
 
-    const QString & id() const {
-        return m_id;
-    }
-
     const QString & name() const {
         return m_name;
     }
@@ -126,7 +122,6 @@ private:
     FbHeadItem * m_parent;
     QString m_name;
     QString m_text;
-    QString m_id;
 };
 
 class FbHeadModel: public QAbstractItemModel