From 390726a83913552e63d4499d216ea6f370d6adad Mon Sep 17 00:00:00 2001 From: lonkaars Date: Wed, 30 Nov 2022 13:44:59 +0100 Subject: move QtClient to confui --- QtClient/.gitignore | 73 ------------------------------------------------- QtClient/QtClient.pro | 24 ---------------- QtClient/main.cpp | 11 -------- QtClient/mainwindow.cpp | 15 ---------- QtClient/mainwindow.h | 27 ------------------ QtClient/mainwindow.ui | 22 --------------- confui/.gitignore | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ confui/QtClient.pro | 24 ++++++++++++++++ confui/main.c | 7 ----- confui/main.cpp | 11 ++++++++ confui/mainwindow.cpp | 15 ++++++++++ confui/mainwindow.h | 27 ++++++++++++++++++ confui/mainwindow.ui | 22 +++++++++++++++ confui/makefile | 24 ---------------- 14 files changed, 172 insertions(+), 203 deletions(-) delete mode 100644 QtClient/.gitignore delete mode 100644 QtClient/QtClient.pro delete mode 100644 QtClient/main.cpp delete mode 100644 QtClient/mainwindow.cpp delete mode 100644 QtClient/mainwindow.h delete mode 100644 QtClient/mainwindow.ui create mode 100644 confui/.gitignore create mode 100644 confui/QtClient.pro delete mode 100644 confui/main.c create mode 100644 confui/main.cpp create mode 100644 confui/mainwindow.cpp create mode 100644 confui/mainwindow.h create mode 100644 confui/mainwindow.ui delete mode 100644 confui/makefile diff --git a/QtClient/.gitignore b/QtClient/.gitignore deleted file mode 100644 index fab7372..0000000 --- a/QtClient/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - diff --git a/QtClient/QtClient.pro b/QtClient/QtClient.pro deleted file mode 100644 index b915c09..0000000 --- a/QtClient/QtClient.pro +++ /dev/null @@ -1,24 +0,0 @@ -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -CONFIG += c++17 - -# You can make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += \ - main.cpp \ - mainwindow.cpp - -HEADERS += \ - mainwindow.h - -FORMS += \ - mainwindow.ui - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target diff --git a/QtClient/main.cpp b/QtClient/main.cpp deleted file mode 100644 index fd3e533..0000000 --- a/QtClient/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "mainwindow.h" - -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - return a.exec(); -} diff --git a/QtClient/mainwindow.cpp b/QtClient/mainwindow.cpp deleted file mode 100644 index 41a26bd..0000000 --- a/QtClient/mainwindow.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent) - , ui(new Ui::MainWindow) -{ - ui->setupUi(this); -} - -MainWindow::~MainWindow() -{ - delete ui; -} - diff --git a/QtClient/mainwindow.h b/QtClient/mainwindow.h deleted file mode 100644 index 57eb614..0000000 --- a/QtClient/mainwindow.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include -#include - -#include - -QT_BEGIN_NAMESPACE -namespace Ui { class MainWindow; } -QT_END_NAMESPACE - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(QWidget *parent = nullptr); - ~MainWindow(); - -private slots: - void on_pushButton_clicked(); - -private: - Ui::MainWindow *ui; -}; -#endif // MAINWINDOW_H diff --git a/QtClient/mainwindow.ui b/QtClient/mainwindow.ui deleted file mode 100644 index b232854..0000000 --- a/QtClient/mainwindow.ui +++ /dev/null @@ -1,22 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 800 - 600 - - - - MainWindow - - - - - - - - diff --git a/confui/.gitignore b/confui/.gitignore new file mode 100644 index 0000000..fab7372 --- /dev/null +++ b/confui/.gitignore @@ -0,0 +1,73 @@ +# This file is used to ignore files which are generated +# ---------------------------------------------------------------------------- + +*~ +*.autosave +*.a +*.core +*.moc +*.o +*.obj +*.orig +*.rej +*.so +*.so.* +*_pch.h.cpp +*_resource.rc +*.qm +.#* +*.*# +core +!core/ +tags +.DS_Store +.directory +*.debug +Makefile* +*.prl +*.app +moc_*.cpp +ui_*.h +qrc_*.cpp +Thumbs.db +*.res +*.rc +/.qmake.cache +/.qmake.stash + +# qtcreator generated files +*.pro.user* + +# xemacs temporary files +*.flc + +# Vim temporary files +.*.swp + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.sdf +*.opensdf +*.vcxproj +*vcxproj.* + +# MinGW generated files +*.Debug +*.Release + +# Python byte code +*.pyc + +# Binaries +# -------- +*.dll +*.exe + diff --git a/confui/QtClient.pro b/confui/QtClient.pro new file mode 100644 index 0000000..b915c09 --- /dev/null +++ b/confui/QtClient.pro @@ -0,0 +1,24 @@ +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++17 + +# You can make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp \ + mainwindow.cpp + +HEADERS += \ + mainwindow.h + +FORMS += \ + mainwindow.ui + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target diff --git a/confui/main.c b/confui/main.c deleted file mode 100644 index 1be969b..0000000 --- a/confui/main.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main() { - printf("hello world!\n"); - - return 0; -} diff --git a/confui/main.cpp b/confui/main.cpp new file mode 100644 index 0000000..fd3e533 --- /dev/null +++ b/confui/main.cpp @@ -0,0 +1,11 @@ +#include "mainwindow.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + return a.exec(); +} diff --git a/confui/mainwindow.cpp b/confui/mainwindow.cpp new file mode 100644 index 0000000..41a26bd --- /dev/null +++ b/confui/mainwindow.cpp @@ -0,0 +1,15 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + diff --git a/confui/mainwindow.h b/confui/mainwindow.h new file mode 100644 index 0000000..57eb614 --- /dev/null +++ b/confui/mainwindow.h @@ -0,0 +1,27 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include +#include + +#include + +QT_BEGIN_NAMESPACE +namespace Ui { class MainWindow; } +QT_END_NAMESPACE + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + MainWindow(QWidget *parent = nullptr); + ~MainWindow(); + +private slots: + void on_pushButton_clicked(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H diff --git a/confui/mainwindow.ui b/confui/mainwindow.ui new file mode 100644 index 0000000..b232854 --- /dev/null +++ b/confui/mainwindow.ui @@ -0,0 +1,22 @@ + + + MainWindow + + + + 0 + 0 + 800 + 600 + + + + MainWindow + + + + + + + + diff --git a/confui/makefile b/confui/makefile deleted file mode 100644 index 78301cb..0000000 --- a/confui/makefile +++ /dev/null @@ -1,24 +0,0 @@ -CC = gcc -LD = gcc -RM = rm -f -CFLAGS = -LFLAGS = -TARGET = confui - -SRCS := $(wildcard *.c) -OBJS := $(patsubst %.c,%.o, $(SRCS)) - -all: $(TARGET) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ - -$(TARGET): $(OBJS) - $(LD) $^ $(LFLAGS) -o $@ - -clean: - $(RM) $(TARGET) $(OBJS) - -compile_commands: clean - compiledb make - -- cgit v1.2.3