diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index 779ce6d..0000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "configurations": [ - { - "name": "Linux", - "includePath": [ - "${workspaceFolder}/**", - "/usr/include/qt" - ], - "defines": [], - "compilerPath": "/usr/bin/clang", - "cStandard": "c11", - "cppStandard": "c++17", - "intelliSenseMode": "clang-x64" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 6425366..bb66887 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,18 +1,10 @@ -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -# Instruct CMake to run moc automatically when needed -set(CMAKE_AUTOMOC ON) -# Create code from a list of Qt designer ui files -set(CMAKE_AUTOUIC ON) - -# Find the QtWidgets library -find_package(Qt5Widgets CONFIG REQUIRED) +set(GUI_HEADERS + +) set(GUI_SOURCES kima2.cpp - mainwindow.cpp - mainwindow.ui ) add_executable(kima2 ${GUI_SOURCES}) -target_link_libraries(kima2 core Qt5::Widgets) +target_link_libraries(kima2 core) \ No newline at end of file diff --git a/src/gui/kima2.cpp b/src/gui/kima2.cpp index 372e273..78ae9c1 100644 --- a/src/gui/kima2.cpp +++ b/src/gui/kima2.cpp @@ -1,16 +1,10 @@ -#include "mainwindow.h" +#include "../core/entity.h" -#include +#include +#include - -int main(int argc, char* argv[]) +int main() { - //Q_INIT_RESOURCE(application); - QApplication kimaApp{argc, argv}; - - MainWindow mainWin{}; - mainWin.show(); - - return kimaApp.exec(); + return 0; } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp deleted file mode 100644 index c94ac19..0000000 --- a/src/gui/mainwindow.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "mainwindow.h" - -MainWindow::MainWindow() -{ - ui.setupUi(this); -} \ No newline at end of file diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h deleted file mode 100644 index 2cc3dad..0000000 --- a/src/gui/mainwindow.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include "ui_mainwindow.h" -#include - -class MainWindow : public QMainWindow -{ - Q_OBJECT - - public: - MainWindow(); - - private: - Ui::MainWindow ui; -}; - -#endif \ No newline at end of file diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui deleted file mode 100644 index ca4bfd5..0000000 --- a/src/gui/mainwindow.ui +++ /dev/null @@ -1,31 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 800 - 600 - - - - KIMA2 - - - - - - 0 - 0 - 800 - 24 - - - - - - - -