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 ++++---- common/CMakeLists.txt | 2 +- common/commands/handshake.fbs | 2 +- common/commands/revisionupdate.fbs | 4 ++-- resource/CMakeLists.txt | 8 ++++---- resource/listener.cpp | 10 +++++----- 7 files changed, 21 insertions(+), 21 deletions(-) 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; diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index a0d3ac9..6533e28 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,4 +1,4 @@ -project(toynadicommon) +project(akonadinextcommon) generate_flatbuffers(commands/handshake commands/revisionupdate) diff --git a/common/commands/handshake.fbs b/common/commands/handshake.fbs index 4492ca9..90c0d3a 100644 --- a/common/commands/handshake.fbs +++ b/common/commands/handshake.fbs @@ -1,5 +1,5 @@ -namespace Toynadi; +namespace Akonadi; table Handshake { name: string; diff --git a/common/commands/revisionupdate.fbs b/common/commands/revisionupdate.fbs index d95f1b5..bf3943f 100644 --- a/common/commands/revisionupdate.fbs +++ b/common/commands/revisionupdate.fbs @@ -1,7 +1,7 @@ -namespace Toynadi; +namespace Akonadi; table RevisionUpdate { revision: ulong; } -root_type RevisionUpdate; \ No newline at end of file +root_type RevisionUpdate; diff --git a/resource/CMakeLists.txt b/resource/CMakeLists.txt index d74c705..1c21b1a 100644 --- a/resource/CMakeLists.txt +++ b/resource/CMakeLists.txt @@ -1,13 +1,13 @@ -project(toynadi_resource) +project(akonadinext_resource) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -set(toynadiresource_SRCS +set(akonadinextresource_SRCS main.cpp listener.cpp ) -add_executable(${PROJECT_NAME} ${toynadiresource_SRCS}) -target_link_libraries(${PROJECT_NAME} toynadicommon) +add_executable(${PROJECT_NAME} ${akonadinextresource_SRCS}) +target_link_libraries(${PROJECT_NAME} akonadinextcommon) qt5_use_modules(${PROJECT_NAME} Widgets Network) install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/resource/listener.cpp b/resource/listener.cpp index 5dd8cc3..038b3fa 100644 --- a/resource/listener.cpp +++ b/resource/listener.cpp @@ -148,7 +148,7 @@ bool Listener::processClientBuffer(Client &client) switch (commandId) { case Commands::HandshakeCommand: { - auto buffer = Toynadi::GetHandshake(data.constData()); + auto buffer = Akonadi::GetHandshake(data.constData()); Console::main()->log(QString(" Handshake from %1").arg(buffer->name()->c_str())); sendCurrentRevision(client); break; @@ -171,8 +171,8 @@ void Listener::sendCurrentRevision(Client &client) } flatbuffers::FlatBufferBuilder fbb; - auto command = Toynadi::CreateRevisionUpdate(fbb, m_revision); - Toynadi::FinishRevisionUpdateBuffer(fbb, command); + auto command = Akonadi::CreateRevisionUpdate(fbb, m_revision); + Akonadi::FinishRevisionUpdateBuffer(fbb, command); const int commandId = Commands::RevisionUpdateCommand; const int dataSize = fbb.GetSize(); client.socket->write((const char*)&commandId, sizeof(int)); @@ -183,8 +183,8 @@ void Listener::sendCurrentRevision(Client &client) void Listener::updateClientsWithRevision() { flatbuffers::FlatBufferBuilder fbb; - auto command = Toynadi::CreateRevisionUpdate(fbb, m_revision); - Toynadi::FinishRevisionUpdateBuffer(fbb, command); + auto command = Akonadi::CreateRevisionUpdate(fbb, m_revision); + Akonadi::FinishRevisionUpdateBuffer(fbb, command); const int commandId = Commands::RevisionUpdateCommand; const int dataSize = fbb.GetSize(); -- cgit v1.2.3