From cd99c2a9649d1e1639dfa9fc7590f2e5af89335a Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Tue, 2 Dec 2014 11:18:11 +0100 Subject: toynadi -> akonadinext --- client/CMakeLists.txt | 8 ++++---- client/resourceaccess.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'client') diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 20b00a5..48e212c 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,14 +1,14 @@ -project(toynadi_client) +project(akonadinext_client) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -set(toynadiclient_SRCS +set(akonadinextclient_SRCS main.cpp resourceaccess.cpp ) -add_executable(${PROJECT_NAME} ${toynadiclient_SRCS}) -target_link_libraries(${PROJECT_NAME} toynadicommon) +add_executable(${PROJECT_NAME} ${akonadinextclient_SRCS}) +target_link_libraries(${PROJECT_NAME} akonadinextcommon) qt5_use_modules(${PROJECT_NAME} Widgets Network) install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/client/resourceaccess.cpp b/client/resourceaccess.cpp index e73c773..44c2d84 100644 --- a/client/resourceaccess.cpp +++ b/client/resourceaccess.cpp @@ -74,8 +74,8 @@ void ResourceAccess::connected() { flatbuffers::FlatBufferBuilder fbb; auto name = fbb.CreateString("Client PID: " + QString::number((long long)this).toLatin1() + "!"); - auto command = Toynadi::CreateHandshake(fbb, name); - Toynadi::FinishHandshakeBuffer(fbb, command); + auto command = Akonadi::CreateHandshake(fbb, name); + Akonadi::FinishHandshakeBuffer(fbb, command); const int commandId = Commands::HandshakeCommand; const int dataSize = fbb.GetSize(); m_socket->write((const char*)&commandId, sizeof(int)); @@ -108,7 +108,7 @@ void ResourceAccess::connectionError(QLocalSocket::LocalSocketError error) Console::main()->log(QString("Attempting to start resource...")); QStringList args; args << m_resourceName; - if (QProcess::startDetached("toynadi_resource", args)) { + if (QProcess::startDetached("akonadinext_resource", args)) { m_socket->open(); } } @@ -142,7 +142,7 @@ bool ResourceAccess::processMessageBuffer() switch (commandId) { case Commands::RevisionUpdateCommand: { - auto buffer = Toynadi::GetRevisionUpdate(m_partialMessageBuffer.constData() + headerSize); + auto buffer = Akonadi::GetRevisionUpdate(m_partialMessageBuffer.constData() + headerSize); Console::main()->log(QString(" Revision updated to: %1").arg(buffer->revision())); emit revisionChanged(buffer->revision()); break; -- cgit v1.2.3