From a638e267cc8402d8a4937f8fdd0fe743dd526cc3 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Wed, 29 Apr 2026 20:59:17 -0700 Subject: [PATCH] Style fixes. --- common/lc_aboutdialog.h | 4 +--- common/lc_arraydialog.h | 4 ++-- common/lc_blenderpreferences.cpp | 16 ---------------- common/lc_blenderpreferences.h | 20 +------------------- common/lc_groupdialog.h | 6 ++---- common/lc_mainwindow.cpp | 2 +- common/lc_pagesetupdialog.h | 2 +- common/lc_previewwidget.h | 2 +- common/lc_updatedialog.h | 2 +- qt/lc_qhtmldialog.h | 5 ++--- qt/lc_qimagedialog.h | 4 +--- qt/lc_qpreferencesdialog.h | 2 +- qt/lc_qselectdialog.h | 4 +--- qt/lc_renderdialog.h | 6 ++---- qt/lc_setsdatabasedialog.h | 4 +--- 15 files changed, 18 insertions(+), 65 deletions(-) diff --git a/common/lc_aboutdialog.h b/common/lc_aboutdialog.h index 16814c49..f3e69209 100644 --- a/common/lc_aboutdialog.h +++ b/common/lc_aboutdialog.h @@ -1,7 +1,5 @@ #pragma once -#include - namespace Ui { class lcAboutDialog; } @@ -12,7 +10,7 @@ class lcAboutDialog : public QDialog public: explicit lcAboutDialog(QWidget* Parent); - ~lcAboutDialog(); + virtual ~lcAboutDialog(); private: Ui::lcAboutDialog* ui; diff --git a/common/lc_arraydialog.h b/common/lc_arraydialog.h index 0129e740..b03e8e57 100644 --- a/common/lc_arraydialog.h +++ b/common/lc_arraydialog.h @@ -12,7 +12,7 @@ class lcArrayDialog : public QDialog public: lcArrayDialog(QWidget* Parent); - ~lcArrayDialog(); + virtual ~lcArrayDialog(); int mCounts[3]; lcVector3 mOffsets[3]; @@ -22,6 +22,6 @@ public slots: void accept() override; private: - Ui::lcArrayDialog *ui; + Ui::lcArrayDialog* ui; }; diff --git a/common/lc_blenderpreferences.cpp b/common/lc_blenderpreferences.cpp index 70655247..1d9687da 100644 --- a/common/lc_blenderpreferences.cpp +++ b/common/lc_blenderpreferences.cpp @@ -1,19 +1,3 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include "lc_blenderpreferences.h" diff --git a/common/lc_blenderpreferences.h b/common/lc_blenderpreferences.h index 47448d6e..95250285 100644 --- a/common/lc_blenderpreferences.h +++ b/common/lc_blenderpreferences.h @@ -1,38 +1,20 @@ #pragma once -#include -#include -#include "qtimer.h" - #define LC_UNIX_SHELL "/bin/sh" #define LC_WINDOWS_SHELL "cmd.exe" #define LC_BLENDER_ADDON_BLEND_FILE "leocad.blend" #define LC_BLENDER_ADDON_IMPORT_MODULE "TN" #define LC_BLENDER_ADDON_RENDER_FOLDER "io_scene_render_ldraw" -class QFormLayout; -class QGridLayout; -class QLabel; -class QGroupBox; -class QLineEdit; -class QCheckBox; -class QComboBox; -class QPushButton; -class QScrollArea; -class QProgressBar; -class QProcess; -class QTimer; - class lcHttpReply; class lcBlenderPreferences; class lcBlenderPreferencesDialog : public QDialog { Q_OBJECT + public: - explicit lcBlenderPreferencesDialog(int Width, int Height, double Scale, QWidget* Parent = nullptr); - virtual ~lcBlenderPreferencesDialog(); static bool GetBlenderPreferences(int& Width, int& Height, double& Scale, QWidget* Parent = nullptr); diff --git a/common/lc_groupdialog.h b/common/lc_groupdialog.h index 5de6b576..22cb97f8 100644 --- a/common/lc_groupdialog.h +++ b/common/lc_groupdialog.h @@ -1,7 +1,5 @@ #pragma once -#include - namespace Ui { class lcGroupDialog; } @@ -12,7 +10,7 @@ class lcGroupDialog : public QDialog public: explicit lcGroupDialog(QWidget* Parent, const QString& Name, const std::vector>& Groups); - ~lcGroupDialog(); + virtual ~lcGroupDialog(); QString mName; @@ -21,5 +19,5 @@ public slots: private: const std::vector>& mGroups; - Ui::lcGroupDialog *ui; + Ui::lcGroupDialog* ui; }; diff --git a/common/lc_mainwindow.cpp b/common/lc_mainwindow.cpp index f858e706..9cb76408 100644 --- a/common/lc_mainwindow.cpp +++ b/common/lc_mainwindow.cpp @@ -826,7 +826,7 @@ void lcMainWindow::PreviewPiece(const QString& PartId, int ColorCode, bool ShowP void lcMainWindow::CreatePreviewWidget() { - mPreviewWidget = new lcPreviewDockWidget(); + mPreviewWidget = new lcPreviewDockWidget(this); mPreviewToolBar = new QDockWidget(tr("Preview"), this); mPreviewToolBar->setWindowTitle(tr("Preview")); diff --git a/common/lc_pagesetupdialog.h b/common/lc_pagesetupdialog.h index c7dd5d81..786bebd3 100644 --- a/common/lc_pagesetupdialog.h +++ b/common/lc_pagesetupdialog.h @@ -17,6 +17,6 @@ public slots: void accept() override; private: - Ui::lcPageSetupDialog *ui; + Ui::lcPageSetupDialog* ui; lcInstructionsPageSetup* mPageSetup; }; diff --git a/common/lc_previewwidget.h b/common/lc_previewwidget.h index b09f78dd..0943f607 100644 --- a/common/lc_previewwidget.h +++ b/common/lc_previewwidget.h @@ -9,7 +9,7 @@ class lcPreviewDockWidget : public QMainWindow Q_OBJECT public: - explicit lcPreviewDockWidget(QMainWindow* Parent = nullptr); + explicit lcPreviewDockWidget(QMainWindow* Parent); bool SetCurrentPiece(const QString& PartType, int ColorCode); void ClearPreview(); diff --git a/common/lc_updatedialog.h b/common/lc_updatedialog.h index 3727281b..d6e3d1b2 100644 --- a/common/lc_updatedialog.h +++ b/common/lc_updatedialog.h @@ -25,7 +25,7 @@ public slots: void finished(int result); private: - Ui::lcUpdateDialog *ui; + Ui::lcUpdateDialog* ui; lcHttpManager* mHttpManager; QByteArray mVersionData; diff --git a/qt/lc_qhtmldialog.h b/qt/lc_qhtmldialog.h index d0c4d2d0..26196df6 100644 --- a/qt/lc_qhtmldialog.h +++ b/qt/lc_qhtmldialog.h @@ -1,6 +1,5 @@ #pragma once -#include class lcHTMLExportOptions; namespace Ui { @@ -13,7 +12,7 @@ class lcHTMLDialog : public QDialog public: explicit lcHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options); - ~lcHTMLDialog(); + virtual ~lcHTMLDialog(); public slots: void accept() override; @@ -23,6 +22,6 @@ private slots: private: lcHTMLExportOptions* mOptions; - Ui::lcHTMLDialog *ui; + Ui::lcHTMLDialog* ui; }; diff --git a/qt/lc_qimagedialog.h b/qt/lc_qimagedialog.h index 2b9d5640..1b1ea588 100644 --- a/qt/lc_qimagedialog.h +++ b/qt/lc_qimagedialog.h @@ -1,7 +1,5 @@ #pragma once -#include - namespace Ui { class lcImageDialog; } @@ -27,6 +25,6 @@ private slots: void FileNameBrowseClicked(); private: - Ui::lcImageDialog *ui; + Ui::lcImageDialog* ui; }; diff --git a/qt/lc_qpreferencesdialog.h b/qt/lc_qpreferencesdialog.h index 72c3c629..734aec2a 100644 --- a/qt/lc_qpreferencesdialog.h +++ b/qt/lc_qpreferencesdialog.h @@ -105,7 +105,7 @@ private slots: void MouseTreeItemChanged(QTreeWidgetItem* Current); private: - Ui::lcPreferencesDialog *ui; + Ui::lcPreferencesDialog* ui; void updateCategories(); void updateCommandList(); diff --git a/qt/lc_qselectdialog.h b/qt/lc_qselectdialog.h index 30469bad..2548bf08 100644 --- a/qt/lc_qselectdialog.h +++ b/qt/lc_qselectdialog.h @@ -1,7 +1,5 @@ #pragma once -#include - namespace Ui { class lcSelectDialog; } @@ -31,7 +29,7 @@ private slots: void ItemChanged(QTreeWidgetItem *item, int column); private: - Ui::lcSelectDialog *ui; + Ui::lcSelectDialog* ui; void AddChildren(QTreeWidgetItem* ParentItem, lcGroup* ParentGroup, lcModel* Model); }; diff --git a/qt/lc_renderdialog.h b/qt/lc_renderdialog.h index 9779029d..5cf7fa59 100644 --- a/qt/lc_renderdialog.h +++ b/qt/lc_renderdialog.h @@ -2,8 +2,6 @@ #ifndef LC_DISABLE_RENDER_DIALOG -#include - namespace Ui { class lcRenderDialog; } @@ -13,7 +11,7 @@ class lcRenderProcess : public QProcess Q_OBJECT public: - explicit lcRenderProcess(QObject* parent = nullptr) + explicit lcRenderProcess(QObject* parent) : QProcess(parent) { } @@ -25,7 +23,7 @@ class lcRenderPreviewWidget : public QWidget Q_OBJECT public: - lcRenderPreviewWidget(QWidget* Parent) + explicit lcRenderPreviewWidget(QWidget* Parent) : QWidget(Parent) { } diff --git a/qt/lc_setsdatabasedialog.h b/qt/lc_setsdatabasedialog.h index 77b7f478..5490fbeb 100644 --- a/qt/lc_setsdatabasedialog.h +++ b/qt/lc_setsdatabasedialog.h @@ -1,7 +1,5 @@ #pragma once -#include - class lcHttpReply; class lcHttpManager; @@ -15,7 +13,7 @@ class lcSetsDatabaseDialog : public QDialog public: explicit lcSetsDatabaseDialog(QWidget* Parent); - ~lcSetsDatabaseDialog(); + virtual ~lcSetsDatabaseDialog(); QString GetSetName() const; QString GetSetDescription() const;