diff --git a/qt/lc_qaboutdialog.cpp b/common/lc_aboutdialog.cpp similarity index 92% rename from qt/lc_qaboutdialog.cpp rename to common/lc_aboutdialog.cpp index 79d5003b..950e5385 100644 --- a/qt/lc_qaboutdialog.cpp +++ b/common/lc_aboutdialog.cpp @@ -1,14 +1,13 @@ #include "lc_global.h" -#include "lc_qaboutdialog.h" -#include "ui_lc_qaboutdialog.h" +#include "lc_aboutdialog.h" +#include "ui_lc_aboutdialog.h" #include "lc_mainwindow.h" #include "lc_view.h" #include "lc_glextensions.h" #include "lc_viewwidget.h" -lcQAboutDialog::lcQAboutDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::lcQAboutDialog) +lcAboutDialog::lcAboutDialog(QWidget* Parent) + : QDialog(Parent), ui(new Ui::lcAboutDialog) { ui->setupUi(this); @@ -42,7 +41,7 @@ lcQAboutDialog::lcQAboutDialog(QWidget *parent) : ui->info->setText(QtVersion + Version + Buffers + Extensions); } -lcQAboutDialog::~lcQAboutDialog() +lcAboutDialog::~lcAboutDialog() { delete ui; } diff --git a/common/lc_aboutdialog.h b/common/lc_aboutdialog.h new file mode 100644 index 00000000..16814c49 --- /dev/null +++ b/common/lc_aboutdialog.h @@ -0,0 +1,19 @@ +#pragma once + +#include + +namespace Ui { +class lcAboutDialog; +} + +class lcAboutDialog : public QDialog +{ + Q_OBJECT + +public: + explicit lcAboutDialog(QWidget* Parent); + ~lcAboutDialog(); + +private: + Ui::lcAboutDialog* ui; +}; diff --git a/qt/lc_qaboutdialog.ui b/common/lc_aboutdialog.ui similarity index 95% rename from qt/lc_qaboutdialog.ui rename to common/lc_aboutdialog.ui index 1d941fad..8fcbf8c2 100644 --- a/qt/lc_qaboutdialog.ui +++ b/common/lc_aboutdialog.ui @@ -1,7 +1,7 @@ - lcQAboutDialog - + lcAboutDialog + 0 @@ -110,7 +110,7 @@ buttonBox accepted() - lcQAboutDialog + lcAboutDialog accept() @@ -126,7 +126,7 @@ buttonBox rejected() - lcQAboutDialog + lcAboutDialog reject() diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index 9b0bfe19..dd475d0e 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -9,7 +9,7 @@ #include "lc_qpropertiestree.h" #include "lc_qutils.h" #include "lc_qupdatedialog.h" -#include "lc_qaboutdialog.h" +#include "lc_aboutdialog.h" #include "lc_setsdatabasedialog.h" #include "lc_qhtmldialog.h" #include "lc_renderdialog.h" @@ -1248,7 +1248,7 @@ void lcMainWindow::ShowUpdatesDialog() void lcMainWindow::ShowAboutDialog() { - lcQAboutDialog Dialog(this); + lcAboutDialog Dialog(this); Dialog.exec(); } diff --git a/leocad.pro b/leocad.pro index 393ac7b3..fb07cc99 100644 --- a/leocad.pro +++ b/leocad.pro @@ -172,6 +172,7 @@ SOURCES += \ common/object.cpp \ common/minifig.cpp \ common/light.cpp \ + common/lc_aboutdialog.cpp \ common/lc_application.cpp \ common/lc_bricklink.cpp \ common/lc_category.cpp \ @@ -216,7 +217,6 @@ SOURCES += \ qt/qtmain.cpp \ qt/lc_qarraydialog.cpp \ qt/lc_qgroupdialog.cpp \ - qt/lc_qaboutdialog.cpp \ qt/lc_qeditgroupsdialog.cpp \ qt/lc_qselectdialog.cpp \ qt/lc_qpropertiesdialog.cpp \ @@ -240,6 +240,7 @@ HEADERS += \ common/object.h \ common/minifig.h \ common/light.h \ + common/lc_aboutdialog.h \ common/lc_application.h \ common/lc_array.h \ common/lc_bricklink.h \ @@ -285,7 +286,6 @@ HEADERS += \ common/camera.h \ qt/lc_qarraydialog.h \ qt/lc_qgroupdialog.h \ - qt/lc_qaboutdialog.h \ qt/lc_qeditgroupsdialog.h \ qt/lc_qselectdialog.h \ qt/lc_qpropertiesdialog.h \ @@ -304,7 +304,6 @@ HEADERS += \ FORMS += \ qt/lc_qarraydialog.ui \ qt/lc_qgroupdialog.ui \ - qt/lc_qaboutdialog.ui \ qt/lc_qeditgroupsdialog.ui \ qt/lc_qselectdialog.ui \ qt/lc_qpropertiesdialog.ui \ @@ -316,6 +315,7 @@ FORMS += \ qt/lc_qmodellistdialog.ui \ qt/lc_renderdialog.ui \ qt/lc_setsdatabasedialog.ui \ + common/lc_aboutdialog.ui \ common/lc_minifigdialog.ui \ common/lc_pagesetupdialog.ui \ common/lc_partpalettedialog.ui diff --git a/qt/lc_qaboutdialog.h b/qt/lc_qaboutdialog.h deleted file mode 100644 index fe7343c7..00000000 --- a/qt/lc_qaboutdialog.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include - -namespace Ui { -class lcQAboutDialog; -} - -class lcQAboutDialog : public QDialog -{ - Q_OBJECT - -public: - explicit lcQAboutDialog(QWidget *parent); - ~lcQAboutDialog(); - -private: - Ui::lcQAboutDialog *ui; -}; -