From e77990a86a3948d8b3820c931cd96f14f85906d1 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Fri, 16 Nov 2018 22:29:41 +0100 Subject: [PATCH] Removed non-working MetaDataModel --- .gitignore | 1 + proto/DataModel.proto | 2 -- proto/MetaDataModel.proto | 8 -------- source/CMakeLists.txt | 1 - source/MetaData/CMakeLists.txt | 13 ------------- source/MetaData/MetaDataModel.h | 4 ---- 6 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 proto/MetaDataModel.proto diff --git a/.gitignore b/.gitignore index 627e015..e42f4b6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ compile_commands.json _*/ build-* *.user +tags diff --git a/proto/DataModel.proto b/proto/DataModel.proto index bd21edb..3439b4a 100644 --- a/proto/DataModel.proto +++ b/proto/DataModel.proto @@ -2,11 +2,9 @@ syntax = "proto3"; package ESGRAF48; -import "MetaDataModel.proto"; import "V2SvkModel.proto"; message DataModel { - MetaDataModel MetaData = 1; V2SvkModel V2Svk = 2; } diff --git a/proto/MetaDataModel.proto b/proto/MetaDataModel.proto deleted file mode 100644 index 1b75c36..0000000 --- a/proto/MetaDataModel.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; - -package ESGRAF48; - -message MetaDataModel -{ - string dummy = 1; -} diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 410e0fe..29ceccf 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -19,7 +19,6 @@ qt5_add_resources(LOGO_TEST_QRC set(DataModel_PROTO_FILES ../proto/DataModel.proto - ../proto/MetaDataModel.proto ../proto/V2SvkModel.proto ) diff --git a/source/MetaData/CMakeLists.txt b/source/MetaData/CMakeLists.txt index d8a6379..01aa53f 100644 --- a/source/MetaData/CMakeLists.txt +++ b/source/MetaData/CMakeLists.txt @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.6) project(MetaData LANGUAGES CXX) find_package(Qt5Widgets REQUIRED) -find_package(Protobuf REQUIRED) set(CMAKE_AUTOMOC ON) @@ -11,20 +10,10 @@ qt5_wrap_ui(META_DATA_UI MetaDataWidget.ui ) -set(MetaDataModel_PROTO_FILES - ../../proto/MetaDataModel.proto -) - -protobuf_generate_cpp(MetaDataModel_PROTO_SRCS MetaDataModel_PROTO_HDRS - ${MetaDataModel_PROTO_FILES} -) - add_library(${PROJECT_NAME} MetaDataModel.cpp MetaDataWidget.cpp ${META_DATA_UI} - ${MetaDateModel_PROTO_SRCS} - ${MetaDateModel_PROTO_HDRS} ) set_target_properties(${PROJECT_NAME} @@ -34,7 +23,6 @@ set_target_properties(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - ${Protobuf_INCLUDE_DIRS} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -42,5 +30,4 @@ target_include_directories(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets - ${Protobuf_LIBRARIES} ) diff --git a/source/MetaData/MetaDataModel.h b/source/MetaData/MetaDataModel.h index 1de7a0f..6c81f8a 100644 --- a/source/MetaData/MetaDataModel.h +++ b/source/MetaData/MetaDataModel.h @@ -2,8 +2,6 @@ #include "../Age.h" -//#include "MetaDataModel.pb.h" - #include #include #include @@ -33,8 +31,6 @@ public: void write(QJsonObject &json) const; void read(const QJsonObject &json); - //void writeProtoBuf(ESGRAF48::MetaDataModel &model) const; - std::string toHtml() const; Age getAge() const