diff --git a/.clangd b/.clangd new file mode 100644 index 0000000..af4d5fb --- /dev/null +++ b/.clangd @@ -0,0 +1,17 @@ +CompileFlags: + Add: [-std=c++14, -Wno-documentation, -Wno-missing-prototypes] + +Diagnostics: + ClangTidy: + Add: + [ + performance-*, + bugprone-*, + modernize-*, + clang-analyzer-*, + readability-identifier*, + ] + CheckOptions: + readability-identifier-naming.VariableCase: camelCase + + Suppress: [-Wdeprecated-declarations] diff --git a/.gitignore b/.gitignore index 8023073..980f7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -191,8 +191,5 @@ _deps .cache .cmake -.vscode -.qt -.qtc - -.build +.qtc_clangd +build diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100755 index 0000000..d9118e6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.configureOnOpen": false, +} diff --git a/clock.py b/clock.py index 6152780..25babd6 100644 --- a/clock.py +++ b/clock.py @@ -29,9 +29,7 @@ class Clock(QWidget): clock.start(1000) # update the clock per second self.show() - self.settings = QSettings( - f"{sys.argv[0]}/../config/config.ini", QSettings.IniFormat - ) + self.settings = QSettings(f"{sys.argv[0]}/../config.ini", QSettings.IniFormat) font = QFont() font.setFamily(self.settings.value("USER/FONT_FAMILY")) font.setPointSize(int(self.settings.value("USER/FONT_SIZE"))) diff --git a/CMakeLists.txt b/cmake/CMakeLists.txt similarity index 95% rename from CMakeLists.txt rename to cmake/CMakeLists.txt index 2be4fb6..0d40688 100644 --- a/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -20,8 +20,8 @@ include_directories( ) set (SRCS - clock.cpp - clock.h + flock.cpp + flock.h main.cpp ) diff --git a/config/config.ini b/config.ini similarity index 100% rename from config/config.ini rename to config.ini diff --git a/clock.cpp b/flock.cpp similarity index 99% rename from clock.cpp rename to flock.cpp index b9f13e9..db9e248 100644 --- a/clock.cpp +++ b/flock.cpp @@ -1,4 +1,4 @@ -#include "clock.h" +#include "flock.h" Clock::Clock(QWidget *parent) : QWidget{parent}, pressed(false) { // geometry of Main Window (x, y, width, height) diff --git a/clock.h b/flock.h similarity index 100% rename from clock.h rename to flock.h diff --git a/flock.pro b/flock.pro index e979991..c3360f2 100644 --- a/flock.pro +++ b/flock.pro @@ -6,13 +6,10 @@ QT = core gui widgets HEADERS = \ - $$PWD/clock.h + $$PWD/flock.h SOURCES = \ - $$PWD/build/CMakeFiles/3.27.1/CompilerIdC/CMakeCCompilerId.c \ - $$PWD/build/CMakeFiles/3.27.1/CompilerIdCXX/CMakeCXXCompilerId.cpp \ - $$PWD/clock_autogen/mocs_compilation.cpp \ - $$PWD/clock.cpp \ + $$PWD/flock.cpp \ $$PWD/main.cpp INCLUDEPATH = \ diff --git a/main.cpp b/main.cpp index 0d69e94..6a18f6b 100644 --- a/main.cpp +++ b/main.cpp @@ -1,8 +1,8 @@ #include -#include "clock.h" +#include "flock.h" -int main(int argc, char *argv[]) { +auto main(int argc, char *argv[]) -> int { QApplication app(argc, argv); Clock clock;