Menu
▾
▴
[QTerm-cvs] SF.net SVN: qterm:[1245] trunk/qterm-qt4/src
|
From: <si...@us...> - 2010-08-13 14:01:04
|
Revision: 1245
http://qterm.svn.sourceforge.net/qterm/?rev=1245&view=rev
Author: sidos
Date: 2010-08-13 14:00:58 +0000 (Fri, 13 Aug 2010)
Log Message:
-----------
remove deprecated cfg address book interface
Modified Paths:
--------------
trunk/qterm-qt4/src/qtermglobal.cpp
trunk/qterm-qt4/src/qtermglobal.h
Modified: trunk/qterm-qt4/src/qtermglobal.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermglobal.cpp 2010-08-13 13:42:56 UTC (rev 1244)
+++ trunk/qterm-qt4/src/qtermglobal.cpp 2010-08-13 14:00:58 UTC (rev 1245)
@@ -83,7 +83,6 @@
m_translatorQTerm = new QTranslator(0);
m_config = new Config(m_fileCfg);
- m_address = new Config(m_addrCfg);
m_converter = new Convert();
if (!iniSettings()) {
m_status = INIT_ERROR;
@@ -104,11 +103,6 @@
return m_config;
}
-Config * Global::addrCfg()
-{
- return m_address;
-}
-
QDomDocument Global::addrXml()
{
QDomDocument doc;
@@ -155,22 +149,7 @@
return listSite;
}
-QStringList Global::loadNameList()
-{
- QStringList listName;
- QString strTmp = m_address->getItemValue("bbs list", "num").toString();
-
- QString strSection;
-
- for (int i = 0; i < strTmp.toInt(); i++) {
- strSection.sprintf("bbs %d", i);
- listName.append(m_address->getItemValue(strSection, "name").toString());
- }
-
- return listName;
-}
-
bool Global::loadAddress(QDomDocument doc, QString uuid, Param& param)
{
if (uuid.isEmpty())
@@ -185,10 +164,10 @@
return true;
}
-bool Global::loadAddress(int n, Param& param)
+bool Global::loadAddress(Config& addrCfg, int n, Param& param)
{
QString strTmp, strSection;
- strTmp = m_address->getItemValue("bbs list", "num").toString();
+ strTmp = addrCfg.getItemValue("bbs list", "num").toString();
if ((n < 0 && strTmp.toInt() <= 0) || n < -1)
strSection = "default";
else {
@@ -197,7 +176,7 @@
}
// check if larger than existence
- strTmp = m_address->getItemValue("bbs list", "num").toString();
+ strTmp = addrCfg.getItemValue("bbs list", "num").toString();
if (n >= strTmp.toInt())
return false;
@@ -210,36 +189,12 @@
param.m_mapParam["user"].toString());
} else
#endif // KWALLET_ENABLED
- param.m_mapParam[key] = m_address->getItemValue(strSection,key);
+ param.m_mapParam[key] = addrCfg.getItemValue(strSection,key);
}
return true;
}
-void Global::saveAddress(int n, const Param& param)
-{
- QString strTmp, strSection;
- if (n < 0)
- strSection = "default";
- else
- strSection.sprintf("bbs %d", n);
-
- foreach(QString key,param.m_mapParam.keys()) {
- #ifdef KWALLET_ENABLED
- if (key == "password" && m_wallet != NULL) {
- m_wallet->open();
- m_wallet->writePassword(
- param.m_mapParam["name"].toString(),
- param.m_mapParam["user"].toString(),
- param.m_mapParam["password"].toString());
- } else
- #endif
- m_address->setItemValue(strSection, key, param.m_mapParam[key]);
- }
- m_address->save();
-
-}
-
void Global::saveAddress(QDomDocument doc, QString uuid, const Param& param)
{
bool result = false;
@@ -270,26 +225,6 @@
}
-void Global::removeAddress(int n)
-{
- if (n < 0)
- return;
- QString strSection = QString("bbs %1").arg(n);
-#ifdef KWALLET_ENABLED
- // check if larger than existence
- QString strTmp = m_address->getItemValue("bbs list", "num").toString();
- if (n >= strTmp.toInt())
- return;
- QString site = m_address->getItemValue(strSection, "name").toString();
- QString username = m_address->getItemValue(strSection, "user").toString();
- if (m_wallet != NULL) {
- m_wallet->open();
- m_wallet->removePassword(site, username);
- }
-#endif // KWALLET_ENABLED
- m_address->deleteSection(strSection);
-}
-
void Global::removeAddress(QDomDocument doc, QString uuid)
{
QDomNodeList nodeList;
@@ -327,8 +262,8 @@
doc.appendChild(addresses);
}
// Combine cfg address book
- m_address = new Config(m_addrCfg);
- int num = m_address->getItemValue("bbs list", "num").toInt();
+ Config addrCfg(m_addrCfg);
+ int num = addrCfg.getItemValue("bbs list", "num").toInt();
QDomElement imported = doc.createElement("folder");
@@ -337,7 +272,7 @@
for (int i = -1; i < num; i++) {
Param param;
- loadAddress(i, param);
+ loadAddress(addrCfg, i, param);
QDomElement site = doc.createElement("site");
if (i==-1)
site.setAttribute("uuid", QUuid().toString());
@@ -355,7 +290,6 @@
addresses.appendChild(site);
}
saveAddressXml(doc);
- delete m_address;
return true;
}
Modified: trunk/qterm-qt4/src/qtermglobal.h
===================================================================
--- trunk/qterm-qt4/src/qtermglobal.h 2010-08-13 13:42:56 UTC (rev 1244)
+++ trunk/qterm-qt4/src/qtermglobal.h 2010-08-13 14:00:58 UTC (rev 1245)
@@ -78,22 +78,21 @@
};
static Global * instance();
Config * fileCfg();
- Config * addrCfg();
QDomDocument addrXml();
const QString & pathLib();
const QString & pathPic();
const QString & pathCfg();
void clearDir(const QString & path);
+ // XML address book
QMap<QString,QString> loadFavoriteList(QDomDocument);
- QStringList loadNameList();
bool loadAddress(QDomDocument doc, QString uuid, Param & param);
- bool loadAddress(int n, Param & param);
- void saveAddress(int n, const Param & param);
void saveAddress(QDomDocument doc, QString uuid, const Param & param);
- void removeAddress(int n);
void removeAddress(QDomDocument doc, QString uuid);
void saveAddressXml(const QDomDocument& doc);
bool convertAddressBook2XML();
+ // deprecated cfg address book, here only for conversion reason
+ bool loadAddress(Config &addrCfg, int n, Param & param);
+
QString getOpenFileName(const QString & filter, QWidget * widget);
QString getSaveFileName(const QString & filename, QWidget * widget);
bool isOK();
@@ -148,7 +147,6 @@
QString m_pathPic;
QString m_pathCfg;
Config * m_config;
- Config * m_address;
QByteArray * m_windowState;
Status m_status;
QString m_style;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
