Skip to content
Snippets Groups Projects
Commit daf9cd74 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm Q_OBJECT, copy edit - ctd

parent da87077a
No related branches found
No related tags found
1 merge request!1447rm Q_OBJECT where not needed (#515); copy edit GUI header files
Showing
with 16 additions and 40 deletions
...@@ -18,14 +18,12 @@ ...@@ -18,14 +18,12 @@
#include <QMap> #include <QMap>
#include <QObject> #include <QObject>
class JobModel;
class JobItem; class JobItem;
class FitSessionController; class FitSessionController;
//! Handles all activity related to the simultaneous running of fitting jobs. //! Handles all activity related to the simultaneous running of fitting jobs.
class FitSessionManager : public QObject { class FitSessionManager : public QObject {
Q_OBJECT
public: public:
FitSessionManager(QObject* parent = nullptr); FitSessionManager(QObject* parent = nullptr);
~FitSessionManager(); ~FitSessionManager();
......
...@@ -17,20 +17,18 @@ ...@@ -17,20 +17,18 @@
#include <QWidget> #include <QWidget>
class RunFitControlWidget;
class JobItem;
class FitParameterWidget; class FitParameterWidget;
class FitSessionController;
class JobItem;
class MinimizerSettingsWidget; class MinimizerSettingsWidget;
class ParameterTuningWidget; class ParameterTuningWidget;
class FitSessionController;
class QTabWidget; class QTabWidget;
class RunFitControlWidget;
//! Contains all fit settings for given JobItem (fit parameters, //! Contains all fit settings for given JobItem (fit parameters,
//! minimizer settings). Controlled by FitActivityPanel. //! minimizer settings). Controlled by FitActivityPanel.
class FitSessionWidget : public QWidget { class FitSessionWidget : public QWidget {
Q_OBJECT
public: public:
FitSessionWidget(QWidget* parent = nullptr); FitSessionWidget(QWidget* parent = nullptr);
~FitSessionWidget(); ~FitSessionWidget();
......
...@@ -18,11 +18,9 @@ ...@@ -18,11 +18,9 @@
#include "GUI/View/Fit/FitLog.h" #include "GUI/View/Fit/FitLog.h"
#include <QTextEdit> #include <QTextEdit>
//! The JobMessagePanel class shows log messages from FitActivityPanel at the //! Shows log messages from FitActivityPanel at the bottom part of JobView.
//! bottom part of JobView.
class JobMessagePanel : public QTextEdit { class JobMessagePanel : public QTextEdit {
Q_OBJECT
public: public:
JobMessagePanel(QWidget* parent = nullptr); JobMessagePanel(QWidget* parent = nullptr);
~JobMessagePanel(); ~JobMessagePanel();
......
...@@ -25,7 +25,6 @@ class SpecularDataItem; ...@@ -25,7 +25,6 @@ class SpecularDataItem;
//! simultaneous, synchronous work while plotting and changing their properties. //! simultaneous, synchronous work while plotting and changing their properties.
class DataItemBundleWidget : public QWidget { class DataItemBundleWidget : public QWidget {
Q_OBJECT
public: public:
explicit DataItemBundleWidget(QWidget* parent = nullptr); explicit DataItemBundleWidget(QWidget* parent = nullptr);
~DataItemBundleWidget() override; ~DataItemBundleWidget() override;
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
//! currently selected items. //! currently selected items.
class ItemStackWidget : public QWidget { class ItemStackWidget : public QWidget {
Q_OBJECT
public: public:
ItemStackWidget(QWidget* parent = nullptr); ItemStackWidget(QWidget* parent = nullptr);
......
...@@ -22,16 +22,14 @@ class QAction; ...@@ -22,16 +22,14 @@ class QAction;
class QAbstractItemView; class QAbstractItemView;
class ItemViewOverlayButtons : public QObject { class ItemViewOverlayButtons : public QObject {
Q_OBJECT
public: public:
using FnGetActions = std::function<QList<QAction*>(const QModelIndex&, bool)>; using FnGetActions = std::function<QList<QAction*>(const QModelIndex&, bool)>;
static void install(QAbstractItemView* view, FnGetActions fnGetActions); static void install(QAbstractItemView* view, FnGetActions fnGetActions);
protected: private:
bool eventFilter(QObject* obj, QEvent* event) override; bool eventFilter(QObject* obj, QEvent* event) override;
private:
ItemViewOverlayButtons(QObject* parent); ItemViewOverlayButtons(QObject* parent);
void updateRecursive(const QModelIndex& index); void updateRecursive(const QModelIndex& index);
void update(); void update();
......
...@@ -24,7 +24,6 @@ class MaterialEditorModel; ...@@ -24,7 +24,6 @@ class MaterialEditorModel;
class SampleItem; class SampleItem;
namespace Ui { namespace Ui {
class MaterialEditorDialog; class MaterialEditorDialog;
} }
...@@ -34,7 +33,6 @@ class MaterialEditorDialog; ...@@ -34,7 +33,6 @@ class MaterialEditorDialog;
//! Use this dialog only with the two static methods to edit the list, or to choose a material //! Use this dialog only with the two static methods to edit the list, or to choose a material
class MaterialEditorDialog : public QDialog { class MaterialEditorDialog : public QDialog {
Q_OBJECT Q_OBJECT
public: public:
//! Use this to choose a material. identifierOfPreviousMaterial is the material which should be //! Use this to choose a material. identifierOfPreviousMaterial is the material which should be
//! selected when opening the dialog. Returns the identifier of the newly selected material. //! selected when opening the dialog. Returns the identifier of the newly selected material.
......
...@@ -19,16 +19,13 @@ ...@@ -19,16 +19,13 @@
class ColorMapCanvas; class ColorMapCanvas;
class FitFlowWidget; class FitFlowWidget;
class IntensityDataPropertyWidget;
class PlotStatusLabel; class PlotStatusLabel;
class QAction; class QAction;
class IntensityDataPropertyWidget;
//! The FitComparisonWidget class plots realdata, simulated data and relative difference map //! Plots realdata, simulated data and relative difference map during the course of the fit.
//! during the course of the fit.
class FitComparisonWidget : public DataAccessWidget { class FitComparisonWidget : public DataAccessWidget {
Q_OBJECT
public: public:
explicit FitComparisonWidget(QWidget* parent = nullptr); explicit FitComparisonWidget(QWidget* parent = nullptr);
......
...@@ -17,19 +17,18 @@ ...@@ -17,19 +17,18 @@
#include "GUI/View/Common/DataAccessWidget.h" #include "GUI/View/Common/DataAccessWidget.h"
class SpecularDataItem;
class FitFlowWidget; class FitFlowWidget;
class SpecularDataPropertyWidget; class JobRealBase;
class SpecularPlotCanvas;
class PlotStatusLabel; class PlotStatusLabel;
class QAction; class QAction;
class JobRealBase; class SpecularDataItem;
class SpecularDataPropertyWidget;
class SpecularPlotCanvas;
//! The FitComparisonWidget class plots real data, simulated data and their relative difference //! The FitComparisonWidget class plots real data, simulated data and their relative difference
//! during the course of the fit. //! during the course of the fit.
class FitComparisonWidget1D : public DataAccessWidget { class FitComparisonWidget1D : public DataAccessWidget {
Q_OBJECT
public: public:
explicit FitComparisonWidget1D(QWidget* parent = nullptr); explicit FitComparisonWidget1D(QWidget* parent = nullptr);
......
...@@ -17,14 +17,13 @@ ...@@ -17,14 +17,13 @@
#include "GUI/View/Common/DataAccessWidget.h" #include "GUI/View/Common/DataAccessWidget.h"
class HistogramPlot;
class FitSuiteItem; class FitSuiteItem;
class HistogramPlot;
//! The FitFlowWidget class is intended for showing chi2 .vs interation count dependency. //! Intended for showing chi2 .vs interation count dependency.
//! The main goal is to fill vacant place in FitComparisonWidget. //! The main goal is to fill vacant place in FitComparisonWidget.
class FitFlowWidget : public DataAccessWidget { class FitFlowWidget : public DataAccessWidget {
Q_OBJECT
public: public:
explicit FitFlowWidget(QWidget* parent = nullptr); explicit FitFlowWidget(QWidget* parent = nullptr);
......
...@@ -17,18 +17,17 @@ ...@@ -17,18 +17,17 @@
#include "GUI/View/Common/DataAccessWidget.h" #include "GUI/View/Common/DataAccessWidget.h"
class ProjectionsToolbar; class IntensityDataPropertyWidget;
class ProjectionsEditorActions; class ProjectionsEditorActions;
class ProjectionsEditorCanvas; class ProjectionsEditorCanvas;
class ProjectionsToolbar;
class ProjectionsWidget; class ProjectionsWidget;
class QItemSelectionModel; class QItemSelectionModel;
class IntensityDataPropertyWidget;
//! Main widget to embed projections editor for IntensityDataItem. //! Main widget to embed projections editor for IntensityDataItem.
//! Part of RealDataPresenter and JobResultsPresenter. //! Part of RealDataPresenter and JobResultsPresenter.
class IntensityDataProjectionsWidget : public DataAccessWidget { class IntensityDataProjectionsWidget : public DataAccessWidget {
Q_OBJECT
public: public:
IntensityDataProjectionsWidget(QWidget* parent = nullptr); IntensityDataProjectionsWidget(QWidget* parent = nullptr);
......
...@@ -22,8 +22,6 @@ class RealspaceWidget; ...@@ -22,8 +22,6 @@ class RealspaceWidget;
//! Panel to show 3D view of sample. Contains toolbar and RealspaceWidget //! Panel to show 3D view of sample. Contains toolbar and RealspaceWidget
class RealspacePanel : public QWidget { class RealspacePanel : public QWidget {
Q_OBJECT
public: public:
RealspacePanel(QWidget* parent); RealspacePanel(QWidget* parent);
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
class ProjectManager; class ProjectManager;
namespace Ui { namespace Ui {
class ProjectsView; class ProjectsView;
} }
......
...@@ -36,18 +36,16 @@ class SimulationView; ...@@ -36,18 +36,16 @@ class SimulationView;
//! * Buttons to run simulation or to export as a Python script //! * Buttons to run simulation or to export as a Python script
class SimulationView : public QWidget { class SimulationView : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
SimulationView(QWidget* parent, ProjectDocument* document); SimulationView(QWidget* parent, ProjectDocument* document);
void simulate(); void simulate();
void exportPythonScript(); void exportPythonScript();
protected: private:
void showEvent(QShowEvent*) override; void showEvent(QShowEvent*) override;
void hideEvent(QHideEvent*) override; void hideEvent(QHideEvent*) override;
private:
//! Read the entries in the UI and modify document. //! Read the entries in the UI and modify document.
void updateStateFromUI(); void updateStateFromUI();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment