From 80afb66a100b24e488939ffe6068a2a06b66cb15 Mon Sep 17 00:00:00 2001 From: anikhalder <halder.anik04@gmail.com> Date: Fri, 6 Apr 2018 11:04:48 +0200 Subject: [PATCH] Rename RealSpaceViewerDialog to RealSpaceDialog --- .../{RealSpaceViewerDialog.cpp => RealSpaceDialog.cpp} | 4 ++-- .../{RealSpaceViewerDialog.h => RealSpaceDialog.h} | 10 +++++----- GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp | 4 ++-- GUI/coregui/Views/SampleDesigner/SampleToolBar.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) rename GUI/coregui/Views/RealSpaceWidgets/{RealSpaceViewerDialog.cpp => RealSpaceDialog.cpp} (91%) rename GUI/coregui/Views/RealSpaceWidgets/{RealSpaceViewerDialog.h => RealSpaceDialog.h} (69%) diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.cpp similarity index 91% rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.cpp rename to GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.cpp index b61822e8c74..d1e8df3b2f1 100644 --- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.cpp +++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.cpp @@ -1,5 +1,5 @@ -#include "RealSpaceViewerDialog.h" +#include "RealSpaceDialog.h" #include "RealSpaceWidget.h" #include "StyleUtils.h" @@ -16,7 +16,7 @@ namespace const QSize default_dialog_size(500, 400); } -RealSpaceViewerDialog::RealSpaceViewerDialog(SampleModel *sampleModel, +RealSpaceDialog::RealSpaceDialog(SampleModel *sampleModel, QItemSelectionModel* selectionModel, QWidget *parent) : QDialog(parent) , m_sampleModel(sampleModel) diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.h similarity index 69% rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.h rename to GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.h index 7c9ebbc6574..b04c2c6eead 100644 --- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.h +++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.h @@ -1,5 +1,5 @@ -#ifndef REALSPACEVIEWERDIALOG_H -#define REALSPACEVIEWERDIALOG_H +#ifndef REALSPACEDIALOG_H +#define REALSPACEDIALOG_H #include "WinDllMacros.h" #include <QDialog> @@ -16,12 +16,12 @@ class QBoxLayout; //! Dialog to hold RealSpaceViewer. -class BA_CORE_API_ RealSpaceViewerDialog : public QDialog +class BA_CORE_API_ RealSpaceDialog : public QDialog { Q_OBJECT public: - RealSpaceViewerDialog(SampleModel* sampleModel = nullptr, + RealSpaceDialog(SampleModel* sampleModel = nullptr, QItemSelectionModel* selectionModel = nullptr, QWidget *parent = nullptr); @@ -31,4 +31,4 @@ private: }; -#endif // REALSPACEVIEWERDIALOG_H +#endif // REALSPACEDIALOG_H diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp index af36fab7c3b..45807de1a75 100644 --- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp +++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp @@ -24,7 +24,7 @@ #include <QPushButton> #include <QToolButton> -#include <RealSpaceViewerDialog.h> +#include <RealSpaceDialog.h> //! main tool bar on top of SampleView window SampleToolBar::SampleToolBar(SampleModel *sampleModel, QItemSelectionModel* selectionModel, @@ -166,7 +166,7 @@ void SampleToolBar::onRealSpaceViewerCall() if(!m_dialog_on) { m_dialog_on = true; - m_dialog = new RealSpaceViewerDialog(m_sampleModel, m_selectionModel, this); + m_dialog = new RealSpaceDialog(m_sampleModel, m_selectionModel, this); m_dialog->show(); // undo the flag when the dialog is destroyed on close event diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h index c6f1d3ed3ce..fcb64b093d6 100644 --- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h +++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h @@ -19,7 +19,7 @@ #include "SampleModel.h" #include <QTreeView> -#include "RealSpaceViewerDialog.h" +#include "RealSpaceDialog.h" class QAction; class QToolButton; @@ -68,7 +68,7 @@ private: QToolButton *m_RealSpaceViewerButton; SampleModel *m_sampleModel; QItemSelectionModel *m_selectionModel; - RealSpaceViewerDialog *m_dialog; + RealSpaceDialog *m_dialog; bool m_dialog_on; }; -- GitLab