10 files changed, 24 insertions, 26 deletions

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 48e212c..a0ebe3a 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,14 +1,14 @@
-project(akonadinext_client)
+project(akonadi2_client)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-set(akonadinextclient_SRCS
+set(akonadi2client_SRCS
     main.cpp
     resourceaccess.cpp
 )
 
-add_executable(${PROJECT_NAME} ${akonadinextclient_SRCS})
-target_link_libraries(${PROJECT_NAME} akonadinextcommon)
+add_executable(${PROJECT_NAME} ${akonadi2client_SRCS})
+target_link_libraries(${PROJECT_NAME} akonadi2common)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
diff --git a/client/main.cpp b/client/main.cpp
index ac086b0..1748331 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    new Console("Akonadi Next Client");
+    new Console("Akonadi2 Client");
 
     ResourceAccess *resAccess = 0;
     QCommandLineParser cliOptions;
diff --git a/client/resourceaccess.cpp b/client/resourceaccess.cpp
index fce8ca6..bbc7f8b 100644
--- a/client/resourceaccess.cpp
+++ b/client/resourceaccess.cpp
@@ -73,8 +73,8 @@ void ResourceAccess::connected()
 
     {
         auto name = m_fbb.CreateString(QString::number((long long)this).toLatin1());
-        auto command = Akonadi::CreateHandshake(m_fbb, name);
-        Akonadi::FinishHandshakeBuffer(m_fbb, command);
+        auto command = Akonadi2::CreateHandshake(m_fbb, name);
+        Akonadi2::FinishHandshakeBuffer(m_fbb, command);
         Commands::write(m_socket, Commands::HandshakeCommand, m_fbb);
         m_fbb.Clear();
     }
@@ -104,7 +104,7 @@ void ResourceAccess::connectionError(QLocalSocket::LocalSocketError error)
     log(QString("Attempting to start resource ") + m_resourceName);
     QStringList args;
     args << m_resourceName;
-    if (QProcess::startDetached("akonadinext_synchronizer", args)) {
+    if (QProcess::startDetached("akonadi2_synchronizer", args)) {
         m_socket->open();
     }
 }
@@ -137,7 +137,7 @@ bool ResourceAccess::processMessageBuffer()
 
     switch (commandId) {
         case Commands::RevisionUpdateCommand: {
-            auto buffer = Akonadi::GetRevisionUpdate(m_partialMessageBuffer.constData() + headerSize);
+            auto buffer = Akonadi2::GetRevisionUpdate(m_partialMessageBuffer.constData() + headerSize);
             log(QString("Revision updated to: %1").arg(buffer->revision()));
             emit revisionChanged(buffer->revision());
             break;
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 68330ce..2fef5f6 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(akonadinextcommon)
+project(akonadi2common)
 generate_flatbuffers(commands/handshake
                      commands/revisionupdate)
 
diff --git a/common/commands/handshake.fbs b/common/commands/handshake.fbs
index 90c0d3a..52a883a 100644
--- a/common/commands/handshake.fbs
+++ b/common/commands/handshake.fbs
@@ -1,9 +1,7 @@
-
-namespace Akonadi;
+namespace Akonadi2;
 
 table Handshake {
     name: string;
 }
 
 root_type Handshake;
-
diff --git a/common/commands/revisionupdate.fbs b/common/commands/revisionupdate.fbs
index bf3943f..634bcd0 100644
--- a/common/commands/revisionupdate.fbs
+++ b/common/commands/revisionupdate.fbs
@@ -1,4 +1,4 @@
-namespace Akonadi;
+namespace Akonadi2;
 
 table RevisionUpdate {
     revision: ulong;
diff --git a/dummyresource/CMakeLists.txt b/dummyresource/CMakeLists.txt
index 9d28c0b..e814f41 100644
--- a/dummyresource/CMakeLists.txt
+++ b/dummyresource/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(akonadinext_dummyresource)
+project(akonadi2_dummyresource)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -6,7 +6,7 @@ generate_flatbuffers(dummycalendar)
 
 #Client plugin
 add_library(${PROJECT_NAME}_facade SHARED facade.cpp)
-target_link_libraries(${PROJECT_NAME}_facade akonadinextcommon)
+target_link_libraries(${PROJECT_NAME}_facade akonadi2common)
 qt5_use_modules(${PROJECT_NAME}_facade Widgets Network)
 #install(TARGETS ${PROJECT_NAME}_facade DESTINATION bin)
 
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()) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1629acb..9ee3f5e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(manual_tests)
     foreach(_testname ${ARGN})
         add_executable(${_testname} ${_testname}.cpp)
         qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} akonadinextcommon)
+        target_link_libraries(${_testname} akonadi2common)
     endforeach(_testname)
 endmacro(manual_tests)