Removed non-working MetaDataModel
This commit is contained in:
parent
ff615ec084
commit
e77990a86a
6 changed files with 1 additions and 28 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -2,3 +2,4 @@ compile_commands.json
|
|||
_*/
|
||||
build-*
|
||||
*.user
|
||||
tags
|
||||
|
|
|
@ -2,11 +2,9 @@ syntax = "proto3";
|
|||
|
||||
package ESGRAF48;
|
||||
|
||||
import "MetaDataModel.proto";
|
||||
import "V2SvkModel.proto";
|
||||
|
||||
message DataModel
|
||||
{
|
||||
MetaDataModel MetaData = 1;
|
||||
V2SvkModel V2Svk = 2;
|
||||
}
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
syntax = "proto3";
|
||||
|
||||
package ESGRAF48;
|
||||
|
||||
message MetaDataModel
|
||||
{
|
||||
string dummy = 1;
|
||||
}
|
|
@ -19,7 +19,6 @@ qt5_add_resources(LOGO_TEST_QRC
|
|||
|
||||
set(DataModel_PROTO_FILES
|
||||
../proto/DataModel.proto
|
||||
../proto/MetaDataModel.proto
|
||||
../proto/V2SvkModel.proto
|
||||
)
|
||||
|
||||
|
|
|
@ -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}
|
||||
)
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
#include "../Age.h"
|
||||
|
||||
//#include "MetaDataModel.pb.h"
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
#include <QString>
|
||||
#include <QDate>
|
||||
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue