diff --git a/GUI/Model/Data/SpecularDataItem.h b/GUI/Model/Data/SpecularDataItem.h index 75f578b08df869e8ddb974a538c2c9882707a977..8541c106383f834c47920acd0a9b8ef3948eb323 100644 --- a/GUI/Model/Data/SpecularDataItem.h +++ b/GUI/Model/Data/SpecularDataItem.h @@ -19,7 +19,6 @@ #include <qcustomplot.h> class SpecularDataItem : public DataItem { - Q_OBJECT public: static constexpr auto M_TYPE{"SpecularData"}; diff --git a/GUI/View/Common/DataAccessWidget.h b/GUI/View/Common/DataAccessWidget.h index 5ad533fc21a13587bfda76f870f8f01e8ce9cb82..70204b4873e8b9d949d15264cf7bbfee667d6c8e 100644 --- a/GUI/View/Common/DataAccessWidget.h +++ b/GUI/View/Common/DataAccessWidget.h @@ -24,10 +24,7 @@ //! as a list of items that is required for simultaneous, synchronous work while plotting and //! changing their properties. -class QObject; - class DataAccessWidget : public QWidget { - Q_OBJECT public: explicit DataAccessWidget(QWidget* parent = nullptr); ~DataAccessWidget() override; diff --git a/GUI/View/Common/IntensityDataPropertyWidget.h b/GUI/View/Common/IntensityDataPropertyWidget.h index ffb3dd50822831c66bc24c3666be3bde225c92e3..f93e6ab463da2910763b0ef83eb70e1140e9ee6c 100644 --- a/GUI/View/Common/IntensityDataPropertyWidget.h +++ b/GUI/View/Common/IntensityDataPropertyWidget.h @@ -20,7 +20,6 @@ //! Widget to edit properties of an IntensityDataItem. class IntensityDataPropertyWidget : public DataPropertyWidget { - Q_OBJECT public: explicit IntensityDataPropertyWidget(QWidget* parent = nullptr); diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.h b/GUI/View/Instrument/InstrumentLibraryEditor.h index 4a890aaae28e27e6e1ee0d900fb7f6063f3cb724..a7cb65972a51b622a6b2f6fc149f48cee68d517d 100644 --- a/GUI/View/Instrument/InstrumentLibraryEditor.h +++ b/GUI/View/Instrument/InstrumentLibraryEditor.h @@ -28,7 +28,6 @@ class InstrumentLibraryEditor; class InstrumentLibraryEditor : public QDialog { Q_OBJECT - public: InstrumentLibraryEditor(QWidget* parent, InstrumentLibrary* instrumentLibrary); ~InstrumentLibraryEditor() override; @@ -55,7 +54,6 @@ private: void onInstrumentDescriptionEdited(const QString& t); void onInstrumentChangedByEditor(); -private: //! A model extension for InstrumentsTreeModel which //! * shows a "NEW" sign in the icon of a newly added instrument. //! * creates a HTML text for the Display role diff --git a/GUI/View/Instrument/InstrumentListModel.h b/GUI/View/Instrument/InstrumentListModel.h index a8c96450e9452251b6d25318a5c1e97d095bd4ba..0e2d5d2ff2a13a5ebbd7413fefbe0a5ff222be3c 100644 --- a/GUI/View/Instrument/InstrumentListModel.h +++ b/GUI/View/Instrument/InstrumentListModel.h @@ -25,8 +25,6 @@ class MultiInstrumentNotifier; //! //! Used e.g. to present the instrument list in the instrument view. class InstrumentListModel : public QAbstractListModel { - Q_OBJECT - public: InstrumentListModel(QObject* parent, MultiInstrumentNotifier* ec); @@ -51,7 +49,6 @@ private: QModelIndex addNewInstrument(); void onInstrumentNameChanged(const InstrumentItem* instrument); -private: MultiInstrumentNotifier* m_ec; QIcon m_gisasIcon; QIcon m_offspecIcon; diff --git a/GUI/View/Instrument/InstrumentView.h b/GUI/View/Instrument/InstrumentView.h index 1283f3bd493b818ef29118c500bd311cca15138f..082bc93b2422e15a3c09aacca572cfa6025b2975 100644 --- a/GUI/View/Instrument/InstrumentView.h +++ b/GUI/View/Instrument/InstrumentView.h @@ -28,18 +28,15 @@ class QCheckBox; class QWidgetAction; class InstrumentView : public QWidget { - Q_OBJECT - public: InstrumentView(QWidget* parent, ProjectDocument* document); void fillViewMenu(QMenu* menu); ProjectDocument::Functionalities functionalities() const; -protected: +private: void showEvent(QShowEvent*) override; void hideEvent(QHideEvent*) override; -private: void createWidgetsForCurrentInstrument(); void onInstrumentNameEdited(const QString& newName); void onInstrumentdescriptionEdited(const QString& t); @@ -49,7 +46,6 @@ private: void onFunctionalityChanged(); void updateSingleInstrumentMode(); -private: InstrumentListView* m_instrumentListView; ProjectDocument* m_document; QScrollArea* m_scrollArea; diff --git a/GUI/View/Main/AboutDialog.h b/GUI/View/Main/AboutDialog.h index 4069d4d0ba561768fb70b9eee878092962266ced..79416d39675f0dbc515388f7676fb127d8c76d16 100644 --- a/GUI/View/Main/AboutDialog.h +++ b/GUI/View/Main/AboutDialog.h @@ -22,7 +22,6 @@ class QBoxLayout; //! About BornAgain dialog. class AboutDialog : public QDialog { - Q_OBJECT public: AboutDialog(QWidget* parent = nullptr); diff --git a/GUI/View/PlotUtil/FontScalingEvent.h b/GUI/View/PlotUtil/FontScalingEvent.h index 239c042597664d23fc7b115066f33848b8226ff8..6597de89dd0d14be3a512690d7c5a1367ee4609f 100644 --- a/GUI/View/PlotUtil/FontScalingEvent.h +++ b/GUI/View/PlotUtil/FontScalingEvent.h @@ -26,15 +26,12 @@ class ScientificPlot; //! on resize events. class FontScalingEvent : public QObject { - Q_OBJECT - public: explicit FontScalingEvent(ScientificPlot* plot, QWidget* parent); -protected: +private: bool eventFilter(QObject* obj, QEvent* event) override; -private: void backupFonts(); void restoreFonts(); void scaleFonts(double factor); diff --git a/GUI/View/PlotUtil/StatusLabel.cpp b/GUI/View/PlotUtil/StatusLabel.cpp index b05e8aa421b2f56b003cf6aa981f43d895c70eb7..036b5e1b300686f476de58dca41c9636a5ad377b 100644 --- a/GUI/View/PlotUtil/StatusLabel.cpp +++ b/GUI/View/PlotUtil/StatusLabel.cpp @@ -31,6 +31,7 @@ int default_label_height() } // namespace + StatusLabel::StatusLabel(QWidget* parent) : QFrame(parent) , m_font("Monospace", default_text_size(), QFont::Normal, false) diff --git a/GUI/View/PlotUtil/StatusLabel.h b/GUI/View/PlotUtil/StatusLabel.h index 04327d0b88d0de2f55311d0ee1833d96a57a1aab..9fadf1dca7ee63fc0ab5bffad1254042f4fdc4b0 100644 --- a/GUI/View/PlotUtil/StatusLabel.h +++ b/GUI/View/PlotUtil/StatusLabel.h @@ -26,8 +26,6 @@ class QPaintEvent; //! depending from available space. class StatusLabel : public QFrame { - Q_OBJECT - public: explicit StatusLabel(QWidget* parent = nullptr); diff --git a/GUI/View/Widget/StyledToolbar.h b/GUI/View/Widget/StyledToolbar.h index 7c5f493718466ee2261a403bde67d208c1c529ff..1ce082c125594232dd6e7d9d2dd3c3b3af4c2dc5 100644 --- a/GUI/View/Widget/StyledToolbar.h +++ b/GUI/View/Widget/StyledToolbar.h @@ -20,8 +20,6 @@ //! The StyledToolbar class represents our standard narrow toolbar with the height 24 pixels. class StyledToolbar : public QToolBar { - Q_OBJECT - public: explicit StyledToolbar(QWidget* parent = nullptr); void addStyledSeparator(); @@ -30,8 +28,6 @@ public: protected: void paintEvent(QPaintEvent* event) override; - -protected: void contextMenuEvent(QContextMenuEvent*) override; };