[QTerm-cvs] SF.net SVN: qterm:[1244] trunk/qterm-qt4/src/qtermglobal.cpp

[<si...@us...>]

Revision: 1244
          http://qterm.svn.sourceforge.net/qterm/?rev=1244&view=rev
Author:   sidos
Date:     2010-08-13 13:42:56 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
fix a bug that system address.xml is never merged

Modified Paths:
--------------
    trunk/qterm-qt4/src/qtermglobal.cpp

Modified: trunk/qterm-qt4/src/qtermglobal.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermglobal.cpp	2010-08-13 13:25:43 UTC (rev 1243)
+++ trunk/qterm-qt4/src/qtermglobal.cpp	2010-08-13 13:42:56 UTC (rev 1244)
@@ -306,26 +306,26 @@
 bool Global::convertAddressBook2XML()
 {
     QDir dir;
-    if (dir.exists(m_addrXml))
+    if (dir.exists(m_addrXml))// do nothing if address.xml existed
         return true;
     else {
-        if (!dir.exists(m_addrCfg))
+        if (!dir.exists(m_addrCfg)) // simply copy from system if even address.cfg not existed
             return createLocalFile(m_addrXml, m_pathLib + "address.xml");
     }
-        // try import xml address book
+    // import system address.xml or create new one
     QDomDocument doc;
     QDomElement addresses;
-    QFile file(m_addrXml);
-        if (file.open(QIODevice::ReadOnly) && doc.setContent(&file)) {
-                addresses = doc.documentElement();
-            } else {
-                QDomProcessingInstruction instr =
+    QFile file(m_pathLib + "address.xml");
+    if (file.open(QIODevice::ReadOnly) && doc.setContent(&file)) {
+        addresses = doc.documentElement();
+    } else {
+        QDomProcessingInstruction instr =
                 doc.createProcessingInstruction("xml","version=\"1.0\" encoding=\"UTF-8\"");
-                doc.appendChild(instr);
+        doc.appendChild(instr);
 
-                addresses = doc.createElement("addresses");
-               doc.appendChild(addresses);
-        }
+        addresses = doc.createElement("addresses");
+        doc.appendChild(addresses);
+    }
     // Combine cfg address book
     m_address = new Config(m_addrCfg);
     int num = m_address->getItemValue("bbs list", "num").toInt();
@@ -354,13 +354,6 @@
 
         addresses.appendChild(site);
     }
-//  QFile ofile(m_addrXml);
-//  if (!ofile.open(QIODevice::WriteOnly))
-//      return false;
-//  QByteArray xml = doc.toByteArray();
-//  QTextStream stream(&ofile);
-//  stream << xml;
-//  ofile.close();
     saveAddressXml(doc);
     delete m_address;
     return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.