From b1fdcec0c82318c7468d3a44cda8af4d94eea24e Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 28 Mar 2022 23:51:38 +0200 Subject: [PATCH] add cmake files to git ignore & change directory structure to module based approach --- .gitignore | 6 ++++++ CMakeLists.txt | 8 ++++---- src/{source-files => InputManager}/InputManager.cpp | 2 +- src/{header-files => InputManager}/InputManager.h | 4 ++-- src/{source-files => StorageEditor}/StorageEditor.cpp | 2 +- src/{header-files => StorageEditor}/StorageEditor.h | 4 ++-- src/{source-files => Ware}/Ware.cpp | 2 +- src/{header-files/data-classes => Ware}/Ware.h | 0 src/{source-files => WarenStorage}/WarenStorage.cpp | 2 +- .../data-classes => WarenStorage}/WarenStorage.h | 2 +- src/main.cpp | 4 ++-- src/{header-files => }/pch.h | 0 12 files changed, 21 insertions(+), 15 deletions(-) rename src/{source-files => InputManager}/InputManager.cpp (99%) rename src/{header-files => InputManager}/InputManager.h (93%) rename src/{source-files => StorageEditor}/StorageEditor.cpp (93%) rename src/{header-files => StorageEditor}/StorageEditor.h (87%) rename src/{source-files => Ware}/Ware.cpp (96%) rename src/{header-files/data-classes => Ware}/Ware.h (100%) rename src/{source-files => WarenStorage}/WarenStorage.cpp (97%) rename src/{header-files/data-classes => WarenStorage}/WarenStorage.h (97%) rename src/{header-files => }/pch.h (100%) diff --git a/.gitignore b/.gitignore index 6a32c1c..9a1ac99 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ .vimspector.json +CMakeFiles +CMakeCache.txt +cmake_install.cmake +CMakeLists.txt +kaufland +Makefile diff --git a/CMakeLists.txt b/CMakeLists.txt index c4f037a..b4eaf1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,10 +2,10 @@ project(kaufland) set (CMAKE_CXX_STANDARD 14) set(SOURCES - src/source-files/Ware.cpp - src/source-files/WarenStorage.cpp - src/source-files/StorageEditor.cpp - src/source-files/InputManager.cpp + src/Ware/Ware.cpp + src/WarenStorage/WarenStorage.cpp + src/StorageEditor/StorageEditor.cpp + src/InputManager/InputManager.cpp ) set(COMBINED_SOURCES ${SOURCES} src/main.cpp) diff --git a/src/source-files/InputManager.cpp b/src/InputManager/InputManager.cpp similarity index 99% rename from src/source-files/InputManager.cpp rename to src/InputManager/InputManager.cpp index aee0419..fafd6fc 100644 --- a/src/source-files/InputManager.cpp +++ b/src/InputManager/InputManager.cpp @@ -1,4 +1,4 @@ -#include "../header-files/InputManager.h" +#include "InputManager.h" #include #include diff --git a/src/header-files/InputManager.h b/src/InputManager/InputManager.h similarity index 93% rename from src/header-files/InputManager.h rename to src/InputManager/InputManager.h index a3ae10b..6db4fdc 100644 --- a/src/header-files/InputManager.h +++ b/src/InputManager/InputManager.h @@ -1,5 +1,5 @@ -#include "pch.h" -#include "StorageEditor.h" +#include "../pch.h" +#include "../StorageEditor/StorageEditor.h" class InputManager { diff --git a/src/source-files/StorageEditor.cpp b/src/StorageEditor/StorageEditor.cpp similarity index 93% rename from src/source-files/StorageEditor.cpp rename to src/StorageEditor/StorageEditor.cpp index 37df68d..9a8b1c1 100644 --- a/src/source-files/StorageEditor.cpp +++ b/src/StorageEditor/StorageEditor.cpp @@ -1,4 +1,4 @@ -#include "../header-files/StorageEditor.h" +#include "StorageEditor.h" StorageEditor::StorageEditor() { } diff --git a/src/header-files/StorageEditor.h b/src/StorageEditor/StorageEditor.h similarity index 87% rename from src/header-files/StorageEditor.h rename to src/StorageEditor/StorageEditor.h index 803b720..aef5ec7 100644 --- a/src/header-files/StorageEditor.h +++ b/src/StorageEditor/StorageEditor.h @@ -1,5 +1,5 @@ -#include "pch.h" -#include "data-classes/WarenStorage.h" +#include "../pch.h" +#include "../WarenStorage/WarenStorage.h" class StorageEditor { private: diff --git a/src/source-files/Ware.cpp b/src/Ware/Ware.cpp similarity index 96% rename from src/source-files/Ware.cpp rename to src/Ware/Ware.cpp index 44a6178..18f4d35 100644 --- a/src/source-files/Ware.cpp +++ b/src/Ware/Ware.cpp @@ -1,4 +1,4 @@ -#include "../header-files/data-classes/Ware.h" +#include "Ware.h" Ware::Ware(){ ++count; } Ware::~Ware() { --count; } diff --git a/src/header-files/data-classes/Ware.h b/src/Ware/Ware.h similarity index 100% rename from src/header-files/data-classes/Ware.h rename to src/Ware/Ware.h diff --git a/src/source-files/WarenStorage.cpp b/src/WarenStorage/WarenStorage.cpp similarity index 97% rename from src/source-files/WarenStorage.cpp rename to src/WarenStorage/WarenStorage.cpp index 38174b5..8751eeb 100644 --- a/src/source-files/WarenStorage.cpp +++ b/src/WarenStorage/WarenStorage.cpp @@ -1,4 +1,4 @@ -#include "../header-files/data-classes/WarenStorage.h" +#include "WarenStorage.h" WarenStorage::WarenStorage() { } diff --git a/src/header-files/data-classes/WarenStorage.h b/src/WarenStorage/WarenStorage.h similarity index 97% rename from src/header-files/data-classes/WarenStorage.h rename to src/WarenStorage/WarenStorage.h index 520f228..15d7463 100644 --- a/src/header-files/data-classes/WarenStorage.h +++ b/src/WarenStorage/WarenStorage.h @@ -1,5 +1,5 @@ #include "../pch.h" -#include "Ware.h" +#include "../Ware/Ware.h" class WarenStorage { public: diff --git a/src/main.cpp b/src/main.cpp index bce2d0f..cfa2a65 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ -#include "header-files/pch.h" -#include "header-files/InputManager.h" +#include "pch.h" +#include "InputManager/InputManager.h" int Ware::count; int main () { diff --git a/src/header-files/pch.h b/src/pch.h similarity index 100% rename from src/header-files/pch.h rename to src/pch.h