From 1d3aaebcaca0a77976eccb764bf8dd0eb0742546 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Sat, 6 Dec 2014 02:41:17 +0100
Subject: standardize on calling it Akonadi2

---
 client/CMakeLists.txt     | 8 ++++----
 client/main.cpp           | 2 +-
 client/resourceaccess.cpp | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'client')

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;
-- 
cgit v1.2.3