#955 Cleanup includes and fix whitespace

This commit is contained in:
Magne Sjaastad
2018-05-14 09:52:27 +02:00
parent 7c0017923c
commit 6fcc91cdcd

View File

@@ -1,17 +1,17 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2016- Statoil ASA // Copyright (C) 2016- Statoil ASA
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or // WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. // FITNESS FOR A PARTICULAR PURPOSE.
// //
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
@@ -20,28 +20,20 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RimSummaryPlot.h"
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimViewWindow.h" #include "RimViewWindow.h"
#include "RimWellAllocationPlot.h"
#include "RimWellLogPlot.h"
#include "RiuPlotMainWindow.h" #include "RiuInterfaceToViewWindow.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RiuSummaryQwtPlot.h" #include "RiuPlotMainWindow.h"
#include "RiuWellAllocationPlot.h"
#include "RiuWellLogPlot.h"
#include <QAction> #include <QAction>
#include <QClipboard>
#include <QMdiSubWindow> #include <QMdiSubWindow>
#include "RiuFlowCharacteristicsPlot.h"
#include "RimFlowCharacteristicsPlot.h"
CAF_CMD_SOURCE_INIT(RicViewZoomAllFeature, "RicViewZoomAllFeature"); CAF_CMD_SOURCE_INIT(RicViewZoomAllFeature, "RicViewZoomAllFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicViewZoomAllFeature::isCommandEnabled() bool RicViewZoomAllFeature::isCommandEnabled()
{ {
@@ -49,7 +41,7 @@ bool RicViewZoomAllFeature::isCommandEnabled()
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicViewZoomAllFeature::onActionTriggered(bool isChecked) void RicViewZoomAllFeature::onActionTriggered(bool isChecked)
{ {
@@ -64,9 +56,9 @@ void RicViewZoomAllFeature::onActionTriggered(bool isChecked)
} }
else if (dynamic_cast<RiuPlotMainWindow*>(topLevelWidget)) else if (dynamic_cast<RiuPlotMainWindow*>(topLevelWidget))
{ {
RiuPlotMainWindow* mainPlotWindow = dynamic_cast<RiuPlotMainWindow*>(topLevelWidget); RiuPlotMainWindow* mainPlotWindow = dynamic_cast<RiuPlotMainWindow*>(topLevelWidget);
QList<QMdiSubWindow*> subwindows = mainPlotWindow->subWindowList(QMdiArea::StackingOrder); QList<QMdiSubWindow*> subwindows = mainPlotWindow->subWindowList(QMdiArea::StackingOrder);
if (subwindows.size() > 0) if (!subwindows.empty())
{ {
RimViewWindow* viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget(subwindows.back()->widget()); RimViewWindow* viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget(subwindows.back()->widget());
@@ -79,11 +71,10 @@ void RicViewZoomAllFeature::onActionTriggered(bool isChecked)
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicViewZoomAllFeature::setupActionLook(QAction* actionToSetup) void RicViewZoomAllFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Zoom All"); actionToSetup->setText("Zoom All");
actionToSetup->setIcon(QIcon(":/ZoomAll16x16.png")); actionToSetup->setIcon(QIcon(":/ZoomAll16x16.png"));
} }