diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2009-10-05 14:49:32 +0200 |
---|---|---|
committer | Patrick Ohly <patrick.ohly@intel.com> | 2009-10-05 14:49:32 +0200 |
commit | 71fbf32c941ab17355483028a6f529354e58e18e (patch) | |
tree | 1939fee221511e4df11f514c269e4c698e10b232 /src/backends/evolution/EvolutionContactSource.cpp | |
parent | bf6e1baf05fca2a53ee908e292d08b11c545eda3 (diff) |
files and classes renamed, include statements cleaned up
The intention is to get rid of the historic and inconsistent
naming of some classes and their corresponding files:
* EvolutionSyncClient = class derived from Funambol's SyncClient,
* SyncEvolutionConfig = SyncEvolution's config
With the strict 'namespace SyncEvo' and the syncevo/ path prefix for
most header files it is no longer necessary to have "SyncEvolution" or
"Evolution" in the names. This patch thus renames as follows:
EvolutionSyncClient => SyncContext
EvolutionSmartPtr => SmartPtr
SyncEvolutionCmdline => Cmdline
SyncEvolutionConfig => SyncConfig
SyncEvolutionUtil => util
The former EvolutionSyncClient always had a role that went beyond just
running a sync, for example it also provided config access. With the
upcoming server support it also won't be just a client. Thus the new
name "SyncContext".
The 'syncevo/' prefix is used throughout the code now.
removed whenever the prefix made it clear that the file belongs
to SyncEvolution. This helps finding incorrect include paths.
Quotes should be used exclusively for SyncEvolution files which don't
have a specific prefix yet (test.h, config.h) to help identifying
them.
Diffstat (limited to 'src/backends/evolution/EvolutionContactSource.cpp')
-rw-r--r-- | src/backends/evolution/EvolutionContactSource.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backends/evolution/EvolutionContactSource.cpp b/src/backends/evolution/EvolutionContactSource.cpp index bb92ae12..42c7f0cc 100644 --- a/src/backends/evolution/EvolutionContactSource.cpp +++ b/src/backends/evolution/EvolutionContactSource.cpp @@ -29,9 +29,9 @@ using namespace std; #ifdef ENABLE_EBOOK -#include <syncevo/EvolutionSyncClient.h> +#include <syncevo/SyncContext.h> #include "EvolutionContactSource.h" -#include <syncevo/SyncEvolutionUtil.h> +#include <syncevo/util.h> #include <syncevo/Logging.h> @@ -39,7 +39,7 @@ using namespace std; #include <boost/algorithm/string/join.hpp> #include <boost/foreach.hpp> -#include "syncevo/declarations.h" +#include <syncevo/declarations.h> SE_BEGIN_CXX class unrefEBookChanges { @@ -78,7 +78,7 @@ EvolutionSyncSource::Databases EvolutionContactSource::getDatabases() ESourceList *sources = NULL; if (!e_book_get_addressbooks(&sources, NULL)) { - EvolutionSyncClient::throwError("unable to access address books"); + SyncContext::throwError("unable to access address books"); } Databases result; @@ -189,7 +189,7 @@ void EvolutionContactSource::open() g_signal_connect_after(m_addressbook, "backend-died", - G_CALLBACK(EvolutionSyncClient::fatalError), + G_CALLBACK(SyncContext::fatalError), (void *)"Evolution Data Server has died unexpectedly, contacts no longer available."); } @@ -401,5 +401,5 @@ SE_END_CXX #endif /* ENABLE_EBOOK */ #ifdef ENABLE_MODULES -# include "EvolutionContactSourceRegister.cpp" +# include <syncevo/EvolutionContactSourceRegister.cpp> #endif |