maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more classes renamed

Browse source 
EvolutionSyncConfig => SyncConfig
SyncEvolutionException => Exception
EvolutionUnref* => Unref*
This commit is contained in:
Patrick Ohly 2009-10-06 17:22:47 +02:00
parent 5d23ae24f8
commit 7e4eb2e93d
15 changed files with 161 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CmdlineSyncClient.h
View file

@ -37,7 +37,7 @@ class CmdlineSyncClient : public SyncContext {
const set<string> &sources = set<string>(),
bool useKeyring = false);
using EvolutionSyncConfig::savePassword;
using SyncConfig::savePassword;
/**
* These 2 functions are from ConfigUserInterface and implement it

2
src/backends/evolution/EvolutionCalendarSource.cpp
View file

@ -714,7 +714,7 @@ string EvolutionCalendarSource::getItemModTime(ECalComponent *ecomp)
{
struct icaltimetype *modTime;
e_cal_component_get_last_modified(ecomp, &modTime);
eptr<struct icaltimetype, struct icaltimetype, EvolutionUnrefFree<struct icaltimetype> > modTimePtr(modTime);
eptr<struct icaltimetype, struct icaltimetype, UnrefFree<struct icaltimetype> > modTimePtr(modTime);
if (!modTimePtr) {
return "";
} else {

8
src/client-test-app.cpp
View file

@ -192,13 +192,13 @@ public:
// get configuration and set obligatory fields
LoggerBase::instance().setLevel(Logger::DEBUG);
std::string root = std::string("evolution/") + server + "_" + id;
EvolutionSyncConfig config(string(server) + "_" + id);
boost::shared_ptr<EvolutionSyncConfig> from = boost::shared_ptr<EvolutionSyncConfig> ();
SyncConfig config(string(server) + "_" + id);
boost::shared_ptr<SyncConfig> from = boost::shared_ptr<SyncConfig> ();
if (!config.exists()) {
// no configuration yet
config.setDefaults();
from = EvolutionSyncConfig::createServerTemplate(server);
from = SyncConfig::createServerTemplate(server);
if(from) {
set<string> filter;
config.copy(*from, &filter);
@ -367,7 +367,7 @@ private:
changeID += isSourceA ? "1" : "2";
string database = evClient.getDatabaseName(name);
EvolutionSyncConfig config("client-test-changes");
SyncConfig config("client-test-changes");
SyncSourceNodes nodes = config.getSyncSourceNodes(name,
string("_") + ((TestEvolution &)client).m_clientID +
"_" + (isSourceA ? "A" : "B"));

32
src/syncevo-dbus-server.cpp
View file

@ -633,16 +633,16 @@ syncevo_get_servers (SyncevoDBusServer *obj,
*servers = g_ptr_array_new ();
EvolutionSyncConfig::ServerList list = EvolutionSyncConfig::getServers();
SyncConfig::ServerList list = SyncConfig::getServers();
BOOST_FOREACH(const EvolutionSyncConfig::ServerList::value_type &server,list) {
BOOST_FOREACH(const SyncConfig::ServerList::value_type &server,list) {
char *name = NULL;
char *url = NULL;
char *icon = NULL;
gboolean ready = TRUE;
SyncevoServer *srv;
boost::shared_ptr<EvolutionSyncConfig> config (EvolutionSyncConfig::createServerTemplate (server.first));
boost::shared_ptr<SyncConfig> config (SyncConfig::createServerTemplate (server.first));
url = icon = NULL;
if (config.get()) {
url = g_strdup (config->getWebURL().c_str());
@ -674,14 +674,14 @@ syncevo_get_templates (SyncevoDBusServer *obj,
*templates = g_ptr_array_new ();
EvolutionSyncConfig::ServerList list = EvolutionSyncConfig::getServerTemplates();
SyncConfig::ServerList list = SyncConfig::getServerTemplates();
BOOST_FOREACH(const EvolutionSyncConfig::ServerList::value_type &server,list) {
BOOST_FOREACH(const SyncConfig::ServerList::value_type &server,list) {
char *name, *url, *icon;
gboolean ready;
SyncevoServer *temp;
boost::shared_ptr<EvolutionSyncConfig> config (EvolutionSyncConfig::createServerTemplate (server.first));
boost::shared_ptr<SyncConfig> config (SyncConfig::createServerTemplate (server.first));
name = g_strdup (server.first.c_str());
url = g_strdup (config->getWebURL().c_str());
icon = g_strdup (config->getIconURI().c_str());
@ -715,7 +715,7 @@ syncevo_get_template_config (SyncevoDBusServer *obj,
return FALSE;
}
boost::shared_ptr<EvolutionSyncConfig> config (EvolutionSyncConfig::createServerTemplate (string (templ)));
boost::shared_ptr<SyncConfig> config (SyncConfig::createServerTemplate (string (templ)));
if (!config.get()) {
*options = NULL;
*error = g_error_new (SYNCEVO_DBUS_ERROR,
@ -790,11 +790,11 @@ syncevo_get_server_config (SyncevoDBusServer *obj,
return FALSE;
}
boost::shared_ptr<EvolutionSyncConfig> from;
boost::shared_ptr<EvolutionSyncConfig> config(new EvolutionSyncConfig (string (server)));
boost::shared_ptr<SyncConfig> from;
boost::shared_ptr<SyncConfig> config(new SyncConfig (string (server)));
/* if config does not exist, create from template */
if (!config->exists()) {
from = EvolutionSyncConfig::createServerTemplate( string (server));
from = SyncConfig::createServerTemplate( string (server));
if (!from.get()) {
*options = NULL;
*error = g_error_new (SYNCEVO_DBUS_ERROR,
@ -812,7 +812,7 @@ syncevo_get_server_config (SyncevoDBusServer *obj,
g_ptr_array_add (*options, option);
/* get template options if template exists */
boost::shared_ptr<EvolutionSyncConfig> templ = EvolutionSyncConfig::createServerTemplate( string (server));
boost::shared_ptr<SyncConfig> templ = SyncConfig::createServerTemplate( string (server));
if (templ.get()) {
const char *ready;
@ -884,15 +884,15 @@ syncevo_set_server_config (SyncevoDBusServer *obj,
return FALSE;
}
boost::shared_ptr<EvolutionSyncConfig> from(new EvolutionSyncConfig (string (server)));
boost::shared_ptr<SyncConfig> from(new SyncConfig (string (server)));
/* if config does not exist, create from template */
if (!from->exists()) {
from = EvolutionSyncConfig::createServerTemplate( string (server));
from = SyncConfig::createServerTemplate( string (server));
if (!from.get()) {
from = EvolutionSyncConfig::createServerTemplate( string ("default"));
from = SyncConfig::createServerTemplate( string ("default"));
}
}
boost::shared_ptr<EvolutionSyncConfig> config(new EvolutionSyncConfig(string (server)));
boost::shared_ptr<SyncConfig> config(new SyncConfig(string (server)));
config->copy(*from, NULL);
for (i = 0; i < (int)options->len; i++) {
@ -948,7 +948,7 @@ syncevo_remove_server_config (SyncevoDBusServer *obj,
return FALSE;
}
boost::shared_ptr<EvolutionSyncConfig> config(new EvolutionSyncConfig (string (server)));
boost::shared_ptr<SyncConfig> config(new SyncConfig (string (server)));
if (!config->exists()) {
*error = g_error_new (SYNCEVO_DBUS_ERROR,
SYNCEVO_DBUS_ERROR_NO_SUCH_SERVER,

32
src/syncevo/Cmdline.cpp
View file

@ -50,7 +50,7 @@ Cmdline::Cmdline(int argc, const char * const * argv, ostream &out, ostream &err
m_argv(argv),
m_out(out),
m_err(err),
m_validSyncProps(EvolutionSyncConfig::getRegistry()),
m_validSyncProps(SyncConfig::getRegistry()),
m_validSourceProps(SyncSourceConfig::getRegistry())
{}
@ -100,7 +100,7 @@ bool Cmdline::parse()
m_configure = true;
if (boost::trim_copy(m_template) == "?") {
dumpServers("Available configuration templates:",
EvolutionSyncConfig::getServerTemplates());
SyncConfig::getServerTemplates());
m_dontrun = true;
}
} else if(boost::iequals(m_argv[opt], "--print-servers")) {
@ -186,7 +186,7 @@ bool Cmdline::run() {
printf("%s", SyncSource::backendsInfo().c_str());
} else if (m_printServers || boost::trim_copy(m_server) == "?") {
dumpServers("Configured servers:",
EvolutionSyncConfig::getServers());
SyncConfig::getServers());
} else if (m_dontrun) {
// user asked for information
} else if (m_argc == 1) {
@ -213,20 +213,20 @@ bool Cmdline::run() {
usage(false);
} else if (m_printConfig) {
boost::shared_ptr<EvolutionSyncConfig> config;
boost::shared_ptr<SyncConfig> config;
if (m_template.empty()) {
if (m_server.empty()) {
m_err << "ERROR: --print-config requires either a --template or a server name." << endl;
return false;
}
config.reset(new EvolutionSyncConfig(m_server));
config.reset(new SyncConfig(m_server));
if (!config->exists()) {
m_err << "ERROR: server '" << m_server << "' has not been configured yet." << endl;
return false;
}
} else {
config = EvolutionSyncConfig::createServerTemplate(m_template);
config = SyncConfig::createServerTemplate(m_template);
if (!config.get()) {
m_err << "ERROR: no configuration template for '" << m_template << "' available." << endl;
return false;
@ -274,9 +274,9 @@ bool Cmdline::run() {
// Both config changes and migration are implemented as copying from
// another config (template resp. old one). Migration also moves
// the old config.
boost::shared_ptr<EvolutionSyncConfig> from;
boost::shared_ptr<SyncConfig> from;
if (m_migrate) {
from.reset(new EvolutionSyncConfig(m_server));
from.reset(new SyncConfig(m_server));
if (!from->exists()) {
m_err << "ERROR: server '" << m_server << "' has not been configured yet." << endl;
return false;
@ -305,18 +305,18 @@ bool Cmdline::run() {
counter++;
}
from.reset(new EvolutionSyncConfig(m_server + suffix));
from.reset(new SyncConfig(m_server + suffix));
} else {
from.reset(new EvolutionSyncConfig(m_server));
from.reset(new SyncConfig(m_server));
if (!from->exists()) {
// creating from scratch, look for template
fromScratch = true;
string configTemplate = m_template.empty() ? m_server : m_template;
from = EvolutionSyncConfig::createServerTemplate(configTemplate);
from = SyncConfig::createServerTemplate(configTemplate);
if (!from.get()) {
m_err << "ERROR: no configuration template for '" << configTemplate << "' available." << endl;
dumpServers("Available configuration templates:",
EvolutionSyncConfig::getServerTemplates());
SyncConfig::getServerTemplates());
return false;
}
}
@ -406,8 +406,8 @@ bool Cmdline::run() {
usage(true, "too many parameters for --remove");
return false;
} else {
boost::shared_ptr<EvolutionSyncConfig> config;
config.reset(new EvolutionSyncConfig(m_server));
boost::shared_ptr<SyncConfig> config;
config.reset(new SyncConfig(m_server));
config->remove();
return true;
}
@ -606,10 +606,10 @@ void Cmdline::listSources(SyncSource &syncSource, const string &header)
}
void Cmdline::dumpServers(const string &preamble,
const EvolutionSyncConfig::ServerList &servers)
const SyncConfig::ServerList &servers)
{
m_out << preamble << endl;
BOOST_FOREACH(const EvolutionSyncConfig::ServerList::value_type &server,servers) {
BOOST_FOREACH(const SyncConfig::ServerList::value_type &server,servers) {
m_out << " " << server.first << " = " << server.second << endl;
}
if (!servers.size()) {

2
src/syncevo/Cmdline.h
View file

@ -122,7 +122,7 @@ protected:
void listSources(SyncSource &syncSource, const string &header);
void dumpServers(const string &preamble,
const EvolutionSyncConfig::ServerList &servers);
const SyncConfig::ServerList &servers);
void dumpProperties(const ConfigNode &configuredProps,
const ConfigPropertyRegistry &allProps);

6
src/syncevo/SmartPtr.h
View file

@ -42,12 +42,12 @@ using namespace std;
#include <syncevo/declarations.h>
SE_BEGIN_CXX
template<class T> class EvolutionUnrefFree {
template<class T> class UnrefFree {
public:
static void unref(T *pointer) { free(pointer); }
};
class EvolutionUnref {
class Unref {
public:
/**
* C character string - beware, Funambol C++ client library strings must
@ -84,7 +84,7 @@ class EvolutionUnref {
* trying to store a NULL pointer raises an exception,
* unreferencing valid objects is done automatically
*/
template<class T, class base = T, class R = EvolutionUnref > class eptr {
template<class T, class base = T, class R = Unref > class eptr {
protected:
T *m_pointer;

166
src/syncevo/SyncConfig.cpp
View file

@ -63,7 +63,7 @@ void ConfigProperty::throwValueError(const ConfigNode &node, const string &name,
SyncContext::throwError(node.getName() + ": " + name + " = " + value + ": " + error);
}
EvolutionSyncConfig::EvolutionSyncConfig() :
SyncConfig::SyncConfig() :
m_oldLayout(false)
{
m_tree.reset(new VolatileConfigTree());
@ -71,7 +71,7 @@ EvolutionSyncConfig::EvolutionSyncConfig() :
m_hiddenNode = m_configNode;
}
EvolutionSyncConfig::EvolutionSyncConfig(const string &server,
SyncConfig::SyncConfig(const string &server,
boost::shared_ptr<ConfigTree> tree) :
m_server(server),
m_oldLayout(false)
@ -102,25 +102,25 @@ EvolutionSyncConfig::EvolutionSyncConfig(const string &server,
m_hiddenNode = m_tree->open(path, ConfigTree::hidden);
}
string EvolutionSyncConfig::getRootPath() const
string SyncConfig::getRootPath() const
{
return m_tree->getRootPath();
}
static void addServers(const string &root, EvolutionSyncConfig::ServerList &res) {
static void addServers(const string &root, SyncConfig::ServerList &res) {
FileConfigTree tree(root, false);
list<string> servers = tree.getChildren("");
BOOST_FOREACH(const string &server, servers) {
// sanity check: only list server directories which actually
// contain a configuration
EvolutionSyncConfig config(server);
SyncConfig config(server);
if (config.exists()) {
res.push_back(pair<string, string>(server, root + "/" + server));
}
}
}
EvolutionSyncConfig::ServerList EvolutionSyncConfig::getServers()
SyncConfig::ServerList SyncConfig::getServers()
{
ServerList res;
@ -130,7 +130,7 @@ EvolutionSyncConfig::ServerList EvolutionSyncConfig::getServers()
return res;
}
EvolutionSyncConfig::ServerList EvolutionSyncConfig::getServerTemplates()
SyncConfig::ServerList SyncConfig::getServerTemplates()
{
class TmpList : public ServerList {
public:
@ -151,7 +151,7 @@ EvolutionSyncConfig::ServerList EvolutionSyncConfig::getServerTemplates()
ReadDir dir(templateDir);
BOOST_FOREACH(const string &entry, dir) {
if (isDir(templateDir + "/" + entry)) {
boost::shared_ptr<EvolutionSyncConfig> config = EvolutionSyncConfig::createServerTemplate(entry);
boost::shared_ptr<SyncConfig> config = SyncConfig::createServerTemplate(entry);
string comment = config->getWebURL();
if (comment.empty()) {
comment = templateDir + "/" + entry;
@ -174,7 +174,7 @@ EvolutionSyncConfig::ServerList EvolutionSyncConfig::getServerTemplates()
return result;
}
boost::shared_ptr<EvolutionSyncConfig> EvolutionSyncConfig::createServerTemplate(const string &server)
boost::shared_ptr<SyncConfig> SyncConfig::createServerTemplate(const string &server)
{
// case insensitive search for read-only file template config
string templateConfig(TEMPLATE_DIR);
@ -193,7 +193,7 @@ boost::shared_ptr<EvolutionSyncConfig> EvolutionSyncConfig::createServerTemplate
}
boost::shared_ptr<FileConfigTree> tree(new FileConfigTree(templateConfig, false));
tree->setReadOnly(true);
boost::shared_ptr<EvolutionSyncConfig> config(new EvolutionSyncConfig(server, tree));
boost::shared_ptr<SyncConfig> config(new SyncConfig(server, tree));
boost::shared_ptr<PersistentSyncSourceConfig> source;
config->setDefaults(false);
@ -367,12 +367,12 @@ boost::shared_ptr<EvolutionSyncConfig> EvolutionSyncConfig::createServerTemplate
return config;
}
bool EvolutionSyncConfig::exists() const
bool SyncConfig::exists() const
{
return m_configNode->exists();
}
void EvolutionSyncConfig::preFlush(ConfigUserInterface &ui)
void SyncConfig::preFlush(ConfigUserInterface &ui)
{
/* Iterator over all sync global and source properties
* one by one and check whether they need to save password */
@ -396,29 +396,29 @@ void EvolutionSyncConfig::preFlush(ConfigUserInterface &ui)
}
}
void EvolutionSyncConfig::flush()
void SyncConfig::flush()
{
m_tree->flush();
}
void EvolutionSyncConfig::remove()
void SyncConfig::remove()
{
m_tree->remove();
m_tree.reset(new VolatileConfigTree());
}
boost::shared_ptr<PersistentSyncSourceConfig> EvolutionSyncConfig::getSyncSourceConfig(const string &name)
boost::shared_ptr<PersistentSyncSourceConfig> SyncConfig::getSyncSourceConfig(const string &name)
{
SyncSourceNodes nodes = getSyncSourceNodes(name);
return boost::shared_ptr<PersistentSyncSourceConfig>(new PersistentSyncSourceConfig(name, nodes));
}
list<string> EvolutionSyncConfig::getSyncSources() const
list<string> SyncConfig::getSyncSources() const
{
return m_tree->getChildren(m_oldLayout ? "spds/sources" : "sources");
}
SyncSourceNodes EvolutionSyncConfig::getSyncSourceNodes(const string &name,
SyncSourceNodes SyncConfig::getSyncSourceNodes(const string &name,
const string &changeId)
{
boost::shared_ptr<FilterConfigNode> configNode;
@ -440,10 +440,10 @@ SyncSourceNodes EvolutionSyncConfig::getSyncSourceNodes(const string &name,
return SyncSourceNodes(configNode, hiddenNode, trackingNode);
}
ConstSyncSourceNodes EvolutionSyncConfig::getSyncSourceNodes(const string &name,
ConstSyncSourceNodes SyncConfig::getSyncSourceNodes(const string &name,
const string &changeId) const
{
return const_cast<EvolutionSyncConfig *>(this)->getSyncSourceNodes(name, changeId);
return const_cast<SyncConfig *>(this)->getSyncSourceNodes(name, changeId);
}
@ -592,7 +592,7 @@ static ULongConfigProperty syncPropHashCode("HashCode", "used by the SyncML libr
static ConfigProperty syncPropConfigDate("ConfigDate", "used by the SyncML library internally; do not modify");
ConfigPropertyRegistry &EvolutionSyncConfig::getRegistry()
ConfigPropertyRegistry &SyncConfig::getRegistry()
{
static ConfigPropertyRegistry registry;
static bool initialized;
@ -637,16 +637,16 @@ ConfigPropertyRegistry &EvolutionSyncConfig::getRegistry()
return registry;
}
const char *EvolutionSyncConfig::getUsername() const { return m_stringCache.getProperty(*m_configNode, syncPropUsername); }
void EvolutionSyncConfig::setUsername(const string &value, bool temporarily) { syncPropUsername.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getPassword() const {
const char *SyncConfig::getUsername() const { return m_stringCache.getProperty(*m_configNode, syncPropUsername); }
void SyncConfig::setUsername(const string &value, bool temporarily) { syncPropUsername.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getPassword() const {
string password = syncPropPassword.getCachedProperty(*m_configNode, m_cachedPassword);
return m_stringCache.storeString(syncPropPassword.getName(), password);
}
void EvolutionSyncConfig::checkPassword(ConfigUserInterface &ui) {
void SyncConfig::checkPassword(ConfigUserInterface &ui) {
syncPropPassword.checkPassword(ui, m_server, *m_configNode, "", boost::shared_ptr<FilterConfigNode>());
}
void EvolutionSyncConfig::savePassword(ConfigUserInterface &ui) {
void SyncConfig::savePassword(ConfigUserInterface &ui) {
syncPropPassword.savePassword(ui,m_server, *m_configNode, "", boost::shared_ptr<FilterConfigNode>());
}
@ -790,60 +790,60 @@ ConfigPasswordKey ProxyPasswordConfigProperty::getPasswordKey(const string &desc
return key;
}
void EvolutionSyncConfig::setPassword(const string &value, bool temporarily) { m_cachedPassword = ""; syncPropPassword.setProperty(*m_configNode, value, temporarily); }
bool EvolutionSyncConfig::getUseProxy() const { return syncPropUseProxy.getProperty(*m_configNode); }
void EvolutionSyncConfig::setUseProxy(bool value, bool temporarily) { syncPropUseProxy.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getProxyHost() const { return m_stringCache.getProperty(*m_configNode, syncPropProxyHost); }
void EvolutionSyncConfig::setProxyHost(const string &value, bool temporarily) { syncPropProxyHost.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getProxyUsername() const { return m_stringCache.getProperty(*m_configNode, syncPropProxyUsername); }
void EvolutionSyncConfig::setProxyUsername(const string &value, bool temporarily) { syncPropProxyUsername.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getProxyPassword() const {
void SyncConfig::setPassword(const string &value, bool temporarily) { m_cachedPassword = ""; syncPropPassword.setProperty(*m_configNode, value, temporarily); }
bool SyncConfig::getUseProxy() const { return syncPropUseProxy.getProperty(*m_configNode); }
void SyncConfig::setUseProxy(bool value, bool temporarily) { syncPropUseProxy.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getProxyHost() const { return m_stringCache.getProperty(*m_configNode, syncPropProxyHost); }
void SyncConfig::setProxyHost(const string &value, bool temporarily) { syncPropProxyHost.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getProxyUsername() const { return m_stringCache.getProperty(*m_configNode, syncPropProxyUsername); }
void SyncConfig::setProxyUsername(const string &value, bool temporarily) { syncPropProxyUsername.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getProxyPassword() const {
string password = syncPropProxyPassword.getCachedProperty(*m_configNode, m_cachedProxyPassword);
return m_stringCache.storeString(syncPropProxyPassword.getName(), password);
}
void EvolutionSyncConfig::checkProxyPassword(ConfigUserInterface &ui) {
void SyncConfig::checkProxyPassword(ConfigUserInterface &ui) {
syncPropProxyPassword.checkPassword(ui, m_server, *m_configNode, "", boost::shared_ptr<FilterConfigNode>());
}
void EvolutionSyncConfig::saveProxyPassword(ConfigUserInterface &ui) {
void SyncConfig::saveProxyPassword(ConfigUserInterface &ui) {
syncPropProxyPassword.savePassword(ui, m_server, *m_configNode, "", boost::shared_ptr<FilterConfigNode>());
}
void EvolutionSyncConfig::setProxyPassword(const string &value, bool temporarily) { m_cachedProxyPassword = ""; syncPropProxyPassword.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getSyncURL() const { return m_stringCache.getProperty(*m_configNode, syncPropSyncURL); }
void EvolutionSyncConfig::setSyncURL(const string &value, bool temporarily) { syncPropSyncURL.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getClientAuthType() const { return m_stringCache.getProperty(*m_configNode, syncPropClientAuthType); }
void EvolutionSyncConfig::setClientAuthType(const string &value, bool temporarily) { syncPropClientAuthType.setProperty(*m_configNode, value, temporarily); }
unsigned long EvolutionSyncConfig::getMaxMsgSize() const { return syncPropMaxMsgSize.getProperty(*m_configNode); }
void EvolutionSyncConfig::setMaxMsgSize(unsigned long value, bool temporarily) { syncPropMaxMsgSize.setProperty(*m_configNode, value, temporarily); }
unsigned int EvolutionSyncConfig::getMaxObjSize() const { return syncPropMaxObjSize.getProperty(*m_configNode); }
void EvolutionSyncConfig::setMaxObjSize(unsigned int value, bool temporarily) { syncPropMaxObjSize.setProperty(*m_configNode, value, temporarily); }
bool EvolutionSyncConfig::getCompression() const { return syncPropCompression.getProperty(*m_configNode); }
void EvolutionSyncConfig::setCompression(bool value, bool temporarily) { syncPropCompression.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getDevID() const { return m_stringCache.getProperty(*m_configNode, syncPropDevID); }
void EvolutionSyncConfig::setDevID(const string &value, bool temporarily) { syncPropDevID.setProperty(*m_configNode, value, temporarily); }
bool EvolutionSyncConfig::getWBXML() const { return syncPropWBXML.getProperty(*m_configNode); }
void EvolutionSyncConfig::setWBXML(bool value, bool temporarily) { syncPropWBXML.setProperty(*m_configNode, value, temporarily); }
const char *EvolutionSyncConfig::getLogDir() const { return m_stringCache.getProperty(*m_configNode, syncPropLogDir); }
void EvolutionSyncConfig::setLogDir(const string &value, bool temporarily) { syncPropLogDir.setProperty(*m_configNode, value, temporarily); }
int EvolutionSyncConfig::getMaxLogDirs() const { return syncPropMaxLogDirs.getProperty(*m_configNode); }
void EvolutionSyncConfig::setMaxLogDirs(int value, bool temporarily) { syncPropMaxLogDirs.setProperty(*m_configNode, value, temporarily); }
int EvolutionSyncConfig::getLogLevel() const { return syncPropLogLevel.getProperty(*m_configNode); }
void EvolutionSyncConfig::setLogLevel(int value, bool temporarily) { syncPropLogLevel.setProperty(*m_configNode, value, temporarily); }
int EvolutionSyncConfig::getRetryDuration() const {return syncPropRetryDuration.getProperty(*m_configNode);}
void EvolutionSyncConfig::setRetryDuration(int value, bool temporarily) {syncPropRetryDuration.setProperty(*m_configNode, value, temporarily);}
int EvolutionSyncConfig::getRetryInterval() const {return syncPropRetryInterval.getProperty(*m_configNode);}
void EvolutionSyncConfig::setRetryInterval(int value, bool temporarily) {return syncPropRetryInterval.setProperty(*m_configNode,value,temporarily);}
bool EvolutionSyncConfig::getPrintChanges() const { return syncPropPrintChanges.getProperty(*m_configNode); }
void EvolutionSyncConfig::setPrintChanges(bool value, bool temporarily) { syncPropPrintChanges.setProperty(*m_configNode, value, temporarily); }
std::string EvolutionSyncConfig::getWebURL() const { return syncPropWebURL.getProperty(*m_configNode); }
void EvolutionSyncConfig::setWebURL(const std::string &url, bool temporarily) { syncPropWebURL.setProperty(*m_configNode, url, temporarily); }
std::string EvolutionSyncConfig::getIconURI() const { return syncPropIconURI.getProperty(*m_configNode); }
bool EvolutionSyncConfig::getConsumerReady() const { return syncPropConsumerReady.getProperty(*m_configNode); }
void EvolutionSyncConfig::setConsumerReady(bool ready) { return syncPropConsumerReady.setProperty(*m_configNode, ready); }
void EvolutionSyncConfig::setIconURI(const std::string &uri, bool temporarily) { syncPropIconURI.setProperty(*m_configNode, uri, temporarily); }
unsigned long EvolutionSyncConfig::getHashCode() const { return syncPropHashCode.getProperty(*m_hiddenNode); }
void EvolutionSyncConfig::setHashCode(unsigned long code) { syncPropHashCode.setProperty(*m_hiddenNode, code); }
std::string EvolutionSyncConfig::getConfigDate() const { return syncPropConfigDate.getProperty(*m_hiddenNode); }
void EvolutionSyncConfig::setConfigDate() {
void SyncConfig::setProxyPassword(const string &value, bool temporarily) { m_cachedProxyPassword = ""; syncPropProxyPassword.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getSyncURL() const { return m_stringCache.getProperty(*m_configNode, syncPropSyncURL); }
void SyncConfig::setSyncURL(const string &value, bool temporarily) { syncPropSyncURL.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getClientAuthType() const { return m_stringCache.getProperty(*m_configNode, syncPropClientAuthType); }
void SyncConfig::setClientAuthType(const string &value, bool temporarily) { syncPropClientAuthType.setProperty(*m_configNode, value, temporarily); }
unsigned long SyncConfig::getMaxMsgSize() const { return syncPropMaxMsgSize.getProperty(*m_configNode); }
void SyncConfig::setMaxMsgSize(unsigned long value, bool temporarily) { syncPropMaxMsgSize.setProperty(*m_configNode, value, temporarily); }
unsigned int SyncConfig::getMaxObjSize() const { return syncPropMaxObjSize.getProperty(*m_configNode); }
void SyncConfig::setMaxObjSize(unsigned int value, bool temporarily) { syncPropMaxObjSize.setProperty(*m_configNode, value, temporarily); }
bool SyncConfig::getCompression() const { return syncPropCompression.getProperty(*m_configNode); }
void SyncConfig::setCompression(bool value, bool temporarily) { syncPropCompression.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getDevID() const { return m_stringCache.getProperty(*m_configNode, syncPropDevID); }
void SyncConfig::setDevID(const string &value, bool temporarily) { syncPropDevID.setProperty(*m_configNode, value, temporarily); }
bool SyncConfig::getWBXML() const { return syncPropWBXML.getProperty(*m_configNode); }
void SyncConfig::setWBXML(bool value, bool temporarily) { syncPropWBXML.setProperty(*m_configNode, value, temporarily); }
const char *SyncConfig::getLogDir() const { return m_stringCache.getProperty(*m_configNode, syncPropLogDir); }
void SyncConfig::setLogDir(const string &value, bool temporarily) { syncPropLogDir.setProperty(*m_configNode, value, temporarily); }
int SyncConfig::getMaxLogDirs() const { return syncPropMaxLogDirs.getProperty(*m_configNode); }
void SyncConfig::setMaxLogDirs(int value, bool temporarily) { syncPropMaxLogDirs.setProperty(*m_configNode, value, temporarily); }
int SyncConfig::getLogLevel() const { return syncPropLogLevel.getProperty(*m_configNode); }
void SyncConfig::setLogLevel(int value, bool temporarily) { syncPropLogLevel.setProperty(*m_configNode, value, temporarily); }
int SyncConfig::getRetryDuration() const {return syncPropRetryDuration.getProperty(*m_configNode);}
void SyncConfig::setRetryDuration(int value, bool temporarily) {syncPropRetryDuration.setProperty(*m_configNode, value, temporarily);}
int SyncConfig::getRetryInterval() const {return syncPropRetryInterval.getProperty(*m_configNode);}
void SyncConfig::setRetryInterval(int value, bool temporarily) {return syncPropRetryInterval.setProperty(*m_configNode,value,temporarily);}
bool SyncConfig::getPrintChanges() const { return syncPropPrintChanges.getProperty(*m_configNode); }
void SyncConfig::setPrintChanges(bool value, bool temporarily) { syncPropPrintChanges.setProperty(*m_configNode, value, temporarily); }
std::string SyncConfig::getWebURL() const { return syncPropWebURL.getProperty(*m_configNode); }
void SyncConfig::setWebURL(const std::string &url, bool temporarily) { syncPropWebURL.setProperty(*m_configNode, url, temporarily); }
std::string SyncConfig::getIconURI() const { return syncPropIconURI.getProperty(*m_configNode); }
bool SyncConfig::getConsumerReady() const { return syncPropConsumerReady.getProperty(*m_configNode); }
void SyncConfig::setConsumerReady(bool ready) { return syncPropConsumerReady.setProperty(*m_configNode, ready); }
void SyncConfig::setIconURI(const std::string &uri, bool temporarily) { syncPropIconURI.setProperty(*m_configNode, uri, temporarily); }
unsigned long SyncConfig::getHashCode() const { return syncPropHashCode.getProperty(*m_hiddenNode); }
void SyncConfig::setHashCode(unsigned long code) { syncPropHashCode.setProperty(*m_hiddenNode, code); }
std::string SyncConfig::getConfigDate() const { return syncPropConfigDate.getProperty(*m_hiddenNode); }
void SyncConfig::setConfigDate() {
/* Set current timestamp as configdate */
char buffer[17];
time_t ts = time(NULL);
@ -851,12 +851,12 @@ void EvolutionSyncConfig::setConfigDate() {
const std::string date(buffer);
syncPropConfigDate.setProperty(*m_hiddenNode, date);
}
const char* EvolutionSyncConfig::getSSLServerCertificates() const { return m_stringCache.getProperty(*m_configNode, syncPropSSLServerCertificates); }
void EvolutionSyncConfig::setSSLServerCertificates(const string &value, bool temporarily) { syncPropSSLServerCertificates.setProperty(*m_configNode, value, temporarily); }
bool EvolutionSyncConfig::getSSLVerifyServer() const { return syncPropSSLVerifyServer.getProperty(*m_configNode); }
void EvolutionSyncConfig::setSSLVerifyServer(bool value, bool temporarily) { syncPropSSLVerifyServer.setProperty(*m_configNode, value, temporarily); }
bool EvolutionSyncConfig::getSSLVerifyHost() const { return syncPropSSLVerifyHost.getProperty(*m_configNode); }
void EvolutionSyncConfig::setSSLVerifyHost(bool value, bool temporarily) { syncPropSSLVerifyHost.setProperty(*m_configNode, value, temporarily); }
const char* SyncConfig::getSSLServerCertificates() const { return m_stringCache.getProperty(*m_configNode, syncPropSSLServerCertificates); }
void SyncConfig::setSSLServerCertificates(const string &value, bool temporarily) { syncPropSSLServerCertificates.setProperty(*m_configNode, value, temporarily); }
bool SyncConfig::getSSLVerifyServer() const { return syncPropSSLVerifyServer.getProperty(*m_configNode); }
void SyncConfig::setSSLVerifyServer(bool value, bool temporarily) { syncPropSSLVerifyServer.setProperty(*m_configNode, value, temporarily); }
bool SyncConfig::getSSLVerifyHost() const { return syncPropSSLVerifyHost.getProperty(*m_configNode); }
void SyncConfig::setSSLVerifyHost(bool value, bool temporarily) { syncPropSSLVerifyHost.setProperty(*m_configNode, value, temporarily); }
static void setDefaultProps(const ConfigPropertyRegistry &registry,
boost::shared_ptr<FilterConfigNode> node,
@ -873,12 +873,12 @@ static void setDefaultProps(const ConfigPropertyRegistry &registry,
}
}
void EvolutionSyncConfig::setDefaults(bool force)
void SyncConfig::setDefaults(bool force)
{
setDefaultProps(getRegistry(), m_configNode, force);
}
void EvolutionSyncConfig::setSourceDefaults(const string &name, bool force)
void SyncConfig::setSourceDefaults(const string &name, bool force)
{
SyncSourceNodes nodes = getSyncSourceNodes(name);
setDefaultProps(SyncSourceConfig::getRegistry(),
@ -912,7 +912,7 @@ static void copyProperties(const ConfigNode &fromProps,
}
}
void EvolutionSyncConfig::copy(const EvolutionSyncConfig &other,
void SyncConfig::copy(const SyncConfig &other,
const set<string> *sourceFilter)
{
static const bool visibility[2] = { false, true };
@ -935,8 +935,8 @@ void EvolutionSyncConfig::copy(const EvolutionSyncConfig &other,
}
}
const char *EvolutionSyncConfig::getSwv() const { return VERSION; }
const char *EvolutionSyncConfig::getDevType() const { return DEVICE_TYPE; }
const char *SyncConfig::getSwv() const { return VERSION; }
const char *SyncConfig::getDevType() const { return DEVICE_TYPE; }
SyncSourceConfig::SyncSourceConfig(const string &name, const SyncSourceNodes &nodes) :

18
src/syncevo/SyncConfig.h
View file

@ -697,7 +697,7 @@ class ConfigStringCache {
* uses a FileConfigTree instance. Other implementations would be
* possible.
*/
class EvolutionSyncConfig {
class SyncConfig {
public:
/**
* Opens the configuration for a specific server,
@ -710,14 +710,14 @@ class EvolutionSyncConfig {
* searching for it; always uses the
* current layout in that tree
*/
EvolutionSyncConfig(const string &server,
SyncConfig(const string &server,
boost::shared_ptr<ConfigTree> tree = boost::shared_ptr<ConfigTree>());
/**
* Creates a temporary configuration.
* Can be copied around, but not flushed.
*/
EvolutionSyncConfig();
SyncConfig();
/** absolute directory name of the configuration root */
string getRootPath() const;
@ -743,7 +743,7 @@ class EvolutionSyncConfig {
*
* @return NULL if no such template
*/
static boost::shared_ptr<EvolutionSyncConfig> createServerTemplate(const string &server);
static boost::shared_ptr<SyncConfig> createServerTemplate(const string &server);
/** true if the main configuration file already exists */
bool exists() const;
@ -801,7 +801,7 @@ class EvolutionSyncConfig {
return m_configNode;
}
}
virtual boost::shared_ptr<const FilterConfigNode> getProperties(bool hidden = false) const { return const_cast<EvolutionSyncConfig *>(this)->getProperties(hidden); }
virtual boost::shared_ptr<const FilterConfigNode> getProperties(bool hidden = false) const { return const_cast<SyncConfig *>(this)->getProperties(hidden); }
/**
@ -819,7 +819,7 @@ class EvolutionSyncConfig {
*/
virtual boost::shared_ptr<PersistentSyncSourceConfig> getSyncSourceConfig(const string &name);
virtual boost::shared_ptr<const PersistentSyncSourceConfig> getSyncSourceConfig(const string &name) const {
return const_cast<EvolutionSyncConfig *>(this)->getSyncSourceConfig(name);
return const_cast<SyncConfig *>(this)->getSyncSourceConfig(name);
}
/**
@ -863,7 +863,7 @@ class EvolutionSyncConfig {
* @param sourceFilter if NULL, then copy all sources; if not NULL,
* then only copy sources listed here
*/
void copy(const EvolutionSyncConfig &other,
void copy(const SyncConfig &other,
const set<string> *sourceFilter);
/**
@ -1111,12 +1111,12 @@ class SyncSourceConfig {
const char *getPassword() const;
virtual void setPassword(const string &value, bool temporarily = false);
/** same as EvolutionSyncConfig::checkPassword() but with
/** same as SyncConfig::checkPassword() but with
* an extra argument globalConfigNode for source config property
* may need global config node to check password */
virtual void checkPassword(ConfigUserInterface &ui, const string &serverName, FilterConfigNode& globalConfigNode);
/** same as EvolutionSyncConfig::savePassword() */
/** same as SyncConfig::savePassword() */
virtual void savePassword(ConfigUserInterface &ui, const string &serverName, FilterConfigNode& globalConfigNode);
virtual const char *getDatabaseID() const;

28
src/syncevo/SyncContext.cpp
View file

@ -104,7 +104,7 @@ extern "C" void suspend_handler(int sig)
SyncContext::SyncContext(const string &server,
bool doLogging,
const set<string> &sources) :
EvolutionSyncConfig(server),
SyncConfig(server),
m_server(server),
m_sources(sources),
m_doLogging(doLogging),
@ -213,7 +213,7 @@ public:
previousLogdirs(path, dirs);
return dirs.empty() ? "" : dirs.back();
} catch (...) {
SyncEvolutionException::handle();
Exception::handle();
return "";
}
}
@ -674,7 +674,7 @@ public:
try {
dumpDatabases("after", &SyncSourceReport::m_backupAfter);
} catch (...) {
SyncEvolutionException::handle();
Exception::handle();
m_prepared = false;
}
if (report) {
@ -1149,9 +1149,9 @@ void SyncContext::setConfigFilter(bool sync, const FilterConfigNode::ConfigFilte
m_overrideMode = hasSync->second;
FilterConfigNode::ConfigFilter strippedFilter = filter;
strippedFilter.erase(SyncSourceConfig::m_sourcePropSync.getName());
EvolutionSyncConfig::setConfigFilter(sync, strippedFilter);
SyncConfig::setConfigFilter(sync, strippedFilter);
} else {
EvolutionSyncConfig::setConfigFilter(sync, filter);
SyncConfig::setConfigFilter(sync, filter);
}
}
@ -1250,7 +1250,7 @@ void SyncContext::getConfigTemplateXML(string &xml, string &configname)
return;
}
} catch (...) {
SyncEvolutionException::handle();
Exception::handle();
}
/**
@ -1533,7 +1533,7 @@ SyncMLStatus SyncContext::sync(SyncReport *report)
// request all config properties once: throwing exceptions
// now is okay, whereas later it would lead to leaks in the
// not exception safe client library
EvolutionSyncConfig dummy;
SyncConfig dummy;
set<string> activeSources = sourceList.getSources();
dummy.copy(*this, &activeSources);
@ -1545,7 +1545,7 @@ SyncMLStatus SyncContext::sync(SyncReport *report)
/* iterator over all sync and source properties instead of checking
* some specified passwords.
*/
ConfigPropertyRegistry& registry = EvolutionSyncConfig::getRegistry();
ConfigPropertyRegistry& registry = SyncConfig::getRegistry();
BOOST_FOREACH(const ConfigProperty *prop, registry) {
prop->checkPassword(*this, m_server, getConfigNode());
}
@ -1572,11 +1572,11 @@ SyncMLStatus SyncContext::sync(SyncReport *report)
status = doSync();
} catch (...) {
// handle the exception here while the engine (and logging!) is still alive
SyncEvolutionException::handle(&status);
Exception::handle(&status);
goto report;
}
} catch (...) {
SyncEvolutionException::handle(&status);
Exception::handle(&status);
}
report:
@ -1593,7 +1593,7 @@ SyncMLStatus SyncContext::sync(SyncReport *report)
}
sourceList.syncDone(status, report);
} catch(...) {
SyncEvolutionException::handle(&status);
Exception::handle(&status);
}
m_sourceListPtr = NULL;
@ -1983,11 +1983,11 @@ SyncMLStatus SyncContext::doSync()
static_cast<int>(result.result()));
stepCmd = sysync::STEPCMD_DONE;
} else {
SyncEvolutionException::handle(&status);
Exception::handle(&status);
stepCmd = sysync::STEPCMD_ABORT;
}
} catch (...) {
SyncEvolutionException::handle(&status);
Exception::handle(&status);
stepCmd = sysync::STEPCMD_ABORT;
}
} while (stepCmd != sysync::STEPCMD_DONE && stepCmd != sysync::STEPCMD_ERROR);
@ -2040,7 +2040,7 @@ void SyncContext::status()
sourceList.dumpDatabases("current", NULL);
sourceList.dumpLocalChanges(sourceList.getPrevLogdir(), "after", "current");
} catch(...) {
SyncEvolutionException::handle();
Exception::handle();
}
} else {
cout << "Previous log directory not found.\n";

4
src/syncevo/SyncContext.h
View file

@ -67,7 +67,7 @@ struct SuspendFlags
* implementation of those uses stdin/out.
*
*/
class SyncContext : public EvolutionSyncConfig, public ConfigUserInterface {
class SyncContext : public SyncConfig, public ConfigUserInterface {
const string m_server;
const set<string> m_sources;
const bool m_doLogging;
@ -123,7 +123,7 @@ class SyncContext : public EvolutionSyncConfig, public ConfigUserInterface {
const set<string> &sources = set<string>());
~SyncContext();
using EvolutionSyncConfig::savePassword;
using SyncConfig::savePassword;
bool getQuiet() { return m_quiet; }
void setQuiet(bool quiet) { m_quiet = quiet; }

4
src/syncevo/SyncSource.cpp
View file

@ -55,7 +55,7 @@ void SyncSourceBase::throwError(const string &failure)
SyncMLStatus SyncSourceBase::handleException()
{
SyncMLStatus res = SyncEvolutionException::handle(this);
SyncMLStatus res = Exception::handle(this);
return res == STATUS_FATAL ?
STATUS_DATASTORE_FAILURE :
res;
@ -334,7 +334,7 @@ SyncSource *SyncSource::createSource(const SyncSourceParams &params, bool error)
SyncSource *SyncSource::createTestingSource(const string &name, const string &type, bool error,
const char *prefix)
{
EvolutionSyncConfig config("testing");
SyncConfig config("testing");
SyncSourceNodes nodes = config.getSyncSourceNodes(name);
SyncSourceParams params(name, nodes, "");
PersistentSyncSourceConfig sourceconfig(name, nodes);

4
src/syncevo/TransportAgent.h
View file

@ -165,13 +165,13 @@ class TransportAgent
};
class TransportException : public SyncEvolutionException
class TransportException : public Exception
{
public:
TransportException(const std::string &file,
int line,
const std::string &what) :
SyncEvolutionException(file, line, what) {}
Exception(file, line, what) {}
~TransportException() throw() {}
};

4
src/syncevo/util.cpp
View file

@ -286,7 +286,7 @@ std::string StringPrintfV(const char *format, va_list ap)
return res;
}
SyncMLStatus SyncEvolutionException::handle(SyncMLStatus *status, Logger *logger)
SyncMLStatus Exception::handle(SyncMLStatus *status, Logger *logger)
{
SyncMLStatus new_status = STATUS_FATAL;
@ -297,7 +297,7 @@ SyncMLStatus SyncEvolutionException::handle(SyncMLStatus *status, Logger *logger
ex.m_file.c_str(), ex.m_line);
SE_LOG_ERROR(logger, NULL, "%s", ex.what());
new_status = SyncMLStatus(sysync::LOCERR_TRANSPFAIL);
} catch (const SyncEvolutionException &ex) {
} catch (const Exception &ex) {
SE_LOG_DEBUG(logger, NULL, "exception thrown at %s:%d",
ex.m_file.c_str(), ex.m_line);
SE_LOG_ERROR(logger, NULL, "%s", ex.what());

10
src/syncevo/util.h
View file

@ -177,17 +177,17 @@ std::string StringPrintfV(const char *format, va_list ap);
*
* @TODO add function name
*/
class SyncEvolutionException : public std::runtime_error
class Exception : public std::runtime_error
{
public:
SyncEvolutionException(const std::string &file,
Exception(const std::string &file,
int line,
const std::string &what) :
std::runtime_error(what),
m_file(file),
m_line(line)
{}
~SyncEvolutionException() throw() {}
~Exception() throw() {}
const std::string m_file;
const int m_line;
@ -217,9 +217,9 @@ inline string getHome() {
return homestr ? homestr : ".";
}
/** throw a SyncEvolutionException */
/** throw a normal SyncEvolution Exception, including source information */
#define SE_THROW(_what) \
SE_THROW_EXCEPTION(SyncEvolutionException, _what)
SE_THROW_EXCEPTION(Exception, _what)
/** throw a class which accepts file, line, what parameters */
#define SE_THROW_EXCEPTION(_class, _what) \