summaryrefslogtreecommitdiffstats
path: root/synchronizer
diff options
context:
space:
mode:
authorAaron Seigo <aseigo@kde.org>2014-12-06 02:41:17 +0100
committerAaron Seigo <aseigo@kde.org>2014-12-06 02:41:17 +0100
commit1d3aaebcaca0a77976eccb764bf8dd0eb0742546 (patch)
treefbcd9403d41bf319bd90ffee1957d821ef6b2a72 /synchronizer
parent7ec167022cbad18697bb99d9c219ac9095cae84f (diff)
downloadsink-1d3aaebcaca0a77976eccb764bf8dd0eb0742546.tar.gz
sink-1d3aaebcaca0a77976eccb764bf8dd0eb0742546.zip
standardize on calling it Akonadi2
Diffstat (limited to 'synchronizer')
-rw-r--r--synchronizer/CMakeLists.txt8
-rw-r--r--synchronizer/listener.cpp10
2 files changed, 9 insertions, 9 deletions
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 @@
1project(akonadinext_synchronizer) 1project(akonadi2_synchronizer)
2 2
3include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) 3include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
4 4
5set(akonadinextsynchronizer_SRCS 5set(akonadi2synchronizer_SRCS
6 main.cpp 6 main.cpp
7 listener.cpp 7 listener.cpp
8) 8)
9 9
10add_executable(${PROJECT_NAME} ${akonadinextsynchronizer_SRCS}) 10add_executable(${PROJECT_NAME} ${akonadi2synchronizer_SRCS})
11target_link_libraries(${PROJECT_NAME} akonadinextcommon) 11target_link_libraries(${PROJECT_NAME} akonadi2common)
12qt5_use_modules(${PROJECT_NAME} Widgets Network) 12qt5_use_modules(${PROJECT_NAME} Widgets Network)
13install(TARGETS ${PROJECT_NAME} DESTINATION bin) 13install(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)
148 148
149 switch (commandId) { 149 switch (commandId) {
150 case Commands::HandshakeCommand: { 150 case Commands::HandshakeCommand: {
151 auto buffer = Akonadi::GetHandshake(data.constData()); 151 auto buffer = Akonadi2::GetHandshake(data.constData());
152 Console::main()->log(QString(" Handshake from %1").arg(buffer->name()->c_str())); 152 Console::main()->log(QString(" Handshake from %1").arg(buffer->name()->c_str()));
153 sendCurrentRevision(client); 153 sendCurrentRevision(client);
154 break; 154 break;
@@ -170,16 +170,16 @@ void Listener::sendCurrentRevision(Client &client)
170 return; 170 return;
171 } 171 }
172 172
173 auto command = Akonadi::CreateRevisionUpdate(m_fbb, m_revision); 173 auto command = Akonadi2::CreateRevisionUpdate(m_fbb, m_revision);
174 Akonadi::FinishRevisionUpdateBuffer(m_fbb, command); 174 Akonadi2::FinishRevisionUpdateBuffer(m_fbb, command);
175 Commands::write(client.socket, Commands::RevisionUpdateCommand, m_fbb); 175 Commands::write(client.socket, Commands::RevisionUpdateCommand, m_fbb);
176 m_fbb.Clear(); 176 m_fbb.Clear();
177} 177}
178 178
179void Listener::updateClientsWithRevision() 179void Listener::updateClientsWithRevision()
180{ 180{
181 auto command = Akonadi::CreateRevisionUpdate(m_fbb, m_revision); 181 auto command = Akonadi2::CreateRevisionUpdate(m_fbb, m_revision);
182 Akonadi::FinishRevisionUpdateBuffer(m_fbb, command); 182 Akonadi2::FinishRevisionUpdateBuffer(m_fbb, command);
183 183
184 for (const Client &client: m_connections) { 184 for (const Client &client: m_connections) {
185 if (!client.socket || !client.socket->isValid()) { 185 if (!client.socket || !client.socket->isValid()) {