From 1d3aaebcaca0a77976eccb764bf8dd0eb0742546 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Sat, 6 Dec 2014 02:41:17 +0100 Subject: standardize on calling it Akonadi2 --- synchronizer/CMakeLists.txt | 8 ++++---- synchronizer/listener.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'synchronizer') diff --git a/synchronizer/CMakeLists.txt b/synchronizer/CMakeLists.txt index 92cb465..031b3b2 100644 --- a/synchronizer/CMakeLists.txt +++ b/synchronizer/CMakeLists.txt @@ -1,13 +1,13 @@ -project(akonadinext_synchronizer) +project(akonadi2_synchronizer) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -set(akonadinextsynchronizer_SRCS +set(akonadi2synchronizer_SRCS main.cpp listener.cpp ) -add_executable(${PROJECT_NAME} ${akonadinextsynchronizer_SRCS}) -target_link_libraries(${PROJECT_NAME} akonadinextcommon) +add_executable(${PROJECT_NAME} ${akonadi2synchronizer_SRCS}) +target_link_libraries(${PROJECT_NAME} akonadi2common) qt5_use_modules(${PROJECT_NAME} Widgets Network) install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/synchronizer/listener.cpp b/synchronizer/listener.cpp index 23a5a70..01daf5d 100644 --- a/synchronizer/listener.cpp +++ b/synchronizer/listener.cpp @@ -148,7 +148,7 @@ bool Listener::processClientBuffer(Client &client) switch (commandId) { case Commands::HandshakeCommand: { - auto buffer = Akonadi::GetHandshake(data.constData()); + auto buffer = Akonadi2::GetHandshake(data.constData()); Console::main()->log(QString(" Handshake from %1").arg(buffer->name()->c_str())); sendCurrentRevision(client); break; @@ -170,16 +170,16 @@ void Listener::sendCurrentRevision(Client &client) return; } - auto command = Akonadi::CreateRevisionUpdate(m_fbb, m_revision); - Akonadi::FinishRevisionUpdateBuffer(m_fbb, command); + auto command = Akonadi2::CreateRevisionUpdate(m_fbb, m_revision); + Akonadi2::FinishRevisionUpdateBuffer(m_fbb, command); Commands::write(client.socket, Commands::RevisionUpdateCommand, m_fbb); m_fbb.Clear(); } void Listener::updateClientsWithRevision() { - auto command = Akonadi::CreateRevisionUpdate(m_fbb, m_revision); - Akonadi::FinishRevisionUpdateBuffer(m_fbb, command); + auto command = Akonadi2::CreateRevisionUpdate(m_fbb, m_revision); + Akonadi2::FinishRevisionUpdateBuffer(m_fbb, command); for (const Client &client: m_connections) { if (!client.socket || !client.socket->isValid()) { -- cgit v1.2.3