From 1a67773acebe07d7fda7f4ba62fe4d22a53fda27 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 15 May 2019 07:35:53 +0200 Subject: [PATCH] #4410 Dock Window State : Remove obsolete functions --- .../Application/RiaGuiApplication.cpp | 22 ------------------- .../Application/RiaGuiApplication.h | 3 --- .../UserInterface/RiuMainWindow.cpp | 2 +- .../UserInterface/RiuPlotMainWindow.cpp | 4 ++-- 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/ApplicationCode/Application/RiaGuiApplication.cpp b/ApplicationCode/Application/RiaGuiApplication.cpp index 7b3e1d9d58..eacbdff6a7 100644 --- a/ApplicationCode/Application/RiaGuiApplication.cpp +++ b/ApplicationCode/Application/RiaGuiApplication.cpp @@ -1172,28 +1172,6 @@ std::vector RiaGuiApplication::recentFileActions() const return m_recentFileActionProvider->actions(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RiaGuiApplication::saveMainWinGeoAndDockToolBarLayout() -{ - if (isMain3dWindowVisible()) - { - m_mainWindow->saveWinGeoAndDockToolBarLayout(); - } -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RiaGuiApplication::savePlotWinGeoAndDockToolBarLayout() -{ - if (isMainPlotWindowVisible()) - { - m_mainPlotWindow->saveWinGeoAndDockToolBarLayout(); - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/RiaGuiApplication.h b/ApplicationCode/Application/RiaGuiApplication.h index 1824ac3183..d7ea79341d 100644 --- a/ApplicationCode/Application/RiaGuiApplication.h +++ b/ApplicationCode/Application/RiaGuiApplication.h @@ -119,9 +119,6 @@ public: std::vector recentFileActions() const; - void saveMainWinGeoAndDockToolBarLayout(); - void savePlotWinGeoAndDockToolBarLayout(); - static void clearAllSelections(); void applyGuiPreferences(const RiaPreferences* oldPreferences = nullptr); diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index 26d94e4cf8..470db90091 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -272,7 +272,7 @@ void RiuMainWindow::closeEvent(QCloseEvent* event) { RiaGuiApplication* app = RiaGuiApplication::instance(); - app->saveMainWinGeoAndDockToolBarLayout(); + this->saveWinGeoAndDockToolBarLayout(); if (app->isMainPlotWindowVisible()) { diff --git a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp index 4e06f9b0e3..3a4e73c6e9 100644 --- a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp @@ -178,9 +178,9 @@ void RiuPlotMainWindow::cleanUpTemporaryWidgets() //-------------------------------------------------------------------------------------------------- void RiuPlotMainWindow::closeEvent(QCloseEvent* event) { - RiaGuiApplication* app = RiaGuiApplication::instance(); + this->saveWinGeoAndDockToolBarLayout(); - app->savePlotWinGeoAndDockToolBarLayout(); + RiaGuiApplication* app = RiaGuiApplication::instance(); if (app->isMain3dWindowVisible()) {