From 828e2efb0809fad435822c9a584afda6e76a3243 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Thu, 23 Jul 2020 13:11:57 +0200 Subject: [PATCH 1/3] Modify clang-format file for AccessModifierOffset (public/private) and rerun clang-format --- src/.clang-format | 2 +- src/bimserver/BIMserverConnection.hpp | 8 +- src/bimserver/ProjectImporter.hpp | 10 +- src/bimserver/Test/BIMserverFixture.hpp | 2 +- src/model_editor/AccessPolicyStore.cpp | 6 +- src/model_editor/AccessPolicyStore.hpp | 10 +- src/model_editor/Application.hpp | 4 +- src/model_editor/BridgeClasses.hpp | 8 +- src/model_editor/ClassViewWidget.hpp | 10 +- src/model_editor/EditorFrame.hpp | 10 +- src/model_editor/IGLineEdit.hpp | 8 +- src/model_editor/IGPrecisionDialog.hpp | 4 +- src/model_editor/IGSpinBoxes.hpp | 10 +- src/model_editor/InspectorDialog.hpp | 12 +- src/model_editor/InspectorGadget.hpp | 18 +- src/model_editor/ListWidget.hpp | 10 +- src/model_editor/ModalDialogs.hpp | 14 +- src/model_editor/ModelExplorer.hpp | 10 +- src/model_editor/OSProgressBar.hpp | 6 +- src/model_editor/ObjectExplorer.hpp | 10 +- src/model_editor/PathWatcher.hpp | 6 +- src/model_editor/TableView.hpp | 10 +- src/model_editor/TableWidget.hpp | 10 +- src/model_editor/TestButton.hpp | 8 +- src/model_editor/TreeView.hpp | 10 +- src/model_editor/TreeViewWidget.hpp | 10 +- src/model_editor/ViewWidget.hpp | 10 +- src/model_editor/modeltest.h | 8 +- src/model_editor/projectmodeldatabase.hpp | 140 ++++++------ src/model_editor/tablemodel.h | 10 +- src/model_editor/test/ModelEditorFixture.hpp | 2 +- src/model_editor/treeitem.h | 4 +- src/model_editor/treemodel.h | 10 +- src/openstudio_app/ExternalToolsDialog.hpp | 4 +- src/openstudio_app/LibraryDialog.hpp | 4 +- src/openstudio_app/OpenStudioApp.hpp | 14 +- src/openstudio_app/StartupMenu.hpp | 6 +- src/openstudio_app/StartupView.hpp | 14 +- .../test/OpenStudioAppFixture.hpp | 2 +- src/openstudio_lib/ApplyMeasureNowDialog.hpp | 24 +-- src/openstudio_lib/BCLComponentItem.hpp | 4 +- src/openstudio_lib/BuildingInspectorView.hpp | 24 +-- src/openstudio_lib/CollapsibleInspector.hpp | 14 +- .../ConstructionAirBoundaryInspectorView.hpp | 6 +- ...ionCfactorUndergroundWallInspectorView.hpp | 6 +- ...ructionFfactorGroundFloorInspectorView.hpp | 6 +- .../ConstructionInspectorView.hpp | 6 +- ...onstructionInternalSourceInspectorView.hpp | 6 +- .../ConstructionObjectVectorController.hpp | 8 +- ...onstructionWindowDataFileInspectorView.hpp | 6 +- .../ConstructionsController.hpp | 4 +- .../ConstructionsTabController.hpp | 6 +- src/openstudio_lib/ConstructionsTabView.hpp | 2 +- src/openstudio_lib/ConstructionsView.hpp | 12 +- .../DefaultConstructionSetInspectorView.hpp | 70 +++--- .../DefaultConstructionSetsController.hpp | 4 +- .../DefaultConstructionSetsView.hpp | 4 +- src/openstudio_lib/DesignDayGridView.hpp | 14 +- src/openstudio_lib/EMSInspectorView.cpp | 14 +- src/openstudio_lib/EMSInspectorView.hpp | 4 +- .../ElectricEquipmentInspectorView.hpp | 8 +- .../FacilityExteriorEquipmentGridView.hpp | 12 +- .../FacilityShadingGridView.hpp | 14 +- .../FacilityStoriesGridView.hpp | 14 +- src/openstudio_lib/FacilityTabController.hpp | 6 +- src/openstudio_lib/FacilityTabView.hpp | 4 +- .../GasEquipmentInspectorView.hpp | 10 +- .../GeometryEditorController.hpp | 4 +- src/openstudio_lib/GeometryEditorView.hpp | 48 ++--- .../GeometryPreviewController.hpp | 4 +- src/openstudio_lib/GeometryPreviewView.hpp | 12 +- src/openstudio_lib/GeometryTabController.hpp | 6 +- src/openstudio_lib/GeometryTabView.hpp | 2 +- src/openstudio_lib/GridItem.hpp | 202 +++++++++--------- src/openstudio_lib/GridScene.hpp | 6 +- src/openstudio_lib/GridViewSubTab.hpp | 10 +- src/openstudio_lib/HVACSystemsController.hpp | 50 ++--- .../HVACSystemsTabController.hpp | 8 +- src/openstudio_lib/HVACSystemsTabView.hpp | 2 +- src/openstudio_lib/HVACSystemsView.hpp | 38 ++-- .../HVACTemplateHelperDialog.hpp | 4 +- src/openstudio_lib/HorizontalTabWidget.hpp | 10 +- src/openstudio_lib/IconLibrary.hpp | 6 +- src/openstudio_lib/InspectorController.hpp | 10 +- src/openstudio_lib/InspectorView.hpp | 164 +++++++------- .../InternalMassInspectorView.hpp | 12 +- src/openstudio_lib/LibraryTabWidget.hpp | 10 +- src/openstudio_lib/LifeCycleCostsTabView.hpp | 10 +- src/openstudio_lib/LightsInspectorView.hpp | 8 +- src/openstudio_lib/LoadsController.hpp | 6 +- src/openstudio_lib/LoadsTabController.hpp | 6 +- src/openstudio_lib/LoadsTabView.hpp | 4 +- src/openstudio_lib/LoadsView.hpp | 14 +- src/openstudio_lib/LocationTabController.hpp | 6 +- src/openstudio_lib/LocationTabView.hpp | 16 +- src/openstudio_lib/LoopChooserView.hpp | 20 +- src/openstudio_lib/LoopLibraryDialog.hpp | 16 +- src/openstudio_lib/LoopScene.hpp | 6 +- src/openstudio_lib/LuminaireInspectorView.hpp | 8 +- src/openstudio_lib/MainMenu.hpp | 10 +- .../MainRightColumnController.hpp | 10 +- src/openstudio_lib/MainTabController.hpp | 8 +- src/openstudio_lib/MainTabView.hpp | 10 +- src/openstudio_lib/MainWindow.hpp | 10 +- .../MaterialAirGapInspectorView.hpp | 6 +- .../MaterialAirWallInspectorView.hpp | 6 +- ...terialInfraredTransparentInspectorView.hpp | 6 +- src/openstudio_lib/MaterialInspectorView.hpp | 6 +- .../MaterialNoMassInspectorView.hpp | 6 +- .../MaterialRoofVegetationInspectorView.hpp | 6 +- src/openstudio_lib/MaterialsController.hpp | 4 +- src/openstudio_lib/MaterialsView.hpp | 12 +- .../ModelObjectInspectorView.hpp | 18 +- src/openstudio_lib/ModelObjectItem.hpp | 6 +- src/openstudio_lib/ModelObjectListView.hpp | 10 +- src/openstudio_lib/ModelObjectTreeItems.hpp | 106 ++++----- src/openstudio_lib/ModelObjectTreeWidget.hpp | 8 +- src/openstudio_lib/ModelObjectTypeItem.hpp | 2 +- .../ModelObjectTypeListView.hpp | 4 +- .../ModelObjectVectorController.hpp | 6 +- src/openstudio_lib/ModelSubTabController.hpp | 10 +- src/openstudio_lib/ModelSubTabView.hpp | 10 +- src/openstudio_lib/OSAppBase.hpp | 10 +- src/openstudio_lib/OSCollapsibleItem.hpp | 10 +- .../OSCollapsibleItemHeader.hpp | 8 +- src/openstudio_lib/OSCollapsibleItemList.hpp | 10 +- src/openstudio_lib/OSDocument.hpp | 12 +- src/openstudio_lib/OSDropZone.hpp | 38 ++-- src/openstudio_lib/OSInspectorView.hpp | 12 +- src/openstudio_lib/OSItem.hpp | 14 +- src/openstudio_lib/OSItemList.hpp | 12 +- src/openstudio_lib/OSItemSelector.hpp | 4 +- src/openstudio_lib/OSItemSelectorButtons.cpp | 2 +- src/openstudio_lib/OSItemSelectorButtons.hpp | 8 +- src/openstudio_lib/OSVectorController.hpp | 8 +- src/openstudio_lib/OSWebEnginePage.hpp | 6 +- .../OtherEquipmentInspectorView.hpp | 8 +- src/openstudio_lib/PeopleInspectorView.hpp | 8 +- src/openstudio_lib/PlanarSurfaceWidget.hpp | 8 +- src/openstudio_lib/RadianceDialog.hpp | 6 +- .../RefrigerationController.hpp | 28 +-- .../RefrigerationGraphicsItems.hpp | 134 ++++++------ .../RefrigerationGridController.hpp | 4 +- src/openstudio_lib/RefrigerationGridView.hpp | 18 +- src/openstudio_lib/RefrigerationScene.hpp | 4 +- src/openstudio_lib/RenderingColorWidget.hpp | 12 +- src/openstudio_lib/ResultsTabController.hpp | 6 +- src/openstudio_lib/ResultsTabView.hpp | 16 +- src/openstudio_lib/RunTabController.hpp | 8 +- src/openstudio_lib/RunTabView.hpp | 8 +- src/openstudio_lib/ScheduleDayView.hpp | 66 +++--- src/openstudio_lib/ScheduleDialog.hpp | 8 +- .../ScheduleSetInspectorView.hpp | 46 ++-- src/openstudio_lib/ScheduleSetsController.hpp | 4 +- src/openstudio_lib/ScheduleSetsView.hpp | 10 +- src/openstudio_lib/SchedulesTabController.hpp | 8 +- src/openstudio_lib/SchedulesTabView.hpp | 2 +- src/openstudio_lib/SchedulesView.hpp | 112 +++++----- src/openstudio_lib/ScriptFolderListView.hpp | 6 +- src/openstudio_lib/ScriptItem.hpp | 10 +- src/openstudio_lib/ScriptsTabController.hpp | 6 +- src/openstudio_lib/ScriptsTabView.hpp | 8 +- src/openstudio_lib/ServiceWaterGridItems.hpp | 72 +++---- src/openstudio_lib/ServiceWaterScene.hpp | 18 +- .../SimSettingsTabController.hpp | 4 +- src/openstudio_lib/SimSettingsTabView.hpp | 6 +- src/openstudio_lib/SimSettingsView.hpp | 8 +- .../SpaceLoadInstancesWidget.hpp | 34 +-- src/openstudio_lib/SpaceTypeInspectorView.hpp | 8 +- src/openstudio_lib/SpaceTypesController.hpp | 4 +- src/openstudio_lib/SpaceTypesGridView.hpp | 14 +- .../SpaceTypesTabController.hpp | 4 +- src/openstudio_lib/SpaceTypesTabView.hpp | 2 +- src/openstudio_lib/SpaceTypesView.hpp | 2 +- .../SpacesDaylightingGridView.hpp | 10 +- .../SpacesInteriorPartitionsGridView.hpp | 12 +- src/openstudio_lib/SpacesLoadsGridView.hpp | 12 +- src/openstudio_lib/SpacesShadingGridView.hpp | 12 +- src/openstudio_lib/SpacesSpacesGridView.hpp | 12 +- .../SpacesSubsurfacesGridView.hpp | 12 +- src/openstudio_lib/SpacesSubtabGridView.hpp | 8 +- src/openstudio_lib/SpacesSurfacesGridView.hpp | 12 +- src/openstudio_lib/SpacesTabController.hpp | 8 +- src/openstudio_lib/SpacesTabView.hpp | 4 +- .../StandardOpaqueMaterialInspectorView.hpp | 6 +- ...StandardsInformationConstructionWidget.hpp | 8 +- .../StandardsInformationMaterialWidget.hpp | 8 +- .../SteamEquipmentInspectorView.hpp | 8 +- src/openstudio_lib/SubTabController.hpp | 14 +- src/openstudio_lib/SubTabView.hpp | 10 +- src/openstudio_lib/SummaryTabController.hpp | 2 +- src/openstudio_lib/SummaryTabView.hpp | 2 +- src/openstudio_lib/ThermalZonesController.hpp | 10 +- src/openstudio_lib/ThermalZonesGridView.hpp | 14 +- .../ThermalZonesTabController.hpp | 6 +- src/openstudio_lib/ThermalZonesTabView.hpp | 2 +- src/openstudio_lib/ThermalZonesView.hpp | 14 +- .../UtilityBillAllFuelTypesListView.hpp | 4 +- .../UtilityBillFuelTypeItem.hpp | 2 +- .../UtilityBillFuelTypeListView.hpp | 12 +- src/openstudio_lib/UtilityBillsController.hpp | 6 +- src/openstudio_lib/UtilityBillsView.hpp | 24 +-- src/openstudio_lib/VRFController.hpp | 24 +-- src/openstudio_lib/VRFGraphicsItems.hpp | 40 ++-- src/openstudio_lib/VariablesTabController.hpp | 2 +- src/openstudio_lib/VariablesTabView.hpp | 18 +- src/openstudio_lib/VerticalTabWidget.hpp | 10 +- .../WaterUseEquipmentInspectorView.hpp | 20 +- .../WindowMaterialBlindInspectorView.hpp | 6 +- ...DaylightRedirectionDeviceInspectorView.hpp | 6 +- .../WindowMaterialGasInspectorView.hpp | 6 +- .../WindowMaterialGasMixtureInspectorView.hpp | 6 +- ...GlazingGroupThermochromicInspectorView.hpp | 6 +- .../WindowMaterialGlazingInspectorView.hpp | 6 +- ...efractionExtinctionMethodInspectorView.hpp | 6 +- .../WindowMaterialScreenInspectorView.hpp | 6 +- .../WindowMaterialShadeInspectorView.hpp | 6 +- ...terialSimpleGlazingSystemInspectorView.hpp | 6 +- src/openstudio_lib/YearSettingsWidget.hpp | 10 +- src/openstudio_lib/ZoneChooserView.hpp | 20 +- .../test/OpenStudioLibFixture.hpp | 2 +- src/qtwinmigrate/qmfcapp.h | 6 +- src/qtwinmigrate/qwinhost.h | 6 +- src/qtwinmigrate/qwinwidget.h | 6 +- .../BCLMeasureDialog.hpp | 6 +- src/shared_gui_components/BaseApp.hpp | 2 +- .../BuildingComponentDialog.hpp | 10 +- .../BuildingComponentDialogCentralWidget.hpp | 10 +- src/shared_gui_components/BusyWidget.hpp | 8 +- src/shared_gui_components/Buttons.hpp | 62 +++--- .../CollapsibleComponent.hpp | 10 +- .../CollapsibleComponentHeader.hpp | 10 +- .../CollapsibleComponentList.hpp | 10 +- src/shared_gui_components/Component.hpp | 10 +- src/shared_gui_components/ComponentList.hpp | 10 +- src/shared_gui_components/EditController.cpp | 2 +- src/shared_gui_components/EditController.hpp | 12 +- src/shared_gui_components/EditView.hpp | 38 ++-- src/shared_gui_components/GraphicsItems.hpp | 32 +-- src/shared_gui_components/HeaderViews.hpp | 12 +- .../LocalLibraryController.hpp | 66 +++--- .../LocalLibraryView.hpp | 20 +- .../LostCloudConnectionDialog.hpp | 8 +- src/shared_gui_components/MeasureBadge.hpp | 2 +- src/shared_gui_components/MeasureDragData.hpp | 4 +- src/shared_gui_components/MeasureManager.hpp | 8 +- .../NetworkProxyDialog.hpp | 6 +- src/shared_gui_components/OSCheckBox.hpp | 16 +- .../OSCollapsibleView.hpp | 10 +- src/shared_gui_components/OSComboBox.hpp | 24 +-- src/shared_gui_components/OSConcepts.hpp | 138 ++++++------ src/shared_gui_components/OSDialog.hpp | 10 +- src/shared_gui_components/OSDoubleEdit.hpp | 10 +- src/shared_gui_components/OSDragableView.hpp | 10 +- .../OSGridController.hpp | 58 ++--- src/shared_gui_components/OSGridView.hpp | 12 +- src/shared_gui_components/OSIntegerEdit.hpp | 10 +- src/shared_gui_components/OSLineEdit.hpp | 12 +- .../OSListController.hpp | 26 +-- src/shared_gui_components/OSListView.hpp | 10 +- .../OSLoadNamePixmapLineEdit.hpp | 8 +- .../OSQObjectController.hpp | 8 +- src/shared_gui_components/OSQuantityEdit.hpp | 18 +- src/shared_gui_components/OSSwitch.hpp | 6 +- src/shared_gui_components/OSUnsignedEdit.hpp | 10 +- src/shared_gui_components/OSViewSwitcher.hpp | 6 +- src/shared_gui_components/PageNavigator.hpp | 10 +- .../ProcessEventsProgressBar.hpp | 2 +- .../SyncMeasuresDialog.hpp | 8 +- .../SyncMeasuresDialogCentralWidget.hpp | 10 +- src/shared_gui_components/TIDItemModel.cpp | 4 +- src/shared_gui_components/TIDItemModel.hpp | 4 +- src/shared_gui_components/TextEditDialog.hpp | 4 +- src/shared_gui_components/WaitDialog.hpp | 8 +- .../WorkflowController.hpp | 32 +-- src/shared_gui_components/WorkflowView.hpp | 24 +-- 276 files changed, 2001 insertions(+), 2001 deletions(-) diff --git a/src/.clang-format b/src/.clang-format index e7621ad32..44c94abb8 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -1,6 +1,6 @@ --- Language: Cpp -AccessModifierOffset: -4 +AccessModifierOffset: -1 AlignAfterOpenBracket: Align AlignConsecutiveAssignments: false AlignConsecutiveDeclarations: false diff --git a/src/bimserver/BIMserverConnection.hpp b/src/bimserver/BIMserverConnection.hpp index 89df5e0d1..09f1d98e4 100644 --- a/src/bimserver/BIMserverConnection.hpp +++ b/src/bimserver/BIMserverConnection.hpp @@ -58,7 +58,7 @@ class BIMSERVER_API BIMserverConnection : public QObject { Q_OBJECT - public: + public: /// Default constructor BIMserverConnection(QObject* parent, QString bimserverAddr, QString bimserverPort); /// destructor @@ -102,7 +102,7 @@ class BIMSERVER_API BIMserverConnection : public QObject /// get all revisions of IFC files of a project, Blocked boost::optional getIFCRevisionListBlocked(QString projectID, int timeout); - signals: + signals: /// send the retrieved osmString to GUI void osmStringRetrieved(QString osmString); @@ -121,7 +121,7 @@ class BIMSERVER_API BIMserverConnection : public QObject ///emit error if BIMserver is not setup correctly. void bimserverError(); - private slots: + private slots: //slots used by this class only /// log in to BIMserver void processLoginRequest(QNetworkReply* rep); @@ -146,7 +146,7 @@ class BIMSERVER_API BIMserverConnection : public QObject /// get download progress void processGetProgressRequest(); - private: + private: REGISTER_LOGGER("openstudio.BIMserverConnection"); void sendLoginRequest(); diff --git a/src/bimserver/ProjectImporter.hpp b/src/bimserver/ProjectImporter.hpp index 1073e4087..57ba4b36f 100644 --- a/src/bimserver/ProjectImporter.hpp +++ b/src/bimserver/ProjectImporter.hpp @@ -51,7 +51,7 @@ class BIMSERVER_API ProjectImporter : public QDialog { Q_OBJECT - public: + public: /// Default constructor ProjectImporter(QWidget* parent); @@ -67,11 +67,11 @@ class BIMSERVER_API ProjectImporter : public QDialog /// Reimplemented the key press event of ESC and guide it to the run() function void keyPressEvent(QKeyEvent* event) override; - signals: + signals: /// OSM String is retrieved. void finished(); - public slots: + public slots: /// Takes projectList from BIMserverConnection and prints out projects void processProjectList(QStringList projectList); @@ -86,7 +86,7 @@ class BIMSERVER_API ProjectImporter : public QDialog /// process if BIMserver is not connected. void processBIMserverErrors(); - private: + private: BIMserverConnection* m_bimserverConnection; QSettings* m_settings; @@ -102,7 +102,7 @@ class BIMSERVER_API ProjectImporter : public QDialog QPushButton* m_loadButton; QPushButton* m_selectButton; - private slots: + private slots: void okButton_clicked(); void newButton_clicked(); diff --git a/src/bimserver/Test/BIMserverFixture.hpp b/src/bimserver/Test/BIMserverFixture.hpp index 2c65a8192..804c62e42 100644 --- a/src/bimserver/Test/BIMserverFixture.hpp +++ b/src/bimserver/Test/BIMserverFixture.hpp @@ -41,7 +41,7 @@ class BIMserverFixture : public ::testing::Test { - protected: + protected: /// initialize for each test virtual void SetUp() override; diff --git a/src/model_editor/AccessPolicyStore.cpp b/src/model_editor/AccessPolicyStore.cpp index 2d7b8e692..de1847055 100644 --- a/src/model_editor/AccessPolicyStore.cpp +++ b/src/model_editor/AccessPolicyStore.cpp @@ -52,10 +52,10 @@ AccessPolicyStore* AccessPolicyStore::s_instance = nullptr; //XML Parser class AccessParser : public QXmlDefaultHandler { - public: + public: AccessParser(); - protected: + protected: bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) override; bool endElement(const QString& namespaceURI, const QString& localName, const QString& qName) override; @@ -63,7 +63,7 @@ class AccessParser : public QXmlDefaultHandler bool error(QXmlParseException&); bool fatalError(QXmlParseException&); - private: + private: AccessPolicy* m_curPolicy; IddObjectType m_curType; IddFileAndFactoryWrapper m_factory; diff --git a/src/model_editor/AccessPolicyStore.hpp b/src/model_editor/AccessPolicyStore.hpp index b86c038c1..6c054bec1 100644 --- a/src/model_editor/AccessPolicyStore.hpp +++ b/src/model_editor/AccessPolicyStore.hpp @@ -62,7 +62,7 @@ class MODELEDITOR_API AccessPolicy friend class AccessParser; friend class openstudio::InspectorView; // For overriding via setAccess - public: + public: /*! tells the ModelObect how to sort its fields for display in a GUI*/ enum ACCESS_LEVEL { @@ -84,11 +84,11 @@ class MODELEDITOR_API AccessPolicy */ ACCESS_LEVEL getAccess(unsigned int index) const; - protected: + protected: // For specific overriding of access policies, such as hiding Fan Schedule only on AirLoopHVAC for eg bool setAccess(unsigned int index, ACCESS_LEVEL); - private: + private: std::map m_accessMap; unsigned int m_numNormalFields; unsigned int m_extensibleSize; @@ -103,7 +103,7 @@ class MODELEDITOR_API AccessPolicyStore { friend class AccessParser; - public: + public: static AccessPolicyStore& Instance(); /*! loads an xml with the policy rules @@ -118,7 +118,7 @@ class MODELEDITOR_API AccessPolicyStore /* clear the map*/ void clear(); - private: + private: AccessPolicyStore(); ~AccessPolicyStore(); AccessPolicyStore(const AccessPolicyStore&); diff --git a/src/model_editor/Application.hpp b/src/model_editor/Application.hpp index e61d20652..f7076c8d4 100644 --- a/src/model_editor/Application.hpp +++ b/src/model_editor/Application.hpp @@ -49,7 +49,7 @@ class ApplicationSingleton friend class Singleton; - public: + public: /// get the QApplication, if no QApplication has been set this will create a default one QCoreApplication* application(bool gui = true); @@ -96,7 +96,7 @@ class ApplicationSingleton ~ApplicationSingleton(); - private: + private: /// private constructor ApplicationSingleton(); diff --git a/src/model_editor/BridgeClasses.hpp b/src/model_editor/BridgeClasses.hpp index 0546e7172..b44bdbff2 100644 --- a/src/model_editor/BridgeClasses.hpp +++ b/src/model_editor/BridgeClasses.hpp @@ -39,19 +39,19 @@ class MODELEDITOR_API ComboHighlightBridge : public QObject Q_OBJECT; - public: + public: ComboHighlightBridge(QObject* parent); QObject* bridgeSender(); - public slots: + public slots: void highlighted(const QString& val); void activated(const QString& val); - signals: + signals: void highlightEmitted(const QString& val); void activatedEmitted(const QString& val); - private: + private: QObject* m_source; //original source object }; diff --git a/src/model_editor/ClassViewWidget.hpp b/src/model_editor/ClassViewWidget.hpp index b00e900ea..f8216a8d5 100644 --- a/src/model_editor/ClassViewWidget.hpp +++ b/src/model_editor/ClassViewWidget.hpp @@ -46,7 +46,7 @@ class ClassViewWidget : public ViewWidget { Q_OBJECT - public: + public: ClassViewWidget(openstudio::model::Model& model, QWidget* parent = nullptr); ClassViewWidget(QWidget* parent = nullptr); virtual ~ClassViewWidget(); @@ -62,18 +62,18 @@ class ClassViewWidget : public ViewWidget TableModel* getTableModel(); virtual void toggleGUIDs() override; - public slots: + public slots: virtual void viewSelection(const QModelIndex& modelIndex) override; virtual void on_nameChanged(QString) override; virtual void viewSelection(); - signals: + signals: - protected: + protected: TableView* mTableView; TableModel* mTableModel; - private: + private: virtual void createWidgets() override; virtual void connectSignalsAndSlots() override; virtual void createLayout() override; diff --git a/src/model_editor/EditorFrame.hpp b/src/model_editor/EditorFrame.hpp index c48746774..028041309 100644 --- a/src/model_editor/EditorFrame.hpp +++ b/src/model_editor/EditorFrame.hpp @@ -53,15 +53,15 @@ class MODELEDITOR_API EditorFrame : public QMainWindow { Q_OBJECT - public: + public: EditorFrame(QWidget* parent = nullptr); virtual ~EditorFrame(); void loadStyleSheet(QString& style); - protected: + protected: void closeEvent(QCloseEvent* event) override; - private: + private: void connectSignalsAndSlots(); void contextMenuEvent(QContextMenuEvent* event) override; void createActions(); @@ -132,7 +132,7 @@ class MODELEDITOR_API EditorFrame : public QMainWindow bool mShowComments; bool mShowPrecision; - private slots: + private slots: void about(); void newIdk(); @@ -163,7 +163,7 @@ class MODELEDITOR_API EditorFrame : public QMainWindow void on_precisionDlgHidden(); void on_precisionDlgFinished(); - signals: + signals: }; } // namespace modeleditor diff --git a/src/model_editor/IGLineEdit.hpp b/src/model_editor/IGLineEdit.hpp index d7e5dd6ff..3a246d2b0 100644 --- a/src/model_editor/IGLineEdit.hpp +++ b/src/model_editor/IGLineEdit.hpp @@ -40,7 +40,7 @@ class MODELEDITOR_API IGLineEdit : public QLineEdit Q_OBJECT; Q_PROPERTY(bool precision READ getPrec WRITE setPrec); - public: + public: IGLineEdit(const QString& val, InspectorGadget* ig, QWidget* parent); virtual ~IGLineEdit(); @@ -59,18 +59,18 @@ class MODELEDITOR_API IGLineEdit : public QLineEdit QString doubleToQString(double v); //QString intToQString( int v ); - public slots: + public slots: void togglePrec(); void editDone(); void hardsizeClicked(bool checked); - signals: + signals: void newValue(const QString& text); - private: + private: InspectorGadget* m_ig; bool m_precision; InspectorGadget::FLOAT_DISPLAY m_floatType; diff --git a/src/model_editor/IGPrecisionDialog.hpp b/src/model_editor/IGPrecisionDialog.hpp index cfc5b6135..69979a297 100644 --- a/src/model_editor/IGPrecisionDialog.hpp +++ b/src/model_editor/IGPrecisionDialog.hpp @@ -39,10 +39,10 @@ class MODELEDITOR_API IGPrecisionDialog : public QDialog, public Ui::PrecisionDi { Q_OBJECT - public: + public: IGPrecisionDialog(QWidget* parent = nullptr); - public slots: + public slots: void on_buttonBox_accepted(); void on_buttonBox_rejected(); }; diff --git a/src/model_editor/IGSpinBoxes.hpp b/src/model_editor/IGSpinBoxes.hpp index 3b04bf932..8541dfc90 100644 --- a/src/model_editor/IGSpinBoxes.hpp +++ b/src/model_editor/IGSpinBoxes.hpp @@ -42,12 +42,12 @@ class MODELEDITOR_API IGSpinBox : public QSpinBox { Q_OBJECT; - public: + public: IGSpinBox(QWidget* parent); virtual void wheelEvent(QWheelEvent* event) override; - public slots: + public slots: void triggered(bool); //the radio button got triggered and calls this slot }; @@ -55,7 +55,7 @@ class MODELEDITOR_API IGDSpinBox : public QDoubleSpinBox { Q_OBJECT; - public: + public: IGDSpinBox(InspectorGadget* ig, QWidget* parent); virtual void wheelEvent(QWheelEvent* event) override; @@ -66,11 +66,11 @@ class MODELEDITOR_API IGDSpinBox : public QDoubleSpinBox void setPrec(bool); void setFloatStyle(InspectorGadget::FLOAT_DISPLAY style); InspectorGadget::FLOAT_DISPLAY getFloatStyle() const; - public slots: + public slots: void triggered(bool); //the radio button got triggered and calls this slot void togglePrec(); - private: + private: InspectorGadget* m_ig; bool m_precision; InspectorGadget::FLOAT_DISPLAY m_floatType; diff --git a/src/model_editor/InspectorDialog.hpp b/src/model_editor/InspectorDialog.hpp index 215708be5..61cd9a670 100644 --- a/src/model_editor/InspectorDialog.hpp +++ b/src/model_editor/InspectorDialog.hpp @@ -69,7 +69,7 @@ class MODELEDITOR_API InspectorDialog : public QMainWindow, public Nano::Observe { Q_OBJECT; - public: + public: /// create a new dialog with empty model InspectorDialog(InspectorDialogClient client = InspectorDialogClient::AllOpenStudio, QWidget* parent = nullptr); @@ -108,7 +108,7 @@ class MODELEDITOR_API InspectorDialog : public QMainWindow, public Nano::Observe void displayIP(const bool displayIP); - public slots: + public slots: virtual void onIddObjectTypeChanged(const openstudio::IddObjectType&); @@ -124,7 +124,7 @@ class MODELEDITOR_API InspectorDialog : public QMainWindow, public Nano::Observe virtual void onPushButtonPurge(bool); - signals: + signals: // emitted when user selects a new idd object type, will be an allowable type void iddObjectTypeChanged(const openstudio::IddObjectType&); @@ -137,14 +137,14 @@ class MODELEDITOR_API InspectorDialog : public QMainWindow, public Nano::Observe void toggleUnitsClicked(bool); - protected: + protected: // handle show event virtual void showEvent(QShowEvent* t_event) override; // handle close event virtual void closeEvent(QCloseEvent* t_event) override; - private slots: + private slots: // for testing friend class ModelEditorFixture; @@ -159,7 +159,7 @@ class MODELEDITOR_API InspectorDialog : public QMainWindow, public Nano::Observe void onRemoveWorkspaceObject(std::shared_ptr impl, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); - private: + private: QListWidget* m_listWidget; QStackedWidget* m_stackedWidget; QLabel* m_selectionLabel; diff --git a/src/model_editor/InspectorGadget.hpp b/src/model_editor/InspectorGadget.hpp index 2691babc1..f730bfb87 100644 --- a/src/model_editor/InspectorGadget.hpp +++ b/src/model_editor/InspectorGadget.hpp @@ -60,7 +60,7 @@ class ComboHighlightBridge; class MODELEDITOR_API IGWidget : public QWidget, public Nano::Observer { - public: + public: IGWidget(QWidget* parent = nullptr); QSize sizeHint() const override; @@ -68,10 +68,10 @@ class MODELEDITOR_API IGWidget : public QWidget, public Nano::Observer class IGComboBox : public QComboBox { - public: + public: IGComboBox(QWidget* parent = nullptr) : QComboBox(parent) {} - protected: + protected: bool event(QEvent* e) override { if (e->type() == QEvent::Wheel) { return false; @@ -97,7 +97,7 @@ class MODELEDITOR_API InspectorGadget : public QWidget, public Nano::Observer Q_OBJECT - public: + public: friend class IGLineEdit; friend class IGDSpinBox; @@ -174,7 +174,7 @@ class MODELEDITOR_API InspectorGadget : public QWidget, public Nano::Observer void removeWorkspaceObject(const openstudio::Handle&); // Middleman nano slot to emit QT signal to simulate signal chaining - public slots: + public slots: void toggleUnits(bool displayIP); @@ -239,7 +239,7 @@ class MODELEDITOR_API InspectorGadget : public QWidget, public Nano::Observer void setRecursive(bool recursive); - signals: + signals: void nameChanged(QString); @@ -254,7 +254,7 @@ class MODELEDITOR_API InspectorGadget : public QWidget, public Nano::Observer void workspaceObjectRemoved(const openstudio::Handle&); - protected slots: + protected slots: void onWorkspaceObjectChanged(); @@ -262,7 +262,7 @@ class MODELEDITOR_API InspectorGadget : public QWidget, public Nano::Observer void onWorkspaceObjectRemoved(const openstudio::Handle&); - protected: + protected: /*! \brief constructor \param workspaceObj the current workspace \param indent indentation for the child frame @@ -348,7 +348,7 @@ class MODELEDITOR_API InspectorGadget : public QWidget, public Nano::Observer void disconnectWorkspaceObjectSignals() const; - private: + private: void connectSignalsAndSlots(); }; diff --git a/src/model_editor/ListWidget.hpp b/src/model_editor/ListWidget.hpp index d90a0c32c..ef09043e3 100644 --- a/src/model_editor/ListWidget.hpp +++ b/src/model_editor/ListWidget.hpp @@ -38,7 +38,7 @@ class ListWidget : public QListWidget { Q_OBJECT - public: + public: ListWidget(QWidget* parent = nullptr); virtual ~ListWidget(); @@ -46,14 +46,14 @@ class ListWidget : public QListWidget return mMimeType; } - public slots: + public slots: - signals: + signals: - protected: + protected: virtual QMimeData* mimeData(const QList items) const override; - private: + private: static QString mMimeType; }; diff --git a/src/model_editor/ModalDialogs.hpp b/src/model_editor/ModalDialogs.hpp index 234766bc4..af1e8c71a 100644 --- a/src/model_editor/ModalDialogs.hpp +++ b/src/model_editor/ModalDialogs.hpp @@ -61,7 +61,7 @@ class MODELEDITOR_API ModelObjectSelectorDialog : public QDialog, public Nano::O { Q_OBJECT - public: + public: ModelObjectSelectorDialog(const openstudio::IddObjectType& typeToDisplay, const openstudio::model::Model& model, QWidget* parent = nullptr); ModelObjectSelectorDialog(const std::vector& typesToDisplay, const openstudio::model::Model& model, @@ -83,19 +83,19 @@ class MODELEDITOR_API ModelObjectSelectorDialog : public QDialog, public Nano::O void onPushButtonCancel(bool); - signals: + signals: // emitted when the dialog is closed void closed(const boost::optional&); - private slots: + private slots: void onAddWorkspaceObject(std::shared_ptr impl, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); void onRemoveWorkspaceObject(std::shared_ptr impl, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); - private: + private: // for testing friend class ModelEditorFixture; @@ -118,7 +118,7 @@ class MODELEDITOR_API ModelObjectSelectorDialogWatcher : public QObject, public { Q_OBJECT - public: + public: ModelObjectSelectorDialogWatcher(std::shared_ptr modelObjectSelectorDialog); /// get the selected object @@ -127,11 +127,11 @@ class MODELEDITOR_API ModelObjectSelectorDialogWatcher : public QObject, public /// true if has the model object selector dialog closed bool isSelectionFinal() const; - private slots: + private slots: virtual void onClose(const boost::optional&); - private: + private: std::shared_ptr m_modelObjectSelectorDialog; mutable boost::optional m_selectedModelObject; }; diff --git a/src/model_editor/ModelExplorer.hpp b/src/model_editor/ModelExplorer.hpp index 0484a5843..df5254055 100644 --- a/src/model_editor/ModelExplorer.hpp +++ b/src/model_editor/ModelExplorer.hpp @@ -64,7 +64,7 @@ class ModelExplorer : public QWidget { Q_OBJECT - public: + public: ModelExplorer(QWidget* parent = nullptr); virtual ~ModelExplorer(); void loadFile(const QString& fileName); @@ -92,7 +92,7 @@ class ModelExplorer : public QWidget void showComments(const bool showComments); void showPrecision(const bool showPrecision); - public slots: + public slots: void classAction(); void systemOutlinerAction(); void treeAction(); @@ -106,14 +106,14 @@ class ModelExplorer : public QWidget void createAllFields(); void setRecursive(bool); - signals: + signals: void modelDirty(); void showStatusBarMsg(const QString& msg, const int millisecondDuration); void precisionDlgHidden(); void precisionDlgFinished(); - protected: - private: + protected: + private: void createProgressDlg(); void createWidgets(); void createActions(); diff --git a/src/model_editor/OSProgressBar.hpp b/src/model_editor/OSProgressBar.hpp index 0d6840be0..628562590 100644 --- a/src/model_editor/OSProgressBar.hpp +++ b/src/model_editor/OSProgressBar.hpp @@ -49,7 +49,7 @@ class QWidget; class OSProgressBar : public openstudio::ProgressBar { - public: + public: /// constructor OSProgressBar(QWidget* parent = nullptr); @@ -103,11 +103,11 @@ class OSProgressBar : public openstudio::ProgressBar /// set window title void setWindowTitle(const QString& windowTitle); - protected: + protected: /// return the impl //std::shared_ptr impl() const; - private: + private: /// impl std::shared_ptr m_impl; }; diff --git a/src/model_editor/ObjectExplorer.hpp b/src/model_editor/ObjectExplorer.hpp index 7af306705..830fe1bd0 100644 --- a/src/model_editor/ObjectExplorer.hpp +++ b/src/model_editor/ObjectExplorer.hpp @@ -45,21 +45,21 @@ class ObjectExplorer : public QWidget { Q_OBJECT - public: + public: ObjectExplorer(openstudio::IddFile& iddFile, QWidget* parent = nullptr); virtual ~ObjectExplorer(); void updateIddFile(); - public slots: + public slots: void on_groupTextEdited(const QString&); void on_objectTextEdited(const QString&); void on_groupItemSelectionChanged(); void on_objectItemSelectionChanged(); - signals: + signals: - protected: - private: + protected: + private: void createWidgets(); void connectSignalsAndSlots(); void createLayout(); diff --git a/src/model_editor/PathWatcher.hpp b/src/model_editor/PathWatcher.hpp index 19e2154e8..064a1ed3b 100644 --- a/src/model_editor/PathWatcher.hpp +++ b/src/model_editor/PathWatcher.hpp @@ -47,7 +47,7 @@ class PathWatcher : public QObject Q_OBJECT; - public: + public: /// constructor with path /// if path is a directory it must exist at time of construction, no periodic checks are performed for directory @@ -88,7 +88,7 @@ class PathWatcher : public QObject /// for directories, called when the watched directory is removed if watcher enabled virtual void onPathRemoved(); - public slots: + public slots: /// called when file/directory is added or removed or when directory is removed void directoryChanged(const QString& path); @@ -99,7 +99,7 @@ class PathWatcher : public QObject /// periodically check for changes void checkFile(); - private: + private: /// impl std::shared_ptr m_impl; std::shared_ptr m_timer; diff --git a/src/model_editor/TableView.hpp b/src/model_editor/TableView.hpp index 11db39e3b..ddc3ed0f5 100644 --- a/src/model_editor/TableView.hpp +++ b/src/model_editor/TableView.hpp @@ -38,25 +38,25 @@ class TableView : public QTableView { Q_OBJECT - public: + public: TableView(QWidget* parent = nullptr); virtual ~TableView(); bool getSelectedRows(QModelIndexList& rowList); bool hasSelectedRows(); - public slots: + public slots: - signals: + signals: void eventEnter(); void eventLeave(); void eventUpDnKeyRelease(); - protected: + protected: virtual void enterEvent(QEvent* event) override; virtual void leaveEvent(QEvent* event) override; virtual void keyReleaseEvent(QKeyEvent* event) override; - private: + private: }; } // namespace modeleditor diff --git a/src/model_editor/TableWidget.hpp b/src/model_editor/TableWidget.hpp index 4cf6f113d..33314f0c2 100644 --- a/src/model_editor/TableWidget.hpp +++ b/src/model_editor/TableWidget.hpp @@ -41,17 +41,17 @@ class MODELEDITOR_API TableWidget : public QTableWidget { Q_OBJECT - public: + public: TableWidget(QWidget* parent = nullptr); virtual ~TableWidget(); void populateTable(const openstudio::WorkspaceObject& obj); - public slots: + public slots: - signals: + signals: - protected: - private: + protected: + private: }; } // namespace modeleditor diff --git a/src/model_editor/TestButton.hpp b/src/model_editor/TestButton.hpp index 5c216cd3a..73ec72960 100644 --- a/src/model_editor/TestButton.hpp +++ b/src/model_editor/TestButton.hpp @@ -38,16 +38,16 @@ class MODELEDITOR_API TestButton : public QObject { Q_OBJECT - public: + public: TestButton(bool clickValue = true); void doClick(); void doClick(double msecDelay); - public slots: + public slots: void onTimeout(); - signals: + signals: void clicked(bool); - private: + private: bool m_clickValue; }; diff --git a/src/model_editor/TreeView.hpp b/src/model_editor/TreeView.hpp index d47e5508d..260c70e86 100644 --- a/src/model_editor/TreeView.hpp +++ b/src/model_editor/TreeView.hpp @@ -40,25 +40,25 @@ class TreeView : public QTreeView { Q_OBJECT - public: + public: TreeView(QWidget* parent = nullptr); virtual ~TreeView(); bool getSelectedRows(QModelIndexList& rowList); bool hasSelectedRows(); - public slots: + public slots: - signals: + signals: void eventEnter(); void eventLeave(); void eventUpDnKeyRelease(); - protected: + protected: virtual void enterEvent(QEvent* event) override; virtual void leaveEvent(QEvent* event) override; virtual void keyReleaseEvent(QKeyEvent* event) override; - private: + private: }; } // namespace modeleditor diff --git a/src/model_editor/TreeViewWidget.hpp b/src/model_editor/TreeViewWidget.hpp index 487181ba6..e24288e4e 100644 --- a/src/model_editor/TreeViewWidget.hpp +++ b/src/model_editor/TreeViewWidget.hpp @@ -45,7 +45,7 @@ class TreeViewWidget : public ViewWidget { Q_OBJECT - public: + public: TreeViewWidget(openstudio::model::Model& model, QWidget* parent = nullptr); TreeViewWidget(QWidget* parent = nullptr); virtual ~TreeViewWidget(); @@ -63,20 +63,20 @@ class TreeViewWidget : public ViewWidget TreeModel* getTreeModel(); virtual void toggleGUIDs() override; - public slots: + public slots: virtual void viewSelection(); virtual void viewSelection(const QModelIndex& modelIndex) override; virtual void on_nameChanged(QString) override; - signals: + signals: void expandAll(); void collapseAll(); - protected: + protected: TreeView* mTreeView; TreeModel* mTreeModel; - private: + private: virtual void connectSignalsAndSlots() override; virtual void createLayout() override; virtual void createWidgets() override; diff --git a/src/model_editor/ViewWidget.hpp b/src/model_editor/ViewWidget.hpp index c293b202d..053754acf 100644 --- a/src/model_editor/ViewWidget.hpp +++ b/src/model_editor/ViewWidget.hpp @@ -55,7 +55,7 @@ class ViewWidget : public QWidget { Q_OBJECT - public: + public: ViewWidget(QWidget* parent = nullptr); ViewWidget(openstudio::model::Model model, QWidget* parent = nullptr); virtual ~ViewWidget(); @@ -79,12 +79,12 @@ class ViewWidget : public QWidget virtual void createAllFields(); virtual void setRecursive(bool state); - public slots: + public slots: virtual void viewSelection(const QModelIndex& modelIndex) = 0; void on_modelDirty(); virtual void on_nameChanged(QString); - signals: + signals: void eventEnter(); void eventLeave(); void modelDirty(); @@ -94,7 +94,7 @@ class ViewWidget : public QWidget void precisionDlgHide(); void precisionDlgFinished(); - protected: + protected: QSplitter* mSplitter; InspectorGadget* mIG; IGPrecisionDialog* mIGPrecisionDlg; @@ -103,7 +103,7 @@ class ViewWidget : public QWidget bool mModelDirty; QString mSplitterSetting; - private: + private: virtual void connectSignalsAndSlots(); virtual void createLayout(); virtual void createWidgets(); diff --git a/src/model_editor/modeltest.h b/src/model_editor/modeltest.h index 2e9c45061..3749228ad 100644 --- a/src/model_editor/modeltest.h +++ b/src/model_editor/modeltest.h @@ -41,10 +41,10 @@ class ModelTest : public QObject { Q_OBJECT - public: + public: ModelTest(QAbstractItemModel* model, QObject* parent = nullptr); - private Q_SLOTS: + private Q_SLOTS: void nonDestructiveBasicTest(); void rowCount(); void columnCount(); @@ -53,7 +53,7 @@ class ModelTest : public QObject void parent(); void data(); - protected Q_SLOTS: + protected Q_SLOTS: void runAllTests(); void layoutAboutToBeChanged(); void layoutChanged(); @@ -62,7 +62,7 @@ class ModelTest : public QObject void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end); void rowsRemoved(const QModelIndex& parent, int start, int end); - private: + private: void checkChildren(const QModelIndex& parent, int currentDepth = 0); QAbstractItemModel* model; diff --git a/src/model_editor/projectmodeldatabase.hpp b/src/model_editor/projectmodeldatabase.hpp index 157ed8d47..3e485c7b2 100644 --- a/src/model_editor/projectmodeldatabase.hpp +++ b/src/model_editor/projectmodeldatabase.hpp @@ -41,10 +41,10 @@ class ResultQuery; class RequestedResult; class AnalysisProjectRelation { - public: + public: class Row { -public: + public: litesql::Field project; litesql::Field analysis; Row(const litesql::Database& db, const litesql::Record& rec = litesql::Record()); @@ -64,10 +64,10 @@ class AnalysisProjectRelation }; class AnalysisModelRelation { - public: + public: class Row { -public: + public: litesql::Field model; litesql::Field analysis; Row(const litesql::Database& db, const litesql::Record& rec = litesql::Record()); @@ -87,10 +87,10 @@ class AnalysisModelRelation }; class ModelResultRelation { - public: + public: class Row { -public: + public: litesql::Field result; litesql::Field model; Row(const litesql::Database& db, const litesql::Record& rec = litesql::Record()); @@ -110,10 +110,10 @@ class ModelResultRelation }; class ResultResultQueryRelation { - public: + public: class Row { -public: + public: litesql::Field resultQuery; litesql::Field result; Row(const litesql::Database& db, const litesql::Record& rec = litesql::Record()); @@ -133,10 +133,10 @@ class ResultResultQueryRelation }; class RequestedResultResultQueryRelation { - public: + public: class Row { -public: + public: litesql::Field resultQuery; litesql::Field requestedResult; Row(const litesql::Database& db, const litesql::Record& rec = litesql::Record()); @@ -157,15 +157,15 @@ class RequestedResultResultQueryRelation }; class Project : public litesql::Persistent { - public: + public: class Own { -public: + public: static const litesql::FieldType Id; }; class AnalysesHandle : public litesql::RelationHandle { -public: + public: AnalysesHandle(const Project& owner); void link(const Analysis& o0); void unlink(const Analysis& o0); @@ -185,30 +185,30 @@ class Project : public litesql::Persistent static const litesql::FieldType Projecttype; litesql::Field projecttype; - protected: + protected: void defaults(); - public: + public: Project(const litesql::Database& db); Project(const litesql::Database& db, const litesql::Record& rec); Project(const Project& obj); const Project& operator=(const Project& obj); Project::AnalysesHandle analyses(); - protected: + protected: std::string insert(litesql::Record& tables, litesql::Records& fieldRecs, litesql::Records& valueRecs); void create(); virtual void addUpdates(Updates& updates); virtual void addIDUpdates(Updates& updates); - public: + public: static void getFieldTypes(std::vector& ftypes); - protected: + protected: virtual void delRecord(); virtual void delRelations(); - public: + public: virtual void update(); virtual void del(); virtual bool typeIsCorrect(); @@ -218,15 +218,15 @@ class Project : public litesql::Persistent std::ostream& operator<<(std::ostream& os, Project o); class Analysis : public litesql::Persistent { - public: + public: class Own { -public: + public: static const litesql::FieldType Id; }; class ProjectHandle : public litesql::RelationHandle { -public: + public: ProjectHandle(const Analysis& owner); void link(const Project& o0); void unlink(const Project& o0); @@ -236,7 +236,7 @@ class Analysis : public litesql::Persistent }; class ModelsHandle : public litesql::RelationHandle { -public: + public: ModelsHandle(const Analysis& owner); void link(const Model& o0); void unlink(const Model& o0); @@ -256,10 +256,10 @@ class Analysis : public litesql::Persistent static const litesql::FieldType Analysistype; litesql::Field analysistype; - protected: + protected: void defaults(); - public: + public: Analysis(const litesql::Database& db); Analysis(const litesql::Database& db, const litesql::Record& rec); Analysis(const Analysis& obj); @@ -267,20 +267,20 @@ class Analysis : public litesql::Persistent Analysis::ProjectHandle project(); Analysis::ModelsHandle models(); - protected: + protected: std::string insert(litesql::Record& tables, litesql::Records& fieldRecs, litesql::Records& valueRecs); void create(); virtual void addUpdates(Updates& updates); virtual void addIDUpdates(Updates& updates); - public: + public: static void getFieldTypes(std::vector& ftypes); - protected: + protected: virtual void delRecord(); virtual void delRelations(); - public: + public: virtual void update(); virtual void del(); virtual bool typeIsCorrect(); @@ -290,15 +290,15 @@ class Analysis : public litesql::Persistent std::ostream& operator<<(std::ostream& os, Analysis o); class Model : public litesql::Persistent { - public: + public: class Own { -public: + public: static const litesql::FieldType Id; }; class AnalysesHandle : public litesql::RelationHandle { -public: + public: AnalysesHandle(const Model& owner); void link(const Analysis& o0); void unlink(const Analysis& o0); @@ -308,7 +308,7 @@ class Model : public litesql::Persistent }; class ResultsHandle : public litesql::RelationHandle { -public: + public: ResultsHandle(const Model& owner); void link(const Result& o0); void unlink(const Result& o0); @@ -330,10 +330,10 @@ class Model : public litesql::Persistent static const litesql::FieldType Guid; litesql::Field guid; - protected: + protected: void defaults(); - public: + public: Model(const litesql::Database& db); Model(const litesql::Database& db, const litesql::Record& rec); Model(const Model& obj); @@ -341,20 +341,20 @@ class Model : public litesql::Persistent Model::AnalysesHandle analyses(); Model::ResultsHandle results(); - protected: + protected: std::string insert(litesql::Record& tables, litesql::Records& fieldRecs, litesql::Records& valueRecs); void create(); virtual void addUpdates(Updates& updates); virtual void addIDUpdates(Updates& updates); - public: + public: static void getFieldTypes(std::vector& ftypes); - protected: + protected: virtual void delRecord(); virtual void delRelations(); - public: + public: virtual void update(); virtual void del(); virtual bool typeIsCorrect(); @@ -364,15 +364,15 @@ class Model : public litesql::Persistent std::ostream& operator<<(std::ostream& os, Model o); class Result : public litesql::Persistent { - public: + public: class Own { -public: + public: static const litesql::FieldType Id; }; class ModelHandle : public litesql::RelationHandle { -public: + public: ModelHandle(const Result& owner); void link(const Model& o0); void unlink(const Model& o0); @@ -382,7 +382,7 @@ class Result : public litesql::Persistent }; class ResultqueriesHandle : public litesql::RelationHandle { -public: + public: ResultqueriesHandle(const Result& owner); void link(const ResultQuery& o0); void unlink(const ResultQuery& o0); @@ -400,10 +400,10 @@ class Result : public litesql::Persistent static const litesql::FieldType Value; litesql::Field value; - protected: + protected: void defaults(); - public: + public: Result(const litesql::Database& db); Result(const litesql::Database& db, const litesql::Record& rec); Result(const Result& obj); @@ -411,20 +411,20 @@ class Result : public litesql::Persistent Result::ModelHandle model(); Result::ResultqueriesHandle resultqueries(); - protected: + protected: std::string insert(litesql::Record& tables, litesql::Records& fieldRecs, litesql::Records& valueRecs); void create(); virtual void addUpdates(Updates& updates); virtual void addIDUpdates(Updates& updates); - public: + public: static void getFieldTypes(std::vector& ftypes); - protected: + protected: virtual void delRecord(); virtual void delRelations(); - public: + public: virtual void update(); virtual void del(); virtual bool typeIsCorrect(); @@ -434,15 +434,15 @@ class Result : public litesql::Persistent std::ostream& operator<<(std::ostream& os, Result o); class ResultQuery : public litesql::Persistent { - public: + public: class Own { -public: + public: static const litesql::FieldType Id; }; class ResultHandle : public litesql::RelationHandle { -public: + public: ResultHandle(const ResultQuery& owner); void link(const Result& o0); void unlink(const Result& o0); @@ -452,7 +452,7 @@ class ResultQuery : public litesql::Persistent }; class RequestedresultsHandle : public litesql::RelationHandle { -public: + public: RequestedresultsHandle(const ResultQuery& owner); void link(const RequestedResult& o0); void unlink(const RequestedResult& o0); @@ -470,10 +470,10 @@ class ResultQuery : public litesql::Persistent static const litesql::FieldType Query; litesql::Field query; - protected: + protected: void defaults(); - public: + public: ResultQuery(const litesql::Database& db); ResultQuery(const litesql::Database& db, const litesql::Record& rec); ResultQuery(const ResultQuery& obj); @@ -481,20 +481,20 @@ class ResultQuery : public litesql::Persistent ResultQuery::ResultHandle result(); ResultQuery::RequestedresultsHandle requestedresults(); - protected: + protected: std::string insert(litesql::Record& tables, litesql::Records& fieldRecs, litesql::Records& valueRecs); void create(); virtual void addUpdates(Updates& updates); virtual void addIDUpdates(Updates& updates); - public: + public: static void getFieldTypes(std::vector& ftypes); - protected: + protected: virtual void delRecord(); virtual void delRelations(); - public: + public: virtual void update(); virtual void del(); virtual bool typeIsCorrect(); @@ -504,15 +504,15 @@ class ResultQuery : public litesql::Persistent std::ostream& operator<<(std::ostream& os, ResultQuery o); class RequestedResult : public litesql::Persistent { - public: + public: class Own { -public: + public: static const litesql::FieldType Id; }; class ResultqueryHandle : public litesql::RelationHandle { -public: + public: ResultqueryHandle(const RequestedResult& owner); void link(const ResultQuery& o0); void unlink(const ResultQuery& o0); @@ -530,30 +530,30 @@ class RequestedResult : public litesql::Persistent static const litesql::FieldType Result; litesql::Field result; - protected: + protected: void defaults(); - public: + public: RequestedResult(const litesql::Database& db); RequestedResult(const litesql::Database& db, const litesql::Record& rec); RequestedResult(const RequestedResult& obj); const RequestedResult& operator=(const RequestedResult& obj); RequestedResult::ResultqueryHandle resultquery(); - protected: + protected: std::string insert(litesql::Record& tables, litesql::Records& fieldRecs, litesql::Records& valueRecs); void create(); virtual void addUpdates(Updates& updates); virtual void addIDUpdates(Updates& updates); - public: + public: static void getFieldTypes(std::vector& ftypes); - protected: + protected: virtual void delRecord(); virtual void delRelations(); - public: + public: virtual void update(); virtual void del(); virtual bool typeIsCorrect(); @@ -563,10 +563,10 @@ class RequestedResult : public litesql::Persistent std::ostream& operator<<(std::ostream& os, RequestedResult o); class ProjectModelDatabase : public litesql::Database { - public: + public: ProjectModelDatabase(std::string backendType, std::string connInfo); - protected: + protected: virtual std::vector getSchema() const; static void initialize(); }; diff --git a/src/model_editor/tablemodel.h b/src/model_editor/tablemodel.h index 95164ab08..8b9b35954 100644 --- a/src/model_editor/tablemodel.h +++ b/src/model_editor/tablemodel.h @@ -57,7 +57,7 @@ class MODELEDITOR_API TableModel : public QAbstractTableModel { Q_OBJECT - public: + public: TableModel(openstudio::WorkspaceObjectVector& objects, ClassViewWidget* parent); TableModel(ClassViewWidget* parent); ~TableModel(); @@ -80,12 +80,12 @@ class MODELEDITOR_API TableModel : public QAbstractTableModel virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; void toggleGUIDs(); - public slots: + public slots: - signals: + signals: - protected: - private: + protected: + private: void setupModelData(openstudio::WorkspaceObjectVector& objects); bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override; void sort(openstudio::WorkspaceObjectVector& objects, int column = 0, Qt::SortOrder order = Qt::AscendingOrder); diff --git a/src/model_editor/test/ModelEditorFixture.hpp b/src/model_editor/test/ModelEditorFixture.hpp index 98cdec414..20009ba73 100644 --- a/src/model_editor/test/ModelEditorFixture.hpp +++ b/src/model_editor/test/ModelEditorFixture.hpp @@ -37,7 +37,7 @@ class ModelEditorFixture : public ::testing::Test { - protected: + protected: // initialize for each test virtual void SetUp() override; diff --git a/src/model_editor/treeitem.h b/src/model_editor/treeitem.h index ea69195b4..e8aa18cd3 100644 --- a/src/model_editor/treeitem.h +++ b/src/model_editor/treeitem.h @@ -52,7 +52,7 @@ namespace modeleditor { class TreeItem { - public: + public: TreeItem(const openstudio::model::ModelObject& object, const QList& data, TreeItem* parent = nullptr); ~TreeItem(); @@ -70,7 +70,7 @@ class TreeItem bool setData(openstudio::model::ModelObject& data); TreeItem* parent(); - private: + private: QList mChildItems; QList mItemData; TreeItem* mParentItem; diff --git a/src/model_editor/treemodel.h b/src/model_editor/treemodel.h index 05b8f01fe..284a90ee9 100644 --- a/src/model_editor/treemodel.h +++ b/src/model_editor/treemodel.h @@ -61,7 +61,7 @@ class TreeModel : public QAbstractItemModel { Q_OBJECT - public: + public: TreeModel(openstudio::model::Model& model, TreeViewWidget* parent); TreeModel(TreeViewWidget* parent); ~TreeModel(); @@ -84,12 +84,12 @@ class TreeModel : public QAbstractItemModel QModelIndexList getPersistentIndexList() const; void toggleGUIDs(); - public slots: + public slots: - signals: + signals: - protected: - private: + protected: + private: void setupModelData(const openstudio::model::ModelObject& object, TreeItem* parent); TreeItem* getItem(const QModelIndex& index) const; bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override; diff --git a/src/openstudio_app/ExternalToolsDialog.hpp b/src/openstudio_app/ExternalToolsDialog.hpp index 117945253..ea576ade7 100644 --- a/src/openstudio_app/ExternalToolsDialog.hpp +++ b/src/openstudio_app/ExternalToolsDialog.hpp @@ -42,7 +42,7 @@ class ExternalToolsDialog : public QDialog { Q_OBJECT - public: + public: ExternalToolsDialog(openstudio::path dviewPath); virtual ~ExternalToolsDialog(){}; @@ -52,7 +52,7 @@ class ExternalToolsDialog : public QDialog // openstudio::path otherToolPath() const; - private: + private: // Tool name should match the executable name void onChangeClicked(QLineEdit* t_lineEdit, QString toolName); diff --git a/src/openstudio_app/LibraryDialog.hpp b/src/openstudio_app/LibraryDialog.hpp index 23ea7c88d..add11b902 100644 --- a/src/openstudio_app/LibraryDialog.hpp +++ b/src/openstudio_app/LibraryDialog.hpp @@ -42,7 +42,7 @@ class LibraryDialog : public QDialog { Q_OBJECT - public: + public: LibraryDialog(std::vector paths, std::vector defaultPaths, const openstudio::path& resourcesPath); virtual ~LibraryDialog(){}; @@ -50,7 +50,7 @@ class LibraryDialog : public QDialog /** The current list of library paths */ std::vector paths() const; - private: + private: void onAdd(); void onRemove(); void onRestore(); diff --git a/src/openstudio_app/OpenStudioApp.hpp b/src/openstudio_app/OpenStudioApp.hpp index f368b7ba0..6ab047d91 100644 --- a/src/openstudio_app/OpenStudioApp.hpp +++ b/src/openstudio_app/OpenStudioApp.hpp @@ -88,7 +88,7 @@ class TouchEater : public QObject { Q_OBJECT - protected: + protected: bool eventFilter(QObject* obj, QEvent* event); }; @@ -97,7 +97,7 @@ class OpenStudioApp : public OSAppBase Q_OBJECT - public: + public: OpenStudioApp(int& argc, char** argv); virtual ~OpenStudioApp(); @@ -121,14 +121,14 @@ class OpenStudioApp : public OSAppBase virtual bool notify(QObject* receiver, QEvent* event) override; - protected: + protected: virtual bool event(QEvent* e) override; virtual void childEvent(QChildEvent* e) override; - signals: + signals: - public slots: + public slots: void quit(); @@ -161,7 +161,7 @@ class OpenStudioApp : public OSAppBase // Checks what happened in the ExternalToolsDialog preference pane void configureExternalTools(); - private slots: + private slots: // Returns default/hvac_library.osm and default/hvac_library.osm std::vector defaultLibraryPaths() const; @@ -202,7 +202,7 @@ class OpenStudioApp : public OSAppBase void onChangeDefaultLibrariesDone(); - private: + private: enum fileType { SDD, diff --git a/src/openstudio_app/StartupMenu.hpp b/src/openstudio_app/StartupMenu.hpp index 88ceb0601..b3a60577e 100644 --- a/src/openstudio_app/StartupMenu.hpp +++ b/src/openstudio_app/StartupMenu.hpp @@ -40,12 +40,12 @@ class StartupMenu : public QMenuBar { Q_OBJECT - public: + public: StartupMenu(QWidget* parent = nullptr); virtual ~StartupMenu() {} - signals: + signals: void exportClicked(); @@ -71,7 +71,7 @@ class StartupMenu : public QMenuBar void aboutClicked(); - private: + private: QMenu* m_fileMenu; QMenu* m_viewMenu; diff --git a/src/openstudio_app/StartupView.hpp b/src/openstudio_app/StartupView.hpp index 0b54c8485..c32d56c81 100644 --- a/src/openstudio_app/StartupView.hpp +++ b/src/openstudio_app/StartupView.hpp @@ -46,14 +46,14 @@ class StartupView : public QWidget { Q_OBJECT - public: + public: StartupView(QWidget* parent = nullptr); virtual ~StartupView() {} QSize sizeHint() const override; - signals: + signals: void newFromTemplate(NewFromTemplateEnum); @@ -63,7 +63,7 @@ class StartupView : public QWidget void importSDDClicked(); - protected: + protected: void mouseMoveEvent(QMouseEvent* event) override; void mousePressEvent(QMouseEvent* event) override; @@ -72,13 +72,13 @@ class StartupView : public QWidget void paintEvent(QPaintEvent* event) override; - private slots: + private slots: void newFromTemplateSlot(); void showDetailsForItem(const QModelIndex& index); - private: + private: QPoint dragPosition; bool _move; @@ -92,7 +92,7 @@ class StartupView : public QWidget class TemplateListModel : public QAbstractListModel { - public: + public: TemplateListModel(QObject* parent = nullptr); int rowCount(const QModelIndex& parent = QModelIndex()) const override; @@ -101,7 +101,7 @@ class TemplateListModel : public QAbstractListModel Qt::ItemFlags flags(const QModelIndex& index) const override; - private: + private: }; } // namespace openstudio diff --git a/src/openstudio_app/test/OpenStudioAppFixture.hpp b/src/openstudio_app/test/OpenStudioAppFixture.hpp index a17465eb1..e50116895 100644 --- a/src/openstudio_app/test/OpenStudioAppFixture.hpp +++ b/src/openstudio_app/test/OpenStudioAppFixture.hpp @@ -37,7 +37,7 @@ class OpenStudioAppFixture : public ::testing::Test { - protected: + protected: // initialize for each test virtual void SetUp() override; diff --git a/src/openstudio_lib/ApplyMeasureNowDialog.hpp b/src/openstudio_lib/ApplyMeasureNowDialog.hpp index 69fc1430c..c3046fd53 100644 --- a/src/openstudio_lib/ApplyMeasureNowDialog.hpp +++ b/src/openstudio_lib/ApplyMeasureNowDialog.hpp @@ -64,7 +64,7 @@ class ApplyMeasureNowDialog : public OSDialog { Q_OBJECT - public: + public: ApplyMeasureNowDialog(QWidget* parent = nullptr); virtual ~ApplyMeasureNowDialog(); @@ -77,7 +77,7 @@ class ApplyMeasureNowDialog : public OSDialog QSharedPointer m_localLibraryController; - protected slots: + protected slots: virtual void on_cancelButton(bool checked) override; @@ -85,10 +85,10 @@ class ApplyMeasureNowDialog : public OSDialog virtual void on_okButton(bool checked) override; - protected: + protected: void closeEvent(QCloseEvent* event) override; - private slots: + private slots: void disableOkButton(bool disable); @@ -98,13 +98,13 @@ class ApplyMeasureNowDialog : public OSDialog void displayResults(); - signals: + signals: void reloadFile(const QString& fileToLoad, bool modified, bool saveCurrentTabs); void toolsUpdated(); - private: + private: REGISTER_LOGGER("openstudio::ApplyMeasureNowDialog"); void createWidgets(); @@ -168,7 +168,7 @@ class DataPointJobHeaderView : public OSHeader { Q_OBJECT - public: + public: DataPointJobHeaderView(); virtual ~DataPointJobHeaderView() {} @@ -197,7 +197,7 @@ class DataPointJobContentView : public QWidget { Q_OBJECT - public: + public: DataPointJobContentView(); virtual ~DataPointJobContentView() {} @@ -216,7 +216,7 @@ class DataPointJobContentView : public QWidget void addStdErrorMessage(const std::string& message); - private: + private: static QString formatMessageForHTML(const std::string& t_message); QLabel* m_textEdit; @@ -226,7 +226,7 @@ class DataPointJobItemView : public OSCollapsibleView { Q_OBJECT - public: + public: DataPointJobItemView(); virtual ~DataPointJobItemView() {} @@ -235,10 +235,10 @@ class DataPointJobItemView : public OSCollapsibleView DataPointJobContentView* m_dataPointJobContentView; - protected: + protected: void paintEvent(QPaintEvent* e) override; - public slots: + public slots: void update(const BCLMeasure& bclMeasure, const boost::optional& outWorkflowJSON, bool canceled); }; diff --git a/src/openstudio_lib/BCLComponentItem.hpp b/src/openstudio_lib/BCLComponentItem.hpp index 7a10f0b9c..4ac235dcd 100644 --- a/src/openstudio_lib/BCLComponentItem.hpp +++ b/src/openstudio_lib/BCLComponentItem.hpp @@ -41,13 +41,13 @@ class BCLComponentItem : public OSItem { Q_OBJECT - public: + public: BCLComponentItem(const BCLComponent& component, OSItemType type, QWidget* parent = nullptr); virtual ~BCLComponentItem() {} virtual bool equal(const openstudio::OSItem*) const override; - private: + private: BCLComponent m_bclComponent; //openstudio::Handle m_handle; diff --git a/src/openstudio_lib/BuildingInspectorView.hpp b/src/openstudio_lib/BuildingInspectorView.hpp index ce78d8761..1234d51ee 100644 --- a/src/openstudio_lib/BuildingInspectorView.hpp +++ b/src/openstudio_lib/BuildingInspectorView.hpp @@ -54,10 +54,10 @@ class BuildingSpaceTypeVectorController : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~BuildingSpaceTypeVectorController() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; @@ -73,10 +73,10 @@ class BuildingDefaultConstructionSetVectorController : public ModelObjectVectorC { Q_OBJECT - public: + public: virtual ~BuildingDefaultConstructionSetVectorController() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; @@ -92,10 +92,10 @@ class BuildingDefaultScheduleSetVectorController : public ModelObjectVectorContr { Q_OBJECT - public: + public: virtual ~BuildingDefaultScheduleSetVectorController() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; @@ -111,21 +111,21 @@ class BuildingInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: BuildingInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~BuildingInspectorView() {} - signals: + signals: - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - protected slots: + protected slots: void editStandardsTemplate(const QString& text); void standardsTemplateChanged(const QString& text); @@ -133,7 +133,7 @@ class BuildingInspectorView : public ModelObjectInspectorView void editStandardsBuildingType(const QString& text); void standardsBuildingTypeChanged(const QString& text); - private: + private: void attach(openstudio::model::Building& building); void detach(); @@ -160,7 +160,7 @@ class BuildingInspectorView : public ModelObjectInspectorView QComboBox* m_standardsBuildingTypeComboBox = nullptr; bool m_isIP; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/CollapsibleInspector.hpp b/src/openstudio_lib/CollapsibleInspector.hpp index 2c070b869..14c630878 100644 --- a/src/openstudio_lib/CollapsibleInspector.hpp +++ b/src/openstudio_lib/CollapsibleInspector.hpp @@ -44,19 +44,19 @@ class CollapsibleInspector : public QWidget { Q_OBJECT - public: + public: CollapsibleInspector(QString text, QWidget* inspector, QWidget* parent = nullptr); virtual ~CollapsibleInspector() {} - private: + private: void createLayout(); CollapsibleInspectorHeader* m_header; QWidget* m_inspector; - public slots: + public slots: void on_headerToggled(bool checked); }; @@ -65,17 +65,17 @@ class CollapsibleInspectorHeader : public QAbstractButton { Q_OBJECT - public: + public: CollapsibleInspectorHeader(QString text, QWidget* parent = nullptr); void setChecked(bool isChecked); - protected: + protected: void paintEvent(QPaintEvent* event) override; QSize sizeHint() const override; - private: + private: void createLayout(); void setImage(bool isChecked); @@ -84,7 +84,7 @@ class CollapsibleInspectorHeader : public QAbstractButton QLabel* m_arrowLabel; - private slots: + private slots: void on_toggled(bool checked); }; diff --git a/src/openstudio_lib/ConstructionAirBoundaryInspectorView.hpp b/src/openstudio_lib/ConstructionAirBoundaryInspectorView.hpp index 8141746d7..c96ff6b76 100644 --- a/src/openstudio_lib/ConstructionAirBoundaryInspectorView.hpp +++ b/src/openstudio_lib/ConstructionAirBoundaryInspectorView.hpp @@ -52,19 +52,19 @@ class ConstructionAirBoundaryInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ConstructionAirBoundaryInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionAirBoundaryInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::ConstructionAirBoundary& constructionAirBoundary); diff --git a/src/openstudio_lib/ConstructionCfactorUndergroundWallInspectorView.hpp b/src/openstudio_lib/ConstructionCfactorUndergroundWallInspectorView.hpp index 25c674536..5b31760a4 100644 --- a/src/openstudio_lib/ConstructionCfactorUndergroundWallInspectorView.hpp +++ b/src/openstudio_lib/ConstructionCfactorUndergroundWallInspectorView.hpp @@ -50,19 +50,19 @@ class ConstructionCfactorUndergroundWallInspectorView : public ModelObjectInspec { Q_OBJECT - public: + public: ConstructionCfactorUndergroundWallInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionCfactorUndergroundWallInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::CFactorUndergroundWallConstruction& cFactorUndergroundWallConstruction); diff --git a/src/openstudio_lib/ConstructionFfactorGroundFloorInspectorView.hpp b/src/openstudio_lib/ConstructionFfactorGroundFloorInspectorView.hpp index 7ee3581d1..75170fcfe 100644 --- a/src/openstudio_lib/ConstructionFfactorGroundFloorInspectorView.hpp +++ b/src/openstudio_lib/ConstructionFfactorGroundFloorInspectorView.hpp @@ -50,19 +50,19 @@ class ConstructionFfactorGroundFloorInspectorView : public ModelObjectInspectorV { Q_OBJECT - public: + public: ConstructionFfactorGroundFloorInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionFfactorGroundFloorInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::FFactorGroundFloorConstruction& fFactorGroundFloorConstruction); diff --git a/src/openstudio_lib/ConstructionInspectorView.hpp b/src/openstudio_lib/ConstructionInspectorView.hpp index 610a8bc9f..e09381c38 100644 --- a/src/openstudio_lib/ConstructionInspectorView.hpp +++ b/src/openstudio_lib/ConstructionInspectorView.hpp @@ -55,19 +55,19 @@ class ConstructionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ConstructionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::Construction& construction); diff --git a/src/openstudio_lib/ConstructionInternalSourceInspectorView.hpp b/src/openstudio_lib/ConstructionInternalSourceInspectorView.hpp index 105589671..80b731b19 100644 --- a/src/openstudio_lib/ConstructionInternalSourceInspectorView.hpp +++ b/src/openstudio_lib/ConstructionInternalSourceInspectorView.hpp @@ -55,19 +55,19 @@ class ConstructionInternalSourceInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ConstructionInternalSourceInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionInternalSourceInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::ConstructionWithInternalSource& constructionWithInternalSource); diff --git a/src/openstudio_lib/ConstructionObjectVectorController.hpp b/src/openstudio_lib/ConstructionObjectVectorController.hpp index 8464d681b..3c62b5dcb 100644 --- a/src/openstudio_lib/ConstructionObjectVectorController.hpp +++ b/src/openstudio_lib/ConstructionObjectVectorController.hpp @@ -41,7 +41,7 @@ class ConstructionObjectVectorController : public ModelObjectVectorController { Q_OBJECT - public: + public: ConstructionObjectVectorController(QWidget* parentWidget); // Need to delete the QMutex @@ -49,14 +49,14 @@ class ConstructionObjectVectorController : public ModelObjectVectorController void setParentWidget(QWidget* parentWidget); - public slots: + public slots: // reportItemsLater should be used as it wraps the call to reportItems in a QTimer::singleShot // which eventually calls ModelObjectVector::reportItems void reportItemsLater(); void reportItems(); - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual void onDataChange(const model::ModelObject& modelObject) override; @@ -71,7 +71,7 @@ class ConstructionObjectVectorController : public ModelObjectVectorController virtual void onDrop(const OSItemId& itemId) override; - private: + private: REGISTER_LOGGER("openstudio::ConstructionObjectVectorController"); void insert(const OSItemId& itemId, int position = -1, bool deleteExisting = false); diff --git a/src/openstudio_lib/ConstructionWindowDataFileInspectorView.hpp b/src/openstudio_lib/ConstructionWindowDataFileInspectorView.hpp index 91ee0d534..c16a1ba46 100644 --- a/src/openstudio_lib/ConstructionWindowDataFileInspectorView.hpp +++ b/src/openstudio_lib/ConstructionWindowDataFileInspectorView.hpp @@ -42,19 +42,19 @@ class ConstructionWindowDataFileInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ConstructionWindowDataFileInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionWindowDataFileInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::WindowDataFile& windowDataFile); diff --git a/src/openstudio_lib/ConstructionsController.hpp b/src/openstudio_lib/ConstructionsController.hpp index dbdf16418..88f694fb0 100644 --- a/src/openstudio_lib/ConstructionsController.hpp +++ b/src/openstudio_lib/ConstructionsController.hpp @@ -38,12 +38,12 @@ class ConstructionsController : public ModelSubTabController { Q_OBJECT - public: + public: ConstructionsController(bool isIP, const model::Model& model); virtual ~ConstructionsController(); - protected: + protected: virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; virtual void onCopyObject(const openstudio::model::ModelObject& modelObject) override; diff --git a/src/openstudio_lib/ConstructionsTabController.hpp b/src/openstudio_lib/ConstructionsTabController.hpp index 3c9f62d9e..4280d974c 100644 --- a/src/openstudio_lib/ConstructionsTabController.hpp +++ b/src/openstudio_lib/ConstructionsTabController.hpp @@ -42,7 +42,7 @@ class ConstructionsTabController : public MainTabController { Q_OBJECT - public: + public: ConstructionsTabController(bool isIP, const openstudio::model::Model& model); virtual ~ConstructionsTabController(); @@ -54,7 +54,7 @@ class ConstructionsTabController : public MainTabController MATERIALS }; - private: + private: model::Model m_model; bool m_isIP; @@ -63,7 +63,7 @@ class ConstructionsTabController : public MainTabController int m_currentIndex = -1; - public slots: + public slots: virtual void setSubTab(int index) override; diff --git a/src/openstudio_lib/ConstructionsTabView.hpp b/src/openstudio_lib/ConstructionsTabView.hpp index bb772a655..57cef6607 100644 --- a/src/openstudio_lib/ConstructionsTabView.hpp +++ b/src/openstudio_lib/ConstructionsTabView.hpp @@ -38,7 +38,7 @@ class ConstructionsTabView : public MainTabView { Q_OBJECT - public: + public: ConstructionsTabView(const model::Model& model, const QString& tabLabel, QWidget* parent = nullptr); virtual ~ConstructionsTabView() {} }; diff --git a/src/openstudio_lib/ConstructionsView.hpp b/src/openstudio_lib/ConstructionsView.hpp index 6d67dc011..ad6e90594 100644 --- a/src/openstudio_lib/ConstructionsView.hpp +++ b/src/openstudio_lib/ConstructionsView.hpp @@ -41,12 +41,12 @@ class ConstructionsView : public ModelSubTabView { Q_OBJECT - public: + public: ConstructionsView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionsView() {} - private: + private: static std::vector> modelObjectTypesAndNames(); }; @@ -54,19 +54,19 @@ class ConstructionsInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ConstructionsInspectorView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~ConstructionsInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void showConstructionInspector(const openstudio::model::ModelObject& modelObject); void showAirBoundaryInspector(const openstudio::model::ModelObject& modelObject); @@ -87,7 +87,7 @@ class ConstructionsInspectorView : public ModelObjectInspectorView bool m_isIP; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp b/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp index 39004f8fa..dc6d69316 100644 --- a/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp +++ b/src/openstudio_lib/DefaultConstructionSetInspectorView.hpp @@ -45,10 +45,10 @@ class WallConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~WallConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -60,10 +60,10 @@ class FloorConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~FloorConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -75,10 +75,10 @@ class RoofConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~RoofConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -90,10 +90,10 @@ class FixedWindowVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~FixedWindowVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -105,10 +105,10 @@ class OperableWindowVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~OperableWindowVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -120,10 +120,10 @@ class DoorVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~DoorVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -135,10 +135,10 @@ class GlassDoorConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~GlassDoorConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -150,10 +150,10 @@ class OverheadDoorConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~OverheadDoorConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -165,10 +165,10 @@ class SkylightConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~SkylightConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -180,10 +180,10 @@ class TubularDaylightDomeConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~TubularDaylightDomeConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -195,10 +195,10 @@ class TubularDaylightDiffuserConstructionVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~TubularDaylightDiffuserConstructionVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -210,10 +210,10 @@ class InteriorPartitionsVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~InteriorPartitionsVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -225,10 +225,10 @@ class SpaceShadingVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~SpaceShadingVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -240,10 +240,10 @@ class BuildingShadingVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~BuildingShadingVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -255,10 +255,10 @@ class SiteShadingVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~SiteShadingVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -270,10 +270,10 @@ class AdiabaticSurfaceVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~AdiabaticSurfaceVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -285,16 +285,16 @@ class DefaultConstructionSetInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: DefaultConstructionSetInspectorView(const model::Model& model, QWidget* parent = nullptr); virtual ~DefaultConstructionSetInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::DefaultConstructionSet& defaultConstructionSet); void detach(); void configDropZones(); diff --git a/src/openstudio_lib/DefaultConstructionSetsController.hpp b/src/openstudio_lib/DefaultConstructionSetsController.hpp index 143d0a77b..eea084130 100644 --- a/src/openstudio_lib/DefaultConstructionSetsController.hpp +++ b/src/openstudio_lib/DefaultConstructionSetsController.hpp @@ -38,12 +38,12 @@ class DefaultConstructionSetsController : public ModelSubTabController { Q_OBJECT - public: + public: DefaultConstructionSetsController(const model::Model& model); virtual ~DefaultConstructionSetsController(); - protected: + protected: virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; virtual void onCopyObject(const openstudio::model::ModelObject& modelObject) override; diff --git a/src/openstudio_lib/DefaultConstructionSetsView.hpp b/src/openstudio_lib/DefaultConstructionSetsView.hpp index 56cceac9a..2967e8131 100644 --- a/src/openstudio_lib/DefaultConstructionSetsView.hpp +++ b/src/openstudio_lib/DefaultConstructionSetsView.hpp @@ -43,12 +43,12 @@ class DefaultConstructionSetsView : public ModelSubTabView { Q_OBJECT - public: + public: DefaultConstructionSetsView(const openstudio::model::Model& model, const QString& tabLabel, bool hasSubTabs, QWidget* parent = nullptr); virtual ~DefaultConstructionSetsView() {} - private: + private: }; } // namespace openstudio diff --git a/src/openstudio_lib/DesignDayGridView.hpp b/src/openstudio_lib/DesignDayGridView.hpp index cd0c362ca..03bbf46be 100644 --- a/src/openstudio_lib/DesignDayGridView.hpp +++ b/src/openstudio_lib/DesignDayGridView.hpp @@ -46,7 +46,7 @@ class DesignDayGridView : public QWidget { Q_OBJECT - public: + public: DesignDayGridView(bool isIP, const model::Model& model, QWidget* parent = 0); virtual ~DesignDayGridView() {} @@ -55,7 +55,7 @@ class DesignDayGridView : public QWidget std::vector selectedObjects() const; - private: + private: void addObject(const model::ModelObject& modelObject); void copyObject(const openstudio::model::ModelObject& modelObject); @@ -66,13 +66,13 @@ class DesignDayGridView : public QWidget bool m_isIP; - signals: + signals: void toggleUnitsClicked(bool displayIP); void dropZoneItemClicked(OSItem* item); - public slots: + public slots: void onAddClicked(); @@ -88,7 +88,7 @@ class DesignDayGridController : public OSGridController Q_OBJECT - public: + public: DesignDayGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -96,7 +96,7 @@ class DesignDayGridController : public OSGridController virtual void refreshModelObjects(); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& t_category, std::vector& fields); @@ -105,7 +105,7 @@ class DesignDayGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); diff --git a/src/openstudio_lib/EMSInspectorView.cpp b/src/openstudio_lib/EMSInspectorView.cpp index 4d2820d08..ebdeb853c 100644 --- a/src/openstudio_lib/EMSInspectorView.cpp +++ b/src/openstudio_lib/EMSInspectorView.cpp @@ -49,7 +49,7 @@ namespace openstudio { class EMSInspectorHeader : public QWidget { - public: + public: EMSInspectorHeader(const QString& text) : QWidget() { setContentsMargins(0, 0, 0, 0); setObjectName("IGHeader"); @@ -68,7 +68,7 @@ class EMSInspectorHeader : public QWidget class EMSInspectorActuator : public QWidget { - public: + public: EMSInspectorActuator(const model::EMSActuatorNames& names, const model::ModelObject& modelObject) : QWidget(), m_names(names), m_modelObject(modelObject) { setContentsMargins(0, 0, 0, 0); @@ -101,7 +101,7 @@ class EMSInspectorActuator : public QWidget } } - private slots: + private slots: void onToggled(bool checked) { auto actuators = m_modelObject.model().getModelObjects(); @@ -124,7 +124,7 @@ class EMSInspectorActuator : public QWidget } } - private: + private: std::function m_isMatchingActuator; model::EMSActuatorNames m_names; model::ModelObject m_modelObject; @@ -133,7 +133,7 @@ class EMSInspectorActuator : public QWidget class EMSInspectorSensor : public QWidget { - public: + public: EMSInspectorSensor(const std::string& name, const model::ModelObject& modelObject) : QWidget(), m_name(name), m_modelObject(modelObject) { setContentsMargins(0, 0, 0, 0); @@ -165,7 +165,7 @@ class EMSInspectorSensor : public QWidget } } - private slots: + private slots: void onToggled(bool checked) { auto sensors = m_modelObject.model().getModelObjects(); @@ -184,7 +184,7 @@ class EMSInspectorSensor : public QWidget } } - private: + private: std::function m_isMatchingSensor; std::string m_name; model::ModelObject m_modelObject; diff --git a/src/openstudio_lib/EMSInspectorView.hpp b/src/openstudio_lib/EMSInspectorView.hpp index b8f82b4a6..608e9f6c1 100644 --- a/src/openstudio_lib/EMSInspectorView.hpp +++ b/src/openstudio_lib/EMSInspectorView.hpp @@ -47,7 +47,7 @@ class EMSInspectorView : public QWidget { Q_OBJECT; - public: + public: enum class Type { SENSOR, @@ -59,7 +59,7 @@ class EMSInspectorView : public QWidget void layoutModelObject(const model::ModelObject& modelObject); - private: + private: QVBoxLayout* m_layout; Type m_type; QScrollArea* m_scrollArea; diff --git a/src/openstudio_lib/ElectricEquipmentInspectorView.hpp b/src/openstudio_lib/ElectricEquipmentInspectorView.hpp index 226639b17..487c3be79 100644 --- a/src/openstudio_lib/ElectricEquipmentInspectorView.hpp +++ b/src/openstudio_lib/ElectricEquipmentInspectorView.hpp @@ -45,19 +45,19 @@ class ElectricEquipmentDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ElectricEquipmentDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ElectricEquipmentDefinitionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::ElectricEquipmentDefinition& electricEquipmentDefinition); void detach(); @@ -82,7 +82,7 @@ class ElectricEquipmentDefinitionInspectorView : public ModelObjectInspectorView boost::optional m_electricEquipmentDefinition; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/FacilityExteriorEquipmentGridView.hpp b/src/openstudio_lib/FacilityExteriorEquipmentGridView.hpp index 9e36793e6..3cb06b813 100644 --- a/src/openstudio_lib/FacilityExteriorEquipmentGridView.hpp +++ b/src/openstudio_lib/FacilityExteriorEquipmentGridView.hpp @@ -45,19 +45,19 @@ class FacilityExteriorEquipmentGridView : public GridViewSubTab { Q_OBJECT - public: + public: FacilityExteriorEquipmentGridView(bool isIP, const model::Model& model, QWidget* parent = 0); virtual ~FacilityExteriorEquipmentGridView() {} - private: + private: REGISTER_LOGGER("openstudio.FacilityExteriorEquipmentGridView"); virtual void addObject(const openstudio::IddObjectType& iddObjectType) override; virtual void purgeObjects(const openstudio::IddObjectType& iddObjectType) override; - protected slots: + protected slots: virtual void onSelectItem() override; @@ -69,7 +69,7 @@ class FacilityExteriorEquipmentGridController : public OSGridController Q_OBJECT - public: + public: FacilityExteriorEquipmentGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -79,7 +79,7 @@ class FacilityExteriorEquipmentGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -88,7 +88,7 @@ class FacilityExteriorEquipmentGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); diff --git a/src/openstudio_lib/FacilityShadingGridView.hpp b/src/openstudio_lib/FacilityShadingGridView.hpp index d9a7121d8..1ab1593f1 100644 --- a/src/openstudio_lib/FacilityShadingGridView.hpp +++ b/src/openstudio_lib/FacilityShadingGridView.hpp @@ -50,7 +50,7 @@ class FacilityShadingGridView : public GridViewSubTab { Q_OBJECT - public: + public: FacilityShadingGridView(bool isIP, const model::Model& model, QWidget* parent = 0); virtual ~FacilityShadingGridView() {} @@ -67,7 +67,7 @@ class FacilityShadingGridView : public GridViewSubTab QLineEdit* m_orientationLessThanFilter = nullptr; - private: + private: REGISTER_LOGGER("openstudio.FacilityShadingGridView"); virtual void addObject(const openstudio::IddObjectType& iddObjectType) override; @@ -86,13 +86,13 @@ class FacilityShadingGridView : public GridViewSubTab std::set m_objectsFilteredByOrientation; - protected slots: + protected slots: virtual void onSelectItem() override; virtual void onClearSelection() override; - private slots: + private slots: void tiltFilterChanged(); @@ -108,7 +108,7 @@ class FacilityShadingGridController : public OSGridController Q_OBJECT - public: + public: FacilityShadingGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -118,7 +118,7 @@ class FacilityShadingGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -127,7 +127,7 @@ class FacilityShadingGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/FacilityStoriesGridView.hpp b/src/openstudio_lib/FacilityStoriesGridView.hpp index 2627e637a..e6c4b7ee6 100644 --- a/src/openstudio_lib/FacilityStoriesGridView.hpp +++ b/src/openstudio_lib/FacilityStoriesGridView.hpp @@ -47,12 +47,12 @@ class FacilityStoriesGridView : public GridViewSubTab { Q_OBJECT - public: + public: FacilityStoriesGridView(bool isIP, const model::Model& model, QWidget* parent = 0); virtual ~FacilityStoriesGridView() {} - private: + private: REGISTER_LOGGER("openstudio.FacilityStoriesGridView"); virtual void addObject(const IddObjectType& iddObjectType) override; @@ -65,13 +65,13 @@ class FacilityStoriesGridView : public GridViewSubTab QLineEdit* m_greaterThanFilter = nullptr; - protected slots: + protected slots: virtual void onSelectItem() override; virtual void onClearSelection() override; - private slots: + private slots: void greaterThanFilterChanged(); @@ -83,7 +83,7 @@ class FacilityStoriesGridController : public OSGridController Q_OBJECT - public: + public: FacilityStoriesGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -93,7 +93,7 @@ class FacilityStoriesGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -102,7 +102,7 @@ class FacilityStoriesGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/FacilityTabController.hpp b/src/openstudio_lib/FacilityTabController.hpp index 5ebd1d665..d9e351554 100644 --- a/src/openstudio_lib/FacilityTabController.hpp +++ b/src/openstudio_lib/FacilityTabController.hpp @@ -38,12 +38,12 @@ class FacilityTabController : public MainTabController { Q_OBJECT - public: + public: FacilityTabController(bool isIP, const model::Model& model); virtual ~FacilityTabController(); - private: + private: enum TabID { BUILDING, @@ -60,7 +60,7 @@ class FacilityTabController : public MainTabController int m_currentIndex = -1; - public slots: + public slots: void toggleUnits(bool displayIP); diff --git a/src/openstudio_lib/FacilityTabView.hpp b/src/openstudio_lib/FacilityTabView.hpp index 97dca51c6..ed4b4e5b0 100644 --- a/src/openstudio_lib/FacilityTabView.hpp +++ b/src/openstudio_lib/FacilityTabView.hpp @@ -46,12 +46,12 @@ class FacilityTabView : public MainTabView { Q_OBJECT - public: + public: FacilityTabView(QWidget* parent = nullptr); virtual ~FacilityTabView() {} - public slots: + public slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/GasEquipmentInspectorView.hpp b/src/openstudio_lib/GasEquipmentInspectorView.hpp index 8683d3e94..b309c5747 100644 --- a/src/openstudio_lib/GasEquipmentInspectorView.hpp +++ b/src/openstudio_lib/GasEquipmentInspectorView.hpp @@ -45,20 +45,20 @@ class GasEquipmentDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: GasEquipmentDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~GasEquipmentDefinitionInspectorView() {} - signals: + signals: - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::GasEquipmentDefinition& gasEquipmentDefinition); void detach(); @@ -85,7 +85,7 @@ class GasEquipmentDefinitionInspectorView : public ModelObjectInspectorView boost::optional m_gasEquipmentDefinition; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/GeometryEditorController.hpp b/src/openstudio_lib/GeometryEditorController.hpp index 7721c1b04..9938f16c8 100644 --- a/src/openstudio_lib/GeometryEditorController.hpp +++ b/src/openstudio_lib/GeometryEditorController.hpp @@ -41,14 +41,14 @@ class GeometryEditorController : public OSQObjectController { Q_OBJECT - public: + public: GeometryEditorController(bool isIP, const model::Model& model); virtual ~GeometryEditorController(); QWidget* view() const; - protected: + protected: QWidget* m_view; }; diff --git a/src/openstudio_lib/GeometryEditorView.hpp b/src/openstudio_lib/GeometryEditorView.hpp index 1e9df2e78..2368d20e3 100644 --- a/src/openstudio_lib/GeometryEditorView.hpp +++ b/src/openstudio_lib/GeometryEditorView.hpp @@ -53,12 +53,12 @@ class GeometryEditorView : public QWidget { Q_OBJECT - public: + public: GeometryEditorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~GeometryEditorView(); - private: + private: }; // debug widget @@ -66,11 +66,11 @@ class DebugWebView : public QDialog { Q_OBJECT; - public: + public: DebugWebView(const QString& debugPort, QWidget* parent = nullptr); virtual ~DebugWebView(); - private: + private: QWebEngineView* m_view; }; @@ -80,7 +80,7 @@ class BaseEditor : public QObject { Q_OBJECT; - public: + public: BaseEditor(bool isIP, const openstudio::model::Model& model, QWebEngineView* m_view, QWidget* t_parent = nullptr); virtual ~BaseEditor(); @@ -91,7 +91,7 @@ class BaseEditor : public QObject model::Model exportModel() const; std::map exportModelHandleMapping() const; - public slots: + public slots: virtual void loadEditor() = 0; virtual void doExport() = 0; virtual void saveExport() = 0; @@ -101,11 +101,11 @@ class BaseEditor : public QObject virtual void onChanged(); - signals: + signals: bool changed(); - protected: + protected: bool m_editorLoaded; bool m_javascriptRunning; unsigned m_versionNumber; @@ -126,12 +126,12 @@ class FloorspaceEditor : public BaseEditor { Q_OBJECT; - public: + public: FloorspaceEditor(const openstudio::path& floorplanPath, bool isIP, const openstudio::model::Model& model, QWebEngineView* m_view, QWidget* t_parent = nullptr); virtual ~FloorspaceEditor(); - public slots: + public slots: virtual void loadEditor(); virtual void doExport(); virtual void saveExport(); @@ -139,7 +139,7 @@ class FloorspaceEditor : public BaseEditor virtual void updateModel(const openstudio::model::Model& model); virtual void checkForUpdate(); - private: + private: openstudio::path m_floorplanPath; boost::optional m_floorplan; }; @@ -148,12 +148,12 @@ class GbXmlEditor : public BaseEditor { Q_OBJECT; - public: + public: GbXmlEditor(const openstudio::path& gbXmlPath, bool isIP, const openstudio::model::Model& model, QWebEngineView* m_view, QWidget* t_parent = nullptr); virtual ~GbXmlEditor(); - public slots: + public slots: virtual void loadEditor(); virtual void doExport(); virtual void saveExport(); @@ -161,7 +161,7 @@ class GbXmlEditor : public BaseEditor virtual void updateModel(const openstudio::model::Model& model); virtual void checkForUpdate(); - private: + private: openstudio::path m_gbXmlPath; QString m_gbXML; }; @@ -170,12 +170,12 @@ class IdfEditor : public BaseEditor { Q_OBJECT; - public: + public: IdfEditor(const openstudio::path& idfPath, bool forceConvert, bool isIP, const openstudio::model::Model& model, QWebEngineView* m_view, QWidget* t_parent = nullptr); virtual ~IdfEditor(); - public slots: + public slots: virtual void loadEditor(); virtual void doExport(); virtual void saveExport(); @@ -183,7 +183,7 @@ class IdfEditor : public BaseEditor virtual void updateModel(const openstudio::model::Model& model); virtual void checkForUpdate(); - private: + private: openstudio::path m_idfPath; QString m_jdf; }; @@ -192,11 +192,11 @@ class OsmEditor : public BaseEditor { Q_OBJECT; - public: + public: OsmEditor(const openstudio::path& osmPath, bool isIP, const openstudio::model::Model& model, QWebEngineView* m_view, QWidget* t_parent = nullptr); virtual ~OsmEditor(); - public slots: + public slots: virtual void loadEditor(); virtual void doExport(); virtual void saveExport(); @@ -204,7 +204,7 @@ class OsmEditor : public BaseEditor virtual void updateModel(const openstudio::model::Model& model); virtual void checkForUpdate(); - private: + private: openstudio::path m_osmPath; }; @@ -213,14 +213,14 @@ class EditorWebView : public QWidget { Q_OBJECT; - public: + public: EditorWebView(bool isIP, const openstudio::model::Model& model, QWidget* t_parent = nullptr); virtual ~EditorWebView(); - public slots: + public slots: void onUnitSystemChange(bool t_isIP); - private slots: + private slots: void geometrySourceChanged(const QString& text); void newImportClicked(); void refreshClicked(); @@ -237,7 +237,7 @@ class EditorWebView : public QWidget void onLoadStarted(); void onRenderProcessTerminated(QWebEnginePage::RenderProcessTerminationStatus terminationStatus, int exitCode); - private: + private: REGISTER_LOGGER("openstudio::EditorWebView"); openstudio::path floorplanPath() const; diff --git a/src/openstudio_lib/GeometryPreviewController.hpp b/src/openstudio_lib/GeometryPreviewController.hpp index edde22f45..abf6617dd 100644 --- a/src/openstudio_lib/GeometryPreviewController.hpp +++ b/src/openstudio_lib/GeometryPreviewController.hpp @@ -41,14 +41,14 @@ class GeometryPreviewController : public OSQObjectController { Q_OBJECT - public: + public: GeometryPreviewController(bool isIP, const model::Model& model); virtual ~GeometryPreviewController(); QWidget* view() const; - protected: + protected: QWidget* m_view; }; diff --git a/src/openstudio_lib/GeometryPreviewView.hpp b/src/openstudio_lib/GeometryPreviewView.hpp index bfe89d00f..74ed548ee 100644 --- a/src/openstudio_lib/GeometryPreviewView.hpp +++ b/src/openstudio_lib/GeometryPreviewView.hpp @@ -51,12 +51,12 @@ class GeometryPreviewView : public QWidget { Q_OBJECT - public: + public: GeometryPreviewView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~GeometryPreviewView(); - private: + private: }; // main widget @@ -65,14 +65,14 @@ class PreviewWebView : public QWidget { Q_OBJECT; - public: + public: PreviewWebView(bool isIP, const openstudio::model::Model& model, QWidget* t_parent = nullptr); virtual ~PreviewWebView(); - public slots: + public slots: void onUnitSystemChange(bool t_isIP); - private slots: + private slots: void refreshClicked(); // DLM: for debugging @@ -83,7 +83,7 @@ class PreviewWebView : public QWidget void onJavaScriptFinished(const QVariant& v); void onRenderProcessTerminated(QWebEnginePage::RenderProcessTerminationStatus terminationStatus, int exitCode); - private: + private: REGISTER_LOGGER("openstudio::PreviewWebView"); bool m_isIP; diff --git a/src/openstudio_lib/GeometryTabController.hpp b/src/openstudio_lib/GeometryTabController.hpp index 191e56c28..5b6b10c39 100644 --- a/src/openstudio_lib/GeometryTabController.hpp +++ b/src/openstudio_lib/GeometryTabController.hpp @@ -41,7 +41,7 @@ class GeometryTabController : public MainTabController { Q_OBJECT - public: + public: GeometryTabController(bool isIP, const openstudio::model::Model& model); virtual ~GeometryTabController(); @@ -52,7 +52,7 @@ class GeometryTabController : public MainTabController EDITOR }; - private: + private: model::Model m_model; bool m_isIP; @@ -61,7 +61,7 @@ class GeometryTabController : public MainTabController int m_currentIndex = -1; - public slots: + public slots: virtual void setSubTab(int index) override; }; diff --git a/src/openstudio_lib/GeometryTabView.hpp b/src/openstudio_lib/GeometryTabView.hpp index 78ab46a53..d835b1783 100644 --- a/src/openstudio_lib/GeometryTabView.hpp +++ b/src/openstudio_lib/GeometryTabView.hpp @@ -38,7 +38,7 @@ class GeometryTabView : public MainTabView { Q_OBJECT - public: + public: GeometryTabView(const model::Model& model, const QString& tabLabel, QWidget* parent = nullptr); virtual ~GeometryTabView() {} }; diff --git a/src/openstudio_lib/GridItem.hpp b/src/openstudio_lib/GridItem.hpp index e57b1db8c..cce229df5 100644 --- a/src/openstudio_lib/GridItem.hpp +++ b/src/openstudio_lib/GridItem.hpp @@ -57,7 +57,7 @@ class ModelObjectGraphicsItem : public QGraphicsObject, public Nano::Observer { Q_OBJECT; - public: + public: ModelObjectGraphicsItem(QGraphicsItem* parent = nullptr); ~ModelObjectGraphicsItem() {} @@ -80,7 +80,7 @@ class ModelObjectGraphicsItem : public QGraphicsObject, public Nano::Observer void setDeletable(bool deletable); - signals: + signals: void modelObjectSelected(model::OptionalModelObject&, bool readOnly); @@ -92,7 +92,7 @@ class ModelObjectGraphicsItem : public QGraphicsObject, public Nano::Observer void innerNodeClicked(model::ModelObject&); - protected: + protected: QVariant itemChange(GraphicsItemChange change, const QVariant& value) override; bool m_deleteAble; @@ -105,7 +105,7 @@ class ModelObjectGraphicsItem : public QGraphicsObject, public Nano::Observer bool m_enableHighlight; - private slots: + private slots: void onNameChange(); @@ -116,7 +116,7 @@ class GridItem : public ModelObjectGraphicsItem { Q_OBJECT; - public: + public: GridItem(QGraphicsItem* parent = nullptr); virtual ~GridItem() {} @@ -137,7 +137,7 @@ class GridItem : public ModelObjectGraphicsItem int getVGridLength(); - protected: + protected: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; int m_hLength; @@ -149,26 +149,26 @@ class NodeContextButtonItem : public ButtonItem { Q_OBJECT; - public: + public: NodeContextButtonItem(GridItem* parent); - signals: + signals: void removeModelObjectClicked(model::ModelObject&); - private slots: + private slots: void showContextMenu(); void onRemoveSPMActionTriggered(); - private: + private: QMenu* m_menu; }; class SplitterItem : public GridItem { - public: + public: SplitterItem(QGraphicsItem* parent = nullptr); void setNumberBranches(int branches); @@ -192,7 +192,7 @@ class SplitterItem : public GridItem void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: std::vector m_terminalTypes; int m_numberBranches; int m_firstDuct1Index; @@ -201,7 +201,7 @@ class SplitterItem : public GridItem class MixerItem : public GridItem { - public: + public: MixerItem(QGraphicsItem* parent = nullptr); void setNumberBranches(int branches); @@ -210,13 +210,13 @@ class MixerItem : public GridItem void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: int m_numberBranches; }; class SupplySplitterItem : public GridItem { - public: + public: SupplySplitterItem(QGraphicsItem* parent = nullptr); void setNumberBranches(int branches); @@ -232,13 +232,13 @@ class SupplySplitterItem : public GridItem void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: std::vector m_baselineBranchPositions; }; class SupplyMixerItem : public GridItem { - public: + public: SupplyMixerItem(QGraphicsItem* parent = nullptr); void setNumberBranches(int branches); @@ -247,20 +247,20 @@ class SupplyMixerItem : public GridItem void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: int m_numberBranches; }; class OneThreeNodeItem : public GridItem { - public: + public: OneThreeNodeItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void setModelObject(model::OptionalModelObject modelObject) override; - private: + private: QPointer m_contextButton; }; @@ -268,7 +268,7 @@ class OneThreeNodeItem : public GridItem // Used after the zone splitter, going into the zone terminal class OneThreeDualDuctItem : public GridItem { - public: + public: OneThreeDualDuctItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -277,13 +277,13 @@ class OneThreeDualDuctItem : public GridItem void setModelObject2(model::OptionalModelObject modelObject); - private: + private: boost::optional m_modelObject2; }; class FourFiveNodeItem : public GridItem { - public: + public: FourFiveNodeItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -291,7 +291,7 @@ class FourFiveNodeItem : public GridItem class TwoFiveNodeItem : public GridItem { - public: + public: TwoFiveNodeItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -299,22 +299,22 @@ class TwoFiveNodeItem : public GridItem class OneThreeStraightItem : public GridItem { - public: + public: // if dual is true there are two parallel lines OneThreeStraightItem(QGraphicsItem* parent = nullptr, bool dualDuct = false); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - protected: + protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; - private: + private: bool m_dualDuct; }; class OneThreeDualDuctMixerItem : public GridItem { - public: + public: // if dual is true there are two parallel lines OneThreeDualDuctMixerItem(QGraphicsItem* parent = nullptr, bool dualDuct = false); @@ -323,27 +323,27 @@ class OneThreeDualDuctMixerItem : public GridItem class SupplyPlenumItem : public GridItem { - public: + public: SupplyPlenumItem(const model::ModelObject& modelObject, QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void setModelObject(model::OptionalModelObject modelObject) override; - private: + private: QColor m_color; }; class ReturnPlenumItem : public GridItem { - public: + public: ReturnPlenumItem(const model::ModelObject& modelObject, QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void setModelObject(model::OptionalModelObject modelObject) override; - private: + private: QColor m_color; }; @@ -351,18 +351,18 @@ class LinkItem : public QGraphicsObject { Q_OBJECT; - public: + public: LinkItem(QGraphicsItem* parent = nullptr); virtual ~LinkItem() {} QRectF boundingRect() const override; - signals: + signals: void mouseClicked(); - protected: + protected: void mousePressEvent(QGraphicsSceneMouseEvent* event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; @@ -373,7 +373,7 @@ class LinkItem : public QGraphicsObject void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: bool m_mouseDown; bool m_isHovering; @@ -383,7 +383,7 @@ class OneThreeWaterToAirItem : public GridItem { Q_OBJECT; - public: + public: OneThreeWaterToAirItem(QGraphicsItem* parent = nullptr); virtual ~OneThreeWaterToAirItem() {} @@ -392,14 +392,14 @@ class OneThreeWaterToAirItem : public GridItem void setModelObject(model::OptionalModelObject modelObject) override; - private slots: + private slots: void onLinkItemClicked(); - protected: + protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; - private: + private: bool m_showLinks; }; @@ -407,7 +407,7 @@ class OneThreeWaterToWaterItem : public GridItem { Q_OBJECT; - public: + public: OneThreeWaterToWaterItem(QGraphicsItem* parent = nullptr); virtual ~OneThreeWaterToWaterItem() {} @@ -416,14 +416,14 @@ class OneThreeWaterToWaterItem : public GridItem void setModelObject(model::OptionalModelObject modelObject) override; - private slots: + private slots: void onLinkItemClicked(); - protected: + protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; - private: + private: bool m_showLinks; }; @@ -456,7 +456,7 @@ class OneThreeWaterToWaterItem : public GridItem class TwoFourStraightItem : public GridItem { - public: + public: TwoFourStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -464,42 +464,42 @@ class TwoFourStraightItem : public GridItem class OASupplyStraightItem : public GridItem { - public: + public: OASupplyStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - protected: + protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; }; class OAReliefStraightItem : public GridItem { - public: + public: OAReliefStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - protected: + protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; }; class OAStraightNodeItem : public GridItem { - public: + public: OAStraightNodeItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void setModelObject(model::OptionalModelObject modelObject) override; - private: + private: QPointer m_contextButton; }; class OASupplyBranchItem : public GridItem { - public: + public: OASupplyBranchItem(std::vector supplyModelObjects, std::vector reliefModelObjects, QGraphicsItem* parent = nullptr); @@ -507,7 +507,7 @@ class OASupplyBranchItem : public GridItem void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: std::vector m_gridItems; std::vector m_paddingItems; @@ -515,7 +515,7 @@ class OASupplyBranchItem : public GridItem class OAReliefBranchItem : public GridItem { - public: + public: OAReliefBranchItem(std::vector reliefModelObjects, std::vector supplyModelObjects, QGraphicsItem* parent = nullptr); @@ -523,7 +523,7 @@ class OAReliefBranchItem : public GridItem void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: std::vector m_gridItems; std::vector m_paddingItems; @@ -531,7 +531,7 @@ class OAReliefBranchItem : public GridItem class OAEndNodeItem : public GridItem { - public: + public: OAEndNodeItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -539,7 +539,7 @@ class OAEndNodeItem : public GridItem class OAAirToAirItem : public GridItem { - public: + public: OAAirToAirItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -547,7 +547,7 @@ class OAAirToAirItem : public GridItem class FourTwoStraightItem : public GridItem { - public: + public: FourTwoStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -555,20 +555,20 @@ class FourTwoStraightItem : public GridItem class TwoFourNodeItem : public GridItem { - public: + public: TwoFourNodeItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void setModelObject(model::OptionalModelObject modelObject) override; - private: + private: QPointer m_contextButton; }; class OneFourStraightItem : public GridItem { - public: + public: OneFourStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -576,7 +576,7 @@ class OneFourStraightItem : public GridItem class ThreeFourStraightItem : public GridItem { - public: + public: ThreeFourStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -584,7 +584,7 @@ class ThreeFourStraightItem : public GridItem class TwoThreeStraightItem : public GridItem { - public: + public: TwoThreeStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -592,7 +592,7 @@ class TwoThreeStraightItem : public GridItem class OneTwoStraightItem : public GridItem { - public: + public: OneTwoStraightItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -600,19 +600,19 @@ class OneTwoStraightItem : public GridItem class OAMixerItem : public GridItem { - public: + public: OAMixerItem(QGraphicsItem* parent = nullptr); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - protected: + protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; }; // These are used inside dual duct items that combine two paths inside one GridItem class HalfHeightItem : public ModelObjectGraphicsItem { - public: + public: HalfHeightItem(QGraphicsItem* parent = nullptr); virtual ~HalfHeightItem() {} @@ -622,29 +622,29 @@ class HalfHeightItem : public ModelObjectGraphicsItem class HalfHeightOneThreeStraightItem : public HalfHeightItem { - public: + public: HalfHeightOneThreeStraightItem(QGraphicsItem* parent = nullptr); virtual ~HalfHeightOneThreeStraightItem() {} - protected: + protected: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class HalfHeightOneThreeNodeItem : public HalfHeightItem { - public: + public: HalfHeightOneThreeNodeItem(QGraphicsItem* parent = nullptr); virtual ~HalfHeightOneThreeNodeItem() {} - protected: + protected: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class HorizontalBranchItem : public GridItem { - public: + public: // Dual duct means there will be two parallel paths within one item HorizontalBranchItem(std::vector modelObjects, QGraphicsItem* parent = nullptr, bool dualDuct = false); @@ -671,12 +671,12 @@ class HorizontalBranchItem : public GridItem void setModelObject(model::OptionalModelObject modelObject) override; - protected: + protected: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void dropEvent(QGraphicsSceneDragDropEvent* event) override; - private: + private: std::vector m_gridItems; std::vector m_paddingItems; @@ -692,7 +692,7 @@ class HorizontalBranchItem : public GridItem class HorizontalBranchGroupItem : public GridItem { - public: + public: HorizontalBranchGroupItem(model::Splitter& splitter, model::Mixer& mixer, QGraphicsItem* parent = nullptr); HorizontalBranchGroupItem(model::Splitter& splitter, std::vector& supplyOutletNodes, QGraphicsItem* parent); @@ -710,10 +710,10 @@ class HorizontalBranchGroupItem : public GridItem // for each branch. std::vector branchBaselineGridPositions() const; - protected: + protected: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: model::Splitter m_splitter; std::vector m_branchItems; HorizontalBranchItem* m_dropZoneBranchItem; @@ -721,17 +721,17 @@ class HorizontalBranchGroupItem : public GridItem class VerticalBranchItem : public GridItem { - public: + public: VerticalBranchItem(std::vector modelObjects, QGraphicsItem* parent = nullptr); void setPadding(unsigned); void layout(); - protected: + protected: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: std::vector m_gridItems; std::vector m_paddingItems; @@ -739,14 +739,14 @@ class VerticalBranchItem : public GridItem class ReverseVerticalBranchItem : public GridItem { - public: + public: ReverseVerticalBranchItem(std::vector modelObjects, QGraphicsItem* parent = nullptr); void setPadding(unsigned); void layout(); - private: + private: std::vector m_gridItems; std::vector m_paddingItems; @@ -758,26 +758,26 @@ class ReverseVerticalBranchItem : public GridItem // into the same grid items (ie one grid item show both streams). class DualDuctTee : public GridItem { - public: + public: DualDuctTee(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; // This is the elbow used on the demand side of a dual duct class TwoThreeStraightItem2 : public GridItem { - public: + public: TwoThreeStraightItem2(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class DemandSideItem : public GridItem { - public: + public: DemandSideItem(QGraphicsItem* parent, std::vector demandInletNodes, model::Node demandOutletNode); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -790,7 +790,7 @@ class DemandSideItem : public GridItem int numberBranches(); - private: + private: std::vector m_demandInletNodes; model::Node m_demandOutletNode; @@ -834,15 +834,15 @@ class DemandSideItem : public GridItem class OASystemItem : public GridItem { - public: + public: OASystemItem(model::AirLoopHVACOutdoorAirSystem& oaSystem, QGraphicsItem* parent = nullptr); - protected: + protected: void layout(); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: OAMixerItem* m_oaMixerItem; OASupplyBranchItem* m_oaBranch; @@ -856,7 +856,7 @@ class OASystemItem : public GridItem class SupplySideItem : public GridItem { - public: + public: SupplySideItem(QGraphicsItem* parent, model::Node supplyInletNode, std::vector supplyOutletNodes); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; @@ -869,7 +869,7 @@ class SupplySideItem : public GridItem int numberBranches(); - private: + private: model::Node m_supplyInletNode; std::vector m_supplyOutletNodes; @@ -913,19 +913,19 @@ class SupplySideItem : public GridItem class SystemCenterItem : public GridItem { - public: + public: SystemCenterItem(QGraphicsItem* parent, model::Loop loop); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: bool m_supplyDualDuct; bool m_demandDualDuct; }; class SystemItem : public GridItem { - public: + public: SystemItem(model::Loop loop, LoopScene* loopScene); virtual ~SystemItem(); @@ -934,7 +934,7 @@ class SystemItem : public GridItem QColor plenumColor(const Handle& plenumHandle); - private: + private: model::Loop m_loop; LoopScene* m_loopScene; @@ -953,19 +953,19 @@ class SystemItem : public GridItem class OneTwoFourStraightItem : public GridItem { - public: + public: OneTwoFourStraightItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class TwoThreeFourStraightItem : public GridItem { - public: + public: TwoThreeFourStraightItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; diff --git a/src/openstudio_lib/GridScene.hpp b/src/openstudio_lib/GridScene.hpp index 5c9a84653..977b3b7ab 100644 --- a/src/openstudio_lib/GridScene.hpp +++ b/src/openstudio_lib/GridScene.hpp @@ -45,12 +45,12 @@ class GridScene : public QGraphicsScene, public Nano::Observer { Q_OBJECT - public: + public: GridScene(QObject* parent = nullptr); virtual ~GridScene() {} - signals: + signals: void modelObjectSelected(model::OptionalModelObject&, bool readOnly); @@ -62,7 +62,7 @@ class GridScene : public QGraphicsScene, public Nano::Observer void innerNodeClicked(model::ModelObject&); - protected: + protected: QRectF getCell(int x, int y); QRectF getCell(QPointF point); diff --git a/src/openstudio_lib/GridViewSubTab.hpp b/src/openstudio_lib/GridViewSubTab.hpp index 0bf5cbef6..782e28c5f 100644 --- a/src/openstudio_lib/GridViewSubTab.hpp +++ b/src/openstudio_lib/GridViewSubTab.hpp @@ -53,14 +53,14 @@ class GridViewSubTab : public QWidget { Q_OBJECT - public: + public: GridViewSubTab(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~GridViewSubTab() {} openstudio::IddObjectType m_iddObjectType; - protected: + protected: void setGridView(OSGridView* gridView); void setGridController(OSGridController* gridController); @@ -91,7 +91,7 @@ class GridViewSubTab : public QWidget OSItemSelectorButtons* m_itemSelectorButtons = nullptr; - signals: + signals: void toggleUnitsClicked(bool displayIP); @@ -99,13 +99,13 @@ class GridViewSubTab : public QWidget void selectionCleared(); - public slots: + public slots: void onDropZoneItemClicked(OSItem* item); void gridRowSelectionChanged(int checkState); - protected slots: + protected slots: void onAddClicked(); diff --git a/src/openstudio_lib/HVACSystemsController.hpp b/src/openstudio_lib/HVACSystemsController.hpp index 7e17797a4..c18374801 100644 --- a/src/openstudio_lib/HVACSystemsController.hpp +++ b/src/openstudio_lib/HVACSystemsController.hpp @@ -89,7 +89,7 @@ class HVACSystemsController : public QObject, public Nano::Observer { Q_OBJECT - public: + public: enum SceneType { TOPOLOGY, @@ -119,13 +119,13 @@ class HVACSystemsController : public QObject, public Nano::Observer void clearSceneSelection(); - public slots: + public slots: void updateLater(); // void dropZoneItemSelected(OSItem* item); - private slots: + private slots: void update(); @@ -157,7 +157,7 @@ class HVACSystemsController : public QObject, public Nano::Observer void toggleUnits(bool displayIP); - private: + private: REGISTER_LOGGER("openstudio.openstudio_lib.HVACSystemsController"); std::vector systemComboBoxTypes() const; @@ -184,7 +184,7 @@ class HVACSystemsController : public QObject, public Nano::Observer bool m_isIP; - signals: + signals: void toggleUnitsClicked(bool displayIP); }; @@ -193,7 +193,7 @@ class HVACControlsController : public QObject, public Nano::Observer { Q_OBJECT; - public: + public: HVACControlsController(HVACSystemsController* hvacSystemsController); virtual ~HVACControlsController(); @@ -208,11 +208,11 @@ class HVACControlsController : public QObject, public Nano::Observer boost::optional plantLoop() const; - public slots: + public slots: void updateLater(); - private slots: + private slots: void update(); @@ -228,7 +228,7 @@ class HVACControlsController : public QObject, public Nano::Observer // void onDropZoneItemClicked(OSItem* item); - private: + private: QPointer m_hvacAirLoopControlsView; QPointer m_hvacPlantLoopControlsView; @@ -266,7 +266,7 @@ class HVACLayoutController : public QObject, public Nano::Observer { Q_OBJECT; - public: + public: HVACLayoutController(HVACSystemsController* hvacSystemsController); virtual ~HVACLayoutController(); @@ -277,11 +277,11 @@ class HVACLayoutController : public QObject, public Nano::Observer void clearSceneSelection(); - public slots: + public slots: void updateLater(); - private slots: + private slots: void update(); @@ -297,7 +297,7 @@ class HVACLayoutController : public QObject, public Nano::Observer void goToServiceWaterScene(); - private: + private: QPointer m_hvacGraphicsView; QPointer m_hvacSystemsController; @@ -311,7 +311,7 @@ class SystemAvailabilityVectorController : public ModelObjectVectorController { Q_OBJECT; - public: + public: SystemAvailabilityVectorController(); virtual ~SystemAvailabilityVectorController(); @@ -322,7 +322,7 @@ class SystemAvailabilityVectorController : public ModelObjectVectorController void detach(); - public slots: + public slots: void reportItemsLater(); @@ -330,14 +330,14 @@ class SystemAvailabilityVectorController : public ModelObjectVectorController void onDropZoneItemClicked(OSItem* item); - protected: + protected: std::vector makeVector() override; void onReplaceItem(OSItem* currentItem, const OSItemId& replacementItemId) override; void onDrop(const OSItemId& itemId) override; - private: + private: bool m_reportScheduled; QMutex* m_reportItemsMutex; @@ -347,7 +347,7 @@ class SupplyAirTempScheduleVectorController : public ModelObjectVectorController { Q_OBJECT; - public: + public: SupplyAirTempScheduleVectorController(); virtual ~SupplyAirTempScheduleVectorController(); @@ -358,7 +358,7 @@ class SupplyAirTempScheduleVectorController : public ModelObjectVectorController void detach(); - public slots: + public slots: void reportItemsLater(); @@ -366,14 +366,14 @@ class SupplyAirTempScheduleVectorController : public ModelObjectVectorController void onDropZoneItemClicked(OSItem* item); - protected: + protected: std::vector makeVector() override; void onReplaceItem(OSItem* currentItem, const OSItemId& replacementItemId) override; void onDrop(const OSItemId& itemId) override; - private: + private: bool m_reportScheduled; QMutex* m_reportItemsMutex; @@ -383,7 +383,7 @@ class AvailabilityManagerObjectVectorController : public ModelObjectVectorContro { Q_OBJECT; - public: + public: AvailabilityManagerObjectVectorController(); virtual ~AvailabilityManagerObjectVectorController(); @@ -396,7 +396,7 @@ class AvailabilityManagerObjectVectorController : public ModelObjectVectorContro boost::optional avmList(); - public slots: + public slots: void reportItemsLater(); @@ -404,7 +404,7 @@ class AvailabilityManagerObjectVectorController : public ModelObjectVectorContro void onDropZoneItemClicked(OSItem* item); - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual void onDataChange(const model::ModelObject& modelObject) override; @@ -417,7 +417,7 @@ class AvailabilityManagerObjectVectorController : public ModelObjectVectorContro virtual void onDrop(const OSItemId& itemId) override; - private: + private: bool m_reportScheduled; QMutex* m_reportItemsMutex; diff --git a/src/openstudio_lib/HVACSystemsTabController.hpp b/src/openstudio_lib/HVACSystemsTabController.hpp index e6facd96c..37a13bf1f 100644 --- a/src/openstudio_lib/HVACSystemsTabController.hpp +++ b/src/openstudio_lib/HVACSystemsTabController.hpp @@ -41,23 +41,23 @@ class HVACSystemsTabController : public MainTabController { Q_OBJECT - public: + public: HVACSystemsTabController(bool isIP, const model::Model& model); virtual ~HVACSystemsTabController() {} void clearSceneSelection(); - private: + private: std::shared_ptr m_hvacSystemsController; bool m_isIP; - signals: + signals: void toggleUnitsClicked(bool displayIP); - private slots: + private slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/HVACSystemsTabView.hpp b/src/openstudio_lib/HVACSystemsTabView.hpp index 6a3387271..10b46b4a3 100644 --- a/src/openstudio_lib/HVACSystemsTabView.hpp +++ b/src/openstudio_lib/HVACSystemsTabView.hpp @@ -38,7 +38,7 @@ class HVACSystemsTabView : public MainTabView { Q_OBJECT - public: + public: HVACSystemsTabView(QWidget* parent = nullptr); virtual ~HVACSystemsTabView(){}; diff --git a/src/openstudio_lib/HVACSystemsView.hpp b/src/openstudio_lib/HVACSystemsView.hpp index 22a4d4380..518253f38 100644 --- a/src/openstudio_lib/HVACSystemsView.hpp +++ b/src/openstudio_lib/HVACSystemsView.hpp @@ -55,7 +55,7 @@ class HVACSystemsView : public QWidget { Q_OBJECT - public: + public: HVACSystemsView(); virtual ~HVACSystemsView() {} @@ -66,7 +66,7 @@ class HVACSystemsView : public QWidget QSize sizeHint() const override; - protected: + protected: void paintEvent(QPaintEvent* event) override; }; @@ -74,7 +74,7 @@ class HVACToolbarView : public QWidget { Q_OBJECT - public: + public: HVACToolbarView(); virtual ~HVACToolbarView(); @@ -103,10 +103,10 @@ class HVACToolbarView : public QWidget // If control buttons are hidden only the systemComboBox and label are shown. void showControls(bool show); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: QStackedWidget* m_viewStack; }; @@ -114,12 +114,12 @@ class HVACGraphicsView : public QGraphicsView { Q_OBJECT - public: + public: HVACGraphicsView(QWidget* parent = nullptr); virtual ~HVACGraphicsView() {} - public slots: + public slots: void zoomIn(); @@ -127,7 +127,7 @@ class HVACGraphicsView : public QGraphicsView void resetZoom(); - private: + private: float m_zoomX; float m_zoomY; @@ -138,7 +138,7 @@ class HVACAirLoopControlsView : public QScrollArea { Q_OBJECT - public: + public: HVACAirLoopControlsView(); virtual ~HVACAirLoopControlsView() {} @@ -164,7 +164,7 @@ class HVACPlantLoopControlsView : public QScrollArea { Q_OBJECT - public: + public: HVACPlantLoopControlsView(); virtual ~HVACPlantLoopControlsView() {} @@ -183,7 +183,7 @@ class MechanicalVentilationView : public QWidget { Q_OBJECT; - public: + public: MechanicalVentilationView(); virtual ~MechanicalVentilationView(); @@ -199,7 +199,7 @@ class NoMechanicalVentilationView : public QWidget { Q_OBJECT; - public: + public: NoMechanicalVentilationView(); virtual ~NoMechanicalVentilationView(); @@ -207,7 +207,7 @@ class NoMechanicalVentilationView : public QWidget class SingleZoneReheatSPMView : public QWidget { - public: + public: SingleZoneReheatSPMView(); virtual ~SingleZoneReheatSPMView(); @@ -217,7 +217,7 @@ class SingleZoneReheatSPMView : public QWidget class ScheduledSPMView : public QWidget { - public: + public: ScheduledSPMView(); virtual ~ScheduledSPMView(); @@ -227,7 +227,7 @@ class ScheduledSPMView : public QWidget class FollowOATempSPMView : public QWidget { - public: + public: FollowOATempSPMView(); virtual ~FollowOATempSPMView(); @@ -235,7 +235,7 @@ class FollowOATempSPMView : public QWidget class OAResetSPMView : public QWidget { - public: + public: OAResetSPMView(); virtual ~OAResetSPMView(); @@ -243,7 +243,7 @@ class OAResetSPMView : public QWidget class AirLoopHVACUnitaryHeatPumpAirToAirControlView : public QWidget { - public: + public: AirLoopHVACUnitaryHeatPumpAirToAirControlView(); virtual ~AirLoopHVACUnitaryHeatPumpAirToAirControlView(); @@ -253,7 +253,7 @@ class AirLoopHVACUnitaryHeatPumpAirToAirControlView : public QWidget class NoSupplyAirTempControlView : public QWidget { - public: + public: NoSupplyAirTempControlView(); virtual ~NoSupplyAirTempControlView(); @@ -261,7 +261,7 @@ class NoSupplyAirTempControlView : public QWidget class NoControlsView : public QWidget { - public: + public: NoControlsView(); virtual ~NoControlsView(); diff --git a/src/openstudio_lib/HVACTemplateHelperDialog.hpp b/src/openstudio_lib/HVACTemplateHelperDialog.hpp index 04abf7a73..c60076bcc 100644 --- a/src/openstudio_lib/HVACTemplateHelperDialog.hpp +++ b/src/openstudio_lib/HVACTemplateHelperDialog.hpp @@ -42,14 +42,14 @@ class HVACTemplateHelperDialog : public QDialog { Q_OBJECT; - public: + public: HVACTemplateHelperDialog(const model::Model& model, QWidget* parent = nullptr); virtual ~HVACTemplateHelperDialog() {} std::vector selectedZones(); - private: + private: model::Model m_model; std::vector m_zones; diff --git a/src/openstudio_lib/HorizontalTabWidget.hpp b/src/openstudio_lib/HorizontalTabWidget.hpp index e689f0cb2..11ac20a39 100644 --- a/src/openstudio_lib/HorizontalTabWidget.hpp +++ b/src/openstudio_lib/HorizontalTabWidget.hpp @@ -45,7 +45,7 @@ class HorizontalTabWidget : public QWidget { Q_OBJECT - public: + public: HorizontalTabWidget(QWidget* parent = nullptr); virtual ~HorizontalTabWidget() {} @@ -54,22 +54,22 @@ class HorizontalTabWidget : public QWidget void hideTab(QWidget* widget, bool hide); - public slots: + public slots: void setCurrentId(int id); void setCurrentWidget(QWidget* widget); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private slots: + private slots: void select(); void setCurrentIndex(int index); - private: + private: QStackedWidget* m_pageStack; QWidget* m_tabBar; diff --git a/src/openstudio_lib/IconLibrary.hpp b/src/openstudio_lib/IconLibrary.hpp index 7621a81f6..29bf55a36 100644 --- a/src/openstudio_lib/IconLibrary.hpp +++ b/src/openstudio_lib/IconLibrary.hpp @@ -49,7 +49,7 @@ namespace openstudio { class OPENSTUDIO_API IconLibrary { - public: + public: //! If the class in not instantiated, this call will instantiate it. (So don't ever worry about it, just call Instance when you want to use the class) static IconLibrary& Instance(); /*! gets an Icon @@ -63,8 +63,8 @@ class OPENSTUDIO_API IconLibrary */ const QPixmap* findMiniIcon(unsigned int val) const; - protected: - private: + protected: + private: REGISTER_LOGGER("openstudio.openstudio_lib.IconLibrary"); IconLibrary(); diff --git a/src/openstudio_lib/InspectorController.hpp b/src/openstudio_lib/InspectorController.hpp index 70717759e..bc81fb549 100644 --- a/src/openstudio_lib/InspectorController.hpp +++ b/src/openstudio_lib/InspectorController.hpp @@ -59,14 +59,14 @@ class InspectorController : public QObject { Q_OBJECT - public: + public: InspectorController(); virtual ~InspectorController(); InspectorView* inspectorView(); - signals: + signals: void toggleUnitsClicked(bool displayIP); @@ -76,7 +76,7 @@ class InspectorController : public QObject void workspaceObjectRemoved(); - public slots: + public slots: void layoutModelObject(model::OptionalModelObject&, bool readOnly); @@ -90,11 +90,11 @@ class InspectorController : public QObject void toggleUnits(bool displayIP); - private slots: + private slots: void onViewDestroyed(QObject* object = nullptr); - private: + private: InspectorView* m_inspectorView; boost::optional m_modelObject; diff --git a/src/openstudio_lib/InspectorView.hpp b/src/openstudio_lib/InspectorView.hpp index c11f0e9f7..5978f73ea 100644 --- a/src/openstudio_lib/InspectorView.hpp +++ b/src/openstudio_lib/InspectorView.hpp @@ -72,7 +72,7 @@ class InspectorView : public QWidget { Q_OBJECT; - public: + public: InspectorView(QWidget* parent = nullptr); virtual ~InspectorView() {} @@ -86,7 +86,7 @@ class InspectorView : public QWidget return m_mouseOverInspectorView; }; - signals: + signals: void addZoneClicked(model::ThermalZone&); void removeZoneClicked(model::ThermalZone&); @@ -102,17 +102,17 @@ class InspectorView : public QWidget void moveBranchForZoneToNewSupplyPlenumSelected(model::ThermalZone& zone, const Handle& newPlenumZoneHandle); void moveBranchForZoneToNewReturnPlenumSelected(model::ThermalZone& zone, const Handle& newPlenumZoneHandle); - public slots: + public slots: void layoutModelObject(model::OptionalModelObject&, bool readOnly, bool displayIP); virtual void toggleUnits(bool displayIP); - protected slots: + protected slots: virtual void enterEvent(QEvent* event) override; virtual void leaveEvent(QEvent* event) override; - private: + private: QVBoxLayout* m_vLayout; BaseInspectorView* m_currentView; QStackedWidget* m_stackedWidget; @@ -124,7 +124,7 @@ class BaseInspectorView : public QWidget, public Nano::Observer { Q_OBJECT; - public: + public: BaseInspectorView(QWidget* parent = nullptr); virtual ~BaseInspectorView() {} @@ -137,7 +137,7 @@ class BaseInspectorView : public QWidget, public Nano::Observer LibraryTabWidget* m_libraryTabWidget; - signals: + signals: void toggleUnitsClicked(bool displayIP); @@ -145,10 +145,10 @@ class BaseInspectorView : public QWidget, public Nano::Observer void workspaceObjectRemoved(); - private: + private: QVBoxLayout* m_vLayout; - public slots: + public slots: virtual void toggleUnits(bool displayIP); }; @@ -157,19 +157,19 @@ class GenericInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: GenericInspectorView(QWidget* parent = nullptr); virtual ~GenericInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - private: + private: InspectorGadget* m_inspectorGadget; EMSInspectorView* m_emsActuatorView; EMSInspectorView* m_emsSensorView; - signals: + signals: void removeButtonClicked(bool); }; @@ -178,20 +178,20 @@ class SplitterMixerInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: SplitterMixerInspectorView(QWidget* parent = nullptr); virtual ~SplitterMixerInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addZoneClicked(model::ThermalZone&); void removeZoneClicked(model::ThermalZone&); - private: + private: ZoneChooserView* m_zoneChooserView; }; @@ -199,14 +199,14 @@ class NewPlenumDialog : public QDialog { Q_OBJECT; - public: + public: NewPlenumDialog(QWidget* parent = nullptr); virtual ~NewPlenumDialog() {} QComboBox* zoneChooser; - private slots: + private slots: void onCancelClicked(); void onApplyClicked(); @@ -216,7 +216,7 @@ class PlenumChooserView : public QWidget { Q_OBJECT; - public: + public: PlenumChooserView(QWidget* parent = nullptr); virtual ~PlenumChooserView() {} @@ -231,14 +231,14 @@ class RefrigerationWalkinInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: RefrigerationWalkinInspectorView(QWidget* parent = nullptr); virtual ~RefrigerationWalkinInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - private: + private: InspectorGadget* m_walkinInspectorGadget; QWidget* m_zoneBoundaryWidget; bool m_displayIP; @@ -249,19 +249,19 @@ class ThermalZoneInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ThermalZoneInspectorView(QWidget* parent = nullptr); virtual ~ThermalZoneInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void moveBranchForZoneSupplySelected(model::ThermalZone& zone, const Handle& newPlenumHandle); void moveBranchForZoneReturnSelected(model::ThermalZone& zone, const Handle& newPlenumHandle); - private slots: + private slots: void onSupplyPlenumChooserChanged(int newIndex); void onReturnPlenumChooserChanged(int newIndex); @@ -269,7 +269,7 @@ class ThermalZoneInspectorView : public BaseInspectorView void onNewSupplyPlenumClicked(); void onNewReturnPlenumClicked(); - private: + private: void update() override; InspectorGadget* m_inspectorGadget; EMSInspectorView* m_emsActuatorView; @@ -283,26 +283,26 @@ class WaterToAirInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: WaterToAirInspectorView(QWidget* parent = nullptr); virtual ~WaterToAirInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private slots: + private slots: void onWorkspaceObjectChanged(); void layoutControllerObject(); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -318,20 +318,20 @@ class AirTerminalSingleDuctConstantVolumeCooledBeamInspectorView : public BaseIn { Q_OBJECT; - public: + public: AirTerminalSingleDuctConstantVolumeCooledBeamInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctConstantVolumeCooledBeamInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -343,18 +343,18 @@ class AirTerminalInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: AirTerminalInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalInspectorView() {} - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - protected: + protected: template void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP); @@ -371,7 +371,7 @@ class AirTerminalSingleDuctConstantVolumeReheatInspectorView : public AirTermina { Q_OBJECT; - public: + public: AirTerminalSingleDuctConstantVolumeReheatInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctConstantVolumeReheatInspectorView() {} @@ -383,7 +383,7 @@ class AirTerminalSingleDuctVAVReheatInspectorView : public AirTerminalInspectorV { Q_OBJECT; - public: + public: AirTerminalSingleDuctVAVReheatInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctVAVReheatInspectorView() {} @@ -395,7 +395,7 @@ class AirTerminalSingleDuctParallelPIUReheatInspectorView : public AirTerminalIn { Q_OBJECT; - public: + public: AirTerminalSingleDuctParallelPIUReheatInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctParallelPIUReheatInspectorView() {} @@ -407,7 +407,7 @@ class AirTerminalSingleDuctSeriesPIUReheatInspectorView : public AirTerminalInsp { Q_OBJECT; - public: + public: AirTerminalSingleDuctSeriesPIUReheatInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctSeriesPIUReheatInspectorView() {} @@ -419,7 +419,7 @@ class AirTerminalSingleDuctVAVHeatAndCoolReheatInspectorView : public AirTermina { Q_OBJECT; - public: + public: AirTerminalSingleDuctVAVHeatAndCoolReheatInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctVAVHeatAndCoolReheatInspectorView() {} @@ -431,20 +431,20 @@ class ZoneHVACPackagedTerminalAirConditionerInspectorView : public BaseInspector { Q_OBJECT; - public: + public: ZoneHVACPackagedTerminalAirConditionerInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACPackagedTerminalAirConditionerInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -456,20 +456,20 @@ class ZoneHVACPackagedTerminalHeatPumpInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACPackagedTerminalHeatPumpInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACPackagedTerminalHeatPumpInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -481,20 +481,20 @@ class WaterHeaterHeatPumpInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: WaterHeaterHeatPumpInspectorView(QWidget* parent = nullptr); virtual ~WaterHeaterHeatPumpInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -506,20 +506,20 @@ class ZoneHVACFourPipeFanCoilInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACFourPipeFanCoilInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACFourPipeFanCoilInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -533,18 +533,18 @@ class ZoneHVACLowTempRadiantConstFlowInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACLowTempRadiantConstFlowInspectorView(QWidget* parent = nullptr); void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -558,18 +558,18 @@ class ZoneHVACLowTempRadiantVarFlowInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACLowTempRadiantVarFlowInspectorView(QWidget* parent = nullptr); void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -583,20 +583,20 @@ class ZoneHVACWaterToAirHeatPumpInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACWaterToAirHeatPumpInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACWaterToAirHeatPumpInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -612,20 +612,20 @@ class ZoneHVACBaseboardConvectiveWaterInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACBaseboardConvectiveWaterInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACBaseboardConvectiveWaterInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -637,20 +637,20 @@ class ZoneHVACBaseboardRadiantConvectiveWaterInspectorView : public BaseInspecto { Q_OBJECT; - public: + public: ZoneHVACBaseboardRadiantConvectiveWaterInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACBaseboardRadiantConvectiveWaterInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -662,20 +662,20 @@ class ZoneHVACUnitHeaterInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACUnitHeaterInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACUnitHeaterInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -687,20 +687,20 @@ class ZoneHVACUnitVentilatorInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ZoneHVACUnitVentilatorInspectorView(QWidget* parent = nullptr); virtual ~ZoneHVACUnitVentilatorInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -714,20 +714,20 @@ class AirLoopHVACUnitarySystemInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: AirLoopHVACUnitarySystemInspectorView(QWidget* parent = nullptr); virtual ~AirLoopHVACUnitarySystemInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -741,20 +741,20 @@ class AirTerminalSingleDuctConstantVolumeFourPipeInductionInspectorView : public { Q_OBJECT; - public: + public: AirTerminalSingleDuctConstantVolumeFourPipeInductionInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctConstantVolumeFourPipeInductionInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -767,20 +767,20 @@ class AirTerminalSingleDuctConstantVolumeFourPipeBeamInspectorView : public Base { Q_OBJECT; - public: + public: AirTerminalSingleDuctConstantVolumeFourPipeBeamInspectorView(QWidget* parent = nullptr); virtual ~AirTerminalSingleDuctConstantVolumeFourPipeBeamInspectorView() {} void layoutModelObject(model::ModelObject&, bool readOnly, bool displayIP) override; - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - private: + private: boost::optional m_modelObject; InspectorGadget* m_inspectorGadget; @@ -793,7 +793,7 @@ class ScheduleRulesetInspectorView : public BaseInspectorView { Q_OBJECT; - public: + public: ScheduleRulesetInspectorView(QWidget* parent = nullptr); virtual ~ScheduleRulesetInspectorView() {} diff --git a/src/openstudio_lib/InternalMassInspectorView.hpp b/src/openstudio_lib/InternalMassInspectorView.hpp index 9b265a232..9e6771b86 100644 --- a/src/openstudio_lib/InternalMassInspectorView.hpp +++ b/src/openstudio_lib/InternalMassInspectorView.hpp @@ -48,19 +48,19 @@ class InternalMassDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: InternalMassDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~InternalMassDefinitionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::InternalMassDefinition& internalMassDefinition); void detach(); @@ -85,10 +85,10 @@ class InternalMassDefinitionInspectorView : public ModelObjectInspectorView class ConstructionVectorController : public ModelObjectVectorController { -public: + public: boost::optional internalMassDefinition(); -protected: + protected: std::vector makeVector() override; void onChangeRelationship(const openstudio::model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; @@ -100,7 +100,7 @@ class InternalMassDefinitionInspectorView : public ModelObjectInspectorView void onDrop(const OSItemId& itemId) override; }; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/LibraryTabWidget.hpp b/src/openstudio_lib/LibraryTabWidget.hpp index 12a4dfc05..e678ca289 100644 --- a/src/openstudio_lib/LibraryTabWidget.hpp +++ b/src/openstudio_lib/LibraryTabWidget.hpp @@ -43,7 +43,7 @@ class LibraryTabWidget : public QWidget { Q_OBJECT - public: + public: LibraryTabWidget(QWidget* parent = nullptr); virtual ~LibraryTabWidget() {} @@ -59,21 +59,21 @@ class LibraryTabWidget : public QWidget * Useful to hide the LoopChooserView for components that don't have a water coil for eg. */ void hideTab(QWidget* widget, bool hide = true); - signals: + signals: void removeButtonClicked(bool); - public slots: + public slots: void setCurrentIndex(int index); void setCurrentWidget(QWidget* widget); - private slots: + private slots: void select(); - private: + private: QStackedWidget* m_pageStack; QWidget* m_tabBar; diff --git a/src/openstudio_lib/LifeCycleCostsTabView.hpp b/src/openstudio_lib/LifeCycleCostsTabView.hpp index bc1a1cdb4..b27105bc5 100644 --- a/src/openstudio_lib/LifeCycleCostsTabView.hpp +++ b/src/openstudio_lib/LifeCycleCostsTabView.hpp @@ -55,12 +55,12 @@ class LifeCycleCostsView : public QWidget { Q_OBJECT - public: + public: LifeCycleCostsView(const model::Model& model); virtual ~LifeCycleCostsView(); - private: + private: void createWidgets(); QWidget* createInflationRatesWidget(); @@ -103,7 +103,7 @@ class LifeCycleCostsView : public QWidget QLabel* m_analysisLengthLabel; QLabel* m_realDiscountRateLabel; - private slots: + private slots: void fempGroupClicked(int index); @@ -115,12 +115,12 @@ class LifeCycleCostsTabView : public MainTabView Q_OBJECT - public: + public: LifeCycleCostsTabView(const model::Model& model, const QString& modelTempDir, QWidget* parent = nullptr); virtual ~LifeCycleCostsTabView(); - private: + private: LifeCycleCostsView* m_lifeCycleCostsView; }; diff --git a/src/openstudio_lib/LightsInspectorView.hpp b/src/openstudio_lib/LightsInspectorView.hpp index 9e015463f..54e3ebfe9 100644 --- a/src/openstudio_lib/LightsInspectorView.hpp +++ b/src/openstudio_lib/LightsInspectorView.hpp @@ -45,19 +45,19 @@ class LightsDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: LightsDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~LightsDefinitionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::LightsDefinition& lightsDefinition); void detach(); @@ -82,7 +82,7 @@ class LightsDefinitionInspectorView : public ModelObjectInspectorView boost::optional m_lightsDefinition; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/LoadsController.hpp b/src/openstudio_lib/LoadsController.hpp index 7b8278648..46e066cd5 100644 --- a/src/openstudio_lib/LoadsController.hpp +++ b/src/openstudio_lib/LoadsController.hpp @@ -38,12 +38,12 @@ class LoadsController : public ModelSubTabController { Q_OBJECT - public: + public: LoadsController(bool isiP, const model::Model& model); virtual ~LoadsController(); - protected: + protected: virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; virtual void onCopyObject(const openstudio::model::ModelObject& modelObject) override; @@ -58,7 +58,7 @@ class LoadsController : public ModelSubTabController virtual void onInspectItem(OSItem* item) override; - public slots: + public slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/LoadsTabController.hpp b/src/openstudio_lib/LoadsTabController.hpp index 50e367989..89bc6f87c 100644 --- a/src/openstudio_lib/LoadsTabController.hpp +++ b/src/openstudio_lib/LoadsTabController.hpp @@ -40,15 +40,15 @@ class LoadsTabController : public MainTabController { Q_OBJECT - public: + public: LoadsTabController(bool isIP, const openstudio::model::Model& model); virtual ~LoadsTabController(); - private: + private: std::shared_ptr m_LoadsController; - public slots: + public slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/LoadsTabView.hpp b/src/openstudio_lib/LoadsTabView.hpp index 36b0544c1..cd45799f9 100644 --- a/src/openstudio_lib/LoadsTabView.hpp +++ b/src/openstudio_lib/LoadsTabView.hpp @@ -38,11 +38,11 @@ class LoadsTabView : public MainTabView { Q_OBJECT - public: + public: LoadsTabView(const model::Model& model, const QString& tabLabel, QWidget* parent = nullptr); virtual ~LoadsTabView() {} - public slots: + public slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/LoadsView.hpp b/src/openstudio_lib/LoadsView.hpp index 43961f55c..828a4dead 100644 --- a/src/openstudio_lib/LoadsView.hpp +++ b/src/openstudio_lib/LoadsView.hpp @@ -45,15 +45,15 @@ class LoadsView : public ModelSubTabView { Q_OBJECT - public: + public: LoadsView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~LoadsView() {} - private: + private: static std::vector> modelObjectTypesAndNames(); - public slots: + public slots: void toggleUnits(bool displayIP); }; @@ -62,12 +62,12 @@ class LoadsInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: LoadsInspectorView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~LoadsInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; @@ -96,10 +96,10 @@ class LoadsInspectorView : public ModelObjectInspectorView void showDefaultView(); - private: + private: bool m_isIP; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/LocationTabController.hpp b/src/openstudio_lib/LocationTabController.hpp index 4648e0bd2..037a6a6c5 100644 --- a/src/openstudio_lib/LocationTabController.hpp +++ b/src/openstudio_lib/LocationTabController.hpp @@ -51,7 +51,7 @@ class LocationTabController : public MainTabController { Q_OBJECT - public: + public: LocationTabController(bool isIP, const model::Model& model, const QString& modelTempDir); virtual ~LocationTabController(); @@ -63,7 +63,7 @@ class LocationTabController : public MainTabController UTILITY_BILLS }; - private: + private: bool showUtilityBills(); QString m_modelTempDir; @@ -76,7 +76,7 @@ class LocationTabController : public MainTabController int m_currentIndex = -1; - private slots: + private slots: virtual void setSubTab(int index) override; }; diff --git a/src/openstudio_lib/LocationTabView.hpp b/src/openstudio_lib/LocationTabView.hpp index c35dbb1ca..301a7580a 100644 --- a/src/openstudio_lib/LocationTabView.hpp +++ b/src/openstudio_lib/LocationTabView.hpp @@ -60,7 +60,7 @@ class LocationView : public QWidget Q_OBJECT - public: + public: LocationView(bool isIP, const model::Model& model, const QString& modelTempDir); virtual ~LocationView(); @@ -73,12 +73,12 @@ class LocationView : public QWidget bool calendarYearChecked(); - protected: + protected: void onSelectModelObject(const openstudio::model::ModelObject& modelObject); void onUpdate(); - private: + private: void update(); void loadQSettings(); @@ -108,7 +108,7 @@ class LocationView : public QWidget QPushButton* m_weatherFileBtn = nullptr; bool m_isIP; - signals: + signals: void calendarYearSelectionChanged(); @@ -116,11 +116,11 @@ class LocationView : public QWidget void toggleUnitsClicked(bool displayIP); - public slots: + public slots: void refresh(); - private slots: + private slots: void onSelectItem(); @@ -159,12 +159,12 @@ class LocationTabView : public MainTabView { Q_OBJECT - public: + public: LocationTabView(const model::Model& model, const QString& modelTempDir, QWidget* parent = nullptr); virtual ~LocationTabView(); - private: + private: LocationView* m_locationView; }; diff --git a/src/openstudio_lib/LoopChooserView.hpp b/src/openstudio_lib/LoopChooserView.hpp index 6500b0165..fd303aca3 100644 --- a/src/openstudio_lib/LoopChooserView.hpp +++ b/src/openstudio_lib/LoopChooserView.hpp @@ -49,7 +49,7 @@ class LoopChooserView : public QWidget { Q_OBJECT; - public: + public: LoopChooserView(QWidget* parent = nullptr); virtual ~LoopChooserView() {} @@ -58,7 +58,7 @@ class LoopChooserView : public QWidget void layoutView(); - public slots: + public slots: void layoutModelObject(boost::optional& modelObject); @@ -66,16 +66,16 @@ class LoopChooserView : public QWidget void onRemoveFromLoopClicked(model::Loop&); - signals: + signals: void addToLoopClicked(model::Loop&, boost::optional&); void removeFromLoopClicked(model::Loop&, boost::optional&); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: boost::optional m_component; QVBoxLayout* m_vLayout; @@ -87,28 +87,28 @@ class LoopChooserItem : public QWidget { Q_OBJECT; - public: + public: LoopChooserItem(model::Loop&, LoopChooserView* parent = nullptr); virtual ~LoopChooserItem() {} std::string loopName(); - signals: + signals: void addToLoopClicked(model::Loop&); void removeFromLoopClicked(model::Loop&); - public slots: + public slots: void setChecked(bool checked); - private slots: + private slots: void sendClickedSignal(bool checked); - private: + private: QCheckBox* m_checkBox; LoopChooserView* m_loopChooserView; diff --git a/src/openstudio_lib/LoopLibraryDialog.hpp b/src/openstudio_lib/LoopLibraryDialog.hpp index 37c8bfddf..41042aa07 100644 --- a/src/openstudio_lib/LoopLibraryDialog.hpp +++ b/src/openstudio_lib/LoopLibraryDialog.hpp @@ -44,7 +44,7 @@ class LoopLibraryDialog : public QDialog { Q_OBJECT - public: + public: LoopLibraryDialog(QWidget* parent = nullptr); virtual ~LoopLibraryDialog() {} @@ -53,14 +53,14 @@ class LoopLibraryDialog : public QDialog boost::optional addToModelEnum() const; - protected: + protected: void paintEvent(QPaintEvent* event) override; - private slots: + private slots: void onAddToModelClicked(AddToModelEnum addToModelEnum); - private: + private: QScrollArea* m_scrollArea; boost::optional m_addToModelEnum; @@ -70,22 +70,22 @@ class LoopItemView : public QWidget { Q_OBJECT - public: + public: LoopItemView(const AddToModelEnum& addToModelEnum, const QString& detailedText, const QPixmap& pixmap, QWidget* parent = nullptr); virtual ~LoopItemView() {} //void paintEvent ( QPaintEvent * event ); - signals: + signals: void addToModelClicked(AddToModelEnum); - private slots: + private slots: void emitAddToModelClicked(); - private: + private: AddToModelEnum m_addToModelEnum; QString m_detailedText; diff --git a/src/openstudio_lib/LoopScene.hpp b/src/openstudio_lib/LoopScene.hpp index aea8a4fd8..2820a28c3 100644 --- a/src/openstudio_lib/LoopScene.hpp +++ b/src/openstudio_lib/LoopScene.hpp @@ -69,14 +69,14 @@ class LoopScene : public GridScene Q_OBJECT - public: + public: LoopScene(model::Loop loop, QObject* parent = nullptr); virtual ~LoopScene() {} model::Loop loop(); - public slots: + public slots: void addedWorkspaceObject(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); @@ -96,7 +96,7 @@ class LoopScene : public GridScene //void innerNodeClicked( model::ModelObject & ); - private: + private: DemandSideItem* createDemandSide(); SupplySideItem* createSupplySide(); diff --git a/src/openstudio_lib/LuminaireInspectorView.hpp b/src/openstudio_lib/LuminaireInspectorView.hpp index 5d60e07d5..ae2088e31 100644 --- a/src/openstudio_lib/LuminaireInspectorView.hpp +++ b/src/openstudio_lib/LuminaireInspectorView.hpp @@ -45,19 +45,19 @@ class LuminaireDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: LuminaireDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~LuminaireDefinitionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::LuminaireDefinition& luminaireDefinition); void detach(); @@ -78,7 +78,7 @@ class LuminaireDefinitionInspectorView : public ModelObjectInspectorView boost::optional m_luminaireDefinition; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/MainMenu.hpp b/src/openstudio_lib/MainMenu.hpp index 3ba26dccd..1c59aac0f 100644 --- a/src/openstudio_lib/MainMenu.hpp +++ b/src/openstudio_lib/MainMenu.hpp @@ -40,12 +40,12 @@ class MainMenu : public QMenuBar { Q_OBJECT - public: + public: MainMenu(bool isIP, bool isPlugin, QWidget* parent = nullptr); virtual ~MainMenu(); - signals: + signals: void exportClicked(); @@ -105,7 +105,7 @@ class MainMenu : public QMenuBar void changeBclLogin(); - private: + private: bool m_isPlugin; QMenu* m_fileMenu; @@ -134,7 +134,7 @@ class MainMenu : public QMenuBar bool m_isIP; - public slots: + public slots: void enableRevertToSavedAction(bool enable); @@ -144,7 +144,7 @@ class MainMenu : public QMenuBar void enableComponentsMeasuresActions(bool enable); - private slots: + private slots: void displaySIUnitsClicked(); diff --git a/src/openstudio_lib/MainRightColumnController.hpp b/src/openstudio_lib/MainRightColumnController.hpp index 29ccbbaeb..af9342aef 100644 --- a/src/openstudio_lib/MainRightColumnController.hpp +++ b/src/openstudio_lib/MainRightColumnController.hpp @@ -53,7 +53,7 @@ class MainRightColumnController : public OSQObjectController { Q_OBJECT - public: + public: MainRightColumnController(const model::Model& model, const openstudio::path& resourcesPath); virtual ~MainRightColumnController(){}; @@ -85,13 +85,13 @@ class MainRightColumnController : public OSQObjectController void unregisterSystemItem(const Handle& systemHandle); SystemItem* systemItem(const Handle& systemHandle) const; - signals: + signals: void toggleUnitsClicked(bool displayIP); void itemRemoveClicked(OSItem*); - public slots: + public slots: void configureForSiteSubTab(int subTabID); @@ -137,7 +137,7 @@ class MainRightColumnController : public OSQObjectController QSharedPointer measuresEditController(); - private: + private: REGISTER_LOGGER("openstudio.openstudio_lib.MainRightColumnController"); void setMyModelView(QWidget* widget); @@ -170,7 +170,7 @@ class MainRightColumnController : public OSQObjectController OSItem* m_item = nullptr; - private slots: + private slots: void onItemRemoveClicked(OSItem*); diff --git a/src/openstudio_lib/MainTabController.hpp b/src/openstudio_lib/MainTabController.hpp index e67369d5a..81ca66a01 100644 --- a/src/openstudio_lib/MainTabController.hpp +++ b/src/openstudio_lib/MainTabController.hpp @@ -44,17 +44,17 @@ class MainTabController : public OSQObjectController { Q_OBJECT - public: + public: MainTabController(MainTabView* mainContentWidget); virtual ~MainTabController(); MainTabView* mainContentWidget() const; - private: + private: MainTabView* m_mainContentWidget; - signals: + signals: void modelObjectSelected(model::OptionalModelObject& modelObject, bool readOnly); @@ -70,7 +70,7 @@ class MainTabController : public OSQObjectController void openLibDlgClicked(); - public slots: + public slots: virtual void setSubTab(int index){}; }; diff --git a/src/openstudio_lib/MainTabView.hpp b/src/openstudio_lib/MainTabView.hpp index 92ebc7517..ef0ddb36c 100644 --- a/src/openstudio_lib/MainTabView.hpp +++ b/src/openstudio_lib/MainTabView.hpp @@ -49,7 +49,7 @@ class MainTabView : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: enum TabType { MAIN_TAB, @@ -84,13 +84,13 @@ class MainTabView : public QWidget, public Nano::Observer QPointer m_editView; - protected: + protected: void setCurrentIndex(int index); void setCurrentWidget(QWidget* widget); void paintEvent(QPaintEvent* event) override; void resizeEvent(QResizeEvent* event) override; - private: + private: QLabel* m_tabLabel = nullptr; QWidget* m_mainWidget = nullptr; QWidget* m_currentInnerWidget = nullptr; @@ -104,12 +104,12 @@ class MainTabView : public QWidget, public Nano::Observer TabType m_tabType; - signals: + signals: void tabSelected(int id); void toggleUnitsClicked(bool displayIP); - private slots: + private slots: void select(); }; diff --git a/src/openstudio_lib/MainWindow.hpp b/src/openstudio_lib/MainWindow.hpp index 1f555f254..ba52aedec 100644 --- a/src/openstudio_lib/MainWindow.hpp +++ b/src/openstudio_lib/MainWindow.hpp @@ -50,7 +50,7 @@ class MainWindow : public QMainWindow { Q_OBJECT - public: + public: MainWindow(bool isPlugin, QWidget* parent = nullptr); virtual ~MainWindow() {} @@ -89,7 +89,7 @@ class MainWindow : public QMainWindow return m_verticalTabWidget; } - signals: + signals: void closeClicked(); @@ -161,7 +161,7 @@ class MainWindow : public QMainWindow void enableComponentsMeasures(bool enable); - protected: + protected: void closeEvent(QCloseEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override; @@ -170,7 +170,7 @@ class MainWindow : public QMainWindow QSize sizeHint() const override; - private: + private: void readSettings(); void writeSettings(); @@ -189,7 +189,7 @@ class MainWindow : public QMainWindow QString m_lastPath; - private slots: + private slots: void toggleUnits(bool displayIP); diff --git a/src/openstudio_lib/MaterialAirGapInspectorView.hpp b/src/openstudio_lib/MaterialAirGapInspectorView.hpp index 91cc12031..a5b3a6dab 100644 --- a/src/openstudio_lib/MaterialAirGapInspectorView.hpp +++ b/src/openstudio_lib/MaterialAirGapInspectorView.hpp @@ -45,19 +45,19 @@ class MaterialAirGapInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: MaterialAirGapInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~MaterialAirGapInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::AirGap& airGap); diff --git a/src/openstudio_lib/MaterialAirWallInspectorView.hpp b/src/openstudio_lib/MaterialAirWallInspectorView.hpp index 422ccd33e..0d7f59bd1 100644 --- a/src/openstudio_lib/MaterialAirWallInspectorView.hpp +++ b/src/openstudio_lib/MaterialAirWallInspectorView.hpp @@ -45,19 +45,19 @@ class MaterialAirWallInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: MaterialAirWallInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~MaterialAirWallInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::AirWallMaterial& airWallMaterial); diff --git a/src/openstudio_lib/MaterialInfraredTransparentInspectorView.hpp b/src/openstudio_lib/MaterialInfraredTransparentInspectorView.hpp index 3f1caa501..a7855505b 100644 --- a/src/openstudio_lib/MaterialInfraredTransparentInspectorView.hpp +++ b/src/openstudio_lib/MaterialInfraredTransparentInspectorView.hpp @@ -45,19 +45,19 @@ class MaterialInfraredTransparentInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: MaterialInfraredTransparentInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~MaterialInfraredTransparentInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::InfraredTransparentMaterial& InfraredTransparentMaterial); diff --git a/src/openstudio_lib/MaterialInspectorView.hpp b/src/openstudio_lib/MaterialInspectorView.hpp index 3986292de..c4afb8338 100644 --- a/src/openstudio_lib/MaterialInspectorView.hpp +++ b/src/openstudio_lib/MaterialInspectorView.hpp @@ -49,19 +49,19 @@ class MaterialInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: MaterialInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~MaterialInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::StandardOpaqueMaterial& material); diff --git a/src/openstudio_lib/MaterialNoMassInspectorView.hpp b/src/openstudio_lib/MaterialNoMassInspectorView.hpp index 577faa008..91ac851c2 100644 --- a/src/openstudio_lib/MaterialNoMassInspectorView.hpp +++ b/src/openstudio_lib/MaterialNoMassInspectorView.hpp @@ -47,19 +47,19 @@ class MaterialNoMassInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: MaterialNoMassInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~MaterialNoMassInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::MasslessOpaqueMaterial& masslessOpaqueMaterial); diff --git a/src/openstudio_lib/MaterialRoofVegetationInspectorView.hpp b/src/openstudio_lib/MaterialRoofVegetationInspectorView.hpp index cd0ca6d33..313558443 100644 --- a/src/openstudio_lib/MaterialRoofVegetationInspectorView.hpp +++ b/src/openstudio_lib/MaterialRoofVegetationInspectorView.hpp @@ -47,19 +47,19 @@ class MaterialRoofVegetationInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: MaterialRoofVegetationInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~MaterialRoofVegetationInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::RoofVegetation& RoofVegetation); diff --git a/src/openstudio_lib/MaterialsController.hpp b/src/openstudio_lib/MaterialsController.hpp index 17c54e324..ddb8f9844 100644 --- a/src/openstudio_lib/MaterialsController.hpp +++ b/src/openstudio_lib/MaterialsController.hpp @@ -38,12 +38,12 @@ class MaterialsController : public ModelSubTabController { Q_OBJECT - public: + public: MaterialsController(bool isIP, const model::Model& model); virtual ~MaterialsController(); - protected: + protected: virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; virtual void onCopyObject(const openstudio::model::ModelObject& modelObject) override; diff --git a/src/openstudio_lib/MaterialsView.hpp b/src/openstudio_lib/MaterialsView.hpp index 4ae73233d..d89b9830f 100644 --- a/src/openstudio_lib/MaterialsView.hpp +++ b/src/openstudio_lib/MaterialsView.hpp @@ -43,12 +43,12 @@ class MaterialsView : public ModelSubTabView { Q_OBJECT - public: + public: MaterialsView(bool isIP, const openstudio::model::Model& model, const QString& tabLabel, bool hasSubTabs, QWidget* parent = nullptr); virtual ~MaterialsView() {} - private: + private: static std::vector> modelObjectTypesAndNames(); }; @@ -56,19 +56,19 @@ class MaterialsInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: MaterialsInspectorView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~MaterialsInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void showMaterialAirGapInspectorView(const openstudio::model::ModelObject& modelObject); void showMaterialAirWallInspectorView(const openstudio::model::ModelObject& modelObject); void showMaterialInfraredTransparentInspectorView(const openstudio::model::ModelObject& modelObject); @@ -94,7 +94,7 @@ class MaterialsInspectorView : public ModelObjectInspectorView bool m_isIP; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/ModelObjectInspectorView.hpp b/src/openstudio_lib/ModelObjectInspectorView.hpp index 496bedfae..645c1dbd4 100644 --- a/src/openstudio_lib/ModelObjectInspectorView.hpp +++ b/src/openstudio_lib/ModelObjectInspectorView.hpp @@ -51,7 +51,7 @@ class ModelObjectInspectorView : public OSInspectorView { Q_OBJECT - public: + public: ModelObjectInspectorView(const openstudio::model::Model& model, bool addScrollArea, QWidget* parent = nullptr); virtual ~ModelObjectInspectorView() {} @@ -64,7 +64,7 @@ class ModelObjectInspectorView : public OSInspectorView virtual std::vector selectedObjects() const; void update(); - signals: + signals: void toggleUnitsClicked(bool displayIP); @@ -78,11 +78,11 @@ class ModelObjectInspectorView : public OSInspectorView void onChange(); - public slots: + public slots: void selectModelObject(const openstudio::model::ModelObject& modelObject); - protected: + protected: virtual void onSelectItem(OSItem* item) override; virtual void onClearSelection() override; @@ -93,11 +93,11 @@ class ModelObjectInspectorView : public OSInspectorView model::Model m_model; - protected slots: + protected slots: virtual void toggleUnits(bool displayIP); - private: + private: boost::optional m_modelObject; }; @@ -105,19 +105,19 @@ class DefaultInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: DefaultInspectorView(const model::Model& model, QWidget* parent = nullptr); virtual ~DefaultInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: QLabel* m_mainLabel; }; diff --git a/src/openstudio_lib/ModelObjectItem.hpp b/src/openstudio_lib/ModelObjectItem.hpp index da297fd2d..3483138a3 100644 --- a/src/openstudio_lib/ModelObjectItem.hpp +++ b/src/openstudio_lib/ModelObjectItem.hpp @@ -50,7 +50,7 @@ class ModelObjectItem : public OSItem { Q_OBJECT - public: + public: ModelObjectItem(const openstudio::model::ModelObject& modelObject, bool isDefaulted, OSItemType type, QWidget* parent = nullptr); virtual ~ModelObjectItem() {} @@ -61,11 +61,11 @@ class ModelObjectItem : public OSItem virtual bool equal(const openstudio::OSItem*) const override; - private slots: + private slots: void onObjectChanged(); - private: + private: openstudio::Handle m_handle; openstudio::model::ModelObject m_modelObject; diff --git a/src/openstudio_lib/ModelObjectListView.hpp b/src/openstudio_lib/ModelObjectListView.hpp index 29ef0954c..3847098cc 100644 --- a/src/openstudio_lib/ModelObjectListView.hpp +++ b/src/openstudio_lib/ModelObjectListView.hpp @@ -43,21 +43,21 @@ class ModelObjectListController : public OSVectorController { Q_OBJECT - public: + public: ModelObjectListController(const openstudio::IddObjectType& iddObjectType, const model::Model& model, bool showLocalBCL = false); virtual ~ModelObjectListController() {} IddObjectType iddObjectType() const; - private slots: + private slots: void objectAdded(std::shared_ptr, const openstudio::IddObjectType&, const openstudio::UUID&); void objectRemoved(std::shared_ptr, const openstudio::IddObjectType&, const openstudio::UUID&); - protected: + protected: virtual std::vector makeVector() override; - private: + private: openstudio::IddObjectType m_iddObjectType; model::Model m_model; bool m_showLocalBCL; @@ -67,7 +67,7 @@ class ModelObjectListView : public OSItemList { Q_OBJECT - public: + public: ModelObjectListView(const openstudio::IddObjectType& iddObjectType, const model::Model& model, bool addScrollArea, bool showLocalBCL = false, QWidget* parent = nullptr); diff --git a/src/openstudio_lib/ModelObjectTreeItems.hpp b/src/openstudio_lib/ModelObjectTreeItems.hpp index 7a785e061..4c5d15af7 100644 --- a/src/openstudio_lib/ModelObjectTreeItems.hpp +++ b/src/openstudio_lib/ModelObjectTreeItems.hpp @@ -59,7 +59,7 @@ class ModelObjectTreeItem : public QObject, public QTreeWidgetItem, public Nano: { Q_OBJECT - public: + public: /// Constructed with a modelObject this tree item represents that object ModelObjectTreeItem(const openstudio::model::ModelObject& modelObject, bool isDefaulted, OSItemType type, QTreeWidgetItem* parent = nullptr); @@ -88,7 +88,7 @@ class ModelObjectTreeItem : public QObject, public QTreeWidgetItem, public Nano: void makeDirty(); - public slots: + public slots: void refresh(); @@ -98,7 +98,7 @@ class ModelObjectTreeItem : public QObject, public QTreeWidgetItem, public Nano: void changeRelationship(int index, Handle newHandle, Handle oldHandle); - protected: + protected: // make all child items void makeChildren(); @@ -124,11 +124,11 @@ class ModelObjectTreeItem : public QObject, public QTreeWidgetItem, public Nano: static OSItemType initializeOSItemType(); - private slots: + private slots: void changeName(); - private: + private: boost::optional m_handle; boost::optional m_modelObject; openstudio::model::Model m_model; @@ -143,12 +143,12 @@ class SiteShadingTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: SiteShadingTreeItem(const openstudio::model::Model& model, QTreeWidgetItem* parent = nullptr); virtual ~SiteShadingTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; }; @@ -159,11 +159,11 @@ class ShadingSurfaceGroupTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: ShadingSurfaceGroupTreeItem(const openstudio::model::ShadingSurfaceGroup& shadingSurfaceGroup, QTreeWidgetItem* parent = nullptr); virtual ~ShadingSurfaceGroupTreeItem() {} - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; }; @@ -174,17 +174,17 @@ class BuildingTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: BuildingTreeItem(const openstudio::model::Building& building, const openstudio::IddObjectType& sortByType, QTreeWidgetItem* parent = nullptr); virtual ~BuildingTreeItem() {} - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; virtual std::vector nonModelObjectChildren() const override; virtual void addNonModelObjectChild(const std::string& child) override; - private: + private: openstudio::IddObjectType m_sortByType; }; @@ -194,12 +194,12 @@ class BuildingShadingTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: BuildingShadingTreeItem(const openstudio::model::Model& model, QTreeWidgetItem* parent = nullptr); virtual ~BuildingShadingTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; }; @@ -210,11 +210,11 @@ class BuildingStoryTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: BuildingStoryTreeItem(const openstudio::model::BuildingStory& buildingStory, QTreeWidgetItem* parent = nullptr); virtual ~BuildingStoryTreeItem() {} - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; }; @@ -223,12 +223,12 @@ class NoBuildingStoryTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: NoBuildingStoryTreeItem(const openstudio::model::Model& model, QTreeWidgetItem* parent = nullptr); virtual ~NoBuildingStoryTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; virtual void finalize() override; @@ -240,11 +240,11 @@ class ThermalZoneTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: ThermalZoneTreeItem(const openstudio::model::ThermalZone& thermalZone, QTreeWidgetItem* parent = nullptr); virtual ~ThermalZoneTreeItem() {} - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; }; @@ -253,12 +253,12 @@ class NoThermalZoneTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: NoThermalZoneTreeItem(const openstudio::model::Model& model, QTreeWidgetItem* parent = nullptr); virtual ~NoThermalZoneTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; virtual void finalize() override; @@ -270,11 +270,11 @@ class SpaceTypeTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: SpaceTypeTreeItem(const openstudio::model::SpaceType& spaceType, QTreeWidgetItem* parent = nullptr); virtual ~SpaceTypeTreeItem() {} - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual std::vector defaultedModelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; @@ -284,12 +284,12 @@ class NoSpaceTypeTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: NoSpaceTypeTreeItem(const openstudio::model::Model& model, QTreeWidgetItem* parent = nullptr); virtual ~NoSpaceTypeTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; virtual void finalize() override; @@ -301,11 +301,11 @@ class SpaceTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: SpaceTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~SpaceTreeItem() {} - protected: + protected: virtual std::vector nonModelObjectChildren() const override; virtual void addNonModelObjectChild(const std::string& child) override; }; @@ -316,16 +316,16 @@ class RoofsTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: RoofsTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~RoofsTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; - private: + private: openstudio::model::Space m_space; }; @@ -335,16 +335,16 @@ class WallsTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: WallsTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~WallsTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; - private: + private: openstudio::model::Space m_space; }; @@ -354,16 +354,16 @@ class FloorsTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: FloorsTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~FloorsTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; - private: + private: openstudio::model::Space m_space; }; @@ -373,11 +373,11 @@ class SurfaceTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: SurfaceTreeItem(const openstudio::model::Surface& surface, QTreeWidgetItem* parent = nullptr); virtual ~SurfaceTreeItem() {} - protected: + protected: virtual std::vector modelObjectChildren() const override; }; @@ -387,16 +387,16 @@ class SpaceShadingTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: SpaceShadingTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~SpaceShadingTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; - private: + private: openstudio::model::Space m_space; }; @@ -406,16 +406,16 @@ class InteriorPartitionsTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: InteriorPartitionsTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~InteriorPartitionsTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual void addModelObjectChild(const model::ModelObject& child, bool isDefaulted) override; - private: + private: openstudio::model::Space m_space; }; @@ -425,12 +425,12 @@ class InteriorPartitionSurfaceGroupTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: InteriorPartitionSurfaceGroupTreeItem(const openstudio::model::InteriorPartitionSurfaceGroup& interiorPartitionSurfaceGroup, QTreeWidgetItem* parent = nullptr); virtual ~InteriorPartitionSurfaceGroupTreeItem() {} - protected: + protected: virtual std::vector modelObjectChildren() const override; }; @@ -440,15 +440,15 @@ class DaylightingObjectsTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: DaylightingObjectsTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~DaylightingObjectsTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; - private: + private: openstudio::model::Space m_space; }; @@ -458,16 +458,16 @@ class LoadsTreeItem : public ModelObjectTreeItem { Q_OBJECT - public: + public: LoadsTreeItem(const openstudio::model::Space& space, QTreeWidgetItem* parent = nullptr); virtual ~LoadsTreeItem() {} static std::string itemName(); - protected: + protected: virtual std::vector modelObjectChildren() const override; virtual std::vector defaultedModelObjectChildren() const override; - private: + private: openstudio::model::Space m_space; }; diff --git a/src/openstudio_lib/ModelObjectTreeWidget.hpp b/src/openstudio_lib/ModelObjectTreeWidget.hpp index 6d6bf310a..0a6b1874b 100644 --- a/src/openstudio_lib/ModelObjectTreeWidget.hpp +++ b/src/openstudio_lib/ModelObjectTreeWidget.hpp @@ -46,7 +46,7 @@ class ModelObjectTreeWidget : public OSItemSelector, public Nano::Observer { Q_OBJECT - public: + public: ModelObjectTreeWidget(const model::Model& model, QWidget* parent = nullptr); virtual ~ModelObjectTreeWidget() {} @@ -59,7 +59,7 @@ class ModelObjectTreeWidget : public OSItemSelector, public Nano::Observer openstudio::model::Model model() const; - protected: + protected: virtual void onObjectAdded(const openstudio::model::ModelObject& modelObject, const openstudio::IddObjectType& iddObjectType, const openstudio::UUID& handle) = 0; @@ -68,7 +68,7 @@ class ModelObjectTreeWidget : public OSItemSelector, public Nano::Observer void refresh(); - private slots: + private slots: void objectAdded(std::shared_ptr impl, const openstudio::IddObjectType& iddObjectType, const openstudio::UUID& handle); @@ -76,7 +76,7 @@ class ModelObjectTreeWidget : public OSItemSelector, public Nano::Observer void objectRemoved(std::shared_ptr impl, const openstudio::IddObjectType& iddObjectType, const openstudio::UUID& handle); - private: + private: QTreeWidget* m_treeWidget; QVBoxLayout* m_vLayout; diff --git a/src/openstudio_lib/ModelObjectTypeItem.hpp b/src/openstudio_lib/ModelObjectTypeItem.hpp index 14feaea01..4762f5f8e 100644 --- a/src/openstudio_lib/ModelObjectTypeItem.hpp +++ b/src/openstudio_lib/ModelObjectTypeItem.hpp @@ -43,7 +43,7 @@ class ModelObjectTypeItem : public OSCollapsibleItem { Q_OBJECT - public: + public: ModelObjectTypeItem(OSCollapsibleItemHeader* collapsibleItemHeader, ModelObjectListView* modelObjectListView, QWidget* parent = nullptr); virtual ~ModelObjectTypeItem() {} diff --git a/src/openstudio_lib/ModelObjectTypeListView.hpp b/src/openstudio_lib/ModelObjectTypeListView.hpp index 1866c7af0..ff39507f9 100644 --- a/src/openstudio_lib/ModelObjectTypeListView.hpp +++ b/src/openstudio_lib/ModelObjectTypeListView.hpp @@ -47,7 +47,7 @@ class ModelObjectTypeListView : public OSCollapsibleItemList { Q_OBJECT - public: + public: ModelObjectTypeListView(const model::Model& model, bool addScrollArea, OSItemType headerType, bool showLocalBCL = false, QWidget* parent = nullptr); ModelObjectTypeListView(const std::vector>& modelObjectTypesAndNames, const model::Model& model, @@ -61,7 +61,7 @@ class ModelObjectTypeListView : public OSCollapsibleItemList virtual boost::optional selectedModelObject() const; - private: + private: std::vector> m_modelObjectTypesAndNames; model::Model m_model; diff --git a/src/openstudio_lib/ModelObjectVectorController.hpp b/src/openstudio_lib/ModelObjectVectorController.hpp index 5ac3292e0..8b3c13964 100644 --- a/src/openstudio_lib/ModelObjectVectorController.hpp +++ b/src/openstudio_lib/ModelObjectVectorController.hpp @@ -42,7 +42,7 @@ class ModelObjectVectorController : public OSVectorController { Q_OBJECT - public: + public: virtual ~ModelObjectVectorController() {} virtual void attach(const model::ModelObject& modelObject); @@ -51,7 +51,7 @@ class ModelObjectVectorController : public OSVectorController void detach(); - protected slots: + protected slots: void objectAdded(std::shared_ptr impl, const openstudio::IddObjectType& iddObjectType, const openstudio::UUID& handle); @@ -65,7 +65,7 @@ class ModelObjectVectorController : public OSVectorController void change(); - protected: + protected: void attachOtherModelObject(const model::ModelObject& modelObject); void detachOtherModelObject(const model::ModelObject& modelObject); diff --git a/src/openstudio_lib/ModelSubTabController.hpp b/src/openstudio_lib/ModelSubTabController.hpp index 7766804ce..ecde3f89e 100644 --- a/src/openstudio_lib/ModelSubTabController.hpp +++ b/src/openstudio_lib/ModelSubTabController.hpp @@ -51,12 +51,12 @@ class ModelSubTabController : public SubTabController { Q_OBJECT - public: + public: ModelSubTabController(ModelSubTabView* subTabView, const model::Model& model); virtual ~ModelSubTabController() {} - signals: + signals: void modelObjectSelected(model::OptionalModelObject& modelObject, bool readOnly); @@ -66,7 +66,7 @@ class ModelSubTabController : public SubTabController void toggleUnitsClicked(bool displayIP); - protected: + protected: openstudio::model::Model model() const; bool fromModel(const OSItemId& itemId) const; @@ -101,9 +101,9 @@ class ModelSubTabController : public SubTabController virtual void onPurgeItems() override; - private slots: + private slots: - private: + private: boost::optional selectedModelObject() const; openstudio::IddObjectType currentIddObjectType() const; diff --git a/src/openstudio_lib/ModelSubTabView.hpp b/src/openstudio_lib/ModelSubTabView.hpp index a62693923..666b3cf2a 100644 --- a/src/openstudio_lib/ModelSubTabView.hpp +++ b/src/openstudio_lib/ModelSubTabView.hpp @@ -52,7 +52,7 @@ class ModelSubTabView : public SubTabView { Q_OBJECT - public: + public: ModelSubTabView(OSItemSelector* itemSelector, ModelObjectInspectorView* modelObjectInspectorView, bool showGridViewLayout = false, QWidget* parent = nullptr); @@ -60,7 +60,7 @@ class ModelSubTabView : public SubTabView ModelObjectInspectorView* modelObjectInspectorView(); - signals: + signals: void modelObjectSelected(model::OptionalModelObject& modelObject, bool readOnly); @@ -70,16 +70,16 @@ class ModelSubTabView : public SubTabView void toggleUnitsClicked(bool displayIP); - protected: + protected: bool m_isIP; - protected slots: + protected slots: virtual void onDropZoneItemClicked(OSItem* item) override; //void onItemSelected(); Evan: Dead slot - private: + private: ModelObjectInspectorView* m_modelObjectInspectorView; }; diff --git a/src/openstudio_lib/OSAppBase.hpp b/src/openstudio_lib/OSAppBase.hpp index 27ab86e4a..42f1c9173 100644 --- a/src/openstudio_lib/OSAppBase.hpp +++ b/src/openstudio_lib/OSAppBase.hpp @@ -55,7 +55,7 @@ class OPENSTUDIO_API OSAppBase : public QApplication, public BaseApp Q_OBJECT; - public: + public: OSAppBase(int& argc, char** argv, const QSharedPointer& t_measureManager); virtual ~OSAppBase(); @@ -92,7 +92,7 @@ class OPENSTUDIO_API OSAppBase : public QApplication, public BaseApp void removeWorkspaceObjectPtr(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); - signals: + signals: void workspaceObjectAdded(const WorkspaceObject& workspaceObject, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); void workspaceObjectAddedPtr(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); @@ -101,19 +101,19 @@ class OPENSTUDIO_API OSAppBase : public QApplication, public BaseApp void workspaceObjectRemovedPtr(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); - protected: + protected: virtual bool event(QEvent* e) override; virtual void childEvent(QChildEvent* e) override; REGISTER_LOGGER("openstudio.OSAppBase"); - private: + private: QSharedPointer m_measureManager; boost::shared_ptr m_waitDialog; - public slots: + public slots: virtual void reloadFile(const QString& osmPath, bool modified, bool saveCurrentTabs) = 0; diff --git a/src/openstudio_lib/OSCollapsibleItem.hpp b/src/openstudio_lib/OSCollapsibleItem.hpp index 8ab01b58d..07e0e2d46 100644 --- a/src/openstudio_lib/OSCollapsibleItem.hpp +++ b/src/openstudio_lib/OSCollapsibleItem.hpp @@ -50,7 +50,7 @@ class OSCollapsibleItem : public QWidget { Q_OBJECT - public: + public: OSCollapsibleItem(OSCollapsibleItemHeader* collapsibleItemHeader, OSItemList* itemList, QWidget* parent = nullptr); virtual ~OSCollapsibleItem() {} @@ -77,7 +77,7 @@ class OSCollapsibleItem : public QWidget bool showFilterLayout(); void setShowFilterLayout(const bool showFilterLayout); - signals: + signals: void collapsableItemSelected(OSCollapsibleItem*); @@ -91,10 +91,10 @@ class OSCollapsibleItem : public QWidget void openLibDlgClicked(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private slots: + private slots: void onHeaderClicked(OSCollapsibleItemHeader* header); @@ -104,7 +104,7 @@ class OSCollapsibleItem : public QWidget void comboBoxClicked(const QString& string); - private: + private: void createLayout(); void setShowFilterWidgets(const bool showFilterWidgets); diff --git a/src/openstudio_lib/OSCollapsibleItemHeader.hpp b/src/openstudio_lib/OSCollapsibleItemHeader.hpp index 5e94ab4b2..9ad7cf2bf 100644 --- a/src/openstudio_lib/OSCollapsibleItemHeader.hpp +++ b/src/openstudio_lib/OSCollapsibleItemHeader.hpp @@ -43,7 +43,7 @@ class OSCollapsibleItemHeader : public QWidget { Q_OBJECT - public: + public: OSCollapsibleItemHeader(const std::string& text, const OSItemId& itemId, OSItemType type = OSItemType::CollapsibleListHeader, QWidget* parent = nullptr); @@ -55,18 +55,18 @@ class OSCollapsibleItemHeader : public QWidget bool selected() const; void setSelected(bool isSelected); - signals: + signals: void clicked(OSCollapsibleItemHeader* header); - protected: + protected: void paintEvent(QPaintEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; void mousePressEvent(QMouseEvent* event) override; void leaveEvent(QEvent* event) override; QSize sizeHint() const override; - private: + private: void setImage(bool expanded); QLabel* m_arrowLabel; diff --git a/src/openstudio_lib/OSCollapsibleItemList.hpp b/src/openstudio_lib/OSCollapsibleItemList.hpp index 8e16e0b9d..9f68637c1 100644 --- a/src/openstudio_lib/OSCollapsibleItemList.hpp +++ b/src/openstudio_lib/OSCollapsibleItemList.hpp @@ -47,7 +47,7 @@ class OSCollapsibleItemList : public OSItemSelector { Q_OBJECT - public: + public: OSCollapsibleItemList(bool addScrollArea, QWidget* parent = nullptr); virtual ~OSCollapsibleItemList() {} @@ -70,20 +70,20 @@ class OSCollapsibleItemList : public OSItemSelector bool showFilterLayout() const; void setShowFilterLayout(const bool showFilterLayout); - signals: + signals: void openLibDlgClicked(); - private slots: + private slots: void onCollapsableItemSelected(OSCollapsibleItem* selectedItem); void onItemSelected(OSItem* item); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: QVBoxLayout* m_vLayout; QHBoxLayout* m_contentLayout; OSCollapsibleItem* m_selectedCollapsibleItem; diff --git a/src/openstudio_lib/OSDocument.hpp b/src/openstudio_lib/OSDocument.hpp index ad19005f7..9202852cd 100644 --- a/src/openstudio_lib/OSDocument.hpp +++ b/src/openstudio_lib/OSDocument.hpp @@ -72,7 +72,7 @@ class OPENSTUDIO_API OSDocument : public OSQObjectController { Q_OBJECT - public: + public: OSDocument(openstudio::model::Model library, const openstudio::path& resourcesPath, openstudio::model::OptionalModel model = boost::none, QString filePath = QString(), bool isPlugin = false, int startTabIndex = 0, int startSubTabIndex = 0); @@ -171,7 +171,7 @@ class OPENSTUDIO_API OSDocument : public OSQObjectController // DLM: would like for this to not be a member variable since it is only used as a modal dialog with a well defined lifetime boost::shared_ptr m_applyMeasureNowDialog; - signals: + signals: void closeClicked(); @@ -216,7 +216,7 @@ class OPENSTUDIO_API OSDocument : public OSQObjectController void enableRevertToSaved(bool enable); - public slots: + public slots: void markAsModified(); @@ -250,7 +250,7 @@ class OPENSTUDIO_API OSDocument : public OSQObjectController void openChangeMeasuresDirDlg(); - private slots: + private slots: void onVerticalTabSelected(int id); @@ -276,7 +276,7 @@ class OPENSTUDIO_API OSDocument : public OSQObjectController void addStandardMeasures(); - public slots: + public slots: void enable(); @@ -288,7 +288,7 @@ class OPENSTUDIO_API OSDocument : public OSQObjectController void weatherFileReset(); - private: + private: enum fileType { SDD, diff --git a/src/openstudio_lib/OSDropZone.hpp b/src/openstudio_lib/OSDropZone.hpp index 55b9538b0..7adf91fb2 100644 --- a/src/openstudio_lib/OSDropZone.hpp +++ b/src/openstudio_lib/OSDropZone.hpp @@ -65,7 +65,7 @@ class OSDropZone2 : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: OSDropZone2(); ~OSDropZone2(); @@ -88,29 +88,29 @@ class OSDropZone2 : public QWidget, public Nano::Observer void unbind(); - signals: + signals: void itemClicked(OSItem* item); void objectRemoved(boost::optional parent); void inFocus(bool inFocus, bool hasData); - protected: + protected: void paintEvent(QPaintEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - public slots: + public slots: void onItemRemoveClicked(); - private slots: + private slots: void refresh(); void dragEnterEvent(QDragEnterEvent* event) override; void dropEvent(QDropEvent* event) override; - private: + private: void makeItem(); boost::optional m_get; @@ -127,7 +127,7 @@ class OSDropZone : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: OSDropZone(OSVectorController* vectorController, const QString& text = "Drag From Library", const QSize& size = QSize(0, 0), bool m_growsHorizontally = true, QWidget* parent = nullptr); @@ -154,7 +154,7 @@ class OSDropZone : public QWidget, public Nano::Observer bool useLargeIcon(); void setUseLargeIcon(bool userLargeIcon); - signals: + signals: // request items from vector controller void itemsRequested(); @@ -173,7 +173,7 @@ class OSDropZone : public QWidget, public Nano::Observer void addButtonClicked(); - protected: + protected: // called when drop occurs, emit onDrop here if needed virtual void onDrop(const OSItemId& itemId); @@ -181,7 +181,7 @@ class OSDropZone : public QWidget, public Nano::Observer //void resizeEvent(QResizeEvent * event); - private slots: + private slots: // set this objects item ids void setItemIds(const std::vector& itemIds); @@ -189,7 +189,7 @@ class OSDropZone : public QWidget, public Nano::Observer // called on drop void handleDrop(QDropEvent* event); - private: + private: OSVectorController* m_vectorController; int m_minItems; int m_maxItems; @@ -210,22 +210,22 @@ class OSItemDropZone : public QWidget { Q_OBJECT - public: + public: OSItemDropZone(bool growsHorizontally, const QString& text, const QSize& size, QWidget* parent = nullptr); virtual ~OSItemDropZone() {} void setExtensible(bool extensible); - signals: + signals: void dropped(QDropEvent* event); - protected: + protected: void paintEvent(QPaintEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override; void dropEvent(QDropEvent* event) override; - private: + private: QSize m_size; bool m_growsHorizontally; }; @@ -237,7 +237,7 @@ class OSDropZoneItem : public QGraphicsObject, public Nano::Observer { Q_OBJECT; - public: + public: OSDropZoneItem(); virtual ~OSDropZoneItem() {} @@ -248,13 +248,13 @@ class OSDropZoneItem : public QGraphicsObject, public Nano::Observer void setText(const QString& text); - signals: + signals: void mouseClicked(); void componentDropped(const OSItemId& itemid); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; @@ -263,7 +263,7 @@ class OSDropZoneItem : public QGraphicsObject, public Nano::Observer QString m_text; - private: + private: bool m_mouseDown; double m_width; diff --git a/src/openstudio_lib/OSInspectorView.hpp b/src/openstudio_lib/OSInspectorView.hpp index 87d9f9a19..5d07b13d2 100644 --- a/src/openstudio_lib/OSInspectorView.hpp +++ b/src/openstudio_lib/OSInspectorView.hpp @@ -48,22 +48,22 @@ class OSInspectorView : public QWidget { Q_OBJECT - public: + public: OSInspectorView(bool addScrollArea, QWidget* parent = nullptr); virtual ~OSInspectorView() {} - signals: + signals: void dropZoneItemClicked(OSItem* item); - public slots: + public slots: void clearSelection(); void selectItem(OSItem* item); - protected: + protected: virtual void onSelectItem(OSItem* item) = 0; virtual void onClearSelection() = 0; @@ -72,11 +72,11 @@ class OSInspectorView : public QWidget QStackedWidget* stackedWidget() const; - protected slots: + protected slots: void update(); - private: + private: QStackedWidget* m_stackedWidget; }; diff --git a/src/openstudio_lib/OSItem.hpp b/src/openstudio_lib/OSItem.hpp index cbe7fc868..f1665abf6 100644 --- a/src/openstudio_lib/OSItem.hpp +++ b/src/openstudio_lib/OSItem.hpp @@ -50,7 +50,7 @@ class MeasureBadge; class OSItemId { - public: + public: static const QString BCL_SOURCE_ID; OSItemId(); OSItemId(const QString& itemId, const QString& sourceId, bool isDefaulted, const QString& otherData = ""); @@ -63,7 +63,7 @@ class OSItemId void setIsDefaulted(bool isDefaulted); bool operator==(const OSItemId& other) const; - private: + private: QString m_itemId; QString m_sourceId; QString m_otherData; @@ -74,7 +74,7 @@ class OSItem : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: // creates a new OSItem if possible static OSItem* makeItem(const OSItemId& itemId, OSItemType osItemType = OSItemType::ListItem); @@ -139,15 +139,15 @@ class OSItem : public QWidget, public Nano::Observer int position() const; void setPosition(int position); - signals: + signals: void itemClicked(OSItem*); void itemRemoveClicked(OSItem*); void itemReplacementDropped(OSItem* currentItem, const OSItemId& replacementItemId); - public slots: + public slots: void onRemoveClicked(); - protected: + protected: void paintEvent(QPaintEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; @@ -165,7 +165,7 @@ class OSItem : public QWidget, public Nano::Observer void setTextColor(QColor color = Qt::black); MeasureBadge* m_measureBadge; - private: + private: void setFixedSize(const QSize& size); void setFixedWidth(int width); void setFixedHeight(int height); diff --git a/src/openstudio_lib/OSItemList.hpp b/src/openstudio_lib/OSItemList.hpp index 6af932e3c..106675de6 100644 --- a/src/openstudio_lib/OSItemList.hpp +++ b/src/openstudio_lib/OSItemList.hpp @@ -43,7 +43,7 @@ class OSVectorController; class OSItemList : public OSItemSelector { Q_OBJECT - public: + public: OSItemList(OSVectorController* vectorController, bool addScrollArea, QWidget* parent = nullptr); virtual ~OSItemList() {} @@ -71,7 +71,7 @@ class OSItemList : public OSItemSelector OSItemType itemsType() const; void setItemsType(OSItemType type); - public slots: + public slots: // adds an item, optionally selects it void addItem(OSItem* item, bool selectItem = true); @@ -85,20 +85,20 @@ class OSItemList : public OSItemSelector // clears the selection, does not emit selectionCleared void clearSelection(); - private slots: + private slots: void setItemIds(const std::vector& itemIds); void refresh(); - signals: + signals: void itemsRequested(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: OSVectorController* m_vectorController; QVBoxLayout* m_vLayout; OSItem* m_selectedItem; diff --git a/src/openstudio_lib/OSItemSelector.hpp b/src/openstudio_lib/OSItemSelector.hpp index 07575884a..ebaf34c29 100644 --- a/src/openstudio_lib/OSItemSelector.hpp +++ b/src/openstudio_lib/OSItemSelector.hpp @@ -45,14 +45,14 @@ class OSItemSelector : public QWidget { Q_OBJECT - public: + public: OSItemSelector(QWidget* parent = nullptr); virtual ~OSItemSelector() {} virtual OSItem* selectedItem() const = 0; - signals: + signals: void itemSelected(OSItem* item); diff --git a/src/openstudio_lib/OSItemSelectorButtons.cpp b/src/openstudio_lib/OSItemSelectorButtons.cpp index 847fa6859..f7ccda65c 100644 --- a/src/openstudio_lib/OSItemSelectorButtons.cpp +++ b/src/openstudio_lib/OSItemSelectorButtons.cpp @@ -56,7 +56,7 @@ namespace openstudio { class AlwaysEmptyDropZoneVectorController : public OSVectorController { - protected: + protected: virtual std::vector makeVector() override { return std::vector(); } diff --git a/src/openstudio_lib/OSItemSelectorButtons.hpp b/src/openstudio_lib/OSItemSelectorButtons.hpp index a061e75ce..1a0639094 100644 --- a/src/openstudio_lib/OSItemSelectorButtons.hpp +++ b/src/openstudio_lib/OSItemSelectorButtons.hpp @@ -52,7 +52,7 @@ class OSItemSelectorButtons : public QWidget { Q_OBJECT - public: + public: OSItemSelectorButtons(QWidget* parent = nullptr); virtual ~OSItemSelectorButtons() {} @@ -87,7 +87,7 @@ class OSItemSelectorButtons : public QWidget void enableBclDlgButton(); void disableBclDlgButton(); - signals: + signals: void itemDropped(const OSItemId& itemId); @@ -101,10 +101,10 @@ class OSItemSelectorButtons : public QWidget void downloadComponentsClicked(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: QVBoxLayout* m_vLayout; OSVectorController* m_dropZoneController; diff --git a/src/openstudio_lib/OSVectorController.hpp b/src/openstudio_lib/OSVectorController.hpp index d6154aa95..53f99b819 100644 --- a/src/openstudio_lib/OSVectorController.hpp +++ b/src/openstudio_lib/OSVectorController.hpp @@ -46,14 +46,14 @@ class OSVectorController : public QObject, public Nano::Observer { Q_OBJECT - public: + public: // in the future, OSVectorController's will be managed by shared_ptr's on parent controller // for now, each controller must be parented by a widget OSVectorController(); virtual ~OSVectorController() {} - public slots: + public slots: void reportItems(); @@ -65,13 +65,13 @@ class OSVectorController : public QObject, public Nano::Observer void makeNewItem(); - signals: + signals: void itemIds(const std::vector& itemIds); void selectedItemId(const OSItemId& itemId); - protected: + protected: virtual std::vector makeVector() = 0; virtual void onRemoveItem(OSItem* item); diff --git a/src/openstudio_lib/OSWebEnginePage.hpp b/src/openstudio_lib/OSWebEnginePage.hpp index 7ecba3647..ee680ccab 100644 --- a/src/openstudio_lib/OSWebEnginePage.hpp +++ b/src/openstudio_lib/OSWebEnginePage.hpp @@ -40,14 +40,14 @@ class OSWebEnginePage : public QWebEnginePage { Q_OBJECT - public: + public: OSWebEnginePage(QObject* parent = 0) : QWebEnginePage(parent) {} - protected: + protected: virtual bool certificateError(const QWebEngineCertificateError& certificateError) override; virtual bool acceptNavigationRequest(const QUrl& url, QWebEnginePage::NavigationType type, bool isMainFrame) override; - private: + private: REGISTER_LOGGER("openstudio::OSWebEnginePage"); }; diff --git a/src/openstudio_lib/OtherEquipmentInspectorView.hpp b/src/openstudio_lib/OtherEquipmentInspectorView.hpp index 83c7f51c0..57bd0b32c 100644 --- a/src/openstudio_lib/OtherEquipmentInspectorView.hpp +++ b/src/openstudio_lib/OtherEquipmentInspectorView.hpp @@ -45,19 +45,19 @@ class OtherEquipmentDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: OtherEquipmentDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~OtherEquipmentDefinitionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::OtherEquipmentDefinition& otherEquipmentDefinition); void detach(); @@ -82,7 +82,7 @@ class OtherEquipmentDefinitionInspectorView : public ModelObjectInspectorView boost::optional m_otherEquipmentDefinition; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/PeopleInspectorView.hpp b/src/openstudio_lib/PeopleInspectorView.hpp index ce14b2ae7..4d93f411e 100644 --- a/src/openstudio_lib/PeopleInspectorView.hpp +++ b/src/openstudio_lib/PeopleInspectorView.hpp @@ -50,19 +50,19 @@ class PeopleDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: PeopleDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~PeopleDefinitionInspectorView() {} - public slots: + public slots: void addExtensible(); void removeExtensible(); void toggleUnits(bool displayIP) override; - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; @@ -73,7 +73,7 @@ class PeopleDefinitionInspectorView : public ModelObjectInspectorView // Disable add extensible group button if can't add more (maxFields) void checkButtons(); - private: + private: REGISTER_LOGGER("openstudio.PeopleDefinitionInspectorView"); void attach(openstudio::model::PeopleDefinition& peopleDefinition); diff --git a/src/openstudio_lib/PlanarSurfaceWidget.hpp b/src/openstudio_lib/PlanarSurfaceWidget.hpp index 7cc76262a..466698791 100644 --- a/src/openstudio_lib/PlanarSurfaceWidget.hpp +++ b/src/openstudio_lib/PlanarSurfaceWidget.hpp @@ -41,7 +41,7 @@ class PlanarSurfaceWidget : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: PlanarSurfaceWidget(bool isIP, QWidget* parent = nullptr); virtual ~PlanarSurfaceWidget() {} @@ -50,20 +50,20 @@ class PlanarSurfaceWidget : public QWidget, public Nano::Observer virtual void detach(); - private slots: + private slots: void clear(); void refresh(); - private: + private: void setUnits(bool displayIP); boost::optional m_planarSurface; QString m_units; - public slots: + public slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/RadianceDialog.hpp b/src/openstudio_lib/RadianceDialog.hpp index adfc0e505..8929bb85a 100644 --- a/src/openstudio_lib/RadianceDialog.hpp +++ b/src/openstudio_lib/RadianceDialog.hpp @@ -40,17 +40,17 @@ class RadianceDialog : public OSDialog { Q_OBJECT - public: + public: RadianceDialog(bool isIP, QWidget* radianceInspector, QWidget* parent = nullptr); virtual ~RadianceDialog() {} - private: + private: virtual void createLayout() override; QWidget* m_radianceInspector; - protected slots: + protected slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/RefrigerationController.hpp b/src/openstudio_lib/RefrigerationController.hpp index 5c955efda..90aaba4a5 100644 --- a/src/openstudio_lib/RefrigerationController.hpp +++ b/src/openstudio_lib/RefrigerationController.hpp @@ -57,7 +57,7 @@ class RefrigerationController : public QObject { Q_OBJECT - public: + public: RefrigerationController(); virtual ~RefrigerationController(); @@ -75,7 +75,7 @@ class RefrigerationController : public QObject void refreshRefrigerationSystemView(RefrigerationSystemView* systemView, boost::optional& system); - public slots: + public slots: void zoomInOnSystem(const Handle& handle); @@ -83,7 +83,7 @@ class RefrigerationController : public QObject void zoomOutToSystemGridView(); - private slots: + private slots: void refresh(); @@ -115,7 +115,7 @@ class RefrigerationController : public QObject void inspectOSItem(const OSItemId& itemid); - private: + private: QPointer m_refrigerationView; QPointer m_refrigerationSystemGridView; @@ -139,7 +139,7 @@ class RefrigerationSystemListController : public OSListController { Q_OBJECT - public: + public: RefrigerationSystemListController(RefrigerationController* refrigerationController); RefrigerationController* refrigerationController() const; @@ -148,21 +148,21 @@ class RefrigerationSystemListController : public OSListController void reset(); - signals: + signals: void itemInsertedPrivate(int i); - public slots: + public slots: void addSystem(const OSItemId& itemid); void createNewSystem(); void removeSystem(model::RefrigerationSystem& refrigerationSystem); - private slots: + private slots: void onModelObjectAdd(const WorkspaceObject& object, const openstudio::IddObjectType& iddObjectType, const openstudio::UUID& handle); - private: + private: std::vector systems() const; int systemIndex(const model::RefrigerationSystem& system) const; QPointer m_refrigerationController; @@ -173,7 +173,7 @@ class RefrigerationSystemItemDelegate : public OSGraphicsItemDelegate { Q_OBJECT; - public: + public: virtual ~RefrigerationSystemItemDelegate() {} virtual QGraphicsObject* view(QSharedPointer dataSource) override; @@ -183,7 +183,7 @@ class RefrigerationSystemListDropZoneItem : public OSListItem { Q_OBJECT - public: + public: RefrigerationSystemListDropZoneItem(OSListController* listController = nullptr); ~RefrigerationSystemListDropZoneItem() {} @@ -193,19 +193,19 @@ class RefrigerationSystemListItem : public OSListItem { Q_OBJECT - public: + public: RefrigerationSystemListItem(const model::RefrigerationSystem& refrigerationSystem, OSListController* listController = nullptr); virtual ~RefrigerationSystemListItem() {} QString systemName() const; model::RefrigerationSystem system() const; - public slots: + public slots: void remove(); void zoomInOnSystem(); - private: + private: model::RefrigerationSystem m_refrigerationSystem; }; diff --git a/src/openstudio_lib/RefrigerationGraphicsItems.hpp b/src/openstudio_lib/RefrigerationGraphicsItems.hpp index 444b46d43..1e75c27cd 100644 --- a/src/openstudio_lib/RefrigerationGraphicsItems.hpp +++ b/src/openstudio_lib/RefrigerationGraphicsItems.hpp @@ -61,7 +61,7 @@ class RefrigerationView : public QWidget { Q_OBJECT; - public: + public: RefrigerationView(); QWidget* header; @@ -77,7 +77,7 @@ class CaseViewExpandButton : public AbstractButtonItem { Q_OBJECT; - public: + public: CaseViewExpandButton(); virtual ~CaseViewExpandButton() {} @@ -86,10 +86,10 @@ class CaseViewExpandButton : public AbstractButtonItem static QSize size(); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: QPixmap m_openImage; QPixmap m_closeImage; @@ -101,7 +101,7 @@ class RefrigerationSystemMiniView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationSystemMiniView(); virtual ~RefrigerationSystemMiniView() {} @@ -118,14 +118,14 @@ class RefrigerationSystemMiniView : public QGraphicsObject static QSize cellSize(); - public slots: + public slots: void setName(const QString& name); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private: + private: QRectF contentRect() const; QRectF headerRect() const; @@ -141,7 +141,7 @@ class RefrigerationSystemDetailView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationSystemDetailView(); virtual ~RefrigerationSystemDetailView() {} @@ -152,10 +152,10 @@ class RefrigerationSystemDetailView : public QGraphicsObject QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private: + private: // QRectF contentRect() const; // QRectF headerRect() const; @@ -171,10 +171,10 @@ class RefrigerationSystemDropZoneView : public OSDropZoneItem { Q_OBJECT; - public: + public: QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; }; @@ -182,7 +182,7 @@ class RefrigerationSystemView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationSystemView(); virtual ~RefrigerationSystemView() {} @@ -222,15 +222,15 @@ class RefrigerationSystemView : public QGraphicsObject void setId(const OSItemId& id); - signals: + signals: void inspectClicked(OSItemId id); - public slots: + public slots: void setCasesExpanded(bool expanded); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; @@ -239,7 +239,7 @@ class RefrigerationSystemView : public QGraphicsObject bool m_mouseDown; - private: + private: OSItemId m_id; }; @@ -247,7 +247,7 @@ class RefrigerationCondenserView : public RefrigerationSystemDropZoneView { Q_OBJECT; - public: + public: RefrigerationCondenserView(); virtual ~RefrigerationCondenserView() {} @@ -264,13 +264,13 @@ class RefrigerationCondenserView : public RefrigerationSystemDropZoneView static QSizeF size(); - signals: + signals: void removeClicked(OSItemId id); void inspectClicked(OSItemId id); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; @@ -279,11 +279,11 @@ class RefrigerationCondenserView : public RefrigerationSystemDropZoneView bool m_mouseDown; - private slots: + private slots: void onRemoveButtonClicked(); - private: + private: OSItemId m_id; QString m_name; @@ -295,7 +295,7 @@ class RefrigerationCompressorDetailView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationCompressorDetailView(); virtual ~RefrigerationCompressorDetailView() {} @@ -310,13 +310,13 @@ class RefrigerationCompressorDetailView : public QGraphicsObject void setId(const OSItemId& id); - signals: + signals: void removeClicked(OSItemId id); void inspectClicked(OSItemId id); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; @@ -325,11 +325,11 @@ class RefrigerationCompressorDetailView : public QGraphicsObject bool m_mouseDown; - private slots: + private slots: void onRemoveButtonClicked(); - private: + private: QString m_label; OSItemId m_id; @@ -341,14 +341,14 @@ class RefrigerationCompressorDropZoneView : public RefrigerationSystemDropZoneVi { Q_OBJECT; - public: + public: RefrigerationCompressorDropZoneView(); virtual ~RefrigerationCompressorDropZoneView() {} QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; @@ -356,7 +356,7 @@ class RefrigerationCompressorView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationCompressorView(); virtual ~RefrigerationCompressorView() {} @@ -373,10 +373,10 @@ class RefrigerationCompressorView : public QGraphicsObject static double height(); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: std::vector m_compressorDetailViews; }; @@ -384,7 +384,7 @@ class RefrigerationCasesDropZoneView : public RefrigerationSystemDropZoneView { Q_OBJECT; - public: + public: RefrigerationCasesDropZoneView(); virtual ~RefrigerationCasesDropZoneView() {} @@ -393,7 +393,7 @@ class RefrigerationCasesDropZoneView : public RefrigerationSystemDropZoneView QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; @@ -401,7 +401,7 @@ class RefrigerationCaseDetailView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationCaseDetailView(); virtual ~RefrigerationCaseDetailView() {} @@ -420,13 +420,13 @@ class RefrigerationCaseDetailView : public QGraphicsObject void setId(const OSItemId& id); - signals: + signals: void removeClicked(OSItemId id); void inspectClicked(OSItemId id); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; @@ -435,11 +435,11 @@ class RefrigerationCaseDetailView : public QGraphicsObject bool m_mouseDown; - private slots: + private slots: void onRemoveButtonClicked(); - private: + private: QString m_name; OSItemId m_id; @@ -453,7 +453,7 @@ class RefrigerationCasesView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationCasesView(); virtual ~RefrigerationCasesView() {} @@ -480,14 +480,14 @@ class RefrigerationCasesView : public QGraphicsObject static QRectF summaryRect(); - public slots: + public slots: void setExpanded(bool exapanded); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: QPointF casePos(int index) const; int m_numberOfDisplayCases; @@ -509,7 +509,7 @@ class RefrigerationSubCoolerView : public RefrigerationSystemDropZoneView { Q_OBJECT; - public: + public: RefrigerationSubCoolerView(); virtual ~RefrigerationSubCoolerView() {} @@ -524,13 +524,13 @@ class RefrigerationSubCoolerView : public RefrigerationSystemDropZoneView static QSizeF size(); - signals: + signals: void removeClicked(OSItemId id); void inspectClicked(OSItemId id); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; @@ -539,11 +539,11 @@ class RefrigerationSubCoolerView : public RefrigerationSystemDropZoneView bool m_mouseDown; - private slots: + private slots: void onRemoveButtonClicked(); - private: + private: OSItemId m_id; QString m_name; @@ -555,10 +555,10 @@ class RefrigerationHeatReclaimView : public RefrigerationSystemDropZoneView { Q_OBJECT; - public: + public: QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; @@ -566,7 +566,7 @@ class RefrigerationSHXView : public RefrigerationSystemDropZoneView { Q_OBJECT; - public: + public: RefrigerationSHXView(); virtual ~RefrigerationSHXView() {} @@ -581,13 +581,13 @@ class RefrigerationSHXView : public RefrigerationSystemDropZoneView static QSizeF size(); - signals: + signals: void removeClicked(OSItemId id); void inspectClicked(OSItemId id); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; @@ -596,11 +596,11 @@ class RefrigerationSHXView : public RefrigerationSystemDropZoneView bool m_mouseDown; - private slots: + private slots: void onRemoveButtonClicked(); - private: + private: OSItemId m_id; QString m_name; @@ -612,10 +612,10 @@ class SecondaryDropZoneView : public RefrigerationSystemDropZoneView { Q_OBJECT; - public: + public: QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; }; @@ -623,7 +623,7 @@ class SecondaryDetailView : public QGraphicsObject { Q_OBJECT; - public: + public: SecondaryDetailView(); virtual ~SecondaryDetailView() {} @@ -640,20 +640,20 @@ class SecondaryDetailView : public QGraphicsObject static double width(); static double height(); - signals: + signals: void zoomInOnSystemClicked(const Handle& handle); void removeClicked(const Handle& handle); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private slots: + private slots: void onZoomButtonClicked(); void onRemoveButtonClicked(); - private: + private: QString m_name; Handle m_handle; }; @@ -662,7 +662,7 @@ class RefrigerationSecondaryView : public QGraphicsObject { Q_OBJECT; - public: + public: RefrigerationSecondaryView(); virtual ~RefrigerationSecondaryView() {} @@ -677,10 +677,10 @@ class RefrigerationSecondaryView : public QGraphicsObject void adjustLayout(); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: std::vector m_secondaryDetailViews; int m_height; }; @@ -688,7 +688,7 @@ class RefrigerationSecondaryView : public QGraphicsObject // A class to display that Refrigeration isn't allowed on that tab class NoRefrigerationView : public QWidget { - public: + public: NoRefrigerationView(); virtual ~NoRefrigerationView(); diff --git a/src/openstudio_lib/RefrigerationGridController.hpp b/src/openstudio_lib/RefrigerationGridController.hpp index e72a45fa3..04a944f62 100644 --- a/src/openstudio_lib/RefrigerationGridController.hpp +++ b/src/openstudio_lib/RefrigerationGridController.hpp @@ -44,14 +44,14 @@ class RefrigerationGridController : public QObject { Q_OBJECT - public: + public: RefrigerationGridController(bool isIP, const model::Model& model); virtual ~RefrigerationGridController(); RefrigerationGridView* refrigerationGridView() const; - private: + private: QPointer m_refrigerationGridView; }; diff --git a/src/openstudio_lib/RefrigerationGridView.hpp b/src/openstudio_lib/RefrigerationGridView.hpp index 5c31ceca2..8c4dc5508 100644 --- a/src/openstudio_lib/RefrigerationGridView.hpp +++ b/src/openstudio_lib/RefrigerationGridView.hpp @@ -43,15 +43,15 @@ class RefrigerationGridView : public QWidget { Q_OBJECT - public: + public: RefrigerationGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~RefrigerationGridView() {} - private: + private: bool m_isIP; - signals: + signals: void toggleUnitsClicked(bool displayIP); @@ -63,7 +63,7 @@ class RefrigerationCaseGridController : public OSGridController Q_OBJECT - public: + public: RefrigerationCaseGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -71,7 +71,7 @@ class RefrigerationCaseGridController : public OSGridController virtual void refreshModelObjects() override; - protected: + protected: virtual void setCategoriesAndFields() override; virtual void addColumns(const QString& t_category, std::vector& fields) override; @@ -80,7 +80,7 @@ class RefrigerationCaseGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject) override; - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId) override; @@ -92,7 +92,7 @@ class RefrigerationWalkInGridController : public OSGridController Q_OBJECT - public: + public: RefrigerationWalkInGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -100,7 +100,7 @@ class RefrigerationWalkInGridController : public OSGridController virtual void refreshModelObjects() override; - protected: + protected: virtual void setCategoriesAndFields() override; virtual void addColumns(const QString& t_category, std::vector& fields) override; @@ -109,7 +109,7 @@ class RefrigerationWalkInGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject) override; - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId) override; diff --git a/src/openstudio_lib/RefrigerationScene.hpp b/src/openstudio_lib/RefrigerationScene.hpp index 1747adea6..7946a4eaa 100644 --- a/src/openstudio_lib/RefrigerationScene.hpp +++ b/src/openstudio_lib/RefrigerationScene.hpp @@ -38,12 +38,12 @@ class RefrigerationScene : public QGraphicsScene { Q_OBJECT - public: + public: RefrigerationScene(); virtual ~RefrigerationScene() {} - public slots: + public slots: void layout(); }; diff --git a/src/openstudio_lib/RenderingColorWidget.hpp b/src/openstudio_lib/RenderingColorWidget.hpp index 609d88296..d1bf7ad68 100644 --- a/src/openstudio_lib/RenderingColorWidget.hpp +++ b/src/openstudio_lib/RenderingColorWidget.hpp @@ -45,7 +45,7 @@ class RenderingColorWidget2 : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: RenderingColorWidget2(QWidget* parent = nullptr); virtual ~RenderingColorWidget2() {} @@ -54,7 +54,7 @@ class RenderingColorWidget2 : public QWidget, public Nano::Observer virtual void unbind(); - private slots: + private slots: void clear(); @@ -64,7 +64,7 @@ class RenderingColorWidget2 : public QWidget, public Nano::Observer void getRenderingColor(); - private: + private: void setRenderingColor(); boost::optional m_get; @@ -78,7 +78,7 @@ class RenderingColorWidget : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: RenderingColorWidget(QWidget* parent = nullptr); virtual ~RenderingColorWidget() {} @@ -87,7 +87,7 @@ class RenderingColorWidget : public QWidget, public Nano::Observer virtual void detach(); - private slots: + private slots: void clear(); @@ -95,7 +95,7 @@ class RenderingColorWidget : public QWidget, public Nano::Observer void renderColorButtonClicked(); - private: + private: QWidget* m_renderColorWidget; QPushButton* m_renderColorButton; boost::optional m_renderingColor; diff --git a/src/openstudio_lib/ResultsTabController.hpp b/src/openstudio_lib/ResultsTabController.hpp index 5e6cedb2b..824a1fde4 100644 --- a/src/openstudio_lib/ResultsTabController.hpp +++ b/src/openstudio_lib/ResultsTabController.hpp @@ -48,16 +48,16 @@ class ResultsTabController : public MainTabController { Q_OBJECT - public: + public: ResultsTabController(); virtual ~ResultsTabController() {} - public slots: + public slots: void onUnitSystemChange(bool t_isIP); - private: + private: ResultsTabView* m_resultsTabView; REGISTER_LOGGER("openstudio::ResultsTabController"); diff --git a/src/openstudio_lib/ResultsTabView.hpp b/src/openstudio_lib/ResultsTabView.hpp index d59194fab..9b5896261 100644 --- a/src/openstudio_lib/ResultsTabView.hpp +++ b/src/openstudio_lib/ResultsTabView.hpp @@ -55,17 +55,17 @@ class ResultsView : public QWidget { Q_OBJECT; - public: + public: ResultsView(QWidget* t_parent = nullptr); virtual ~ResultsView(); void searchForExistingResults(const openstudio::path& t_runDir, const openstudio::path& t_reportsDir); - public slots: + public slots: void resultsGenerated(const openstudio::path& t_sqlFile, const openstudio::path& t_radianceResultsPath); void onUnitSystemChange(bool t_isIP); void treeChanged(const openstudio::UUID& t_uuid); - private slots: + private slots: void refreshClicked(); void openDViewClicked(); void comboBoxChanged(int index); @@ -76,7 +76,7 @@ class ResultsView : public QWidget void onLoadStarted(); void onRenderProcessTerminated(QWebEnginePage::RenderProcessTerminationStatus terminationStatus, int exitCode); - private: + private: REGISTER_LOGGER("openstudio::ResultsView"); //openstudio::runmanager::RunManager runManager(); void populateComboBox(std::vector reports); @@ -103,15 +103,15 @@ class ResultsTabView : public MainTabView { Q_OBJECT; - public: + public: ResultsTabView(const QString& tabLabel, TabType tabType, QWidget* parent = nullptr); virtual ~ResultsTabView() {} - public slots: + public slots: void onUnitSystemChange(bool t_isIP); - signals: + signals: void removeResultClicked(); @@ -119,7 +119,7 @@ class ResultsTabView : public MainTabView void treeChanged(const openstudio::UUID& t_uuid); - private: + private: ResultsView* m_resultsView; REGISTER_LOGGER("openstudio::ResultsTabView"); }; diff --git a/src/openstudio_lib/RunTabController.hpp b/src/openstudio_lib/RunTabController.hpp index 213ecbf70..6738c6a99 100644 --- a/src/openstudio_lib/RunTabController.hpp +++ b/src/openstudio_lib/RunTabController.hpp @@ -50,7 +50,7 @@ class RunTabController : public MainTabController { Q_OBJECT - public: + public: RunTabController(const model::Model& model, const openstudio::path& t_modelPath, const openstudio::path& t_tempFolder); //, openstudio::runmanager::RunManager t_runManager); @@ -66,15 +66,15 @@ class RunTabController : public MainTabController TREE }; - signals: + signals: void resultsGenerated(const openstudio::path& t_sqlFile, const openstudio::path& t_radianceOutputFile); void toolsUpdated(); //void useRadianceStateChanged(bool); - public slots: + public slots: void updateToolsWarnings(); - private: + private: //RunView * m_runView; //openstudio::runmanager::JobStatusWidget * m_status; diff --git a/src/openstudio_lib/RunTabView.hpp b/src/openstudio_lib/RunTabView.hpp index c5b72620c..9d2a0103a 100644 --- a/src/openstudio_lib/RunTabView.hpp +++ b/src/openstudio_lib/RunTabView.hpp @@ -61,10 +61,10 @@ class RunView : public QWidget { Q_OBJECT; - public: + public: RunView(); - private: + private: REGISTER_LOGGER("openstudio::RunView"); void playButtonClicked(bool t_checked); @@ -112,7 +112,7 @@ class RunTabView : public MainTabView { Q_OBJECT; - public: + public: RunTabView(const model::Model& model, QWidget* parent = nullptr); virtual ~RunTabView() {} @@ -120,7 +120,7 @@ class RunTabView : public MainTabView //signals: // void resultsGenerated(const openstudio::path &t_sqlFile); - private: + private: RunView* m_runView; //openstudio::runmanager::JobStatusWidget * m_status; }; diff --git a/src/openstudio_lib/ScheduleDayView.hpp b/src/openstudio_lib/ScheduleDayView.hpp index 12e3f9427..923af6426 100644 --- a/src/openstudio_lib/ScheduleDayView.hpp +++ b/src/openstudio_lib/ScheduleDayView.hpp @@ -87,7 +87,7 @@ class ScheduleDayView : public QWidget { Q_OBJECT - public: + public: ScheduleDayView(bool isIP, const model::ScheduleDay& scheduleDay, SchedulesView* schedulesView); virtual ~ScheduleDayView() {} @@ -134,7 +134,7 @@ class ScheduleDayView : public QWidget // gets the current units for the schedule boost::optional units(bool displayIP) const; - signals: + signals: void zoomChanged(double zoom); @@ -144,7 +144,7 @@ class ScheduleDayView : public QWidget //void endDateTimeChanged(model::ScheduleRule & scheduleRule, const QDateTime & newDate); - public slots: + public slots: void onToggleUnitsClicked(bool displayIP); @@ -154,7 +154,7 @@ class ScheduleDayView : public QWidget // called when value in the spin box changes void onUpperViewLimitChanged(double d); - private slots: + private slots: //void refresh(); @@ -170,7 +170,7 @@ class ScheduleDayView : public QWidget void setOneMinuteZoom(); - private: + private: boost::optional m_yearDescription; double m_focusStartTime; @@ -199,7 +199,7 @@ class ScheduleLimitsView : public QWidget { Q_OBJECT - public: + public: ScheduleLimitsView(bool isIP, const boost::optional& scheduleTypeLimits, ScheduleDayView* scheduleDayView); virtual ~ScheduleLimitsView() {} @@ -226,7 +226,7 @@ class ScheduleLimitsView : public QWidget boost::optional units(bool displayIP) const; - private: + private: bool m_isIP; boost::optional m_scheduleTypeLimits; @@ -244,18 +244,18 @@ class ScheduleDayEditor : public QWidget { Q_OBJECT - public: + public: ScheduleDayEditor(bool isIP, ScheduleDayView* scheduleView, const model::ScheduleDay& scheduleDay); virtual ~ScheduleDayEditor() {} ScheduleDayView* scheduleDayView() const; - signals: + signals: void changeVerticalAxisClicked(model::ScheduleDay scheduleDay); - public slots: + public slots: void fitInView(); @@ -263,7 +263,7 @@ class ScheduleDayEditor : public QWidget void updateKeyboardPrompt(const QString& keyboardPrompt); - protected: + protected: void mouseDoubleClickEvent(QMouseEvent* event) override; void paintEvent(QPaintEvent* event) override; @@ -274,7 +274,7 @@ class ScheduleDayEditor : public QWidget //void scheduleRefresh(); - private: + private: void setLabelText(bool isIP); DaySchedulePlotArea* m_graphicsView; @@ -294,7 +294,7 @@ class DayScheduleScene : public QGraphicsScene, public Nano::Observer { Q_OBJECT - public: + public: DayScheduleScene(ScheduleDayView* scheduleRuleView, const model::ScheduleDay& scheduleDay); virtual ~DayScheduleScene() {} @@ -321,15 +321,15 @@ class DayScheduleScene : public QGraphicsScene, public Nano::Observer QGraphicsItem* segmentAt(double x, double y, double zoom) const; - public slots: + public slots: void scheduleRefresh(); - private slots: + private slots: void refresh(); - private: + private: CalendarSegmentItem* m_firstSegment; ScheduleTypeLimitItem* m_upperScheduleTypeLimitItem; @@ -347,7 +347,7 @@ class DaySchedulePlotArea : public QGraphicsView { Q_OBJECT - public: + public: DaySchedulePlotArea(ScheduleDayEditor* mainScheduleView); virtual ~DaySchedulePlotArea() {} @@ -362,13 +362,13 @@ class DaySchedulePlotArea : public QGraphicsView DayScheduleScene* scene() const; - signals: + signals: void dayScheduleSceneChanged(DayScheduleScene* scene, double lowerValue, double upperValue); void keyboardPromptChanged(QString keyboardPrompt); - protected: + protected: void mouseDoubleClickEvent(QMouseEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override; @@ -379,7 +379,7 @@ class DaySchedulePlotArea : public QGraphicsView void keyPressEvent(QKeyEvent* event) override; - private: + private: void updateKeyboardPrompt(); ScheduleDayEditor* m_scheduleDayEditor; @@ -397,14 +397,14 @@ class DayScheduleOverview : public QWidget { Q_OBJECT - public: + public: DayScheduleOverview(ScheduleDayView* scheduleRuleView); virtual ~DayScheduleOverview() {} void updateFocusRectangleGeometry(); - protected: + protected: void resizeEvent(QResizeEvent* event) override; void mouseMoveEvent(QMouseEvent* event) override; @@ -413,13 +413,13 @@ class DayScheduleOverview : public QWidget void mouseReleaseEvent(QMouseEvent* event) override; - private slots: + private slots: void fitInView(); void onZoomChange(double newZoom); - private: + private: double timeAt(int x) const; int xAt(double time) const; @@ -437,7 +437,7 @@ class DayScheduleOverview : public QWidget class VCalendarSegmentItem : public QGraphicsItem { - public: + public: VCalendarSegmentItem(QGraphicsItem* parent = nullptr); virtual ~VCalendarSegmentItem() {} @@ -470,14 +470,14 @@ class VCalendarSegmentItem : public QGraphicsItem double hCenterPos() const; - protected: + protected: void setMouseDown(bool mouseDown); void setHovering(bool hovering); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private: + private: void remove(); bool m_mouseDown; @@ -495,7 +495,7 @@ class VCalendarSegmentItem : public QGraphicsItem class CalendarSegmentItem : public QGraphicsItem { - public: + public: CalendarSegmentItem(QGraphicsItem* parent = nullptr); virtual ~CalendarSegmentItem() {} @@ -540,14 +540,14 @@ class CalendarSegmentItem : public QGraphicsItem void splitSegment(double time); - protected: + protected: void setMouseDown(bool mouseDown); void setHovering(bool hovering); void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private: + private: VCalendarSegmentItem* m_previousVCalendarItem; VCalendarSegmentItem* m_nextVCalendarItem; @@ -565,7 +565,7 @@ class CalendarSegmentItem : public QGraphicsItem class ScheduleTypeLimitItem : public QGraphicsItem { - public: + public: ScheduleTypeLimitItem(bool isUpperLimit, QGraphicsItem* parent = nullptr); virtual ~ScheduleTypeLimitItem() {} @@ -588,10 +588,10 @@ class ScheduleTypeLimitItem : public QGraphicsItem QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private: + private: bool m_isUpperLimit; friend class DaySchedulePlotArea; diff --git a/src/openstudio_lib/ScheduleDialog.hpp b/src/openstudio_lib/ScheduleDialog.hpp index 6b0d08eaf..683742ef2 100644 --- a/src/openstudio_lib/ScheduleDialog.hpp +++ b/src/openstudio_lib/ScheduleDialog.hpp @@ -48,18 +48,18 @@ class ScheduleDialog : public OSDialog { Q_OBJECT - public: + public: ScheduleDialog(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~ScheduleDialog() {} void setIsIP(bool isIP); - private slots: + private slots: void onCurrentIndexChanged(int index); - private: + private: virtual void createLayout() override; bool m_isIP; @@ -76,7 +76,7 @@ class ScheduleDialog : public OSDialog QLabel* m_upperLimitLabel; - protected slots: + protected slots: virtual void on_okButton(bool checked) override; }; diff --git a/src/openstudio_lib/ScheduleSetInspectorView.hpp b/src/openstudio_lib/ScheduleSetInspectorView.hpp index 7ed7da270..f3061d790 100644 --- a/src/openstudio_lib/ScheduleSetInspectorView.hpp +++ b/src/openstudio_lib/ScheduleSetInspectorView.hpp @@ -45,10 +45,10 @@ class HoursOfOperationVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~HoursOfOperationVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -60,10 +60,10 @@ class NumberOfPeopleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~NumberOfPeopleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -75,10 +75,10 @@ class PeopleActivityScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~PeopleActivityScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -90,10 +90,10 @@ class LightingScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~LightingScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -105,10 +105,10 @@ class ElectricEquipmentScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~ElectricEquipmentScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -120,10 +120,10 @@ class GasEquipmentScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~GasEquipmentScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -135,10 +135,10 @@ class HotWaterEquipmentScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~HotWaterEquipmentScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -150,10 +150,10 @@ class InfiltrationScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~InfiltrationScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -165,10 +165,10 @@ class SteamEquipmentScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~SteamEquipmentScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -180,10 +180,10 @@ class OtherEquipmentScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~OtherEquipmentScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -195,16 +195,16 @@ class ScheduleSetInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ScheduleSetInspectorView(const model::Model& model, QWidget* parent = nullptr); virtual ~ScheduleSetInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::DefaultScheduleSet& scheduleSet); void detach(); void configDropZones(); diff --git a/src/openstudio_lib/ScheduleSetsController.hpp b/src/openstudio_lib/ScheduleSetsController.hpp index fc7d08af3..a28629342 100644 --- a/src/openstudio_lib/ScheduleSetsController.hpp +++ b/src/openstudio_lib/ScheduleSetsController.hpp @@ -38,12 +38,12 @@ class ScheduleSetsController : public ModelSubTabController { Q_OBJECT - public: + public: ScheduleSetsController(const model::Model& model); virtual ~ScheduleSetsController() {} - protected: + protected: virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; virtual void onCopyObject(const openstudio::model::ModelObject& modelObject) override; diff --git a/src/openstudio_lib/ScheduleSetsView.hpp b/src/openstudio_lib/ScheduleSetsView.hpp index 1952218fc..280ea9ca8 100644 --- a/src/openstudio_lib/ScheduleSetsView.hpp +++ b/src/openstudio_lib/ScheduleSetsView.hpp @@ -43,12 +43,12 @@ class ScheduleSetsView : public ModelSubTabView { Q_OBJECT - public: + public: ScheduleSetsView(const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~ScheduleSetsView() {} - private: + private: static std::vector> modelObjectTypesAndNames(); }; @@ -56,19 +56,19 @@ class ScheduleSetsInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: ScheduleSetsInspectorView(const model::Model& model, QWidget* parent = nullptr); virtual ~ScheduleSetsInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: std::map m_inspectorIndexMap; }; diff --git a/src/openstudio_lib/SchedulesTabController.hpp b/src/openstudio_lib/SchedulesTabController.hpp index be840f257..78c16af7e 100644 --- a/src/openstudio_lib/SchedulesTabController.hpp +++ b/src/openstudio_lib/SchedulesTabController.hpp @@ -66,7 +66,7 @@ class SchedulesTabController : public MainTabController { Q_OBJECT - public: + public: SchedulesTabController(bool isIP, const model::Model& model); virtual ~SchedulesTabController(); @@ -80,7 +80,7 @@ class SchedulesTabController : public MainTabController static double defaultStartingValue(const model::ScheduleDay& scheduleDay); - private: + private: void showScheduleDialog(); ScheduleDialog* m_scheduleDialog = nullptr; @@ -95,13 +95,13 @@ class SchedulesTabController : public MainTabController int m_currentIndex = -1; - public slots: + public slots: virtual void setSubTab(int index) override; void toggleUnits(bool displayIP); - private slots: + private slots: void addScheduleRuleset(); diff --git a/src/openstudio_lib/SchedulesTabView.hpp b/src/openstudio_lib/SchedulesTabView.hpp index 5777b19d1..2ad336990 100644 --- a/src/openstudio_lib/SchedulesTabView.hpp +++ b/src/openstudio_lib/SchedulesTabView.hpp @@ -38,7 +38,7 @@ class SchedulesTabView : public MainTabView { Q_OBJECT - public: + public: SchedulesTabView(const model::Model& model, QWidget* parent = nullptr); virtual ~SchedulesTabView() {} diff --git a/src/openstudio_lib/SchedulesView.hpp b/src/openstudio_lib/SchedulesView.hpp index 0ae8f6255..0aeab173b 100644 --- a/src/openstudio_lib/SchedulesView.hpp +++ b/src/openstudio_lib/SchedulesView.hpp @@ -127,7 +127,7 @@ class SchedulesView : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: static const std::vector colors; static std::vector initializeColors(); @@ -142,7 +142,7 @@ class SchedulesView : public QWidget, public Nano::Observer void closeAllTabs() const; - public slots: + public slots: void setCurrentSchedule(const model::ScheduleRuleset& schedule); @@ -167,7 +167,7 @@ class SchedulesView : public QWidget, public Nano::Observer bool isIP() const; - signals: + signals: void itemDropped(const OSItemId& itemId); @@ -205,10 +205,10 @@ class SchedulesView : public QWidget, public Nano::Observer void modelObjectSelected(model::OptionalModelObject& modelObject, bool readOnly); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private slots: + private slots: void addSchedule(model::ScheduleRuleset& schedule); @@ -220,7 +220,7 @@ class SchedulesView : public QWidget, public Nano::Observer void onScheduleRuleRemoved(const Handle& handle); - private: + private: void updateRowColors(); model::Model m_model; @@ -241,7 +241,7 @@ class ScheduleTab : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: ScheduleTab(const model::ScheduleRuleset& schedule, SchedulesView* schedulesView, QWidget* parent = nullptr); virtual ~ScheduleTab() {} @@ -264,14 +264,14 @@ class ScheduleTab : public QWidget, public Nano::Observer void toggle(); - signals: + signals: void scheduleClicked(const model::ScheduleRuleset& schedule); // DLM: not sure if this is wired to anything? void removeScheduleClicked(const model::ScheduleRuleset& schedule); - protected: + protected: //void paintEvent(QPaintEvent * event); //void mouseReleaseEvent( QMouseEvent * event ); @@ -282,7 +282,7 @@ class ScheduleTab : public QWidget, public Nano::Observer //void resizeEvent(QResizeEvent * event); - private slots: + private slots: //void onClicked(); @@ -290,7 +290,7 @@ class ScheduleTab : public QWidget, public Nano::Observer //void onObjectChanged(); - private: + private: //void refresh(); //bool m_mouseDown; @@ -311,7 +311,7 @@ class ScheduleTabHeader : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: ScheduleTabHeader(ScheduleTab* scheduleTab, QWidget* parent = nullptr); virtual ~ScheduleTabHeader() {} @@ -328,13 +328,13 @@ class ScheduleTabHeader : public QWidget, public Nano::Observer void toggle(); - signals: + signals: void scheduleClicked(const model::ScheduleRuleset& schedule); void toggleHeaderClicked(bool close); - protected: + protected: void paintEvent(QPaintEvent* event) override; void resizeEvent(QResizeEvent* event) override; @@ -343,13 +343,13 @@ class ScheduleTabHeader : public QWidget, public Nano::Observer void mousePressEvent(QMouseEvent* event) override; - private slots: + private slots: void refresh(); void refreshNow(); - private: + private: QWidget* m_selectionWidget; QLabel* m_mainLabel; @@ -368,7 +368,7 @@ class ScheduleTabContent : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: ScheduleTabContent(ScheduleTab* scheduleTab, QWidget* parent = nullptr); virtual ~ScheduleTabContent() {} @@ -377,17 +377,17 @@ class ScheduleTabContent : public QWidget, public Nano::Observer void addScheduleRule(const model::ScheduleRule& scheduleRule); - signals: + signals: void scheduleRuleClicked(const model::ScheduleRuleset& schedule); void defaultScheduleClicked(const model::ScheduleRuleset& schedule); - public slots: + public slots: void scheduleRefresh(const Handle& handle); - private slots: + private slots: void refresh(); @@ -395,7 +395,7 @@ class ScheduleTabContent : public QWidget, public Nano::Observer void onDefaultScheduleClicked(); - private: + private: ScheduleTab* m_scheduleTab; QVBoxLayout* m_ruleLayout; @@ -412,16 +412,16 @@ class ScheduleTabRule : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: ScheduleTabRule(ScheduleTab* scheduleTab, const model::ScheduleRule& scheduleRule, QWidget* parent = nullptr); virtual ~ScheduleTabRule() {} - signals: + signals: void clicked(model::ScheduleRule scheduleRule); - protected: + protected: void mouseReleaseEvent(QMouseEvent* event) override; void mousePressEvent(QMouseEvent* event) override; @@ -432,13 +432,13 @@ class ScheduleTabRule : public QWidget, public Nano::Observer void paintEvent(QPaintEvent* event) override; - private slots: + private slots: void refresh(); void scheduleRefresh(); - private: + private: ScheduleTab* m_scheduleTab; model::ScheduleRule m_scheduleRule; @@ -457,7 +457,7 @@ class ScheduleTabDefault : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: enum ScheduleTabDefaultType { DEFAULT, @@ -470,7 +470,7 @@ class ScheduleTabDefault : public QWidget, public Nano::Observer virtual ~ScheduleTabDefault() {} - signals: + signals: void defaultClicked(model::ScheduleRuleset scheduleRuleset); @@ -480,7 +480,7 @@ class ScheduleTabDefault : public QWidget, public Nano::Observer void holidayClicked(model::ScheduleRuleset scheduleRuleset); - protected: + protected: void mouseReleaseEvent(QMouseEvent* event) override; void mousePressEvent(QMouseEvent* event) override; @@ -491,7 +491,7 @@ class ScheduleTabDefault : public QWidget, public Nano::Observer void paintEvent(QPaintEvent* event) override; - private: + private: bool m_mouseDown; QLabel* m_label; @@ -512,7 +512,7 @@ class NewProfileView : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: enum NewProfileViewType { SCHEDULERULE, @@ -525,7 +525,7 @@ class NewProfileView : public QWidget, public Nano::Observer virtual ~NewProfileView() {} - signals: + signals: void addRuleClicked(model::ScheduleRuleset& scheduleRuleset, UUID dayScheduleHandle); @@ -535,11 +535,11 @@ class NewProfileView : public QWidget, public Nano::Observer void addHolidayProfileClicked(model::ScheduleRuleset& scheduleRuleset, UUID dayScheduleHandle); - private slots: + private slots: void onAddClicked(); - private: + private: void populateComboBox(const model::ScheduleRuleset& scheduleRuleset); SchedulesView* m_schedulesView; @@ -556,12 +556,12 @@ class ScheduleRulesetNameView : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: ScheduleRulesetNameView(const model::ScheduleRuleset& scheduleRuleset, SchedulesView* schedulesView); virtual ~ScheduleRulesetNameView() {} - private: + private: SchedulesView* m_schedulesView; model::ScheduleRuleset m_scheduleRuleset; @@ -572,12 +572,12 @@ class DefaultScheduleDayView : public QWidget { Q_OBJECT - public: + public: DefaultScheduleDayView(bool isIP, const model::ScheduleRuleset& scheduleRuleset, SchedulesView* schedulesView); virtual ~DefaultScheduleDayView() {} - signals: + signals: void toggleUnitsClicked(bool displayIP); }; @@ -587,7 +587,7 @@ class SpecialScheduleDayView : public QWidget { Q_OBJECT - public: + public: enum SpecialScheduleDayType { SUMMER, @@ -599,11 +599,11 @@ class SpecialScheduleDayView : public QWidget virtual ~SpecialScheduleDayView() {} - signals: + signals: void toggleUnitsClicked(bool displayIP); - private: + private: SpecialScheduleDayType m_type; }; @@ -612,14 +612,14 @@ class ScheduleRuleView : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: ScheduleRuleView(bool isIP, const model::ScheduleRule& scheduleRule, SchedulesView* schedulesView); virtual ~ScheduleRuleView() {} model::ScheduleRule scheduleRule() const; - signals: + signals: void startDateTimeChanged(model::ScheduleRule& scheduleRule, const QDateTime& newDate); @@ -627,7 +627,7 @@ class ScheduleRuleView : public QWidget, public Nano::Observer void removeScheduleRuleClicked(model::ScheduleRule& scheduleRule); - private slots: + private slots: void refresh(); @@ -639,11 +639,11 @@ class ScheduleRuleView : public QWidget, public Nano::Observer void onEndDateTimeChanged(const QDateTime& newDate); - signals: + signals: void toggleUnitsClicked(bool displayIP); - private: + private: SchedulesView* m_schedulesView; model::ScheduleRule m_scheduleRule; @@ -680,12 +680,12 @@ class ScheduleRulesetNameWidget : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: ScheduleRulesetNameWidget(const model::ScheduleRuleset& scheduleRuleset); virtual ~ScheduleRulesetNameWidget() {} - private: + private: model::ScheduleRuleset m_scheduleRuleset; boost::optional opt_scheduleRuleset; @@ -696,7 +696,7 @@ class YearOverview : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: YearOverview(const model::ScheduleRuleset& scheduleRuleset, QWidget* parent = nullptr); virtual ~YearOverview() {} @@ -705,7 +705,7 @@ class YearOverview : public QWidget, public Nano::Observer std::vector activeRuleIndices() const; - private slots: + private slots: void refresh(); @@ -713,7 +713,7 @@ class YearOverview : public QWidget, public Nano::Observer void onModelAdd(std::shared_ptr, const openstudio::IddObjectType&, const openstudio::UUID&); - private: + private: void refreshActiveRuleIndices(); MonthView* m_januaryView; @@ -752,7 +752,7 @@ class MonthView : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: MonthView(YearOverview* yearOverview); virtual ~MonthView() {} @@ -765,7 +765,7 @@ class MonthView : public QWidget, public Nano::Observer void update(); - private: + private: ScheduleCalendarWidget* m_calendarWidget; YearOverview* m_yearOverview; @@ -780,15 +780,15 @@ class ScheduleCalendarWidget : public QCalendarWidget { Q_OBJECT - public: + public: ScheduleCalendarWidget(MonthView* monthView = nullptr); virtual ~ScheduleCalendarWidget() {} - protected: + protected: void paintCell(QPainter* painter, const QRect& rect, const QDate& date) const override; - private: + private: MonthView* m_monthView; }; diff --git a/src/openstudio_lib/ScriptFolderListView.hpp b/src/openstudio_lib/ScriptFolderListView.hpp index 977d8a1be..4bc5a8228 100644 --- a/src/openstudio_lib/ScriptFolderListView.hpp +++ b/src/openstudio_lib/ScriptFolderListView.hpp @@ -55,7 +55,7 @@ class ScriptsListView; class ScriptFolderListView : public OSCollapsibleItemList { Q_OBJECT - public: + public: ScriptFolderListView(const openstudio::path& t_rootPath, bool addScrollArea, bool draggable, bool removeable, OSItemType headerType, QWidget* parent = nullptr); @@ -83,10 +83,10 @@ class ScriptFolderListView : public OSCollapsibleItemList std::shared_ptr fsWatcher() const; - signals: + signals: void scriptListChanged(); - private: + private: REGISTER_LOGGER("openstudio.ScriptFolderListView"); openstudio::path iterateFileName(const openstudio::path& t_path); diff --git a/src/openstudio_lib/ScriptItem.hpp b/src/openstudio_lib/ScriptItem.hpp index e96784578..92e990a5b 100644 --- a/src/openstudio_lib/ScriptItem.hpp +++ b/src/openstudio_lib/ScriptItem.hpp @@ -54,7 +54,7 @@ class ScriptItem : public OSItem { Q_OBJECT - public: + public: ScriptItem(const openstudio::path& t_path, OSItemType type, QWidget* parent = nullptr); virtual ~ScriptItem() {} @@ -87,19 +87,19 @@ class ScriptItem : public OSItem virtual bool equal(const openstudio::OSItem*) const override; - signals: + signals: void argChanged(); - public slots: + public slots: void setOSArgument(const measure::OSArgument& arg); - private slots: + private slots: void onObjectChanged(); - private: + private: bool m_removed; //runmanager::ScriptInfo m_scriptInfo; diff --git a/src/openstudio_lib/ScriptsTabController.hpp b/src/openstudio_lib/ScriptsTabController.hpp index 890c9924f..9c3fbc02f 100644 --- a/src/openstudio_lib/ScriptsTabController.hpp +++ b/src/openstudio_lib/ScriptsTabController.hpp @@ -48,15 +48,15 @@ class ScriptsTabController : public MainTabController { Q_OBJECT - public: + public: ScriptsTabController(); virtual ~ScriptsTabController(); - private: + private: QPointer scriptsTabView; - private: + private: REGISTER_LOGGER("openstudio.measuretab.MeasuresTabController"); QSharedPointer m_workflowController; diff --git a/src/openstudio_lib/ScriptsTabView.hpp b/src/openstudio_lib/ScriptsTabView.hpp index 07c55728d..391e2d395 100644 --- a/src/openstudio_lib/ScriptsTabView.hpp +++ b/src/openstudio_lib/ScriptsTabView.hpp @@ -44,7 +44,7 @@ class ScriptsTabView : public MainTabView { Q_OBJECT - public: + public: ScriptsTabView(QWidget* t_parent); virtual ~ScriptsTabView() {} @@ -53,15 +53,15 @@ class ScriptsTabView : public MainTabView OSListView* workflowView; - protected: + protected: virtual void showEvent(QShowEvent* e) override; - private: + private: QPushButton* m_updateMeasuresButton; boost::shared_ptr m_syncMeasuresDialog; - private slots: + private slots: void openUpdateMeasuresDlg(); }; diff --git a/src/openstudio_lib/ServiceWaterGridItems.hpp b/src/openstudio_lib/ServiceWaterGridItems.hpp index a27b9a73d..17f551a91 100644 --- a/src/openstudio_lib/ServiceWaterGridItems.hpp +++ b/src/openstudio_lib/ServiceWaterGridItems.hpp @@ -45,42 +45,42 @@ class WaterUseConnectionsDetailScene; class ServiceWaterItem : public GridItem { - public: + public: ServiceWaterItem(ServiceWaterScene* serviceWaterScene); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class WaterUseConnectionsDetailItem : public GridItem { - public: + public: WaterUseConnectionsDetailItem(WaterUseConnectionsDetailScene* waterUseConnectionsDetailScene); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class WaterUseConnectionsDropZoneItem : public HorizontalBranchItem { - public: + public: WaterUseConnectionsDropZoneItem(QGraphicsItem* parent = nullptr); }; class WaterUseEquipmentDropZoneItem : public HorizontalBranchItem { - public: + public: WaterUseEquipmentDropZoneItem(QGraphicsItem* parent = nullptr); }; class SewerItem : public GridItem { - public: + public: SewerItem(QGraphicsItem* parent = nullptr); ButtonItem* sewerButton() const; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; ButtonItem* m_sewerButton; @@ -88,12 +88,12 @@ class SewerItem : public GridItem class MainsSupplyItem : public GridItem { - public: + public: MainsSupplyItem(QGraphicsItem* parent = nullptr); ButtonItem* mainsSupplyButton() const; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; ButtonItem* m_mainsSupplyButton; @@ -103,104 +103,104 @@ class HotWaterSupplyItem : public GridItem { Q_OBJECT; - public: + public: HotWaterSupplyItem(QGraphicsItem* parent = nullptr); virtual ~HotWaterSupplyItem() {} - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; ButtonItem* m_hotWaterSupplyButton; - private slots: + private slots: void onHotWaterSupplyButtonClicked(); }; class DoubleOneThreeStraightItem : public GridItem { - public: + public: DoubleOneThreeStraightItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class DoubleThreeFourStraightItem : public GridItem { - public: + public: DoubleThreeFourStraightItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class DoubleTwoFourStraightItem : public GridItem { - public: + public: DoubleTwoFourStraightItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class DoubleTwoThreeStraightItem : public GridItem { - public: + public: DoubleTwoThreeStraightItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class DoubleTwoThreeFourStraightItem : public GridItem { - public: + public: DoubleTwoThreeFourStraightItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class HotWaterJunctionItem : public DoubleTwoFourStraightItem { - public: + public: HotWaterJunctionItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class ColdWaterJunctionItem : public GridItem { - public: + public: ColdWaterJunctionItem(int isElbow, QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: bool m_isElbow; }; class WaterUseConnectionsItem : public GridItem { - public: + public: WaterUseConnectionsItem(QGraphicsItem* parent = nullptr); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; class WaterUseEquipmentItem : public GridItem { - public: + public: WaterUseEquipmentItem(QGraphicsItem* parent = nullptr); void setModelObject(model::OptionalModelObject modelObject) override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; }; @@ -208,21 +208,21 @@ class MakeupWaterItem : public GridItem { Q_OBJECT; - public: + public: MakeupWaterItem(QGraphicsItem* parent = nullptr); virtual ~MakeupWaterItem() {} ButtonItem* mainsSupplyButton() const; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private slots: + private slots: void onHotWaterSupplyButtonClicked(); - private: + private: ButtonItem* m_mainsSupplyButton; ButtonItem* m_hotWaterSupplyButton; diff --git a/src/openstudio_lib/ServiceWaterScene.hpp b/src/openstudio_lib/ServiceWaterScene.hpp index 57d5e1037..84363bac0 100644 --- a/src/openstudio_lib/ServiceWaterScene.hpp +++ b/src/openstudio_lib/ServiceWaterScene.hpp @@ -48,18 +48,18 @@ class ServiceWaterScene : public GridScene { Q_OBJECT - public: + public: ServiceWaterScene(const model::Model& model); virtual ~ServiceWaterScene() {} model::Model model() const; - public slots: + public slots: void layout(); - private slots: + private slots: void onAddedWorkspaceObject(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); @@ -67,7 +67,7 @@ class ServiceWaterScene : public GridScene void onRemovedWorkspaceObject(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); - private: + private: bool m_dirty; model::Model m_model; @@ -77,22 +77,22 @@ class WaterUseConnectionsDetailScene : public GridScene { Q_OBJECT - public: + public: WaterUseConnectionsDetailScene(const model::WaterUseConnections& waterUseConnections); virtual ~WaterUseConnectionsDetailScene() {} model::WaterUseConnections waterUseConnections() const; - public slots: + public slots: void layout(); - signals: + signals: void goToServiceWaterSceneClicked(); - private slots: + private slots: void onAddedWorkspaceObject(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); @@ -100,7 +100,7 @@ class WaterUseConnectionsDetailScene : public GridScene void onRemovedWorkspaceObject(std::shared_ptr wPtr, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); - private: + private: bool m_dirty; model::WaterUseConnections m_waterUseConnections; diff --git a/src/openstudio_lib/SimSettingsTabController.hpp b/src/openstudio_lib/SimSettingsTabController.hpp index b1f346808..d6472b638 100644 --- a/src/openstudio_lib/SimSettingsTabController.hpp +++ b/src/openstudio_lib/SimSettingsTabController.hpp @@ -44,12 +44,12 @@ class SimSettingsTabController : public MainTabController { Q_OBJECT - public: + public: SimSettingsTabController(bool isIP, const model::Model& model); virtual ~SimSettingsTabController() {} - public slots: + public slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/SimSettingsTabView.hpp b/src/openstudio_lib/SimSettingsTabView.hpp index 57c2cb40b..64887c9d5 100644 --- a/src/openstudio_lib/SimSettingsTabView.hpp +++ b/src/openstudio_lib/SimSettingsTabView.hpp @@ -48,16 +48,16 @@ class SimSettingsTabView : public MainTabView { Q_OBJECT - public: + public: SimSettingsTabView(bool isIP, const model::Model& model, const QString& tabLabel, TabType tabType, QWidget* parent = nullptr); virtual ~SimSettingsTabView() {} - public slots: + public slots: void toggleUnits(bool displayIP); - private: + private: SimSettingsView* m_simSettingsView; }; diff --git a/src/openstudio_lib/SimSettingsView.hpp b/src/openstudio_lib/SimSettingsView.hpp index 70ca1a381..a65542c70 100644 --- a/src/openstudio_lib/SimSettingsView.hpp +++ b/src/openstudio_lib/SimSettingsView.hpp @@ -60,12 +60,12 @@ class SimSettingsView : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: SimSettingsView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SimSettingsView() {} - private: + private: void createWidgets(); void setCoarseRadianceSettings(); void setFineRadianceSettings(); @@ -270,11 +270,11 @@ class SimSettingsView : public QWidget, public Nano::Observer OSQuantityEdit2* m_humidityCapacityMultiplier; OSQuantityEdit2* m_carbonDioxideCapacityMultiplier; - signals: + signals: void toggleUnitsClicked(bool displayIP); - private slots: + private slots: void on_startDateChanged(const QDate& date); diff --git a/src/openstudio_lib/SpaceLoadInstancesWidget.hpp b/src/openstudio_lib/SpaceLoadInstancesWidget.hpp index 0582b841f..cb8b08f8f 100644 --- a/src/openstudio_lib/SpaceLoadInstancesWidget.hpp +++ b/src/openstudio_lib/SpaceLoadInstancesWidget.hpp @@ -60,10 +60,10 @@ class SpaceLoadInstanceDefinitionVectorController : public ModelObjectVectorCont { Q_OBJECT - public: + public: virtual ~SpaceLoadInstanceDefinitionVectorController() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onReplaceItem(OSItem* currentItem, const OSItemId& replacementItemId) override; @@ -73,18 +73,18 @@ class SpaceLoadInstanceScheduleVectorController : public ModelObjectVectorContro { Q_OBJECT - public: + public: virtual ~SpaceLoadInstanceScheduleVectorController() {} virtual void attach(const model::ModelObject& modelObject) override; - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; virtual void onReplaceItem(OSItem* currentItem, const OSItemId& replacementItemId) override; virtual void onDrop(const OSItemId& itemId) override; - private: + private: void attachOtherModelObjects(const model::SpaceLoadInstance& spaceLoadInstance); void attachOtherModelObjects(const model::Space& space); void attachOtherModelObjects(const model::SpaceType& spaceType); @@ -97,10 +97,10 @@ class SpaceLoadInstanceActivityScheduleVectorController : public ModelObjectVect { Q_OBJECT - public: + public: virtual ~SpaceLoadInstanceActivityScheduleVectorController() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -112,19 +112,19 @@ class SpaceLoadInstanceMiniView : public QWidget { Q_OBJECT - public: + public: SpaceLoadInstanceMiniView(const model::SpaceLoadInstance& spaceLoadInstance, bool isDefault); virtual ~SpaceLoadInstanceMiniView() {} model::SpaceLoadInstance spaceLoadInstance() const; bool isDefault() const; - signals: + signals: void removeClicked(SpaceLoadInstanceMiniView* spaceLoadInstanceMiniView); - private slots: + private slots: void onRemoveClicked(); - private: + private: OSDoubleEdit2* m_multiplierEdit; OSLineEdit2* m_nameEdit; QLabel* m_activityScheduleLabel; @@ -144,7 +144,7 @@ class SpaceLoadInstanceMiniView : public QWidget boost::optional opt_spaceLoadInstance; - private: + private: void createLayout(bool isDefault); }; @@ -152,10 +152,10 @@ class NewSpaceLoadVectorController : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~NewSpaceLoadVectorController() {} - protected: + protected: virtual std::vector makeVector() override; virtual void onDrop(const OSItemId& itemId) override; }; @@ -164,14 +164,14 @@ class SpaceLoadInstancesWidget : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: SpaceLoadInstancesWidget(QWidget* parent = nullptr); virtual ~SpaceLoadInstancesWidget() {} void attach(const model::Space& space); void attach(const model::SpaceType& spaceType); void detach(); - private slots: + private slots: void remove(SpaceLoadInstanceMiniView* spaceLoadInstanceMiniView); @@ -187,7 +187,7 @@ class SpaceLoadInstancesWidget : public QWidget, public Nano::Observer void refresh(); - private: + private: void addSpaceLoads(const model::Space& space); void addSpaceTypeLoads(const model::SpaceType& spaceType, bool addAsDefaultLoads); diff --git a/src/openstudio_lib/SpaceTypeInspectorView.hpp b/src/openstudio_lib/SpaceTypeInspectorView.hpp index 40831a177..097d2d6e8 100644 --- a/src/openstudio_lib/SpaceTypeInspectorView.hpp +++ b/src/openstudio_lib/SpaceTypeInspectorView.hpp @@ -40,7 +40,7 @@ class SpaceTypeInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: SpaceTypeInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~SpaceTypeInspectorView() {} @@ -50,20 +50,20 @@ class SpaceTypeInspectorView : public ModelObjectInspectorView } virtual std::vector selectedObjects() const override; - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void refresh(); bool m_isIP; SpaceTypesGridView* m_gridView; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/SpaceTypesController.hpp b/src/openstudio_lib/SpaceTypesController.hpp index fa143b452..ef7ab4e3d 100644 --- a/src/openstudio_lib/SpaceTypesController.hpp +++ b/src/openstudio_lib/SpaceTypesController.hpp @@ -38,12 +38,12 @@ class SpaceTypesController : public ModelSubTabController { Q_OBJECT - public: + public: SpaceTypesController(bool isIP, const model::Model& model); virtual ~SpaceTypesController() {} - protected: + protected: virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; virtual void onAddObject(const openstudio::model::ModelObject& modelObject) override; diff --git a/src/openstudio_lib/SpaceTypesGridView.hpp b/src/openstudio_lib/SpaceTypesGridView.hpp index 35e68f3f8..9b0db4ce9 100644 --- a/src/openstudio_lib/SpaceTypesGridView.hpp +++ b/src/openstudio_lib/SpaceTypesGridView.hpp @@ -50,7 +50,7 @@ class SpaceTypesGridView : public QWidget { Q_OBJECT - public: + public: SpaceTypesGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpaceTypesGridView() {} @@ -63,7 +63,7 @@ class SpaceTypesGridView : public QWidget QComboBox* m_filters = nullptr; - private: + private: REGISTER_LOGGER("openstudio.SpaceTypesGridView"); bool m_isIP; @@ -72,7 +72,7 @@ class SpaceTypesGridView : public QWidget QLabel* m_filterLabel = nullptr; - signals: + signals: void toggleUnitsClicked(bool displayIP); @@ -86,7 +86,7 @@ class SpaceTypesGridController : public OSGridController Q_OBJECT - public: + public: SpaceTypesGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -96,7 +96,7 @@ class SpaceTypesGridController : public OSGridController virtual void categorySelected(int index) override; - protected: + protected: virtual void setCategoriesAndFields() override; virtual void addColumns(const QString& category, std::vector& fields) override; @@ -105,10 +105,10 @@ class SpaceTypesGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject) override; - private: + private: SpaceTypesGridView* spaceTypesGridView(); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId) override; diff --git a/src/openstudio_lib/SpaceTypesTabController.hpp b/src/openstudio_lib/SpaceTypesTabController.hpp index 61cf3fa71..82997c97d 100644 --- a/src/openstudio_lib/SpaceTypesTabController.hpp +++ b/src/openstudio_lib/SpaceTypesTabController.hpp @@ -40,12 +40,12 @@ class SpaceTypesTabController : public MainTabController { Q_OBJECT - public: + public: SpaceTypesTabController(bool isIP, const openstudio::model::Model& model); virtual ~SpaceTypesTabController() {} - private: + private: std::shared_ptr m_spaceTypesController; }; diff --git a/src/openstudio_lib/SpaceTypesTabView.hpp b/src/openstudio_lib/SpaceTypesTabView.hpp index 1f81cea39..9b9219465 100644 --- a/src/openstudio_lib/SpaceTypesTabView.hpp +++ b/src/openstudio_lib/SpaceTypesTabView.hpp @@ -38,7 +38,7 @@ class SpaceTypesTabView : public MainTabView { Q_OBJECT - public: + public: SpaceTypesTabView(QWidget* parent = nullptr); virtual ~SpaceTypesTabView() {} }; diff --git a/src/openstudio_lib/SpaceTypesView.hpp b/src/openstudio_lib/SpaceTypesView.hpp index 93d4e4915..c50958f03 100644 --- a/src/openstudio_lib/SpaceTypesView.hpp +++ b/src/openstudio_lib/SpaceTypesView.hpp @@ -47,7 +47,7 @@ class SpaceTypesView : public ModelSubTabView { Q_OBJECT - public: + public: SpaceTypesView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~SpaceTypesView() {} diff --git a/src/openstudio_lib/SpacesDaylightingGridView.hpp b/src/openstudio_lib/SpacesDaylightingGridView.hpp index 5ec652195..a8131ae9e 100644 --- a/src/openstudio_lib/SpacesDaylightingGridView.hpp +++ b/src/openstudio_lib/SpacesDaylightingGridView.hpp @@ -45,12 +45,12 @@ class SpacesDaylightingGridView : public SpacesSubtabGridView { Q_OBJECT - public: + public: SpacesDaylightingGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpacesDaylightingGridView() {} - private: + private: REGISTER_LOGGER("openstudio.SpacesDaylightingGridView"); }; @@ -59,7 +59,7 @@ class SpacesDaylightingGridController : public OSGridController Q_OBJECT - public: + public: SpacesDaylightingGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -69,7 +69,7 @@ class SpacesDaylightingGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -78,7 +78,7 @@ class SpacesDaylightingGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/SpacesInteriorPartitionsGridView.hpp b/src/openstudio_lib/SpacesInteriorPartitionsGridView.hpp index 3f38de090..3748d970c 100644 --- a/src/openstudio_lib/SpacesInteriorPartitionsGridView.hpp +++ b/src/openstudio_lib/SpacesInteriorPartitionsGridView.hpp @@ -45,15 +45,15 @@ class SpacesInteriorPartitionsGridView : public SpacesSubtabGridView { Q_OBJECT - public: + public: SpacesInteriorPartitionsGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpacesInteriorPartitionsGridView() {} - private: + private: REGISTER_LOGGER("openstudio.SpacesInteriorPartitionsGridView"); - protected slots: + protected slots: virtual void onSelectItem() override; @@ -65,7 +65,7 @@ class SpacesInteriorPartitionsGridController : public OSGridController Q_OBJECT - public: + public: SpacesInteriorPartitionsGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -75,7 +75,7 @@ class SpacesInteriorPartitionsGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -84,7 +84,7 @@ class SpacesInteriorPartitionsGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/SpacesLoadsGridView.hpp b/src/openstudio_lib/SpacesLoadsGridView.hpp index 3a525d0a3..5960ae44b 100644 --- a/src/openstudio_lib/SpacesLoadsGridView.hpp +++ b/src/openstudio_lib/SpacesLoadsGridView.hpp @@ -45,15 +45,15 @@ class SpacesLoadsGridView : public SpacesSubtabGridView { Q_OBJECT - public: + public: SpacesLoadsGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpacesLoadsGridView() {} - private: + private: REGISTER_LOGGER("openstudio.SpacesLoadsGridView"); - protected slots: + protected slots: virtual void onSelectItem() override; @@ -65,7 +65,7 @@ class SpacesLoadsGridController : public OSGridController Q_OBJECT - public: + public: SpacesLoadsGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -75,7 +75,7 @@ class SpacesLoadsGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -84,7 +84,7 @@ class SpacesLoadsGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/SpacesShadingGridView.hpp b/src/openstudio_lib/SpacesShadingGridView.hpp index 05a79ee89..b6f0bda8f 100644 --- a/src/openstudio_lib/SpacesShadingGridView.hpp +++ b/src/openstudio_lib/SpacesShadingGridView.hpp @@ -45,15 +45,15 @@ class SpacesShadingGridView : public SpacesSubtabGridView { Q_OBJECT - public: + public: SpacesShadingGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpacesShadingGridView() {} - private: + private: REGISTER_LOGGER("openstudio.SpacesShadingGridView"); - protected slots: + protected slots: virtual void onSelectItem() override; @@ -65,7 +65,7 @@ class SpacesShadingGridController : public OSGridController Q_OBJECT - public: + public: SpacesShadingGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -75,7 +75,7 @@ class SpacesShadingGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -84,7 +84,7 @@ class SpacesShadingGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/SpacesSpacesGridView.hpp b/src/openstudio_lib/SpacesSpacesGridView.hpp index e2662c427..680fd3ddf 100644 --- a/src/openstudio_lib/SpacesSpacesGridView.hpp +++ b/src/openstudio_lib/SpacesSpacesGridView.hpp @@ -45,12 +45,12 @@ class SpacesSpacesGridView : public SpacesSubtabGridView { Q_OBJECT - public: + public: SpacesSpacesGridView(bool isIP, const model::Model& model, QWidget* parent = 0); virtual ~SpacesSpacesGridView() {} - private: + private: REGISTER_LOGGER("openstudio.SpacesSpacesGridView"); // Overrides SpacesSubtabGrid view to trigger appropriate filtering @@ -58,7 +58,7 @@ class SpacesSpacesGridView : public SpacesSubtabGridView return false; }; - protected slots: + protected slots: virtual void onSelectItem() override; @@ -70,7 +70,7 @@ class SpacesSpacesGridController : public OSGridController Q_OBJECT - public: + public: SpacesSpacesGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -80,7 +80,7 @@ class SpacesSpacesGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -89,7 +89,7 @@ class SpacesSpacesGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/SpacesSubsurfacesGridView.hpp b/src/openstudio_lib/SpacesSubsurfacesGridView.hpp index cdf5ae63a..f0ae07492 100644 --- a/src/openstudio_lib/SpacesSubsurfacesGridView.hpp +++ b/src/openstudio_lib/SpacesSubsurfacesGridView.hpp @@ -45,15 +45,15 @@ class SpacesSubsurfacesGridView : public SpacesSubtabGridView { Q_OBJECT - public: + public: SpacesSubsurfacesGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpacesSubsurfacesGridView() {} - private: + private: REGISTER_LOGGER("openstudio.SpacesSubsurfacesGridView"); - protected slots: + protected slots: virtual void onSelectItem() override; @@ -65,7 +65,7 @@ class SpacesSubsurfacesGridController : public OSGridController Q_OBJECT - public: + public: SpacesSubsurfacesGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -75,7 +75,7 @@ class SpacesSubsurfacesGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -84,7 +84,7 @@ class SpacesSubsurfacesGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/SpacesSubtabGridView.hpp b/src/openstudio_lib/SpacesSubtabGridView.hpp index b809e4fed..174adab65 100644 --- a/src/openstudio_lib/SpacesSubtabGridView.hpp +++ b/src/openstudio_lib/SpacesSubtabGridView.hpp @@ -48,7 +48,7 @@ class SpacesSubtabGridView : public GridViewSubTab { Q_OBJECT - public: + public: SpacesSubtabGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpacesSubtabGridView() {} @@ -77,7 +77,7 @@ class SpacesSubtabGridView : public GridViewSubTab QComboBox* m_interiorPartitionGroupFilter = nullptr; - protected: + protected: REGISTER_LOGGER("openstudio.SpacesSubtabGridView"); virtual void addObject(const openstudio::IddObjectType& iddObjectType); @@ -154,7 +154,7 @@ class SpacesSubtabGridView : public GridViewSubTab std::vector m_spacesModelObjects = std::vector(); - protected slots: + protected slots: virtual void spaceNameFilterChanged(); @@ -178,7 +178,7 @@ class SpacesSubtabGridView : public GridViewSubTab virtual void interiorPartitionGroupFilterChanged(const QString& text); - private: + private: // All of the subtabs except the main SpacesSpace subtab will return true // We use this in filterChanged virtual bool hasSubRows() { diff --git a/src/openstudio_lib/SpacesSurfacesGridView.hpp b/src/openstudio_lib/SpacesSurfacesGridView.hpp index 3d94caa7f..f4dcaea14 100644 --- a/src/openstudio_lib/SpacesSurfacesGridView.hpp +++ b/src/openstudio_lib/SpacesSurfacesGridView.hpp @@ -45,15 +45,15 @@ class SpacesSurfacesGridView : public SpacesSubtabGridView { Q_OBJECT - public: + public: SpacesSurfacesGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~SpacesSurfacesGridView() {} - private: + private: REGISTER_LOGGER("openstudio.SpacesSurfacesGridView"); - protected slots: + protected slots: virtual void onSelectItem() override; @@ -65,7 +65,7 @@ class SpacesSurfacesGridController : public OSGridController Q_OBJECT - public: + public: SpacesSurfacesGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -75,7 +75,7 @@ class SpacesSurfacesGridController : public OSGridController virtual void categorySelected(int index); - protected: + protected: virtual void setCategoriesAndFields(); virtual void addColumns(const QString& category, std::vector& fields); @@ -84,7 +84,7 @@ class SpacesSurfacesGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId); }; diff --git a/src/openstudio_lib/SpacesTabController.hpp b/src/openstudio_lib/SpacesTabController.hpp index 70fc96b81..01cdbb815 100644 --- a/src/openstudio_lib/SpacesTabController.hpp +++ b/src/openstudio_lib/SpacesTabController.hpp @@ -38,7 +38,7 @@ class SpacesTabController : public MainTabController { Q_OBJECT - public: + public: SpacesTabController(bool isIP, const model::Model& model); virtual ~SpacesTabController(); @@ -54,7 +54,7 @@ class SpacesTabController : public MainTabController DAYLIGHTING }; - private: + private: model::Model m_model; bool m_isIP; @@ -63,11 +63,11 @@ class SpacesTabController : public MainTabController int m_currentIndex = -1; - public slots: + public slots: virtual void setSubTab(int index) override; - private slots: + private slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/SpacesTabView.hpp b/src/openstudio_lib/SpacesTabView.hpp index 096b7f78d..89a23a40f 100644 --- a/src/openstudio_lib/SpacesTabView.hpp +++ b/src/openstudio_lib/SpacesTabView.hpp @@ -46,12 +46,12 @@ class SpacesTabView : public MainTabView { Q_OBJECT - public: + public: SpacesTabView(QWidget* parent = nullptr); virtual ~SpacesTabView() {} - public slots: + public slots: void toggleUnits(bool displayIP); }; diff --git a/src/openstudio_lib/StandardOpaqueMaterialInspectorView.hpp b/src/openstudio_lib/StandardOpaqueMaterialInspectorView.hpp index 874c424a7..66e617c4b 100644 --- a/src/openstudio_lib/StandardOpaqueMaterialInspectorView.hpp +++ b/src/openstudio_lib/StandardOpaqueMaterialInspectorView.hpp @@ -42,19 +42,19 @@ class StandardOpaqueMaterialInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: StandardOpaqueMaterialInspectorView(const model::Model& model, QWidget* parent = nullptr); virtual ~StandardOpaqueMaterialInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: QLabel* m_mainLabel; }; diff --git a/src/openstudio_lib/StandardsInformationConstructionWidget.hpp b/src/openstudio_lib/StandardsInformationConstructionWidget.hpp index 53efdef31..c9bb88e6f 100644 --- a/src/openstudio_lib/StandardsInformationConstructionWidget.hpp +++ b/src/openstudio_lib/StandardsInformationConstructionWidget.hpp @@ -59,7 +59,7 @@ class StandardsInformationConstructionWidget : public QWidget { Q_OBJECT - public: + public: StandardsInformationConstructionWidget(bool isIP, QGridLayout* mainGridLayout, int& row); virtual ~StandardsInformationConstructionWidget(); @@ -76,11 +76,11 @@ class StandardsInformationConstructionWidget : public QWidget void disableFenestration(); - public slots: + public slots: void toggleUnits(bool displayIP); - private slots: + private slots: void standardChanged(const QString& text); void populateStandards(); @@ -93,7 +93,7 @@ class StandardsInformationConstructionWidget : public QWidget void standardsConstructionTypeChanged(const QString& text); void populateStandardsConstructionType(); - private: + private: QComboBox* m_standard = nullptr; QComboBox* m_standardSource = nullptr; diff --git a/src/openstudio_lib/StandardsInformationMaterialWidget.hpp b/src/openstudio_lib/StandardsInformationMaterialWidget.hpp index 485dee66e..e0014cdb1 100644 --- a/src/openstudio_lib/StandardsInformationMaterialWidget.hpp +++ b/src/openstudio_lib/StandardsInformationMaterialWidget.hpp @@ -58,7 +58,7 @@ class StandardsInformationMaterialWidget : public QWidget { Q_OBJECT - public: + public: StandardsInformationMaterialWidget(bool isIP, QGridLayout* mainGridLayout, int& row); virtual ~StandardsInformationMaterialWidget(); @@ -75,7 +75,7 @@ class StandardsInformationMaterialWidget : public QWidget void disableComposite(); - private: + private: QComboBox* m_standard = nullptr; QComboBox* m_standardSource = nullptr; @@ -109,13 +109,13 @@ class StandardsInformationMaterialWidget : public QWidget void requestPopulateFields(); - public slots: + public slots: void toggleUnits(bool displayIP); void populateFields(); - private slots: + private slots: void standardChanged(const QString& text); void populateStandards(); diff --git a/src/openstudio_lib/SteamEquipmentInspectorView.hpp b/src/openstudio_lib/SteamEquipmentInspectorView.hpp index 8cde5c389..efacf3992 100644 --- a/src/openstudio_lib/SteamEquipmentInspectorView.hpp +++ b/src/openstudio_lib/SteamEquipmentInspectorView.hpp @@ -45,19 +45,19 @@ class SteamEquipmentDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: SteamEquipmentDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~SteamEquipmentDefinitionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::SteamEquipmentDefinition& steamEquipmentDefinition); void detach(); @@ -82,7 +82,7 @@ class SteamEquipmentDefinitionInspectorView : public ModelObjectInspectorView boost::optional m_steamEquipmentDefinition; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/SubTabController.hpp b/src/openstudio_lib/SubTabController.hpp index 7e65b297c..18f88a178 100644 --- a/src/openstudio_lib/SubTabController.hpp +++ b/src/openstudio_lib/SubTabController.hpp @@ -46,14 +46,14 @@ class SubTabController : public OSQObjectController { Q_OBJECT - public: + public: SubTabController(SubTabView* subTabView); virtual ~SubTabController() {} SubTabView* subTabView(); const SubTabView* subTabView() const; - protected: + protected: virtual void onSelectItem(OSItem* item); virtual void onClearSelection(); @@ -74,21 +74,21 @@ class SubTabController : public OSQObjectController SubTabView* m_subTabView; - signals: + signals: void downloadComponentsClicked(); void openLibDlgClicked(); - public slots: + public slots: void removeItem(OSItem* item); - protected slots: + protected slots: void selectItem(OSItem* item); - private slots: + private slots: void replaceItem(OSItem* item, const OSItemId& replacementItemId); @@ -106,7 +106,7 @@ class SubTabController : public OSQObjectController void inspectItem(OSItem* item); - private: + private: boost::optional selectedModelObject() const; openstudio::IddObjectType currentIddObjectType() const; diff --git a/src/openstudio_lib/SubTabView.hpp b/src/openstudio_lib/SubTabView.hpp index 6df581375..7a3d1a6c7 100644 --- a/src/openstudio_lib/SubTabView.hpp +++ b/src/openstudio_lib/SubTabView.hpp @@ -52,7 +52,7 @@ class SubTabView : public QSplitter { Q_OBJECT - public: + public: SubTabView(OSItemSelector* itemSelector, OSInspectorView* inspectorView, bool showGridViewLayout = false, QWidget* parent = nullptr); virtual ~SubTabView() {} @@ -69,7 +69,7 @@ class SubTabView : public QSplitter const OSInspectorView* inspectorView() const; - signals: + signals: void itemSelected(OSItem* item); @@ -95,14 +95,14 @@ class SubTabView : public QSplitter void openLibDlgClicked(); - protected slots: + protected slots: virtual void onDropZoneItemClicked(OSItem* item); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: void connectItemSelector(); void connectInspectorView(); diff --git a/src/openstudio_lib/SummaryTabController.hpp b/src/openstudio_lib/SummaryTabController.hpp index ef82219bc..99be58c47 100644 --- a/src/openstudio_lib/SummaryTabController.hpp +++ b/src/openstudio_lib/SummaryTabController.hpp @@ -40,7 +40,7 @@ class SummaryTabController : public MainTabController { Q_OBJECT - public: + public: SummaryTabController(const model::Model& model); virtual ~SummaryTabController() {} diff --git a/src/openstudio_lib/SummaryTabView.hpp b/src/openstudio_lib/SummaryTabView.hpp index d3f63dabb..cd258acf2 100644 --- a/src/openstudio_lib/SummaryTabView.hpp +++ b/src/openstudio_lib/SummaryTabView.hpp @@ -39,7 +39,7 @@ class SummaryTabView : public MainTabView { Q_OBJECT - public: + public: SummaryTabView(const model::Model& model, QWidget* parent = nullptr); virtual ~SummaryTabView() {} diff --git a/src/openstudio_lib/ThermalZonesController.hpp b/src/openstudio_lib/ThermalZonesController.hpp index 22f487c5f..d6b283a50 100644 --- a/src/openstudio_lib/ThermalZonesController.hpp +++ b/src/openstudio_lib/ThermalZonesController.hpp @@ -53,16 +53,16 @@ class ThermalZonesController : public ModelSubTabController { Q_OBJECT - public: + public: ThermalZonesController(bool isIP, const model::Model& model); virtual ~ThermalZonesController() {} - signals: + signals: void toggleUnitsClicked(bool); - protected: + protected: virtual void onSelectItem(OSItem* item) override; virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; @@ -81,7 +81,7 @@ class ThermalZonesController : public ModelSubTabController virtual void onInspectItem(OSItem* item) override; - public slots: + public slots: void setHeatingSchedule(model::ThermalZone&, model::OptionalSchedule&); @@ -95,7 +95,7 @@ class ThermalZonesController : public ModelSubTabController void removeZoneHVACComponent(model::ZoneHVACComponent&); - private slots: + private slots: void onZoneHVACComponentClicked(model::ZoneHVACComponent&); }; diff --git a/src/openstudio_lib/ThermalZonesGridView.hpp b/src/openstudio_lib/ThermalZonesGridView.hpp index 21a67c37e..6004b7388 100644 --- a/src/openstudio_lib/ThermalZonesGridView.hpp +++ b/src/openstudio_lib/ThermalZonesGridView.hpp @@ -47,19 +47,19 @@ class ThermalZonesGridView : public QWidget { Q_OBJECT - public: + public: ThermalZonesGridView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~ThermalZonesGridView() {} std::vector selectedObjects() const; - private: + private: ThermalZonesGridController* m_gridController = nullptr; bool m_isIP; - signals: + signals: void toggleUnitsClicked(bool displayIP); @@ -73,7 +73,7 @@ class ThermalZonesGridController : public OSGridController Q_OBJECT - public: + public: ThermalZonesGridController(bool isIP, const QString& headerText, IddObjectType iddObjectType, model::Model model, std::vector modelObjects); @@ -81,7 +81,7 @@ class ThermalZonesGridController : public OSGridController virtual void refreshModelObjects() override; - protected: + protected: virtual void setCategoriesAndFields() override; virtual void addColumns(const QString& t_category, std::vector& fields) override; @@ -90,10 +90,10 @@ class ThermalZonesGridController : public OSGridController virtual QString getColor(const model::ModelObject& modelObject) override; - private: + private: REGISTER_LOGGER("openstudio.ThermalZonesGridController"); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId) override; diff --git a/src/openstudio_lib/ThermalZonesTabController.hpp b/src/openstudio_lib/ThermalZonesTabController.hpp index cd67430c0..4e2751d38 100644 --- a/src/openstudio_lib/ThermalZonesTabController.hpp +++ b/src/openstudio_lib/ThermalZonesTabController.hpp @@ -41,16 +41,16 @@ class ThermalZonesTabController : public MainTabController { Q_OBJECT - public: + public: ThermalZonesTabController(bool isIP, const model::Model& model); virtual ~ThermalZonesTabController() {} - signals: + signals: void toggleUnitsClicked(bool); - private: + private: std::shared_ptr m_thermalZonesController; }; diff --git a/src/openstudio_lib/ThermalZonesTabView.hpp b/src/openstudio_lib/ThermalZonesTabView.hpp index 7c3fe75e4..51eadba01 100644 --- a/src/openstudio_lib/ThermalZonesTabView.hpp +++ b/src/openstudio_lib/ThermalZonesTabView.hpp @@ -38,7 +38,7 @@ class ThermalZonesTabView : public MainTabView { Q_OBJECT - public: + public: ThermalZonesTabView(QWidget* parent = nullptr); virtual ~ThermalZonesTabView(){}; diff --git a/src/openstudio_lib/ThermalZonesView.hpp b/src/openstudio_lib/ThermalZonesView.hpp index 8b1d3d041..c780a33ad 100644 --- a/src/openstudio_lib/ThermalZonesView.hpp +++ b/src/openstudio_lib/ThermalZonesView.hpp @@ -43,7 +43,7 @@ class ThermalZonesView : public ModelSubTabView { Q_OBJECT - public: + public: ThermalZonesView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~ThermalZonesView() {} @@ -54,7 +54,7 @@ class ThermalZoneView : public ModelObjectInspectorView Q_OBJECT - public: + public: ThermalZoneView(bool isIP, const model::Model& model, QWidget* parent = nullptr); virtual ~ThermalZoneView() {} @@ -64,28 +64,28 @@ class ThermalZoneView : public ModelObjectInspectorView } virtual std::vector selectedObjects() const override; - public slots: + public slots: void refresh(); - signals: + signals: void modelObjectSelected(model::OptionalModelObject& modelObject, bool readOnly); void dropZoneItemSelected(OSItem* item, bool readOnly); - protected: + protected: void onClearSelection() override; void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; void onUpdate() override; - private slots: + private slots: void toggleUnits(bool) override; - private: + private: ThermalZonesGridView* m_thermalZonesGridView = nullptr; bool m_isIP; diff --git a/src/openstudio_lib/UtilityBillAllFuelTypesListView.hpp b/src/openstudio_lib/UtilityBillAllFuelTypesListView.hpp index c981f4ec9..102220a2b 100644 --- a/src/openstudio_lib/UtilityBillAllFuelTypesListView.hpp +++ b/src/openstudio_lib/UtilityBillAllFuelTypesListView.hpp @@ -47,7 +47,7 @@ class UtilityBillAllFuelTypesListView : public OSCollapsibleItemList { Q_OBJECT - public: + public: UtilityBillAllFuelTypesListView(const model::Model& model, bool addScrollArea, OSItemType headerType, QWidget* parent = nullptr); UtilityBillAllFuelTypesListView(const std::vector>& utilityBillFuelTypesAndNames, const model::Model& model, @@ -65,7 +65,7 @@ class UtilityBillAllFuelTypesListView : public OSCollapsibleItemList virtual boost::optional selectedModelObject() const; - private: + private: std::vector> m_utilityBillFuelTypesAndNames; model::Model m_model; diff --git a/src/openstudio_lib/UtilityBillFuelTypeItem.hpp b/src/openstudio_lib/UtilityBillFuelTypeItem.hpp index 119c939e5..88b808de9 100644 --- a/src/openstudio_lib/UtilityBillFuelTypeItem.hpp +++ b/src/openstudio_lib/UtilityBillFuelTypeItem.hpp @@ -44,7 +44,7 @@ class UtilityBillFuelTypeItem : public OSCollapsibleItem { Q_OBJECT - public: + public: UtilityBillFuelTypeItem(OSCollapsibleItemHeader* collapsibleItemHeader, UtilityBillFuelTypeListView* utilityBillFuelTypeListView, QWidget* parent = nullptr); diff --git a/src/openstudio_lib/UtilityBillFuelTypeListView.hpp b/src/openstudio_lib/UtilityBillFuelTypeListView.hpp index 6b64820b7..06b61a642 100644 --- a/src/openstudio_lib/UtilityBillFuelTypeListView.hpp +++ b/src/openstudio_lib/UtilityBillFuelTypeListView.hpp @@ -47,7 +47,7 @@ class UtilityBillFuelTypeListController : public OSVectorController { Q_OBJECT - public: + public: UtilityBillFuelTypeListController(const model::Model& model, openstudio::FuelType fuelType); virtual ~UtilityBillFuelTypeListController() {} @@ -56,14 +56,14 @@ class UtilityBillFuelTypeListController : public OSVectorController FuelType fuelType() const; - private slots: + private slots: void objectAdded(std::shared_ptr, const openstudio::IddObjectType&, const openstudio::UUID&); void objectRemoved(std::shared_ptr, const openstudio::IddObjectType&, const openstudio::UUID&); - protected: + protected: virtual std::vector makeVector() override; - private: + private: openstudio::IddObjectType m_iddObjectType; openstudio::FuelType m_fuelType; model::Model m_model; @@ -73,7 +73,7 @@ class UtilityBillFuelTypeListView : public OSItemList { Q_OBJECT - public: + public: UtilityBillFuelTypeListView(const model::Model& model, openstudio::FuelType fuelType, bool addScrollArea, QWidget* parent = nullptr); virtual ~UtilityBillFuelTypeListView() {} @@ -84,7 +84,7 @@ class UtilityBillFuelTypeListView : public OSItemList FuelType fuelType() const; - private: + private: openstudio::FuelType m_fuelType; }; diff --git a/src/openstudio_lib/UtilityBillsController.hpp b/src/openstudio_lib/UtilityBillsController.hpp index 2bcd6085d..46d62de13 100644 --- a/src/openstudio_lib/UtilityBillsController.hpp +++ b/src/openstudio_lib/UtilityBillsController.hpp @@ -38,16 +38,16 @@ class UtilityBillsController : public ModelSubTabController { Q_OBJECT - public: + public: UtilityBillsController(const model::Model& model); virtual ~UtilityBillsController() {} - public slots: + public slots: void enableAddNewObjectButton(bool enable); - protected: + protected: virtual void onAddObject(const openstudio::IddObjectType& iddObjectType) override; virtual void onCopyObject(const openstudio::model::ModelObject& modelObject) override; diff --git a/src/openstudio_lib/UtilityBillsView.hpp b/src/openstudio_lib/UtilityBillsView.hpp index b55a2317a..a5324379c 100644 --- a/src/openstudio_lib/UtilityBillsView.hpp +++ b/src/openstudio_lib/UtilityBillsView.hpp @@ -76,17 +76,17 @@ class UtilityBillsView : public ModelSubTabView { Q_OBJECT - public: + public: UtilityBillsView(const model::Model& model, QWidget* parent = nullptr); virtual ~UtilityBillsView(); - private: + private: void resetUtilityBills(); static std::vector> utilityBillFuelTypesAndNames(); - signals: + signals: void enableAddNewObjectButton(bool enable); }; @@ -95,24 +95,24 @@ class UtilityBillsInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: UtilityBillsInspectorView(const openstudio::model::Model& model, bool addScrollArea, QWidget* parent = nullptr); virtual ~UtilityBillsInspectorView(); boost::optional runPeriodDates(); - protected: + protected: virtual void onSelectItem(OSItem* item) override; virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - protected slots: + protected slots: //virtual void toggleUnits(bool displayIP); - private: + private: void createWidgets(); void getSortedBills(); void showAddButton(); @@ -173,11 +173,11 @@ class UtilityBillsInspectorView : public ModelObjectInspectorView int m_hiddenWidgetIndex; int m_visibleWidgetIndex; - signals: + signals: void showSubTabView(bool showSubTabView); void enableAddNewObjectButton(bool enable); - private slots: + private slots: void addBillingPeriod(bool checked); void deleteBillingPeriod(int index); void setBillFormat(int index); @@ -193,7 +193,7 @@ class BillingPeriodWidget : public QWidget, public Nano::Observer Q_OBJECT - public: + public: BillingPeriodWidget(model::BillingPeriod billingPeriod, FuelType fuelType, BillFormat billFormat, QWidget* parent = nullptr); virtual ~BillingPeriodWidget() {} @@ -211,12 +211,12 @@ class BillingPeriodWidget : public QWidget, public Nano::Observer QPushButton* m_deleteBillWidget; - private: + private: void createWidgets(FuelType fuelType, BillFormat billFormat); boost::optional m_billingPeriod; - private slots: + private slots: void modelObjectChanged(); void startDateChanged(const QDate& newdate); diff --git a/src/openstudio_lib/VRFController.hpp b/src/openstudio_lib/VRFController.hpp index 5c6b99237..87f0be00f 100644 --- a/src/openstudio_lib/VRFController.hpp +++ b/src/openstudio_lib/VRFController.hpp @@ -51,7 +51,7 @@ class VRFController : public QObject { Q_OBJECT - public: + public: VRFController(); virtual ~VRFController(); @@ -60,13 +60,13 @@ class VRFController : public QObject QSharedPointer vrfSystemListController() const; - public slots: + public slots: void zoomInOnSystem(model::AirConditionerVariableRefrigerantFlow& system); void zoomOutToSystemGridView(); - private slots: + private slots: void refresh(); @@ -84,7 +84,7 @@ class VRFController : public QObject void onRemoveTerminalClicked(const OSItemId& terminalId); - private: + private: QPointer m_vrfView; QPointer m_vrfSystemGridView; @@ -106,7 +106,7 @@ class VRFSystemListController : public OSListController { Q_OBJECT - public: + public: VRFSystemListController(VRFController* vrfController); VRFController* vrfController() const; @@ -117,7 +117,7 @@ class VRFSystemListController : public OSListController void reset(); - public slots: + public slots: void addSystem(const OSItemId& itemid); @@ -125,7 +125,7 @@ class VRFSystemListController : public OSListController void removeSystem(model::AirConditionerVariableRefrigerantFlow& system); - private: + private: std::vector systems() const; int systemIndex(const model::AirConditionerVariableRefrigerantFlow& system) const; @@ -138,7 +138,7 @@ class VRFSystemItemDelegate : public OSGraphicsItemDelegate { Q_OBJECT; - public: + public: virtual ~VRFSystemItemDelegate() {} virtual QGraphicsObject* view(QSharedPointer dataSource) override; @@ -148,7 +148,7 @@ class VRFSystemListDropZoneItem : public OSListItem { Q_OBJECT - public: + public: VRFSystemListDropZoneItem(OSListController* listController = nullptr); ~VRFSystemListDropZoneItem() {} @@ -158,7 +158,7 @@ class VRFSystemListItem : public OSListItem { Q_OBJECT - public: + public: VRFSystemListItem(const model::AirConditionerVariableRefrigerantFlow& vrfSystem, OSListController* listController = nullptr); virtual ~VRFSystemListItem() {} @@ -169,13 +169,13 @@ class VRFSystemListItem : public OSListItem int numberOfConnectedTerminals() const; - public slots: + public slots: void remove(); void zoomInOnSystem(); - private: + private: model::AirConditionerVariableRefrigerantFlow m_vrfSystem; }; diff --git a/src/openstudio_lib/VRFGraphicsItems.hpp b/src/openstudio_lib/VRFGraphicsItems.hpp index aafbac2d6..2ff186b64 100644 --- a/src/openstudio_lib/VRFGraphicsItems.hpp +++ b/src/openstudio_lib/VRFGraphicsItems.hpp @@ -51,7 +51,7 @@ class VRFView : public QWidget { Q_OBJECT; - public: + public: VRFView(); virtual ~VRFView() {} @@ -69,7 +69,7 @@ class VRFSystemMiniView : public QGraphicsObject { Q_OBJECT; - public: + public: VRFSystemMiniView(); virtual ~VRFSystemMiniView() {} @@ -83,14 +83,14 @@ class VRFSystemMiniView : public QGraphicsObject void setNumberOfZones(int zones); void setNumberOfTerminals(int terminals); - public slots: + public slots: void setName(const QString& name); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private: + private: QRectF contentRect() const; QRectF headerRect() const; @@ -118,7 +118,7 @@ class VRFSystemView : public QGraphicsObject { Q_OBJECT; - public: + public: VRFSystemView(); virtual ~VRFSystemView() {} @@ -144,22 +144,22 @@ class VRFSystemView : public QGraphicsObject void addVRFTerminalView(VRFTerminalView* view); void removeAllVRFTerminalViews(); - signals: + signals: void inspectClicked(const OSItemId& id); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void mousePressEvent(QGraphicsSceneMouseEvent* event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; bool m_mouseDown; - private slots: + private slots: void onVRFIconClicked(); - private: + private: double m_width; double m_height; @@ -173,7 +173,7 @@ class VRFTerminalView : public QGraphicsObject { Q_OBJECT; - public: + public: VRFTerminalView(); virtual ~VRFTerminalView() {} @@ -192,7 +192,7 @@ class VRFTerminalView : public QGraphicsObject void setId(const OSItemId& id); - signals: + signals: void componentDroppedOnZone(const OSItemId& zoneHVACTerminalID, const OSItemId& dropComponentID); @@ -202,10 +202,10 @@ class VRFTerminalView : public QGraphicsObject void removeTerminalClicked(const OSItemId& zoneHVACTerminalID); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private slots: + private slots: void onComponenDroppedOnZone(const OSItemId& dropComponentID); @@ -215,7 +215,7 @@ class VRFTerminalView : public QGraphicsObject void onTerminalIconClicked(); - private: + private: QRectF terminalPixmapRect() const; QPixmap m_terminalPixmap; @@ -227,17 +227,17 @@ class VRFThermalZoneDropZoneView : public OSDropZoneItem { Q_OBJECT; - public: + public: VRFThermalZoneDropZoneView(); ~VRFThermalZoneDropZoneView() {} void setHasZone(bool hasZone); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; - private: + private: bool m_hasZone; }; @@ -245,10 +245,10 @@ class VRFSystemDropZoneView : public OSDropZoneItem { Q_OBJECT; - public: + public: QRectF boundingRect() const override; - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; }; diff --git a/src/openstudio_lib/VariablesTabController.hpp b/src/openstudio_lib/VariablesTabController.hpp index 42724c455..4b6f17b40 100644 --- a/src/openstudio_lib/VariablesTabController.hpp +++ b/src/openstudio_lib/VariablesTabController.hpp @@ -38,7 +38,7 @@ class VariablesTabController : public MainTabController { Q_OBJECT - public: + public: VariablesTabController(const model::Model& model); virtual ~VariablesTabController() {} diff --git a/src/openstudio_lib/VariablesTabView.hpp b/src/openstudio_lib/VariablesTabView.hpp index a7d14489a..7c4f6e77c 100644 --- a/src/openstudio_lib/VariablesTabView.hpp +++ b/src/openstudio_lib/VariablesTabView.hpp @@ -49,20 +49,20 @@ class VariableListItem : public QWidget, public Nano::Observer { Q_OBJECT; - public: + public: VariableListItem(const std::string& t_name, const std::string& t_keyValue, const boost::optional& t_variable, const openstudio::model::Model& t_model); virtual ~VariableListItem() {} - public slots: + public slots: void setVariableEnabled(bool); - private slots: + private slots: void onOffClicked(bool); void indexChanged(const QString& t_frequency); - private: + private: REGISTER_LOGGER("openstudio.VariableListItem"); std::string m_name; @@ -78,11 +78,11 @@ class VariablesList : public QWidget, public Nano::Observer { Q_OBJECT; - public: + public: VariablesList(openstudio::model::Model t_model); virtual ~VariablesList(); - private slots: + private slots: void onAdded(const WorkspaceObject&, const openstudio::IddObjectType&, const openstudio::UUID&); void onRemoved(const WorkspaceObject&, const openstudio::IddObjectType&, const openstudio::UUID&); @@ -92,7 +92,7 @@ class VariablesList : public QWidget, public Nano::Observer void enableAll(bool); void updateVariableList(); - private: + private: REGISTER_LOGGER("openstudio.VariablesList"); openstudio::model::Model m_model; QPushButton* m_allOnBtn; @@ -106,12 +106,12 @@ class VariablesTabView : public MainTabView { Q_OBJECT; - public: + public: VariablesTabView(openstudio::model::Model t_model, QWidget* parent = nullptr); virtual ~VariablesTabView() {} - private: + private: REGISTER_LOGGER("openstudio.VariablesTabView"); }; diff --git a/src/openstudio_lib/VerticalTabWidget.hpp b/src/openstudio_lib/VerticalTabWidget.hpp index 4c5f754b6..c23c62ed2 100644 --- a/src/openstudio_lib/VerticalTabWidget.hpp +++ b/src/openstudio_lib/VerticalTabWidget.hpp @@ -46,7 +46,7 @@ class VerticalTabWidget : public QWidget { Q_OBJECT - public: + public: VerticalTabWidget(QWidget* parent = nullptr); virtual ~VerticalTabWidget() {} @@ -63,19 +63,19 @@ class VerticalTabWidget : public QWidget int verticalTabIndex(); - signals: + signals: void tabSelected(int id); - public slots: + public slots: void setCurrentIndex(int index); - private slots: + private slots: void select(); - private: + private: int getIndex(int id); OSViewSwitcher* m_viewSwitcher = nullptr; diff --git a/src/openstudio_lib/WaterUseEquipmentInspectorView.hpp b/src/openstudio_lib/WaterUseEquipmentInspectorView.hpp index fbc774f4d..32aa4f5a8 100644 --- a/src/openstudio_lib/WaterUseEquipmentInspectorView.hpp +++ b/src/openstudio_lib/WaterUseEquipmentInspectorView.hpp @@ -46,10 +46,10 @@ class TargetTemperatureScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~TargetTemperatureScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -63,10 +63,10 @@ class SensibleFractionScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~SensibleFractionScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -80,10 +80,10 @@ class LatentFractionScheduleVC : public ModelObjectVectorController { Q_OBJECT - public: + public: virtual ~LatentFractionScheduleVC() {} - protected: + protected: virtual void onChangeRelationship(const model::ModelObject& modelObject, int index, Handle newHandle, Handle oldHandle) override; virtual std::vector makeVector() override; virtual void onRemoveItem(OSItem* item) override; @@ -97,19 +97,19 @@ class WaterUseEquipmentDefinitionInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: WaterUseEquipmentDefinitionInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WaterUseEquipmentDefinitionInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void attach(openstudio::model::WaterUseEquipmentDefinition& waterUseEquipmentDefinition); void detach(); @@ -134,7 +134,7 @@ class WaterUseEquipmentDefinitionInspectorView : public ModelObjectInspectorView boost::optional m_waterUseEquipmentDefinition; - public slots: + public slots: void toggleUnits(bool displayIP) override; }; diff --git a/src/openstudio_lib/WindowMaterialBlindInspectorView.hpp b/src/openstudio_lib/WindowMaterialBlindInspectorView.hpp index b2d64c432..bbb93b473 100644 --- a/src/openstudio_lib/WindowMaterialBlindInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialBlindInspectorView.hpp @@ -47,19 +47,19 @@ class WindowMaterialBlindInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: WindowMaterialBlindInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialBlindInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::Blind& Blind); diff --git a/src/openstudio_lib/WindowMaterialDaylightRedirectionDeviceInspectorView.hpp b/src/openstudio_lib/WindowMaterialDaylightRedirectionDeviceInspectorView.hpp index b7b44d86f..e6b389a6a 100644 --- a/src/openstudio_lib/WindowMaterialDaylightRedirectionDeviceInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialDaylightRedirectionDeviceInspectorView.hpp @@ -46,19 +46,19 @@ class WindowMaterialDaylightRedirectionDeviceInspectorView : public ModelObjectI { Q_OBJECT - public: + public: WindowMaterialDaylightRedirectionDeviceInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialDaylightRedirectionDeviceInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::DaylightRedirectionDevice& daylightRedirectionDevice); diff --git a/src/openstudio_lib/WindowMaterialGasInspectorView.hpp b/src/openstudio_lib/WindowMaterialGasInspectorView.hpp index 9842b0d5d..b7062dc37 100644 --- a/src/openstudio_lib/WindowMaterialGasInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialGasInspectorView.hpp @@ -47,19 +47,19 @@ class WindowMaterialGasInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: WindowMaterialGasInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialGasInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::Gas& Gas); diff --git a/src/openstudio_lib/WindowMaterialGasMixtureInspectorView.hpp b/src/openstudio_lib/WindowMaterialGasMixtureInspectorView.hpp index 18652dc8d..12b4a47b0 100644 --- a/src/openstudio_lib/WindowMaterialGasMixtureInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialGasMixtureInspectorView.hpp @@ -49,19 +49,19 @@ class WindowMaterialGasMixtureInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: WindowMaterialGasMixtureInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialGasMixtureInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::GasMixture& GasMixture); diff --git a/src/openstudio_lib/WindowMaterialGlazingGroupThermochromicInspectorView.hpp b/src/openstudio_lib/WindowMaterialGlazingGroupThermochromicInspectorView.hpp index bb14fe941..a920e3275 100644 --- a/src/openstudio_lib/WindowMaterialGlazingGroupThermochromicInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialGlazingGroupThermochromicInspectorView.hpp @@ -47,19 +47,19 @@ class WindowMaterialGlazingGroupThermochromicInspectorView : public ModelObjectI { Q_OBJECT - public: + public: WindowMaterialGlazingGroupThermochromicInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialGlazingGroupThermochromicInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::ThermochromicGlazing& ThermochromicGlazing); diff --git a/src/openstudio_lib/WindowMaterialGlazingInspectorView.hpp b/src/openstudio_lib/WindowMaterialGlazingInspectorView.hpp index 35f0e0845..9d9f5c066 100644 --- a/src/openstudio_lib/WindowMaterialGlazingInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialGlazingInspectorView.hpp @@ -49,19 +49,19 @@ class WindowMaterialGlazingInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: WindowMaterialGlazingInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialGlazingInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::StandardGlazing& Glazing); diff --git a/src/openstudio_lib/WindowMaterialGlazingRefractionExtinctionMethodInspectorView.hpp b/src/openstudio_lib/WindowMaterialGlazingRefractionExtinctionMethodInspectorView.hpp index a4b1f7bdc..1634ad95f 100644 --- a/src/openstudio_lib/WindowMaterialGlazingRefractionExtinctionMethodInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialGlazingRefractionExtinctionMethodInspectorView.hpp @@ -47,19 +47,19 @@ class WindowMaterialGlazingRefractionExtinctionMethodInspectorView : public Mode { Q_OBJECT - public: + public: WindowMaterialGlazingRefractionExtinctionMethodInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialGlazingRefractionExtinctionMethodInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::RefractionExtinctionGlazing& RefractionExtinctionGlazing); diff --git a/src/openstudio_lib/WindowMaterialScreenInspectorView.hpp b/src/openstudio_lib/WindowMaterialScreenInspectorView.hpp index 5d9aa93ba..f21759f00 100644 --- a/src/openstudio_lib/WindowMaterialScreenInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialScreenInspectorView.hpp @@ -47,19 +47,19 @@ class WindowMaterialScreenInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: WindowMaterialScreenInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialScreenInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::Screen& Screen); diff --git a/src/openstudio_lib/WindowMaterialShadeInspectorView.hpp b/src/openstudio_lib/WindowMaterialShadeInspectorView.hpp index 409bad37a..693ccf08e 100644 --- a/src/openstudio_lib/WindowMaterialShadeInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialShadeInspectorView.hpp @@ -45,19 +45,19 @@ class WindowMaterialShadeInspectorView : public ModelObjectInspectorView { Q_OBJECT - public: + public: WindowMaterialShadeInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialShadeInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::Shade& Shade); diff --git a/src/openstudio_lib/WindowMaterialSimpleGlazingSystemInspectorView.hpp b/src/openstudio_lib/WindowMaterialSimpleGlazingSystemInspectorView.hpp index b61853ada..b749d36f8 100644 --- a/src/openstudio_lib/WindowMaterialSimpleGlazingSystemInspectorView.hpp +++ b/src/openstudio_lib/WindowMaterialSimpleGlazingSystemInspectorView.hpp @@ -45,19 +45,19 @@ class WindowMaterialSimpleGlazingSystemInspectorView : public ModelObjectInspect { Q_OBJECT - public: + public: WindowMaterialSimpleGlazingSystemInspectorView(bool isIP, const openstudio::model::Model& model, QWidget* parent = nullptr); virtual ~WindowMaterialSimpleGlazingSystemInspectorView() {} - protected: + protected: virtual void onClearSelection() override; virtual void onSelectModelObject(const openstudio::model::ModelObject& modelObject) override; virtual void onUpdate() override; - private: + private: void createLayout(); void attach(openstudio::model::SimpleGlazing& SimpleGlazing); diff --git a/src/openstudio_lib/YearSettingsWidget.hpp b/src/openstudio_lib/YearSettingsWidget.hpp index 24bc50011..652ed11cd 100644 --- a/src/openstudio_lib/YearSettingsWidget.hpp +++ b/src/openstudio_lib/YearSettingsWidget.hpp @@ -54,7 +54,7 @@ class YearSettingsWidget : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: static const int FIRSTYEAR; static const int LASTYEAR; @@ -74,7 +74,7 @@ class YearSettingsWidget : public QWidget, public Nano::Observer virtual ~YearSettingsWidget() {} - signals: + signals: void calendarYearSelected(int year); @@ -90,11 +90,11 @@ class YearSettingsWidget : public QWidget, public Nano::Observer void dstEndDateChanged(const QDate& newdate); - public slots: + public slots: void scheduleRefresh(); - private slots: + private slots: void refresh(); @@ -130,7 +130,7 @@ class YearSettingsWidget : public QWidget, public Nano::Observer //void emitNewDSTEndDate(); - private: + private: // year selection section QRadioButton* m_calendarYearButton = nullptr; diff --git a/src/openstudio_lib/ZoneChooserView.hpp b/src/openstudio_lib/ZoneChooserView.hpp index ea0d9c297..2b1e59ed3 100644 --- a/src/openstudio_lib/ZoneChooserView.hpp +++ b/src/openstudio_lib/ZoneChooserView.hpp @@ -49,7 +49,7 @@ class ZoneChooserView : public QWidget { Q_OBJECT; - public: + public: ZoneChooserView(QWidget* parent = nullptr); virtual ~ZoneChooserView() {} @@ -58,20 +58,20 @@ class ZoneChooserView : public QWidget void layoutView(); - public slots: + public slots: void layoutModelObject(model::ModelObject& modelObject); - signals: + signals: void addZoneClicked(model::ThermalZone&); void removeZoneClicked(model::ThermalZone&); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: model::OptionalAirLoopHVACZoneSplitter m_splitter; model::OptionalAirLoopHVACZoneMixer m_mixer; @@ -85,28 +85,28 @@ class ZoneChooserItem : public QWidget { Q_OBJECT; - public: + public: ZoneChooserItem(model::ThermalZone&, ZoneChooserView* parent = nullptr); virtual ~ZoneChooserItem() {} std::string zoneName(); - signals: + signals: void addZoneClicked(model::ThermalZone&); void removeZoneClicked(model::ThermalZone&); - public slots: + public slots: void setChecked(bool checked); - private slots: + private slots: void sendClickedSignal(bool checked); - private: + private: QCheckBox* m_checkBox; ZoneChooserView* m_zoneChooserView; diff --git a/src/openstudio_lib/test/OpenStudioLibFixture.hpp b/src/openstudio_lib/test/OpenStudioLibFixture.hpp index bdbc7f9ed..a5f1002d9 100644 --- a/src/openstudio_lib/test/OpenStudioLibFixture.hpp +++ b/src/openstudio_lib/test/OpenStudioLibFixture.hpp @@ -37,7 +37,7 @@ class OpenStudioLibFixture : public ::testing::Test { - protected: + protected: // initialize for each test virtual void SetUp() override; diff --git a/src/qtwinmigrate/qmfcapp.h b/src/qtwinmigrate/qmfcapp.h index 085f64913..2e50a0738 100644 --- a/src/qtwinmigrate/qmfcapp.h +++ b/src/qtwinmigrate/qmfcapp.h @@ -71,7 +71,7 @@ class CWinApp; class QT_QTWINMIGRATE_EXPORT QMfcAppEventFilter : public QAbstractNativeEventFilter { - public: + public: QMfcAppEventFilter(); bool nativeEventFilter(const QByteArray& eventType, void* message, long* result); }; @@ -79,7 +79,7 @@ class QT_QTWINMIGRATE_EXPORT QMfcAppEventFilter : public QAbstractNativeEventFil class QT_QTWINMIGRATE_EXPORT QMfcApp : public QApplication { - public: + public: static bool pluginInstance(Qt::HANDLE plugin = 0); #ifdef QTWINMIGRATE_WITHMFC @@ -95,7 +95,7 @@ class QT_QTWINMIGRATE_EXPORT QMfcApp : public QApplication static void enterModalLoop(); static void exitModalLoop(); - private: + private: #ifdef QTWINMIGRATE_WITHMFC static char** mfc_argv; static int mfc_argc; diff --git a/src/qtwinmigrate/qwinhost.h b/src/qtwinmigrate/qwinhost.h index af82a70be..40b9affba 100644 --- a/src/qtwinmigrate/qwinhost.h +++ b/src/qtwinmigrate/qwinhost.h @@ -64,14 +64,14 @@ class QT_QTWINMIGRATE_EXPORT QWinHost : public QWidget { Q_OBJECT - public: + public: QWinHost(QWidget* parent = 0, Qt::WindowFlags f = 0); ~QWinHost(); void setWindow(HWND); HWND window() const; - protected: + protected: virtual HWND createWindow(HWND parent, HINSTANCE instance); bool event(QEvent* e); @@ -85,7 +85,7 @@ class QT_QTWINMIGRATE_EXPORT QWinHost : public QWidget bool winEvent(MSG* msg, long* result); #endif - private: + private: void fixParent(); friend void* getWindowProc(QWinHost*); diff --git a/src/qtwinmigrate/qwinwidget.h b/src/qtwinmigrate/qwinwidget.h index 108097e9c..c514257cf 100644 --- a/src/qtwinmigrate/qwinwidget.h +++ b/src/qtwinmigrate/qwinwidget.h @@ -67,7 +67,7 @@ class CWnd; class QT_QTWINMIGRATE_EXPORT QWinWidget : public QWidget { Q_OBJECT - public: + public: QWinWidget(HWND hParentWnd, QObject* parent = 0, Qt::WindowFlags f = 0); #ifdef QTWINMIGRATE_WITHMFC QWinWidget(CWnd* parnetWnd, QObject* parent = 0, Qt::WindowFlags f = 0); @@ -80,7 +80,7 @@ class QT_QTWINMIGRATE_EXPORT QWinWidget : public QWidget HWND parentWindow() const; - protected: + protected: void childEvent(QChildEvent* e); bool eventFilter(QObject* o, QEvent* e); @@ -92,7 +92,7 @@ class QT_QTWINMIGRATE_EXPORT QWinWidget : public QWidget bool winEvent(MSG* msg, long* result); #endif - private: + private: void init(); void saveFocus(); diff --git a/src/shared_gui_components/BCLMeasureDialog.hpp b/src/shared_gui_components/BCLMeasureDialog.hpp index 39e8a85ca..f5bd002a1 100644 --- a/src/shared_gui_components/BCLMeasureDialog.hpp +++ b/src/shared_gui_components/BCLMeasureDialog.hpp @@ -47,7 +47,7 @@ class BCLMeasureDialog : public OSDialog { Q_OBJECT - public: + public: /// Constructor of the dialog to create a new BCL Measure BCLMeasureDialog(QWidget* parent = nullptr); @@ -62,7 +62,7 @@ class BCLMeasureDialog : public OSDialog /// Call createMeasure to create the new measure boost::optional createMeasure(); - private slots: + private slots: void nameChanged(const QString& newName); @@ -70,7 +70,7 @@ class BCLMeasureDialog : public OSDialog void firstLevelTaxonomyChanged(const QString& newName); - private: + private: void init(); QLineEdit* m_nameLineEdit; diff --git a/src/shared_gui_components/BaseApp.hpp b/src/shared_gui_components/BaseApp.hpp index a31a7747a..87be95869 100644 --- a/src/shared_gui_components/BaseApp.hpp +++ b/src/shared_gui_components/BaseApp.hpp @@ -52,7 +52,7 @@ class Model; class BaseApp { - public: + public: virtual ~BaseApp() {} //virtual boost::optional project() = 0; diff --git a/src/shared_gui_components/BuildingComponentDialog.hpp b/src/shared_gui_components/BuildingComponentDialog.hpp index 281caa7ca..85e0dcd51 100644 --- a/src/shared_gui_components/BuildingComponentDialog.hpp +++ b/src/shared_gui_components/BuildingComponentDialog.hpp @@ -54,7 +54,7 @@ class BuildingComponentDialog : public QDialog { Q_OBJECT - public: + public: BuildingComponentDialog(std::string& filterType, bool isBclDlg = true, QWidget* parent = nullptr); virtual ~BuildingComponentDialog() {} @@ -64,10 +64,10 @@ class BuildingComponentDialog : public QDialog bool showNewComponents(); void setShowNewComponents(bool showNewComponents); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: void requestComponents(const std::string& filterType, int tids, int pageIdx, const QString& searchString); void createLayout(bool isBclDlg); @@ -81,13 +81,13 @@ class BuildingComponentDialog : public QDialog QStackedWidget* m_stackedWidget; QTimer* m_timer; - signals: + signals: void headerClicked(bool checked); void componentClicked(bool checked); void collapsibleComponentClicked(bool checked); void getComponentsByPage(int pageNum); - private slots: + private slots: void on_tidClicked(const QModelIndex& index); void on_headerClicked(bool checked); void on_componentClicked(bool checked); diff --git a/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp b/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp index dc26dd0de..bacee2a62 100644 --- a/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp +++ b/src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp @@ -52,7 +52,7 @@ class BuildingComponentDialogCentralWidget : public QWidget, public Nano::Observ { Q_OBJECT - public: + public: BuildingComponentDialogCentralWidget(QWidget* parent = nullptr); BuildingComponentDialogCentralWidget(int tid, QWidget* parent = nullptr); virtual ~BuildingComponentDialogCentralWidget() {} @@ -63,8 +63,8 @@ class BuildingComponentDialogCentralWidget : public QWidget, public Nano::Observ bool showNewComponents(); void setShowNewComponents(bool showNewComponents); - protected: - private: + protected: + private: void createLayout(); void init(); void setTid(); @@ -79,7 +79,7 @@ class BuildingComponentDialogCentralWidget : public QWidget, public Nano::Observ QString m_searchString; bool m_showNewComponents; - signals: + signals: void headerClicked(bool checked); void componentClicked(bool checked); void collapsibleComponentClicked(bool checked); @@ -88,7 +88,7 @@ class BuildingComponentDialogCentralWidget : public QWidget, public Nano::Observ void noComponents(); void requestComponents(const std::string& filterType, int tids, int pageIdx, const QString& searchString); - private slots: + private slots: void upperPushButtonClicked(); void lowerPushButtonClicked(); void comboBoxIndexChanged(const QString& text); diff --git a/src/shared_gui_components/BusyWidget.hpp b/src/shared_gui_components/BusyWidget.hpp index 47060540f..0b446771f 100644 --- a/src/shared_gui_components/BusyWidget.hpp +++ b/src/shared_gui_components/BusyWidget.hpp @@ -43,21 +43,21 @@ class BusyWidget : public QWidget { Q_OBJECT - public: + public: BusyWidget(QWidget* parent = nullptr); virtual ~BusyWidget() {} const QSize sizeHint(); - public slots: + public slots: void rotate(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: std::shared_ptr m_pixmap; float m_rotation; diff --git a/src/shared_gui_components/Buttons.hpp b/src/shared_gui_components/Buttons.hpp index f2aea78f5..213a5c14e 100644 --- a/src/shared_gui_components/Buttons.hpp +++ b/src/shared_gui_components/Buttons.hpp @@ -46,7 +46,7 @@ class ZoomOutButton : public QPushButton { Q_OBJECT - public: + public: ZoomOutButton(QWidget* parent = nullptr); virtual ~ZoomOutButton() {} }; @@ -55,7 +55,7 @@ class OrangeButton : public QPushButton { Q_OBJECT - public: + public: OrangeButton(QWidget* parent = nullptr); virtual ~OrangeButton() {} }; @@ -64,7 +64,7 @@ class GrayButton : public QPushButton { Q_OBJECT - public: + public: GrayButton(QWidget* parent = nullptr); virtual ~GrayButton() {} }; @@ -73,7 +73,7 @@ class BlueButton : public QPushButton { Q_OBJECT - public: + public: BlueButton(QWidget* parent = nullptr); virtual ~BlueButton() {} }; @@ -82,7 +82,7 @@ class AddButton : public QPushButton { Q_OBJECT - public: + public: AddButton(QWidget* parent = nullptr); virtual ~AddButton() {} }; @@ -91,7 +91,7 @@ class SofterAddButton : public QPushButton { Q_OBJECT - public: + public: SofterAddButton(QWidget* parent = nullptr); virtual ~SofterAddButton() {} }; @@ -100,7 +100,7 @@ class RemoveButton : public QPushButton { Q_OBJECT - public: + public: RemoveButton(QWidget* parent = nullptr); virtual ~RemoveButton() {} }; @@ -109,7 +109,7 @@ class SofterRemoveButton : public QPushButton { Q_OBJECT - public: + public: SofterRemoveButton(QWidget* parent = nullptr); virtual ~SofterRemoveButton() {} }; @@ -118,7 +118,7 @@ class AddScriptButton : public QPushButton { Q_OBJECT - public: + public: AddScriptButton(QWidget* parent = nullptr); virtual ~AddScriptButton() {} }; @@ -127,7 +127,7 @@ class DuplicateButton : public QPushButton { Q_OBJECT - public: + public: DuplicateButton(QWidget* parent = nullptr); virtual ~DuplicateButton() {} }; @@ -136,7 +136,7 @@ class SofterDuplicateButton : public QPushButton { Q_OBJECT - public: + public: SofterDuplicateButton(QWidget* parent = nullptr); virtual ~SofterDuplicateButton() {} }; @@ -145,7 +145,7 @@ class UpButton : public QPushButton { Q_OBJECT - public: + public: UpButton(QWidget* parent = nullptr); virtual ~UpButton() {} }; @@ -154,7 +154,7 @@ class DownButton : public QPushButton { Q_OBJECT - public: + public: DownButton(QWidget* parent = nullptr); virtual ~DownButton() {} }; @@ -163,7 +163,7 @@ class MyMeasuresFolderButton : public QPushButton { Q_OBJECT - public: + public: MyMeasuresFolderButton(QWidget* parent = nullptr); virtual ~MyMeasuresFolderButton() {} }; @@ -172,7 +172,7 @@ class OpenDirectoryButton : public QPushButton { Q_OBJECT - public: + public: OpenDirectoryButton(QWidget* parent = nullptr); virtual ~OpenDirectoryButton() {} }; @@ -181,7 +181,7 @@ class CreateOneWithSelectedMeasuresButton : public GrayButton { Q_OBJECT - public: + public: CreateOneWithSelectedMeasuresButton(); virtual ~CreateOneWithSelectedMeasuresButton() {} }; @@ -190,7 +190,7 @@ class CreateOneForEachSelectedMeasureButton : public GrayButton { Q_OBJECT - public: + public: CreateOneForEachSelectedMeasureButton(); virtual ~CreateOneForEachSelectedMeasureButton() {} }; @@ -199,7 +199,7 @@ class CreateFromFileButton : public GrayButton { Q_OBJECT - public: + public: CreateFromFileButton(); virtual ~CreateFromFileButton() {} }; @@ -208,7 +208,7 @@ class CloudLostConnectionButton : public QPushButton { Q_OBJECT - public: + public: CloudLostConnectionButton(QWidget* parent = nullptr); virtual ~CloudLostConnectionButton() {} }; @@ -217,7 +217,7 @@ class CloudOffButton : public QPushButton { Q_OBJECT - public: + public: CloudOffButton(QWidget* parent = nullptr); virtual ~CloudOffButton() {} }; @@ -226,7 +226,7 @@ class CloudOnButton : public QPushButton { Q_OBJECT - public: + public: CloudOnButton(QWidget* parent = nullptr); virtual ~CloudOnButton() {} }; @@ -235,18 +235,18 @@ class CloudStartingButton : public QPushButton { Q_OBJECT - public: + public: CloudStartingButton(QWidget* parent = nullptr); virtual ~CloudStartingButton() {} - public slots: + public slots: void rotate(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: QPixmap* m_background; QPixmap* m_arrow; @@ -260,18 +260,18 @@ class CloudStoppingButton : public QPushButton { Q_OBJECT - public: + public: CloudStoppingButton(QWidget* parent = nullptr); virtual ~CloudStoppingButton() {} - public slots: + public slots: void rotate(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: QPixmap* m_background; QPixmap* m_arrow; @@ -285,7 +285,7 @@ class PlayButton : public QPushButton { Q_OBJECT - public: + public: enum Status { IDLE, @@ -302,7 +302,7 @@ class PlayButton : public QPushButton Status status() const; void setStatus(const Status& status); - private: + private: Status m_status; }; diff --git a/src/shared_gui_components/CollapsibleComponent.hpp b/src/shared_gui_components/CollapsibleComponent.hpp index 58e3abf74..de910af32 100644 --- a/src/shared_gui_components/CollapsibleComponent.hpp +++ b/src/shared_gui_components/CollapsibleComponent.hpp @@ -45,7 +45,7 @@ class CollapsibleComponent : public QAbstractButton { Q_OBJECT - public: + public: CollapsibleComponent(CollapsibleComponentHeader* collapsibleComponentHeader, ComponentList* componentList, QWidget* parent = nullptr); virtual ~CollapsibleComponent() {} bool expanded() const; @@ -57,22 +57,22 @@ class CollapsibleComponent : public QAbstractButton void setNumPages(int numPages); void firstPage(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: void createLayout(); CollapsibleComponentHeader* m_collapsibleComponentHeader; ComponentList* m_componentList; QVBoxLayout* m_mainLayout; - signals: + signals: void headerClicked(bool); void componentClicked(bool); void getComponentsByPage(int pageNum); - private slots: + private slots: void on_headerClicked(bool checked); void on_componentClicked(bool checked); void on_getComponentsByPage(int pageIdx); diff --git a/src/shared_gui_components/CollapsibleComponentHeader.hpp b/src/shared_gui_components/CollapsibleComponentHeader.hpp index cb5bad01d..cf8ccdb86 100644 --- a/src/shared_gui_components/CollapsibleComponentHeader.hpp +++ b/src/shared_gui_components/CollapsibleComponentHeader.hpp @@ -47,7 +47,7 @@ class CollapsibleComponentHeader : public QAbstractButton { Q_OBJECT - public: + public: CollapsibleComponentHeader(const std::string& text, int numResults, int numPages, QWidget* parent = nullptr); virtual ~CollapsibleComponentHeader() {} void setChecked(bool isChecked); @@ -56,11 +56,11 @@ class CollapsibleComponentHeader : public QAbstractButton void setNumPages(int numPages); void firstPage(); - protected: + protected: void paintEvent(QPaintEvent* event) override; QSize sizeHint() const override; - private: + private: void createLayout(const std::string& text, int numResults, int numPages); void setImage(bool isChecked); @@ -69,10 +69,10 @@ class CollapsibleComponentHeader : public QAbstractButton PageNavigator* m_pageNavigator; QLabel* m_numLabel; - signals: + signals: void getComponentsByPage(int pageNum); - private slots: + private slots: void on_getComponentsByPage(int pageIdx); }; diff --git a/src/shared_gui_components/CollapsibleComponentList.hpp b/src/shared_gui_components/CollapsibleComponentList.hpp index 1fdc33fa3..0d3864e32 100644 --- a/src/shared_gui_components/CollapsibleComponentList.hpp +++ b/src/shared_gui_components/CollapsibleComponentList.hpp @@ -46,7 +46,7 @@ class CollapsibleComponentList : public QWidget { Q_OBJECT - public: + public: CollapsibleComponentList(QWidget* parent = nullptr); CollapsibleComponentList(const std::vector& collapsibleComponents, QWidget* parent = nullptr); virtual ~CollapsibleComponentList() {} @@ -73,10 +73,10 @@ class CollapsibleComponentList : public QWidget ///! set the page nav to display first page (pageIdx = 0) void firstPage(); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: void createLayout(); // set the CollapsibleComponents void setCollapsibleComponents(const std::vector& collapsibleComponents); @@ -85,13 +85,13 @@ class CollapsibleComponentList : public QWidget QHBoxLayout* m_contentLayout; QButtonGroup* m_collapsibleComponentGroup; - signals: + signals: void headerClicked(bool checked); void componentClicked(bool checked); void collapsibleComponentClicked(bool checked); void getComponentsByPage(int pageNum); - private slots: + private slots: void on_headerClicked(bool checked); void on_componentClicked(bool checked); void on_collapsibleComponentClicked(bool checked); diff --git a/src/shared_gui_components/Component.hpp b/src/shared_gui_components/Component.hpp index 41a7a7e70..1553cfcb9 100644 --- a/src/shared_gui_components/Component.hpp +++ b/src/shared_gui_components/Component.hpp @@ -47,7 +47,7 @@ class Component : public QAbstractButton { Q_OBJECT - public: + public: Component(const BCLMeasure& bclMeasure, bool showAbridgedView = true, bool showCheckBox = true, QWidget* parent = nullptr); Component(const BCLSearchResult& bclSearchResult, bool showAbridgedView = true, bool showCheckBox = true, QWidget* parent = nullptr); Component(bool showAbridgedView = false, bool showCheckBox = false, QWidget* parent = nullptr); @@ -60,10 +60,10 @@ class Component : public QAbstractButton std::string versionId() const; void setChecked(bool checked); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: void createAbridgedLayout(); void createCompleteLayout(); void parseBCLMeasure(const BCLMeasure& bclMeasure); @@ -89,9 +89,9 @@ class Component : public QAbstractButton QCheckBox* m_checkBox; QLabel* m_msg; - signals: + signals: - private slots: + private slots: }; } // namespace openstudio diff --git a/src/shared_gui_components/ComponentList.hpp b/src/shared_gui_components/ComponentList.hpp index fa434bbd4..5a6723f8f 100644 --- a/src/shared_gui_components/ComponentList.hpp +++ b/src/shared_gui_components/ComponentList.hpp @@ -44,7 +44,7 @@ class ComponentList : public QWidget Q_OBJECT - public: + public: ComponentList(QWidget* parent = nullptr); ComponentList(const std::vector& components, QWidget* parent = nullptr); virtual ~ComponentList() {} @@ -59,10 +59,10 @@ class ComponentList : public QWidget // add a component void addComponent(Component* component); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: void createLayout(); // set the components void setComponents(const std::vector& components); @@ -70,10 +70,10 @@ class ComponentList : public QWidget QVBoxLayout* m_mainLayout; QButtonGroup* m_componentGroup; - signals: + signals: void componentClicked(bool checked); - private slots: + private slots: void on_componentClicked(bool); }; diff --git a/src/shared_gui_components/EditController.cpp b/src/shared_gui_components/EditController.cpp index ef20dd8dd..d820a5aba 100644 --- a/src/shared_gui_components/EditController.cpp +++ b/src/shared_gui_components/EditController.cpp @@ -134,7 +134,7 @@ class EditMeasureMessageBox : public QMessageBox { Q_OBJECT - public: + public: // Warning used when a message is about to be edited and design points will be removed; // Returns true if the user chooses to edit anyway. static bool warning(BaseApp* t_app) { diff --git a/src/shared_gui_components/EditController.hpp b/src/shared_gui_components/EditController.hpp index baa7b96bd..3f62890a2 100644 --- a/src/shared_gui_components/EditController.hpp +++ b/src/shared_gui_components/EditController.hpp @@ -58,7 +58,7 @@ class EditController : public QObject { Q_OBJECT - public: + public: QPointer editView; QPointer editRubyMeasureView; @@ -74,11 +74,11 @@ class EditController : public QObject // Show something when no RubyMeasure is selected void reset(); - private slots: + private slots: void updateDescription(); - private: + private: REGISTER_LOGGER("openstudio.pat.EditController"); QPointer m_editNullView; @@ -92,14 +92,14 @@ class InputController : public QObject { Q_OBJECT - public: + public: InputController(EditController* editController, const measure::OSArgument& argument, BaseApp* t_app); virtual ~InputController(); QPointer inputView; - private slots: + private slots: void setValue(const QString& value); @@ -107,7 +107,7 @@ class InputController : public QObject void setValueForIndex(int index); - private: + private: bool isItOKToClearResults(); bool isArgumentIncomplete() const; diff --git a/src/shared_gui_components/EditView.hpp b/src/shared_gui_components/EditView.hpp index d3a0133a7..c00eeecb0 100644 --- a/src/shared_gui_components/EditView.hpp +++ b/src/shared_gui_components/EditView.hpp @@ -49,11 +49,11 @@ class EditNullView : public QWidget { Q_OBJECT - public: + public: EditNullView(const QString& text = "Select a Measure to Edit"); virtual ~EditNullView() {} - protected: + protected: void paintEvent(QPaintEvent*) override; }; @@ -61,7 +61,7 @@ class EditRubyMeasureView : public QWidget { Q_OBJECT - public: + public: EditRubyMeasureView(bool applyMeasureNow); virtual ~EditRubyMeasureView() {} @@ -76,10 +76,10 @@ class EditRubyMeasureView : public QWidget // Clear all of the information specific to a particular ruby perturbation void clear(); - protected: + protected: void paintEvent(QPaintEvent*) override; - private: + private: std::vector m_inputViews; QVBoxLayout* m_mainVLayout; @@ -89,7 +89,7 @@ class EditRubyMeasureView : public QWidget class InputView : public QWidget { - public: + public: virtual void setIncomplete(bool incomplete) {} virtual void setDisplayValue(const QVariant& value) {} @@ -99,7 +99,7 @@ class DoubleInputView : public InputView { Q_OBJECT - public: + public: DoubleInputView(); virtual ~DoubleInputView() {} @@ -111,7 +111,7 @@ class DoubleInputView : public InputView void setDisplayValue(const QVariant& value) override; - private: + private: QLabel* nameLabel; }; @@ -119,7 +119,7 @@ class ChoiceInputView : public InputView { Q_OBJECT - public: + public: ChoiceInputView(); virtual ~ChoiceInputView() {} @@ -131,7 +131,7 @@ class ChoiceInputView : public InputView void setDisplayValue(const QVariant& value) override; - private: + private: QLabel* nameLabel; }; @@ -139,7 +139,7 @@ class BoolInputView : public InputView { Q_OBJECT - public: + public: BoolInputView(); virtual ~BoolInputView() {} @@ -156,7 +156,7 @@ class IntegerInputView : public InputView { Q_OBJECT - public: + public: IntegerInputView(); virtual ~IntegerInputView() {} @@ -168,7 +168,7 @@ class IntegerInputView : public InputView void setDisplayValue(const QVariant& value) override; - private: + private: QLabel* nameLabel; }; @@ -176,7 +176,7 @@ class StringInputView : public InputView { Q_OBJECT - public: + public: StringInputView(); virtual ~StringInputView() {} @@ -188,7 +188,7 @@ class StringInputView : public InputView void setDisplayValue(const QVariant& value) override; - private: + private: QLabel* nameLabel; }; @@ -196,7 +196,7 @@ class InputComboBox : public QComboBox { Q_OBJECT - protected: + protected: void wheelEvent(QWheelEvent* e) override; }; @@ -204,7 +204,7 @@ class InputCheckBox : public QAbstractButton { Q_OBJECT - public: + public: InputCheckBox(); virtual ~InputCheckBox(); @@ -213,10 +213,10 @@ class InputCheckBox : public QAbstractButton void setIncomplete(bool incomplete); - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: QLabel* m_label; }; diff --git a/src/shared_gui_components/GraphicsItems.hpp b/src/shared_gui_components/GraphicsItems.hpp index 47fec21f2..8f9e49c79 100644 --- a/src/shared_gui_components/GraphicsItems.hpp +++ b/src/shared_gui_components/GraphicsItems.hpp @@ -47,27 +47,27 @@ class AbstractButtonItem : public QGraphicsObject { Q_OBJECT; - public: + public: AbstractButtonItem(QGraphicsItem* parent = nullptr); virtual ~AbstractButtonItem() {} void setChecked(bool checked); - signals: + signals: void mouseClicked(bool checked = false); void toggled(bool checked); - protected: + protected: void mousePressEvent(QGraphicsSceneMouseEvent* event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; bool m_checked; - private: + private: bool m_mouseDown; }; @@ -75,18 +75,18 @@ class ButtonItem : public QGraphicsObject, public Nano::Observer { Q_OBJECT; - public: + public: ButtonItem(const QPixmap& image, const QPixmap& downImage, const QPixmap& hoverImage, QGraphicsItem* parent = nullptr); virtual ~ButtonItem() {} QRectF boundingRect() const override; - signals: + signals: void mouseClicked(); - protected: + protected: void mousePressEvent(QGraphicsSceneMouseEvent* event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override; @@ -97,7 +97,7 @@ class ButtonItem : public QGraphicsObject, public Nano::Observer void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; - private: + private: bool m_mouseDown; bool m_isHovering; @@ -111,19 +111,19 @@ class ButtonItem : public QGraphicsObject, public Nano::Observer class RemoveButtonItem : public ButtonItem { - public: + public: RemoveButtonItem(QGraphicsItem* parent = nullptr); }; class ZoomInButtonItem : public ButtonItem { - public: + public: ZoomInButtonItem(QGraphicsItem* parent = nullptr); }; class ZoomOutButtonItem : public ButtonItem { - public: + public: ZoomOutButtonItem(QGraphicsItem* parent = nullptr); }; @@ -131,7 +131,7 @@ class GridLayoutItem : public QGraphicsObject { Q_OBJECT; - public: + public: GridLayoutItem(); virtual ~GridLayoutItem(); @@ -152,14 +152,14 @@ class GridLayoutItem : public QGraphicsObject void setMargin(int margin); - public slots: + public slots: void refreshAllItemViews(); - protected: + protected: void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override {} - private slots: + private slots: void insertItemView(int i); @@ -169,7 +169,7 @@ class GridLayoutItem : public QGraphicsObject void refreshItemView(int i); - private: + private: int spacing() const; int rows() const; diff --git a/src/shared_gui_components/HeaderViews.hpp b/src/shared_gui_components/HeaderViews.hpp index 211b63009..4cc2dbd86 100644 --- a/src/shared_gui_components/HeaderViews.hpp +++ b/src/shared_gui_components/HeaderViews.hpp @@ -41,14 +41,14 @@ class MeasureType; class LightHeaderToggleButton : public QPushButton { - public: + public: LightHeaderToggleButton(QWidget* parent = nullptr); virtual ~LightHeaderToggleButton() {} }; class HeaderToggleButton : public QPushButton { - public: + public: HeaderToggleButton(QWidget* parent = nullptr); virtual ~HeaderToggleButton() {} }; @@ -57,7 +57,7 @@ class DarkGradientHeader : public OSHeader { Q_OBJECT - public: + public: QLabel* label; DarkGradientHeader(QWidget* parent = nullptr); @@ -68,14 +68,14 @@ class LightGradientHeader : public OSHeader { Q_OBJECT - public: + public: QLabel* label; LightGradientHeader(QWidget* parent = nullptr); void setMeasureType(MeasureType measureType); virtual ~LightGradientHeader() {} - private: + private: QLabel* m_measureTypeBadge; }; @@ -83,7 +83,7 @@ class LightHeader : public OSHeader { Q_OBJECT - public: + public: QLabel* label; LightHeader(QWidget* parent = nullptr); diff --git a/src/shared_gui_components/LocalLibraryController.hpp b/src/shared_gui_components/LocalLibraryController.hpp index 1637969d6..0a272ab53 100644 --- a/src/shared_gui_components/LocalLibraryController.hpp +++ b/src/shared_gui_components/LocalLibraryController.hpp @@ -68,7 +68,7 @@ class LocalLibraryController : public QObject friend class LibraryListController; - public: + public: QPointer localLibraryView; LocalLibraryController(openstudio::BaseApp* t_app, bool onlyShowModelMeasures = false); @@ -80,19 +80,19 @@ class LocalLibraryController : public QObject void reset(); - public slots: + public slots: void showMeasures(); void showMyMeasuresFolder(); - private slots: + private slots: void addMeasure(); void duplicateSelectedMeasure(); void downloadUpdatedBCLMeasures(); void openBclDlg(); - private: + private: REGISTER_LOGGER("openstudio.LocalLibraryController"); BaseApp* m_app; @@ -110,7 +110,7 @@ class LibraryTypeItem : public OSListItem { Q_OBJECT - public: + public: LibraryTypeItem(const QString& name); virtual ~LibraryTypeItem() {} @@ -122,7 +122,7 @@ class LibraryTypeItem : public OSListItem return m_libraryGroupListController; } - private: + private: QString m_name; QSharedPointer m_libraryGroupListController; @@ -132,11 +132,11 @@ class LibraryTypeItemDelegate : public OSItemDelegate { QWidget* view(QSharedPointer dataSource) override; - public: + public: LibraryTypeItemDelegate(BaseApp* t_app); virtual ~LibraryTypeItemDelegate() {} - private: + private: BaseApp* m_app; }; @@ -144,7 +144,7 @@ class LibraryTypeListController : public OSListController { Q_OBJECT; - public: + public: virtual ~LibraryTypeListController() {} QSharedPointer itemAt(int i) override; @@ -155,7 +155,7 @@ class LibraryTypeListController : public OSListController void reset(); - private: + private: QList> m_items; }; @@ -163,7 +163,7 @@ class LibraryGroupItem : public OSListItem { Q_OBJECT - public: + public: LibraryGroupItem(const QString& name, BaseApp* t_app); virtual ~LibraryGroupItem() {} @@ -175,7 +175,7 @@ class LibraryGroupItem : public OSListItem return m_librarySubGroupListController; } - private: + private: QString m_name; QSharedPointer m_librarySubGroupListController; @@ -185,11 +185,11 @@ class LibraryGroupItemDelegate : public OSItemDelegate { QWidget* view(QSharedPointer dataSource) override; - public: + public: LibraryGroupItemDelegate(BaseApp* t_app); virtual ~LibraryGroupItemDelegate() {} - private: + private: BaseApp* m_app; }; @@ -197,7 +197,7 @@ class LibraryGroupListController : public OSListController { Q_OBJECT; - public: + public: virtual ~LibraryGroupListController() {} QSharedPointer itemAt(int i) override; @@ -208,7 +208,7 @@ class LibraryGroupListController : public OSListController void reset(); - private: + private: QList> m_items; }; @@ -216,7 +216,7 @@ class LibrarySubGroupItem : public OSListItem { Q_OBJECT - public: + public: LibrarySubGroupItem(const QString& name, const QString& taxonomyTag, LocalLibrary::LibrarySource source, BaseApp* t_app, bool onlyShowModelMeasures); @@ -230,11 +230,11 @@ class LibrarySubGroupItem : public OSListItem return m_libraryListController; } - signals: + signals: void libraryItemCountChanged(int count); - private: + private: BaseApp* m_app; QString m_name; @@ -245,11 +245,11 @@ class LibrarySubGroupItemDelegate : public OSItemDelegate { QWidget* view(QSharedPointer dataSource) override; - public: + public: LibrarySubGroupItemDelegate(BaseApp* t_app); virtual ~LibrarySubGroupItemDelegate() {} - private: + private: BaseApp* m_app; }; @@ -257,7 +257,7 @@ class LibrarySubGroupListController : public OSListController { Q_OBJECT; - public: + public: LibrarySubGroupListController(BaseApp* t_app); virtual ~LibrarySubGroupListController() {} @@ -271,11 +271,11 @@ class LibrarySubGroupListController : public OSListController int libraryItemCount(); - signals: + signals: void libraryItemCountChanged(int libraryItemCount); - private: + private: BaseApp* m_app; QList> m_items; }; @@ -284,7 +284,7 @@ class LibraryItem : public OSListItem { Q_OBJECT - public: + public: LibraryItem(const BCLMeasure& bclMeasure, LocalLibrary::LibrarySource source, BaseApp* t_app); virtual ~LibraryItem(); @@ -313,11 +313,11 @@ class LibraryItem : public OSListItem bool isAvailable() const; - public slots: + public slots: void dragItem(const OSDragPixmapData& data); - private: + private: bool m_available; BaseApp* m_app; }; @@ -326,16 +326,16 @@ class LibraryItemDelegate : public OSItemDelegate { Q_OBJECT; - public: + public: LibraryItemDelegate(BaseApp* t_app); virtual ~LibraryItemDelegate() {} QWidget* view(QSharedPointer dataSource) override; - private slots: + private slots: void selectedChanged(); - private: + private: BaseApp* m_app; }; @@ -343,7 +343,7 @@ class LibraryListController : public OSListController { Q_OBJECT; - public: + public: LibraryListController(const QString& taxonomyTag, LocalLibrary::LibrarySource source, BaseApp* t_app, bool onlyShowModelMeasures); virtual ~LibraryListController() {} @@ -354,11 +354,11 @@ class LibraryListController : public OSListController void reset(); - signals: + signals: void countChanged(int count); - private: + private: void createItems(); BaseApp* m_app; diff --git a/src/shared_gui_components/LocalLibraryView.hpp b/src/shared_gui_components/LocalLibraryView.hpp index 9967c5f50..6aeed6315 100644 --- a/src/shared_gui_components/LocalLibraryView.hpp +++ b/src/shared_gui_components/LocalLibraryView.hpp @@ -49,7 +49,7 @@ class LocalLibraryView : public QWidget { Q_OBJECT - public: + public: LocalLibraryView(QWidget* parent = nullptr); virtual ~LocalLibraryView() {} @@ -69,16 +69,16 @@ class LibraryGroupItemHeader : public LightGradientHeader { Q_OBJECT - public: + public: LibraryGroupItemHeader(); virtual ~LibraryGroupItemHeader() {} - public slots: + public slots: void setCount(int count); - private: + private: QLabel* countLabel; }; @@ -86,16 +86,16 @@ class LibrarySubGroupItemHeader : public LightHeader { Q_OBJECT - public: + public: LibrarySubGroupItemHeader(); virtual ~LibrarySubGroupItemHeader() {} - public slots: + public slots: void setCount(int count); - private: + private: QLabel* countLabel; }; @@ -103,7 +103,7 @@ class LibraryItemView : public OSDragableView { Q_OBJECT - public: + public: LibraryItemView(QWidget* parent = nullptr); virtual ~LibraryItemView() {} @@ -113,11 +113,11 @@ class LibraryItemView : public OSDragableView MeasureBadge* m_measureBadge; QLabel* errorLabel; - public slots: + public slots: void setHasEmphasis(bool hasEmphasis); - protected: + protected: void paintEvent(QPaintEvent*) override; }; diff --git a/src/shared_gui_components/LostCloudConnectionDialog.hpp b/src/shared_gui_components/LostCloudConnectionDialog.hpp index c4efc6580..6af2eeadf 100644 --- a/src/shared_gui_components/LostCloudConnectionDialog.hpp +++ b/src/shared_gui_components/LostCloudConnectionDialog.hpp @@ -40,7 +40,7 @@ class LostCloudConnectionDialog : public OSDialog { Q_OBJECT - public: + public: LostCloudConnectionDialog(bool internetAvailable, bool authenticated, bool cloudRunning, QWidget* parent = nullptr); virtual ~LostCloudConnectionDialog(); @@ -49,18 +49,18 @@ class LostCloudConnectionDialog : public OSDialog return m_clearCloudSession; } - protected slots: + protected slots: //virtual void on_okButton(bool checked); - private: + private: void createWidgets(bool internetAvailable, bool authenticated, bool cloudRunning); void createCloudConnectionWidgets(QVBoxLayout* vLayout); bool m_clearCloudSession; - private slots: + private slots: void on_launchAWSConsole(bool checked); diff --git a/src/shared_gui_components/MeasureBadge.hpp b/src/shared_gui_components/MeasureBadge.hpp index 5e9d66c84..5fac08d5f 100644 --- a/src/shared_gui_components/MeasureBadge.hpp +++ b/src/shared_gui_components/MeasureBadge.hpp @@ -40,7 +40,7 @@ class MeasureBadge : public QLabel { Q_OBJECT - public: + public: void setMeasureBadgeType(MeasureBadgeType type); }; diff --git a/src/shared_gui_components/MeasureDragData.hpp b/src/shared_gui_components/MeasureDragData.hpp index 18181e39e..dbcb63a93 100644 --- a/src/shared_gui_components/MeasureDragData.hpp +++ b/src/shared_gui_components/MeasureDragData.hpp @@ -42,7 +42,7 @@ class MeasureDragData : QObject { Q_OBJECT - public: + public: static QString mimeType(); static QString mimeType(openstudio::MeasureType type); @@ -61,7 +61,7 @@ class MeasureDragData : QObject QByteArray data(); - private: + private: UUID m_id; LocalLibrary::LibrarySource m_sourceEnum; diff --git a/src/shared_gui_components/MeasureManager.hpp b/src/shared_gui_components/MeasureManager.hpp index 1f8922c69..6fc5fd13b 100644 --- a/src/shared_gui_components/MeasureManager.hpp +++ b/src/shared_gui_components/MeasureManager.hpp @@ -96,7 +96,7 @@ class MeasureManager : public QObject { Q_OBJECT; - public: + public: MeasureManager(BaseApp* t_app); virtual ~MeasureManager() {} @@ -153,7 +153,7 @@ class MeasureManager : public QObject bool isStarted() const; - public slots: + public slots: /// Update the UI display for all measures. Does recompute the measure's XML. /// Does not update the measures in the project at all @@ -187,11 +187,11 @@ class MeasureManager : public QObject // Custom slot to debug potential SSL errors // void sslErrors(const QList& errors); - signals: + signals: void newMeasure(BCLMeasure newMeasure); - private: + private: REGISTER_LOGGER("openstudio.MeasureManager"); void updateMeasuresLists(bool updateUserMeasures); diff --git a/src/shared_gui_components/NetworkProxyDialog.hpp b/src/shared_gui_components/NetworkProxyDialog.hpp index afdaaaebb..2fa81478f 100644 --- a/src/shared_gui_components/NetworkProxyDialog.hpp +++ b/src/shared_gui_components/NetworkProxyDialog.hpp @@ -46,7 +46,7 @@ class NetworkProxyDialog : public QDialog Q_OBJECT; REGISTER_LOGGER("openstudio.NetworkProxyDialog"); - public: + public: // Saves to / loads from the QSettings object passed in NetworkProxyDialog(QSettings& t_settings, QWidget* t_parent); virtual ~NetworkProxyDialog() {} @@ -58,13 +58,13 @@ class NetworkProxyDialog : public QDialog static bool testProxy(QNetworkProxy& t_proxy, QWidget* t_parent); void setSettings(QSettings& t_settings) const; - private slots: + private slots: void saveClicked(); void cancelClicked(); void testClicked(); void proxyTypeChanged(int index); - private: + private: static std::pair testProxyConnection(const QNetworkProxy& t_proxy, QWidget* t_parent); QSettings& m_settings; diff --git a/src/shared_gui_components/OSCheckBox.hpp b/src/shared_gui_components/OSCheckBox.hpp index f6fe49c6d..78f6ad5bc 100644 --- a/src/shared_gui_components/OSCheckBox.hpp +++ b/src/shared_gui_components/OSCheckBox.hpp @@ -47,7 +47,7 @@ class OSCheckBox3 : public QCheckBox, public Nano::Observer { Q_OBJECT - public: + public: OSCheckBox3(QWidget* parent = nullptr); virtual ~OSCheckBox3(); @@ -66,16 +66,16 @@ class OSCheckBox3 : public QCheckBox, public Nano::Observer void unbind(); - signals: + signals: void inFocus(bool inFocus, bool hasData); - protected: + protected: // We override these methods to emit inFocus as appropriate to enable/disable the header button virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - private slots: + private slots: void onToggled(bool checked); @@ -83,7 +83,7 @@ class OSCheckBox3 : public QCheckBox, public Nano::Observer void onModelObjectRemove(const Handle& handle); - private: + private: boost::optional m_modelObject; boost::optional m_get; boost::optional m_set; @@ -96,7 +96,7 @@ class OSCheckBox2 : public QPushButton, public Nano::Observer { Q_OBJECT - public: + public: OSCheckBox2(QWidget* parent = nullptr); virtual ~OSCheckBox2() {} @@ -106,7 +106,7 @@ class OSCheckBox2 : public QPushButton, public Nano::Observer void unbind(); - private slots: + private slots: void onToggled(bool checked); @@ -114,7 +114,7 @@ class OSCheckBox2 : public QPushButton, public Nano::Observer void onModelObjectRemove(const Handle& handle); - private: + private: boost::optional m_modelObject; boost::optional m_get; boost::optional m_set; diff --git a/src/shared_gui_components/OSCollapsibleView.hpp b/src/shared_gui_components/OSCollapsibleView.hpp index 2a1d52969..07c4aaef4 100644 --- a/src/shared_gui_components/OSCollapsibleView.hpp +++ b/src/shared_gui_components/OSCollapsibleView.hpp @@ -45,14 +45,14 @@ class OSHeader : public QPushButton { Q_OBJECT - public: + public: OSHeader(QPushButton* button); virtual ~OSHeader() {} QPushButton* toggleButton; - protected: + protected: void paintEvent(QPaintEvent*) override; }; @@ -60,7 +60,7 @@ class OSCollapsibleView : public QWidget { Q_OBJECT - public: + public: OSCollapsibleView(bool alwaysExpanded = false, QWidget* parent = nullptr); virtual ~OSCollapsibleView() {} @@ -69,7 +69,7 @@ class OSCollapsibleView : public QWidget void setContent(QWidget* content); - public slots: + public slots: void expand(); @@ -79,7 +79,7 @@ class OSCollapsibleView : public QWidget bool isExpanded(); - private: + private: QPointer m_osHeader; OSViewSwitcher* m_headerContainer; diff --git a/src/shared_gui_components/OSComboBox.hpp b/src/shared_gui_components/OSComboBox.hpp index ac3bf3009..36c9c0f88 100644 --- a/src/shared_gui_components/OSComboBox.hpp +++ b/src/shared_gui_components/OSComboBox.hpp @@ -52,14 +52,14 @@ class OSComboBoxDataSource : public QObject, public Nano::Observer { Q_OBJECT - public: + public: virtual ~OSComboBoxDataSource() {} virtual int numberOfItems() = 0; virtual QString valueAt(int i) = 0; - signals: + signals: void itemChanged(int); @@ -72,7 +72,7 @@ class OSObjectListCBDS : public OSComboBoxDataSource { Q_OBJECT - public: + public: OSObjectListCBDS(const IddObjectType& type, const model::Model& model); OSObjectListCBDS(const std::vector& types, const model::Model& model); @@ -83,10 +83,10 @@ class OSObjectListCBDS : public OSComboBoxDataSource QString valueAt(int i) override; - protected: + protected: bool m_allowEmptySelection; - private slots: + private slots: void onObjectAdded(const WorkspaceObject&, const openstudio::IddObjectType& type, const openstudio::UUID& uuid); @@ -94,7 +94,7 @@ class OSObjectListCBDS : public OSComboBoxDataSource void onObjectChanged(); - private: + private: void initialize(); std::vector m_types; @@ -107,7 +107,7 @@ class OSObjectListCBDS : public OSComboBoxDataSource class OSComboBox2 : public QComboBox, public Nano::Observer { Q_OBJECT - public: + public: OSComboBox2(QWidget* parent = nullptr, bool editable = false); virtual ~OSComboBox2(); @@ -181,18 +181,18 @@ class OSComboBox2 : public QComboBox, public Nano::Observer void unbind(); - protected: + protected: bool event(QEvent* e) override; - signals: + signals: void inFocus(bool inFocus, bool hasData); - public slots: + public slots: // Need to make that public for dependent dropdowns... void onChoicesRefreshTrigger(); - private slots: + private slots: void onModelObjectChanged(); @@ -208,7 +208,7 @@ class OSComboBox2 : public QComboBox, public Nano::Observer void onDataSourceRemove(int); - private: + private: std::shared_ptr m_dataSource; boost::optional m_modelObject; diff --git a/src/shared_gui_components/OSConcepts.hpp b/src/shared_gui_components/OSConcepts.hpp index 4b4ee3935..ee8fb6dc7 100644 --- a/src/shared_gui_components/OSConcepts.hpp +++ b/src/shared_gui_components/OSConcepts.hpp @@ -42,7 +42,7 @@ namespace openstudio { class Heading { - public: + public: explicit Heading(const QString& t_headingLabel, const bool t_showColumnCheckbox = true, const bool t_showColumnButton = true, const QSharedPointer& t_widget = QSharedPointer()) : m_label(t_headingLabel), m_showColumnCheckbox(t_showColumnCheckbox), m_showColumnButton(t_showColumnButton), m_widget(t_widget) {} @@ -63,7 +63,7 @@ class Heading return m_widget; } - private: + private: QString m_label; bool m_showColumnCheckbox; bool m_showColumnButton; @@ -258,7 +258,7 @@ std::function ProxyAdapter(RetType (ToDataType:: class ConceptProxy { - public: + public: template ConceptProxy(const T& t_obj) : m_any(t_obj) {} @@ -283,14 +283,14 @@ class ConceptProxy } } - private: + private: REGISTER_LOGGER("openstudio.ConceptProxy"); boost::any m_any; }; class BaseConcept { - public: + public: virtual ~BaseConcept() {} BaseConcept(const Heading& t_heading, bool t_hasClickFocus = false) : m_heading(t_heading), m_selector(false), m_hasClickFocus(t_hasClickFocus) {} @@ -311,7 +311,7 @@ class BaseConcept return m_heading; } - private: + private: Heading m_heading; bool m_selector; bool m_hasClickFocus; @@ -321,7 +321,7 @@ class BaseConcept class CheckBoxConcept : public BaseConcept { - public: + public: CheckBoxConcept(const Heading& t_heading, const std::string& t_tooltip) : BaseConcept(t_heading), m_tooltip(t_tooltip) {} virtual ~CheckBoxConcept() {} @@ -333,14 +333,14 @@ class CheckBoxConcept : public BaseConcept return m_tooltip; } - private: + private: std::string m_tooltip; }; template class CheckBoxConceptImpl : public CheckBoxConcept { - public: + public: CheckBoxConceptImpl(const Heading& t_heading, const std::string& t_tooltip, std::function t_getter, std::function t_setter) : CheckBoxConcept(t_heading, t_tooltip), m_getter(t_getter), m_setter(t_setter) {} @@ -357,7 +357,7 @@ class CheckBoxConceptImpl : public CheckBoxConcept return m_setter(&obj, value); } - private: + private: std::function m_getter; std::function m_setter; }; @@ -366,7 +366,7 @@ class CheckBoxConceptImpl : public CheckBoxConcept class CheckBoxConceptBoolReturn : public BaseConcept { - public: + public: /* This concept will allow click focus IIF Heading is passed with t_showColumnButton=true */ CheckBoxConceptBoolReturn(const Heading& t_heading, const std::string& t_tooltip) : BaseConcept(t_heading, t_heading.showButton()), m_tooltip(t_tooltip) {} @@ -380,14 +380,14 @@ class CheckBoxConceptBoolReturn : public BaseConcept return m_tooltip; } - private: + private: std::string m_tooltip; }; template class CheckBoxConceptBoolReturnImpl : public CheckBoxConceptBoolReturn { - public: + public: CheckBoxConceptBoolReturnImpl(const Heading& t_heading, const std::string& t_tooltip, std::function t_getter, std::function t_setter) : CheckBoxConceptBoolReturn(t_heading, t_tooltip), m_getter(t_getter), m_setter(t_setter) {} @@ -404,7 +404,7 @@ class CheckBoxConceptBoolReturnImpl : public CheckBoxConceptBoolReturn return m_setter(&obj, value); } - private: + private: std::function m_getter; std::function m_setter; }; @@ -414,7 +414,7 @@ class CheckBoxConceptBoolReturnImpl : public CheckBoxConceptBoolReturn /** Concept of being able to get and set std::string choices. */ class ChoiceConcept { - public: + public: virtual ~ChoiceConcept() {} virtual std::vector choices() = 0; @@ -436,7 +436,7 @@ class ChoiceConcept template class RequiredChoiceConceptImpl : public ChoiceConcept { - public: + public: RequiredChoiceConceptImpl(std::function toString, std::function()> choices, std::function getter, std::function setter, boost::optional reset = boost::none, boost::optional isDefaulted = boost::none) @@ -505,7 +505,7 @@ class RequiredChoiceConceptImpl : public ChoiceConcept return false; } - private: + private: std::function m_toString; std::function()> m_choices; std::function m_getter; @@ -519,7 +519,7 @@ class RequiredChoiceConceptImpl : public ChoiceConcept template class RequiredChoiceSaveDataSourceConceptImpl : public RequiredChoiceConceptImpl { - public: + public: RequiredChoiceSaveDataSourceConceptImpl(std::shared_ptr dataSource, std::function toString, std::function()> choices, std::function getter, std::function setter, boost::optional reset, @@ -528,7 +528,7 @@ class RequiredChoiceSaveDataSourceConceptImpl : public RequiredChoiceConceptImpl virtual ~RequiredChoiceSaveDataSourceConceptImpl() {} - private: + private: std::shared_ptr m_dataSource; }; @@ -538,7 +538,7 @@ class RequiredChoiceSaveDataSourceConceptImpl : public RequiredChoiceConceptImpl template class OptionalChoiceConceptImpl : public ChoiceConcept { - public: + public: OptionalChoiceConceptImpl(std::function toString, std::function()> choices, std::function()> getter, std::function setter, boost::optional reset = boost::none, bool editable = false) @@ -627,7 +627,7 @@ class OptionalChoiceConceptImpl : public ChoiceConcept return m_editable; } - private: + private: std::function m_toString; std::function()> m_choices; std::function()> m_getter; @@ -641,7 +641,7 @@ class OptionalChoiceConceptImpl : public ChoiceConcept template class OptionalChoiceSaveDataSourceConceptImpl : public OptionalChoiceConceptImpl { - public: + public: OptionalChoiceSaveDataSourceConceptImpl(std::shared_ptr dataSource, std::function toString, std::function()> choices, std::function()> getter, std::function setter, boost::optional reset = boost::none, @@ -650,13 +650,13 @@ class OptionalChoiceSaveDataSourceConceptImpl : public OptionalChoiceConceptImpl virtual ~OptionalChoiceSaveDataSourceConceptImpl() {} - private: + private: std::shared_ptr m_dataSource; }; class ComboBoxConcept : public BaseConcept { - public: + public: ComboBoxConcept(const Heading& t_heading, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus) {} virtual ~ComboBoxConcept() {} @@ -667,7 +667,7 @@ class ComboBoxConcept : public BaseConcept template class ComboBoxRequiredChoiceImpl : public ComboBoxConcept { - public: + public: ComboBoxRequiredChoiceImpl(const Heading& t_heading, std::function t_toString, std::function(DataSourceType*)> t_choices, std::function t_getter, std::function t_setter, @@ -692,7 +692,7 @@ class ComboBoxRequiredChoiceImpl : public ComboBoxConcept m_defaulted ? boost::optional>(std::bind(*m_defaulted, dataSource.get())) : boost::none)); } - private: + private: std::function m_toString; std::function(DataSourceType*)> m_choices; std::function m_getter; @@ -704,7 +704,7 @@ class ComboBoxRequiredChoiceImpl : public ComboBoxConcept template class ComboBoxOptionalChoiceImpl : public ComboBoxConcept { - public: + public: ComboBoxOptionalChoiceImpl(const Heading& t_heading, std::function t_toString, std::function(DataSourceType*)> t_choices, std::function(DataSourceType*)> t_getter, @@ -733,7 +733,7 @@ class ComboBoxOptionalChoiceImpl : public ComboBoxConcept std::bind(m_setter, dataSource.get(), std::placeholders::_1), resetAction, m_editable); } - private: + private: std::function m_toString; std::function(DataSourceType*)> m_choices; std::function(DataSourceType*)> m_getter; @@ -747,7 +747,7 @@ class ComboBoxOptionalChoiceImpl : public ComboBoxConcept template class ValueEditConcept : public BaseConcept { - public: + public: ValueEditConcept(const Heading& t_heading, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus) {} virtual ~ValueEditConcept() {} @@ -761,7 +761,7 @@ class ValueEditConcept : public BaseConcept template class ValueEditConceptImpl : public ValueEditConcept { - public: + public: ValueEditConceptImpl(const Heading& t_heading, std::function t_getter, std::function t_setter, boost::optional> t_reset, boost::optional> t_isDefaulted) @@ -795,7 +795,7 @@ class ValueEditConceptImpl : public ValueEditConcept } } - private: + private: std::function m_getter; std::function m_setter; boost::optional> m_reset; @@ -807,7 +807,7 @@ class ValueEditConceptImpl : public ValueEditConcept template class OptionalValueEditConcept : public BaseConcept { - public: + public: OptionalValueEditConcept(const Heading& t_heading, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus) {} virtual ~OptionalValueEditConcept() {} @@ -819,7 +819,7 @@ class OptionalValueEditConcept : public BaseConcept template class OptionalValueEditConceptImpl : public OptionalValueEditConcept { - public: + public: OptionalValueEditConceptImpl(const Heading& t_heading, std::function(DataSourceType*)> t_getter, std::function t_setter) : OptionalValueEditConcept(t_heading), m_getter(t_getter), m_setter(t_setter) {} @@ -836,7 +836,7 @@ class OptionalValueEditConceptImpl : public OptionalValueEditConcept return m_setter(&obj, value); } - private: + private: std::function(DataSourceType*)> m_getter; std::function m_setter; }; @@ -846,7 +846,7 @@ class OptionalValueEditConceptImpl : public OptionalValueEditConcept template class ValueEditVoidReturnConcept : public BaseConcept { - public: + public: ValueEditVoidReturnConcept(const Heading& t_heading, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus) {} virtual ~ValueEditVoidReturnConcept() {} @@ -860,7 +860,7 @@ class ValueEditVoidReturnConcept : public BaseConcept template class ValueEditVoidReturnConceptImpl : public ValueEditVoidReturnConcept { - public: + public: ValueEditVoidReturnConceptImpl(const Heading& t_heading, std::function t_getter, std::function t_setter, boost::optional> t_reset, @@ -895,7 +895,7 @@ class ValueEditVoidReturnConceptImpl : public ValueEditVoidReturnConcept m_getter; std::function m_setter; boost::optional> m_reset; @@ -907,7 +907,7 @@ class ValueEditVoidReturnConceptImpl : public ValueEditVoidReturnConcept class OptionalValueEditVoidReturnConcept : public BaseConcept { - public: + public: OptionalValueEditVoidReturnConcept(const Heading& t_heading, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus) {} virtual ~OptionalValueEditVoidReturnConcept() {} @@ -919,7 +919,7 @@ class OptionalValueEditVoidReturnConcept : public BaseConcept template class OptionalValueEditVoidReturnConceptImpl : public OptionalValueEditVoidReturnConcept { - public: + public: OptionalValueEditVoidReturnConceptImpl(const Heading& t_heading, std::function(DataSourceType*)> t_getter, std::function t_setter) : OptionalValueEditVoidReturnConcept(t_heading), m_getter(t_getter), m_setter(t_setter) {} @@ -936,7 +936,7 @@ class OptionalValueEditVoidReturnConceptImpl : public OptionalValueEditVoidRetur return m_setter(&obj, value); } - private: + private: std::function(DataSourceType*)> m_getter; std::function m_setter; }; @@ -945,7 +945,7 @@ class OptionalValueEditVoidReturnConceptImpl : public OptionalValueEditVoidRetur class NameLineEditConcept : public BaseConcept { - public: + public: NameLineEditConcept(const Heading& t_heading, bool t_isInspectable, bool t_deleteObject, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus), m_isInspectable(t_isInspectable), m_deleteObject(t_deleteObject) {} @@ -963,7 +963,7 @@ class NameLineEditConcept : public BaseConcept return m_deleteObject; } - private: + private: bool m_isInspectable; bool m_deleteObject; }; @@ -971,7 +971,7 @@ class NameLineEditConcept : public BaseConcept template class NameLineEditConceptImpl : public NameLineEditConcept { - public: + public: NameLineEditConceptImpl(const Heading& t_heading, bool t_isInspectable, bool t_deleteObject, std::function(DataSourceType*, bool)> t_getter, std::function(DataSourceType*, const std::string&)> t_setter, @@ -1009,7 +1009,7 @@ class NameLineEditConceptImpl : public NameLineEditConcept return m_setter ? false : true; } - private: + private: std::function(DataSourceType*, bool)> m_getter; std::function(DataSourceType*, const std::string&)> m_setter; boost::optional> m_reset; @@ -1019,7 +1019,7 @@ class NameLineEditConceptImpl : public NameLineEditConcept class LoadNameConcept : public BaseConcept { - public: + public: LoadNameConcept(const Heading& t_heading, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus) {} virtual ~LoadNameConcept() {} @@ -1034,7 +1034,7 @@ class LoadNameConcept : public BaseConcept template class LoadNameConceptImpl : public LoadNameConcept { - public: + public: LoadNameConceptImpl(const Heading& t_heading, std::function(DataSourceType*, bool)> t_getter, std::function(DataSourceType*, const std::string&)> t_setter, boost::optional> t_reset = boost::none) @@ -1071,7 +1071,7 @@ class LoadNameConceptImpl : public LoadNameConcept return m_setter ? false : true; } - private: + private: std::function(DataSourceType*, bool)> m_getter; std::function(DataSourceType*, const std::string&)> m_setter; boost::optional> m_reset; @@ -1082,7 +1082,7 @@ class LoadNameConceptImpl : public LoadNameConcept template class QuantityEditConcept : public BaseConcept { - public: + public: QuantityEditConcept(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus), m_modelUnits(t_modelUnits), m_siUnits(t_siUnits), m_ipUnits(t_ipUnits), m_isIP(t_isIP) {} @@ -1106,7 +1106,7 @@ class QuantityEditConcept : public BaseConcept return m_isIP; } - private: + private: QString m_modelUnits; QString m_siUnits; QString m_ipUnits; @@ -1116,7 +1116,7 @@ class QuantityEditConcept : public BaseConcept template class QuantityEditConceptImpl : public QuantityEditConcept { - public: + public: QuantityEditConceptImpl(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, std::function t_getter, std::function t_setter, boost::optional> t_reset, @@ -1157,7 +1157,7 @@ class QuantityEditConceptImpl : public QuantityEditConcept } } - private: + private: std::function m_getter; std::function m_setter; boost::optional> m_reset; @@ -1169,7 +1169,7 @@ class QuantityEditConceptImpl : public QuantityEditConcept template class OptionalQuantityEditConcept : public BaseConcept { - public: + public: OptionalQuantityEditConcept(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus), m_modelUnits(t_modelUnits), m_siUnits(t_siUnits), m_ipUnits(t_ipUnits), m_isIP(t_isIP) {} @@ -1192,7 +1192,7 @@ class OptionalQuantityEditConcept : public BaseConcept return m_isIP; } - private: + private: QString m_modelUnits; QString m_siUnits; QString m_ipUnits; @@ -1202,7 +1202,7 @@ class OptionalQuantityEditConcept : public BaseConcept template class OptionalQuantityEditConceptImpl : public OptionalQuantityEditConcept { - public: + public: OptionalQuantityEditConceptImpl(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, std::function(DataSourceType*)> t_getter, std::function t_setter) @@ -1220,7 +1220,7 @@ class OptionalQuantityEditConceptImpl : public OptionalQuantityEditConcept(DataSourceType*)> m_getter; std::function m_setter; }; @@ -1230,7 +1230,7 @@ class OptionalQuantityEditConceptImpl : public OptionalQuantityEditConcept class QuantityEditVoidReturnConcept : public BaseConcept { - public: + public: QuantityEditVoidReturnConcept(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus), m_modelUnits(t_modelUnits), m_siUnits(t_siUnits), m_ipUnits(t_ipUnits), m_isIP(t_isIP) {} @@ -1255,7 +1255,7 @@ class QuantityEditVoidReturnConcept : public BaseConcept return m_isIP; } - private: + private: QString m_modelUnits; QString m_siUnits; QString m_ipUnits; @@ -1265,7 +1265,7 @@ class QuantityEditVoidReturnConcept : public BaseConcept template class QuantityEditVoidReturnConceptImpl : public QuantityEditVoidReturnConcept { - public: + public: QuantityEditVoidReturnConceptImpl(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, std::function t_getter, std::function t_setter, boost::optional> t_reset, @@ -1304,7 +1304,7 @@ class QuantityEditVoidReturnConceptImpl : public QuantityEditVoidReturnConcept m_getter; std::function m_setter; boost::optional> m_reset; @@ -1316,7 +1316,7 @@ class QuantityEditVoidReturnConceptImpl : public QuantityEditVoidReturnConcept class OptionalQuantityEditVoidReturnConcept : public BaseConcept { - public: + public: OptionalQuantityEditVoidReturnConcept(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus), m_modelUnits(t_modelUnits), m_siUnits(t_siUnits), m_ipUnits(t_ipUnits), m_isIP(t_isIP) {} @@ -1339,7 +1339,7 @@ class OptionalQuantityEditVoidReturnConcept : public BaseConcept return m_isIP; } - private: + private: QString m_modelUnits; QString m_siUnits; QString m_ipUnits; @@ -1349,7 +1349,7 @@ class OptionalQuantityEditVoidReturnConcept : public BaseConcept template class OptionalQuantityEditVoidReturnConceptImpl : public OptionalQuantityEditVoidReturnConcept { - public: + public: OptionalQuantityEditVoidReturnConceptImpl(const Heading& t_heading, QString t_modelUnits, QString t_siUnits, QString t_ipUnits, bool t_isIP, std::function(DataSourceType*)> t_getter, std::function t_setter) @@ -1369,7 +1369,7 @@ class OptionalQuantityEditVoidReturnConceptImpl : public OptionalQuantityEditVoi return m_setter(&obj, value); } - private: + private: std::function(DataSourceType*)> m_getter; std::function m_setter; }; @@ -1378,7 +1378,7 @@ class OptionalQuantityEditVoidReturnConceptImpl : public OptionalQuantityEditVoi class DropZoneConcept : public BaseConcept { - public: + public: DropZoneConcept(const Heading& t_heading, bool t_hasClickFocus = true) : BaseConcept(t_heading, t_hasClickFocus) {} virtual ~DropZoneConcept() {} @@ -1391,7 +1391,7 @@ class DropZoneConcept : public BaseConcept template class DropZoneConceptImpl : public DropZoneConcept { - public: + public: DropZoneConceptImpl(const Heading& t_heading, std::function(DataSourceType*)> t_getter, std::function t_setter, boost::optional> t_reset = boost::none) @@ -1445,7 +1445,7 @@ class DropZoneConceptImpl : public DropZoneConcept } } - private: + private: std::function(DataSourceType*)> m_getter; std::function m_setter; boost::optional> m_reset; @@ -1455,7 +1455,7 @@ class DropZoneConceptImpl : public DropZoneConcept class RenderingColorConcept : public BaseConcept { - public: + public: RenderingColorConcept(const Heading& t_heading) : BaseConcept(t_heading) {} virtual ~RenderingColorConcept() {} @@ -1467,7 +1467,7 @@ class RenderingColorConcept : public BaseConcept template class RenderingColorConceptImpl : public RenderingColorConcept { - public: + public: RenderingColorConceptImpl(const Heading& t_heading, std::function(DataSourceType*)> t_getter, std::function t_setter) : RenderingColorConcept(t_heading), m_getter(t_getter), m_setter(t_setter) {} @@ -1500,7 +1500,7 @@ class RenderingColorConceptImpl : public RenderingColorConcept return m_setter(&obj, t_value); } - private: + private: std::function(DataSourceType*)> m_getter; std::function m_setter; }; diff --git a/src/shared_gui_components/OSDialog.hpp b/src/shared_gui_components/OSDialog.hpp index 9c075a044..4560c69d1 100644 --- a/src/shared_gui_components/OSDialog.hpp +++ b/src/shared_gui_components/OSDialog.hpp @@ -48,7 +48,7 @@ class OSDialog : public QDialog { Q_OBJECT - public: + public: OSDialog(bool isIP = false, QWidget* parent = nullptr); virtual ~OSDialog() {} @@ -69,7 +69,7 @@ class OSDialog : public QDialog QPushButton* okButton(); - protected: + protected: void setOkButtonAsDefault(bool isDefault); void mouseMoveEvent(QMouseEvent* event) override; @@ -90,7 +90,7 @@ class OSDialog : public QDialog QPushButton* m_okButton; - private: + private: virtual void createLayout(); QVBoxLayout* m_upperLayout; @@ -103,7 +103,7 @@ class OSDialog : public QDialog bool _move; - signals: + signals: void backButtonClicked(bool checked); @@ -113,7 +113,7 @@ class OSDialog : public QDialog void toggleUnitsClicked(bool displayIP); - protected slots: + protected slots: virtual void on_backButton(bool checked); diff --git a/src/shared_gui_components/OSDoubleEdit.hpp b/src/shared_gui_components/OSDoubleEdit.hpp index 00dc6d89c..845a729bd 100644 --- a/src/shared_gui_components/OSDoubleEdit.hpp +++ b/src/shared_gui_components/OSDoubleEdit.hpp @@ -51,7 +51,7 @@ namespace openstudio { class OSDoubleEdit2 : public QLineEdit, public Nano::Observer { Q_OBJECT - public: + public: OSDoubleEdit2(QWidget* parent = nullptr); virtual ~OSDoubleEdit2(); @@ -100,16 +100,16 @@ class OSDoubleEdit2 : public QLineEdit, public Nano::Observer void unbind(); - signals: + signals: void inFocus(bool inFocus, bool hasData); - protected: + protected: virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - private slots: + private slots: void onEditingFinished(); @@ -117,7 +117,7 @@ class OSDoubleEdit2 : public QLineEdit, public Nano::Observer void onModelObjectRemove(const Handle& handle); - private: + private: boost::optional m_modelObject; // will be set if attached to ModelObject or ModelExtensibleGroup boost::optional m_modelExtensibleGroup; // will only be set if attached to ModelExtensibleGroup boost::optional m_get; diff --git a/src/shared_gui_components/OSDragableView.hpp b/src/shared_gui_components/OSDragableView.hpp index 9954e17e3..2eacae1ed 100644 --- a/src/shared_gui_components/OSDragableView.hpp +++ b/src/shared_gui_components/OSDragableView.hpp @@ -36,7 +36,7 @@ namespace openstudio { class OSDragPixmapData { - public: + public: OSDragPixmapData(const QPixmap& pixmap, const QPoint& hotSpot); virtual ~OSDragPixmapData() {} @@ -50,18 +50,18 @@ class OSDragableView : public QWidget { Q_OBJECT - public: + public: OSDragableView(QWidget* parent = nullptr); virtual ~OSDragableView() {} - signals: + signals: void dragRequested(const OSDragPixmapData& dragPixmapData); void clicked(); - protected: + protected: void mouseReleaseEvent(QMouseEvent* event) override; void mousePressEvent(QMouseEvent* event) override; @@ -70,7 +70,7 @@ class OSDragableView : public QWidget void leaveEvent(QEvent* event) override; - private: + private: bool m_mouseDown; QPoint m_dragStartPosition; diff --git a/src/shared_gui_components/OSGridController.hpp b/src/shared_gui_components/OSGridController.hpp index b2ff87574..e46e5a07c 100644 --- a/src/shared_gui_components/OSGridController.hpp +++ b/src/shared_gui_components/OSGridController.hpp @@ -93,7 +93,7 @@ class Holder; /// \endcode class DataSource { - public: + public: /// Create a new DataSource object, which is optionally passed into the various /// add.*Column functions. /// @@ -134,7 +134,7 @@ class DataSource return m_wantsPlaceholder; } - private: + private: std::function>(const ConceptProxy&)> m_sourceFunc; bool m_wantsPlaceholder; QSharedPointer m_dropZoneConcept; @@ -142,7 +142,7 @@ class DataSource class DataSourceAdapter : public BaseConcept { - public: + public: DataSourceAdapter(DataSource t_source, QSharedPointer t_inner) : BaseConcept(t_inner->heading()), m_source(t_source), m_inner(t_inner) {} @@ -154,7 +154,7 @@ class DataSourceAdapter : public BaseConcept return m_inner; } - private: + private: DataSource m_source; QSharedPointer m_inner; }; @@ -165,7 +165,7 @@ class WidgetLocation : public QObject, public Nano::Observer { Q_OBJECT; - public: + public: WidgetLocation(QWidget* t_widget, int t_row, int t_column, boost::optional t_subrow); virtual ~WidgetLocation(); @@ -175,11 +175,11 @@ class WidgetLocation : public QObject, public Nano::Observer int column; boost::optional subrow; - signals: + signals: void inFocus(bool inFocus, bool hasData, int row, int column, boost::optional subrow); - public slots: + public slots: void onInFocus(bool hasFocus, bool hasData); }; @@ -188,7 +188,7 @@ class ObjectSelector : public QObject, public Nano::Observer { Q_OBJECT; - public: + public: ObjectSelector(OSGridController* t_grid); void addWidget(const boost::optional& t_obj, Holder* t_holder, int row, int column, const boost::optional& subrow, @@ -212,16 +212,16 @@ class ObjectSelector : public QObject, public Nano::Observer std::set m_selectorObjects; std::set m_filteredObjects; - signals: + signals: void inFocus(bool inFocus, bool hasData, int row, int column, boost::optional subrow); - private slots: + private slots: void widgetDestroyed(QObject* t_obj); - protected: + protected: REGISTER_LOGGER("openstudio.ObjectSelector"); - private: + private: void updateWidgets(const model::ModelObject& t_obj); void updateWidgets(const model::ModelObject& t_obj, const bool t_objectVisible); void updateWidgets(const int t_row, const boost::optional& t_subrow, bool t_selected, bool t_visible); @@ -236,7 +236,7 @@ class OSGridController : public QObject, public Nano::Observer { Q_OBJECT - public: + public: // This form requires clients to subclass OSGridController and // reimplement rowCount(), and itemAt() OSGridController(); @@ -521,7 +521,7 @@ class OSGridController : public QObject, public Nano::Observer // should set this value, if appropriate. int m_constructionColumn = -1; - protected: + protected: // This function determines the category for // each button, and the fields associated with // each category @@ -576,7 +576,7 @@ class OSGridController : public QObject, public Nano::Observer REGISTER_LOGGER("openstudio.OSGridController"); - private: + private: friend class OSGridView; friend class ObjectSelector; @@ -615,14 +615,14 @@ class OSGridController : public QObject, public Nano::Observer std::vector> m_applyToButtonStates = std::vector>(); - signals: + signals: // Nuclear reset of everything void modelReset(); void toggleUnitsClicked(bool displayIP); - public slots: + public slots: virtual void onItemDropped(const OSItemId& itemId) = 0; @@ -640,11 +640,11 @@ class OSGridController : public QObject, public Nano::Observer void onInFocus(bool inFocus, bool hasData, int row, int column, boost::optional subrow); - protected slots: + protected slots: void selectAllStateChanged(const int newState) const; - private slots: + private slots: void horizontalHeaderChecked(int index); @@ -670,17 +670,17 @@ class Holder : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: Holder(QWidget* parent = nullptr); virtual ~Holder(); QWidget* widget = nullptr; - protected: + protected: void paintEvent(QPaintEvent* event) override; - signals: + signals: void inFocus(bool inFocus, bool hasData); }; @@ -689,17 +689,17 @@ class HorizontalHeaderPushButton : public QPushButton { Q_OBJECT - public: + public: HorizontalHeaderPushButton(QWidget* parent = nullptr); virtual ~HorizontalHeaderPushButton(); - protected: + protected: virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - signals: + signals: void inFocus(bool inFocus, bool hasData); }; @@ -708,7 +708,7 @@ class HorizontalHeaderWidget : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: HorizontalHeaderWidget(const QString& fieldName, QWidget* parent = nullptr); virtual ~HorizontalHeaderWidget(); @@ -722,17 +722,17 @@ class HorizontalHeaderWidget : public QWidget, public Nano::Observer std::vector> m_addedWidgets; - signals: + signals: void inFocus(bool inFocus, bool hasData); - private: + private: QVBoxLayout* m_innerLayout; }; class GridViewDropZoneVectorController : public OSVectorController { - protected: + protected: virtual std::vector makeVector() override { return std::vector(); } diff --git a/src/shared_gui_components/OSGridView.hpp b/src/shared_gui_components/OSGridView.hpp index 8db98ccd0..97494d321 100644 --- a/src/shared_gui_components/OSGridView.hpp +++ b/src/shared_gui_components/OSGridView.hpp @@ -57,7 +57,7 @@ class OSGridView : public QWidget { Q_OBJECT - public: + public: OSGridView(OSGridController* gridController, const QString& headerText, const QString& dropZoneText, bool useHeader, QWidget* parent = nullptr); virtual ~OSGridView(){}; @@ -75,18 +75,18 @@ class OSGridView : public QWidget QVBoxLayout* m_contentLayout; - protected: + protected: virtual void hideEvent(QHideEvent* event) override; virtual void showEvent(QShowEvent* event) override; - signals: + signals: void dropZoneItemClicked(OSItem* item); void gridRowSelectionChanged(int checkState); - public slots: + public slots: void onSelectionCleared(); @@ -96,7 +96,7 @@ class OSGridView : public QWidget void requestRefreshGrid(); - private slots: + private slots: void deleteAll(); @@ -110,7 +110,7 @@ class OSGridView : public QWidget void selectRowDeterminedByModelSubTabView(); - private: + private: enum QueueType { AddRow, diff --git a/src/shared_gui_components/OSIntegerEdit.hpp b/src/shared_gui_components/OSIntegerEdit.hpp index 7e50e7c09..8303a15f5 100644 --- a/src/shared_gui_components/OSIntegerEdit.hpp +++ b/src/shared_gui_components/OSIntegerEdit.hpp @@ -51,7 +51,7 @@ class OSIntegerEdit2 : public QLineEdit, public Nano::Observer { Q_OBJECT - public: + public: OSIntegerEdit2(QWidget* parent = nullptr); virtual ~OSIntegerEdit2(); @@ -90,16 +90,16 @@ class OSIntegerEdit2 : public QLineEdit, public Nano::Observer void unbind(); - protected: + protected: virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - signals: + signals: void inFocus(bool inFocus, bool hasData); - private slots: + private slots: void onEditingFinished(); @@ -107,7 +107,7 @@ class OSIntegerEdit2 : public QLineEdit, public Nano::Observer void onModelObjectRemove(const Handle& handle); - private: + private: boost::optional m_modelObject; // will be set if attached to ModelObject or ModelExtensibleGroup boost::optional m_modelExtensibleGroup; // will only be set if attached to ModelExtensibleGroup boost::optional m_get; diff --git a/src/shared_gui_components/OSLineEdit.hpp b/src/shared_gui_components/OSLineEdit.hpp index 4d392adf3..654a6ee62 100644 --- a/src/shared_gui_components/OSLineEdit.hpp +++ b/src/shared_gui_components/OSLineEdit.hpp @@ -50,7 +50,7 @@ class OSLineEdit2 : public QLineEdit, public Nano::Observer { Q_OBJECT - public: + public: OSLineEdit2(QWidget* parent = nullptr); virtual ~OSLineEdit2(); @@ -85,14 +85,14 @@ class OSLineEdit2 : public QLineEdit, public Nano::Observer void unbind(); - protected: + protected: void mouseReleaseEvent(QMouseEvent* event) override; virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - signals: + signals: void itemClicked(OSItem* item); @@ -100,11 +100,11 @@ class OSLineEdit2 : public QLineEdit, public Nano::Observer void inFocus(bool inFocus, bool hasData); - public slots: + public slots: void onItemRemoveClicked(); - private slots: + private slots: void onEditingFinished(); @@ -114,7 +114,7 @@ class OSLineEdit2 : public QLineEdit, public Nano::Observer void emitItemClicked(); - private: + private: void onModelObjectChangeInternal(bool startingup); void completeBind(); void adjustWidth(); diff --git a/src/shared_gui_components/OSListController.hpp b/src/shared_gui_components/OSListController.hpp index d877f1f93..3f3ebbcfb 100644 --- a/src/shared_gui_components/OSListController.hpp +++ b/src/shared_gui_components/OSListController.hpp @@ -52,7 +52,7 @@ class OSListController : public QObject, public Nano::Observer { Q_OBJECT - public: + public: OSListController(); virtual ~OSListController(); @@ -68,7 +68,7 @@ class OSListController : public QObject, public Nano::Observer void setSelectionController(QSharedPointer controller); - signals: + signals: // Emit this signal when an item has been added to the underlying model or data structure. void itemInserted(int index); @@ -84,7 +84,7 @@ class OSListController : public QObject, public Nano::Observer // emit this signal to trigger a complete update of the attached views. void modelReset(); - private: + private: friend class OSListItem; friend class OSItemSelectionController; @@ -110,7 +110,7 @@ class OSListItem : public QObject { Q_OBJECT - public: + public: OSListItem(OSListController* listController = nullptr); virtual ~OSListItem(); @@ -123,17 +123,17 @@ class OSListItem : public QObject bool isSelected() const; - public slots: + public slots: virtual void setSelected(bool isSelected); void toggleSelected(); - signals: + signals: void selectedChanged(bool isSelected); - protected: + protected: QPointer m_listController; }; @@ -143,7 +143,7 @@ class OSItemSelectionController : public QObject, public Nano::Observer { Q_OBJECT - public: + public: OSItemSelectionController(); virtual ~OSItemSelectionController() {} @@ -154,7 +154,7 @@ class OSItemSelectionController : public QObject, public Nano::Observer std::vector> selectedItems() const; - public slots: + public slots: void unselectAllItems(); @@ -162,11 +162,11 @@ class OSItemSelectionController : public QObject, public Nano::Observer void emitSelectionChanged(); - signals: + signals: void selectionChanged(std::vector> selectedItems); - private: + private: friend class OSListItem; friend class OSListController; @@ -205,7 +205,7 @@ class OSItemDelegate : public QObject, public Nano::Observer { Q_OBJECT - public: + public: virtual ~OSItemDelegate() {} virtual QWidget* view(QSharedPointer dataSource); @@ -217,7 +217,7 @@ class OSGraphicsItemDelegate : public QObject, public Nano::Observer { Q_OBJECT; - public: + public: virtual ~OSGraphicsItemDelegate() {} virtual QGraphicsObject* view(QSharedPointer dataSource); diff --git a/src/shared_gui_components/OSListView.hpp b/src/shared_gui_components/OSListView.hpp index 7be129ccd..641f05313 100644 --- a/src/shared_gui_components/OSListView.hpp +++ b/src/shared_gui_components/OSListView.hpp @@ -55,7 +55,7 @@ class OSListView : public QWidget { Q_OBJECT - public: + public: OSListView(bool scrollable = false, QWidget* parent = nullptr); virtual ~OSListView() {} @@ -74,14 +74,14 @@ class OSListView : public QWidget void setVerticalScrollBarAlwaysOn(bool alwaysOn); - public slots: + public slots: void refreshAllViews(); - protected: + protected: void paintEvent(QPaintEvent*) override; - private slots: + private slots: void insertItemView(int i); @@ -91,7 +91,7 @@ class OSListView : public QWidget void refreshItemView(int i); - private: + private: QSharedPointer m_delegate; QSharedPointer m_listController; diff --git a/src/shared_gui_components/OSLoadNamePixmapLineEdit.hpp b/src/shared_gui_components/OSLoadNamePixmapLineEdit.hpp index 8278c468a..094dad744 100644 --- a/src/shared_gui_components/OSLoadNamePixmapLineEdit.hpp +++ b/src/shared_gui_components/OSLoadNamePixmapLineEdit.hpp @@ -47,7 +47,7 @@ class OSLoadNamePixmapLineEdit : public QWidget { Q_OBJECT - public: + public: OSLoadNamePixmapLineEdit(QWidget* parent = nullptr); virtual ~OSLoadNamePixmapLineEdit(); @@ -69,17 +69,17 @@ class OSLoadNamePixmapLineEdit : public QWidget void unbind(); - signals: + signals: void itemClicked(OSItem* item); void objectRemoved(boost::optional parent); - private slots: + private slots: void onModelObjectChange(); - private: + private: boost::optional m_modelObject; void completeBind(); diff --git a/src/shared_gui_components/OSQObjectController.hpp b/src/shared_gui_components/OSQObjectController.hpp index ced6101e8..1e801646b 100644 --- a/src/shared_gui_components/OSQObjectController.hpp +++ b/src/shared_gui_components/OSQObjectController.hpp @@ -41,7 +41,7 @@ class OSQObjectController : public QObject, public Nano::Observer { Q_OBJECT - public: + public: /** OSQObjectController manages the life cycle of dynamically allocated QObjects when they * are not part of a parent child hierarchy. This is the case for top level QWidgets * owned by a controller. @@ -50,17 +50,17 @@ class OSQObjectController : public QObject, public Nano::Observer virtual ~OSQObjectController(); - protected: + protected: /** Registers the QObject so that its lifecycle is managed. * When OSQObjectController is deleted the managed QObjects will safely be removed. **/ void addQObject(QObject* object); - private slots: + private slots: void onObjectDestroyed(QObject* object = nullptr); - private: + private: std::vector m_objects; }; diff --git a/src/shared_gui_components/OSQuantityEdit.hpp b/src/shared_gui_components/OSQuantityEdit.hpp index fedde1713..2204c5258 100644 --- a/src/shared_gui_components/OSQuantityEdit.hpp +++ b/src/shared_gui_components/OSQuantityEdit.hpp @@ -52,7 +52,7 @@ class Unit; class QuantityLineEdit : public QLineEdit { Q_OBJECT - public: + public: QuantityLineEdit(QWidget* parent = nullptr); virtual ~QuantityLineEdit() {} @@ -61,15 +61,15 @@ class QuantityLineEdit : public QLineEdit this->m_hasClickFocus = true; } - protected: + protected: virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - private: + private: bool m_hasClickFocus = false; - signals: + signals: void inFocus(bool inFocus); }; @@ -77,7 +77,7 @@ class QuantityLineEdit : public QLineEdit class OSQuantityEdit2 : public QWidget, public Nano::Observer { Q_OBJECT - public: + public: OSQuantityEdit2(const std::string& modelUnits, const std::string& siUnits, const std::string& ipUnits, bool isIP, QWidget* parent = nullptr); virtual ~OSQuantityEdit2(); @@ -114,15 +114,15 @@ class OSQuantityEdit2 : public QWidget, public Nano::Observer void unbind(); - signals: + signals: void inFocus(bool inFocus, bool hasData); - public slots: + public slots: void onUnitSystemChange(bool isIP); - private slots: + private slots: void onEditingFinished(); @@ -132,7 +132,7 @@ class OSQuantityEdit2 : public QWidget, public Nano::Observer void onInFocus(bool inFocus); - private: + private: QuantityLineEdit* m_lineEdit; QLabel* m_units; QString m_text = "UNINITIALIZED"; diff --git a/src/shared_gui_components/OSSwitch.hpp b/src/shared_gui_components/OSSwitch.hpp index 82f7258b8..e0dee30bb 100644 --- a/src/shared_gui_components/OSSwitch.hpp +++ b/src/shared_gui_components/OSSwitch.hpp @@ -41,7 +41,7 @@ namespace openstudio { class OSSwitch2 : public QPushButton, public Nano::Observer { Q_OBJECT - public: + public: OSSwitch2(QWidget* parent = nullptr); virtual ~OSSwitch2(); @@ -56,7 +56,7 @@ class OSSwitch2 : public QPushButton, public Nano::Observer void unbind(); - private slots: + private slots: void onClicked(bool checked); @@ -64,7 +64,7 @@ class OSSwitch2 : public QPushButton, public Nano::Observer void onModelObjectRemove(const Handle& handle); - private: + private: boost::optional m_modelObject; boost::optional m_get; boost::optional m_set; diff --git a/src/shared_gui_components/OSUnsignedEdit.hpp b/src/shared_gui_components/OSUnsignedEdit.hpp index 19cdc9927..85ab0bb89 100644 --- a/src/shared_gui_components/OSUnsignedEdit.hpp +++ b/src/shared_gui_components/OSUnsignedEdit.hpp @@ -49,7 +49,7 @@ class OSUnsignedEdit2 : public QLineEdit { Q_OBJECT - public: + public: OSUnsignedEdit2(QWidget* parent = nullptr); virtual ~OSUnsignedEdit2(); @@ -88,16 +88,16 @@ class OSUnsignedEdit2 : public QLineEdit void unbind(); - protected: + protected: virtual void focusInEvent(QFocusEvent* e) override; virtual void focusOutEvent(QFocusEvent* e) override; - signals: + signals: void inFocus(bool inFocus, bool hasData); - private slots: + private slots: void onEditingFinished(); @@ -105,7 +105,7 @@ class OSUnsignedEdit2 : public QLineEdit void onModelObjectRemove(const Handle& handle); - private: + private: boost::optional m_modelObject; // will be set if attached to ModelObject or ModelExtensibleGroup boost::optional m_modelExtensibleGroup; // will only be set if attached to ModelExtensibleGroup boost::optional m_get; diff --git a/src/shared_gui_components/OSViewSwitcher.hpp b/src/shared_gui_components/OSViewSwitcher.hpp index b2664d88e..73089c0a6 100644 --- a/src/shared_gui_components/OSViewSwitcher.hpp +++ b/src/shared_gui_components/OSViewSwitcher.hpp @@ -41,7 +41,7 @@ class OSViewSwitcher : public QWidget { Q_OBJECT - public: + public: OSViewSwitcher(QWidget* parent = nullptr); virtual ~OSViewSwitcher(); @@ -52,10 +52,10 @@ class OSViewSwitcher : public QWidget void clear(); - protected: + protected: void paintEvent(QPaintEvent*) override; - private: + private: QWidget* m_view; QStackedWidget* m_stack; diff --git a/src/shared_gui_components/PageNavigator.hpp b/src/shared_gui_components/PageNavigator.hpp index 0bb72eb0f..11a568263 100644 --- a/src/shared_gui_components/PageNavigator.hpp +++ b/src/shared_gui_components/PageNavigator.hpp @@ -43,7 +43,7 @@ class PageNavigator : public QWidget { Q_OBJECT - public: + public: PageNavigator(int numPages, int numPagesListed = 5, QWidget* parent = nullptr); virtual ~PageNavigator(); void setNumPages(int numPages); @@ -51,8 +51,8 @@ class PageNavigator : public QWidget ///! Sets widget to display first page (pageIdx = 0) void firstPage(); - protected: - private: + protected: + private: void createLayout(); ///! sets all the page numbers displayed by the buttons void setButtonPageNumbers(int lowestPageNum); @@ -65,14 +65,14 @@ class PageNavigator : public QWidget QButtonGroup* m_buttonGroup; QHBoxLayout* m_buttonLayout; - private slots: + private slots: void on_buttonClicked(QAbstractButton* button); void on_firstPage(bool checked); void on_previousPage(bool checked); void on_nextPage(bool checked); void on_lastPage(bool checked); - signals: + signals: void getComponentsByPage(int pageNum); }; diff --git a/src/shared_gui_components/ProcessEventsProgressBar.hpp b/src/shared_gui_components/ProcessEventsProgressBar.hpp index 63153a607..7c078c3b4 100644 --- a/src/shared_gui_components/ProcessEventsProgressBar.hpp +++ b/src/shared_gui_components/ProcessEventsProgressBar.hpp @@ -38,7 +38,7 @@ namespace openstudio { // to call process events class ProcessEventsProgressBar : public OSProgressBar { - public: + public: ProcessEventsProgressBar(); virtual void onPercentageUpdated(double percentage) override; }; diff --git a/src/shared_gui_components/SyncMeasuresDialog.hpp b/src/shared_gui_components/SyncMeasuresDialog.hpp index a9e65e2e1..fcf6c82a6 100644 --- a/src/shared_gui_components/SyncMeasuresDialog.hpp +++ b/src/shared_gui_components/SyncMeasuresDialog.hpp @@ -50,14 +50,14 @@ class SyncMeasuresDialog : public QDialog { Q_OBJECT - public: + public: SyncMeasuresDialog(const WorkflowJSON& workflow, MeasureManager* measureManager, QWidget* parent = nullptr); virtual ~SyncMeasuresDialog() {} - protected: + protected: void paintEvent(QPaintEvent* event) override; - private: + private: void createLayout(); void findUpdates(); @@ -68,7 +68,7 @@ class SyncMeasuresDialog : public QDialog WorkflowJSON m_workflow; MeasureManager* m_measureManager; // DLM: why is this a raw pointer? - private slots: + private slots: void on_componentClicked(bool checked); void on_noComponents(); void closeDlg(); diff --git a/src/shared_gui_components/SyncMeasuresDialogCentralWidget.hpp b/src/shared_gui_components/SyncMeasuresDialogCentralWidget.hpp index 8c7ea7bb9..51a2eb3bb 100644 --- a/src/shared_gui_components/SyncMeasuresDialogCentralWidget.hpp +++ b/src/shared_gui_components/SyncMeasuresDialogCentralWidget.hpp @@ -51,7 +51,7 @@ class SyncMeasuresDialogCentralWidget : public QWidget { Q_OBJECT - public: + public: SyncMeasuresDialogCentralWidget(const WorkflowJSON& workflow, MeasureManager* measureManager, QWidget* parent = nullptr); virtual ~SyncMeasuresDialogCentralWidget() {} @@ -60,8 +60,8 @@ class SyncMeasuresDialogCentralWidget : public QWidget QProgressBar* progressBar; QPushButton* lowerPushButton; - protected: - private: + protected: + private: void createLayout(); void init(); void displayMeasures(int pageIdx); @@ -73,13 +73,13 @@ class SyncMeasuresDialogCentralWidget : public QWidget WorkflowJSON m_workflow; MeasureManager* m_measureManager; - signals: + signals: void componentClicked(bool checked); void getComponentsByPage(int pageNum); void noComponents(); void closeDlg(); - private slots: + private slots: void upperPushButtonClicked(); void lowerPushButtonClicked(); void on_getComponentsByPage(int pageIdx); diff --git a/src/shared_gui_components/TIDItemModel.cpp b/src/shared_gui_components/TIDItemModel.cpp index 8345164f1..382111c6e 100644 --- a/src/shared_gui_components/TIDItemModel.cpp +++ b/src/shared_gui_components/TIDItemModel.cpp @@ -36,7 +36,7 @@ namespace openstudio { class TIDItem { - public: + public: TIDItem(const QDomElement& element, TIDItem* parent = nullptr) { m_parentItem = parent; @@ -105,7 +105,7 @@ class TIDItem return m_parentItem; } - private: + private: QList m_childItems; QList m_itemData; diff --git a/src/shared_gui_components/TIDItemModel.hpp b/src/shared_gui_components/TIDItemModel.hpp index a194b7add..143a8938e 100644 --- a/src/shared_gui_components/TIDItemModel.hpp +++ b/src/shared_gui_components/TIDItemModel.hpp @@ -42,7 +42,7 @@ class TIDItemModel : public QAbstractItemModel { Q_OBJECT - public: + public: TIDItemModel(const QDomDocument& document, QObject* parent = nullptr); virtual ~TIDItemModel(); @@ -63,7 +63,7 @@ class TIDItemModel : public QAbstractItemModel static const std::map> tidToOSTypeMap; - private: + private: QDomDocument m_document; TIDItem* m_rootItem; diff --git a/src/shared_gui_components/TextEditDialog.hpp b/src/shared_gui_components/TextEditDialog.hpp index 3af990939..46d5779a4 100644 --- a/src/shared_gui_components/TextEditDialog.hpp +++ b/src/shared_gui_components/TextEditDialog.hpp @@ -40,7 +40,7 @@ class TextEditDialog : public OSDialog { Q_OBJECT - public: + public: TextEditDialog(const QString& windowTitle, const QString& windowMessage = QString(), QWidget* parent = nullptr); virtual ~TextEditDialog(); @@ -49,7 +49,7 @@ class TextEditDialog : public OSDialog void setText(const QString& text); - private: + private: virtual void createWidgets(); QTextEdit* m_textEdit; diff --git a/src/shared_gui_components/WaitDialog.hpp b/src/shared_gui_components/WaitDialog.hpp index b4c55d6c0..0b876dc25 100644 --- a/src/shared_gui_components/WaitDialog.hpp +++ b/src/shared_gui_components/WaitDialog.hpp @@ -40,7 +40,7 @@ class WaitDialog : public OSDialog { Q_OBJECT - public: + public: WaitDialog(const QString& windowTitle, const QString& windowMessage, QWidget* parent = nullptr); virtual ~WaitDialog(); @@ -57,14 +57,14 @@ class WaitDialog : public OSDialog QLabel* m_thirdLine; QLabel* m_fourthLine; - protected slots: + protected slots: virtual void on_cancelButton(bool checked) override; - protected: + protected: void closeEvent(QCloseEvent* event) override; - private: + private: virtual void createWidgets(); QString m_windowMessage; diff --git a/src/shared_gui_components/WorkflowController.hpp b/src/shared_gui_components/WorkflowController.hpp index 0af96ac41..463e3ade1 100644 --- a/src/shared_gui_components/WorkflowController.hpp +++ b/src/shared_gui_components/WorkflowController.hpp @@ -68,14 +68,14 @@ class WorkflowController : public OSListController { Q_OBJECT - public: + public: WorkflowController(BaseApp* t_baseApp); QSharedPointer itemAt(int i) override; int count() override; - private: + private: void addItem(QSharedPointer item); std::vector> m_workflowSectionItems; @@ -86,12 +86,12 @@ class WorkflowSectionItemDelegate : public OSItemDelegate { Q_OBJECT - public: + public: explicit WorkflowSectionItemDelegate(); QWidget* view(QSharedPointer dataSource) override; - private: + private: }; // Each WorkflowSectionItem represents a set of measures grouped by type, e.g. all the model measures @@ -100,7 +100,7 @@ class WorkflowSectionItem : public OSListItem { Q_OBJECT - public: + public: WorkflowSectionItem(MeasureType measureType, const QString& label, BaseApp* t_baseApp); QString label() const; @@ -109,7 +109,7 @@ class WorkflowSectionItem : public OSListItem QSharedPointer workflowStepController() const; - private: + private: QString m_label; boost::optional m_measureType; @@ -121,7 +121,7 @@ class WorkflowStepController : public OSListController { Q_OBJECT - public: + public: WorkflowStepController(BaseApp* t_baseApp); }; @@ -130,7 +130,7 @@ class MeasureStepController : public WorkflowStepController { Q_OBJECT - public: + public: MeasureStepController(MeasureType measureType, BaseApp* t_baseApp); QSharedPointer itemAt(int i) override; @@ -147,11 +147,11 @@ class MeasureStepController : public WorkflowStepController void moveDown(MeasureStep step); - public slots: + public slots: void addItemForDroppedMeasure(QDropEvent* event); - private: + private: void addItem(QSharedPointer item); MeasureType m_measureType; @@ -165,12 +165,12 @@ class MeasureStepItemDelegate : public OSItemDelegate { Q_OBJECT - public: + public: explicit MeasureStepItemDelegate(); QWidget* view(QSharedPointer dataSource) override; - private: + private: }; // Each MeasureStepItem represents a MeasureStep @@ -178,7 +178,7 @@ class MeasureStepItem : public OSListItem { Q_OBJECT - public: + public: MeasureStepItem(MeasureType measureType, MeasureStep step, BaseApp* t_baseApp); QString name() const; @@ -204,7 +204,7 @@ class MeasureStepItem : public OSListItem std::vector incompleteArguments() const; - public slots: + public slots: void remove(); @@ -222,7 +222,7 @@ class MeasureStepItem : public OSListItem void setSelected(bool isSelected) override; - signals: + signals: void nameChanged(const QString& name); @@ -232,7 +232,7 @@ class MeasureStepItem : public OSListItem void argumentsChanged(bool isIncomplete); - private: + private: MeasureType m_measureType; MeasureStep m_step; BaseApp* m_app; diff --git a/src/shared_gui_components/WorkflowView.hpp b/src/shared_gui_components/WorkflowView.hpp index 48fa5d0fc..131e6cebd 100644 --- a/src/shared_gui_components/WorkflowView.hpp +++ b/src/shared_gui_components/WorkflowView.hpp @@ -58,7 +58,7 @@ class RectangularDropZone : public QWidget { Q_OBJECT - public: + public: RectangularDropZone(); virtual ~RectangularDropZone() {} @@ -67,18 +67,18 @@ class RectangularDropZone : public QWidget QLabel* nameLabel; - signals: + signals: void dataDropped(QDropEvent* event); - protected: + protected: void paintEvent(QPaintEvent*) override; void dropEvent(QDropEvent* event) override; void dragEnterEvent(QDragEnterEvent* event) override; - private: + private: QString m_acceptedMimeType; }; @@ -87,7 +87,7 @@ class NewMeasureDropZone : public RectangularDropZone { Q_OBJECT - public: + public: NewMeasureDropZone(); virtual ~NewMeasureDropZone() {} @@ -98,7 +98,7 @@ class WorkflowSectionView : public OSCollapsibleView { Q_OBJECT - public: + public: WorkflowSectionView(MeasureType measureType); virtual ~WorkflowSectionView() {} @@ -112,7 +112,7 @@ class WorkflowSectionContentView : public QWidget { Q_OBJECT - public: + public: WorkflowSectionContentView(); virtual ~WorkflowSectionContentView() {} @@ -127,7 +127,7 @@ class WorkflowStepView : public QWidget { Q_OBJECT - public: + public: WorkflowStepView(); virtual ~WorkflowStepView() {} @@ -142,7 +142,7 @@ class WorkflowStepView : public QWidget QPushButton* downButton; - protected: + protected: void paintEvent(QPaintEvent*) override; }; @@ -150,7 +150,7 @@ class WorkflowStepButton : public QAbstractButton { Q_OBJECT - public: + public: WorkflowStepButton(); virtual ~WorkflowStepButton() {} @@ -159,11 +159,11 @@ class WorkflowStepButton : public QAbstractButton QLabel* cautionLabel; - public slots: + public slots: void setHasEmphasis(bool hasEmphasis); - protected: + protected: void paintEvent(QPaintEvent* e) override; }; From b3bc120e8e269ed18592f98e5a533fd91aaeabe6 Mon Sep 17 00:00:00 2001 From: XXX Date: Sat, 25 Jul 2020 21:01:08 -0600 Subject: [PATCH 2/3] Fixes #177 Depends on NREL/OpenStudio#4026 --- src/openstudio_lib/OSDocument.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openstudio_lib/OSDocument.cpp b/src/openstudio_lib/OSDocument.cpp index c8d8c779f..1595768a4 100644 --- a/src/openstudio_lib/OSDocument.cpp +++ b/src/openstudio_lib/OSDocument.cpp @@ -1379,7 +1379,9 @@ bool OSDocument::save() { // saves the model to modelTempDir / m_savePath.filename() // also copies the temp files to user location bool saved = saveModel(this->model(), modelPath, toPath(m_modelTempDir)); - OS_ASSERT(saved); + if (!saved) { + QMessageBox::warning(this->mainWindow(), tr("Failed to save model"), tr("Failed to save model, make sure that you do not have the location open and that you have correct write access.")); + } this->setSavePath(toQString(modelPath)); From be06b93b9ddc7213e840c318749d18e0dcd7c024 Mon Sep 17 00:00:00 2001 From: XXX Date: Sat, 25 Jul 2020 21:01:28 -0600 Subject: [PATCH 3/3] Add debug and release folders to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 1e210c2bd..ee34a85dc 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ build_profile/ build-profile/ core-build/ super-build/ +debug/ +release/ /super-build-shared/ /super-build-static/