Moved Console to client.

It's part of the demo application.

6 files changed, 6 insertions, 19 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index c18d98a..f6847a7 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -28,7 +28,6 @@ set(command_SRCS
     entitybuffer.cpp
     clientapi.cpp
     commands.cpp
-    console.cpp
     facade.cpp
     pipeline.cpp
     domainadaptor.cpp
@@ -44,6 +43,6 @@ set(command_SRCS
 add_library(${PROJECT_NAME} SHARED ${command_SRCS})
 generate_export_header(${PROJECT_NAME} BASE_NAME Akonadi2Common EXPORT_FILE_NAME akonadi2common_export.h)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-qt5_use_modules(${PROJECT_NAME} Widgets Network)
+qt5_use_modules(${PROJECT_NAME} Network)
 target_link_libraries(${PROJECT_NAME} ${storage_LIBS} akonadi2async)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/examples/client/CMakeLists.txt b/examples/client/CMakeLists.txt
index 3555b3e..97b5ad2 100644
--- a/examples/client/CMakeLists.txt
+++ b/examples/client/CMakeLists.txt
@@ -2,7 +2,7 @@ project(akonadi2_client)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(${PROJECT_NAME} main.cpp)
+add_executable(${PROJECT_NAME} main.cpp console.cpp)
 target_link_libraries(${PROJECT_NAME} akonadi2common)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/common/console.cpp b/examples/client/console.cpp
index 97a6e88..8b4f1a5 100644
--- a/common/console.cpp
+++ b/examples/client/console.cpp
@@ -25,9 +25,6 @@
 #include <QTextBrowser>
 #include <QVBoxLayout>
 
-namespace Akonadi2
-{
-
 static Console *s_console = 0;
 
 Console *Console::main()
@@ -77,4 +74,3 @@ void Console::log(const QString &message)
     m_textDisplay->append(QString::number(m_timestamper.elapsed()).rightJustified(6) + ": " + message);
 }
 
-} // namespace Akonadi2
diff --git a/common/console.h b/examples/client/console.h
index edfc8e5..a6fef01 100644
--- a/common/console.h
+++ b/examples/client/console.h
@@ -20,17 +20,12 @@
 
 #pragma once
 
-#include <akonadi2common_export.h>
-
 #include <QTime>
 #include <QWidget>
 
 class QTextBrowser;
 
-namespace Akonadi2
-{
-
-class AKONADI2COMMON_EXPORT Console : public QWidget
+class Console : public QWidget
 {
     Q_OBJECT
 public:
@@ -45,5 +40,3 @@ private:
     QTime m_timestamper;
     static Console *s_output;
 };
-
-} // namespace Akonadi2
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index b4cb081..5cd6141 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -21,15 +21,15 @@
 #include <QCommandLineParser>
 
 #include "common/commands.h"
-#include "common/console.h"
 #include "common/resourceaccess.h"
+#include "console.h"
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    new Akonadi2::Console("Akonadi2 Client");
-    Akonadi2::Console::main()->log(QString("PID: %1").arg(QCoreApplication::applicationPid()));
+    new Console("Akonadi2 Client");
+    Console::main()->log(QString("PID: %1").arg(QCoreApplication::applicationPid()));
 
     QCommandLineParser cliOptions;
     cliOptions.addPositionalArgument(QObject::tr("[resource]"),
diff --git a/synchronizer/listener.cpp b/synchronizer/listener.cpp
index c68bd9a..e930a02 100644
--- a/synchronizer/listener.cpp
+++ b/synchronizer/listener.cpp
@@ -20,7 +20,6 @@
 #include "listener.h"
 
 #include "common/clientapi.h"
-#include "common/console.h"
 #include "common/commands.h"
 #include "common/resource.h"
 #include "common/log.h"