mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
System : Always include Qt using <> and cleaned up some includes/whitespace
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
#include "QDialogButtonBox"
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2017- Statoil ASA
|
||||
|
@@ -23,7 +23,7 @@
|
||||
#include "cafSelectionManager.h"
|
||||
|
||||
#include <QAction>
|
||||
#include "QMessageBox"
|
||||
#include <QMessageBox>
|
||||
|
||||
CAF_CMD_SOURCE_INIT(RicReloadFormationNamesFeature, "RicReloadFormationNamesFeature");
|
||||
|
||||
|
@@ -28,7 +28,7 @@
|
||||
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include "QMessageBox"
|
||||
#include <QMessageBox>
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimFormationNames, "FormationNames");
|
||||
|
||||
|
@@ -23,6 +23,9 @@
|
||||
|
||||
class RigFormationNames;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimFormationNames : public caf::PdmObject
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
@@ -15,10 +15,12 @@
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RimFormationNamesCollection.h"
|
||||
|
||||
#include "RimFormationNames.h"
|
||||
#include "QMessageBox"
|
||||
|
||||
#include <QMessageBox>
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimFormationNamesCollection, "FormationNamesCollectionObject");
|
||||
|
||||
|
@@ -22,6 +22,9 @@
|
||||
|
||||
class RimFormationNames;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RimFormationNamesCollection: public caf::PdmObject
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
@@ -36,6 +39,7 @@ public:
|
||||
|
||||
void importFiles(const QStringList& fileNames);
|
||||
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
|
||||
|
||||
private:
|
||||
caf::PdmChildArrayField<RimFormationNames*> m_formationNamesList;
|
||||
};
|
||||
};
|
||||
|
@@ -17,13 +17,16 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RimFileSummaryCase.h"
|
||||
|
||||
#include "RiaLogging.h"
|
||||
|
||||
#include "RifEclipseSummaryTools.h"
|
||||
#include "RifReaderEclipseSummary.h"
|
||||
|
||||
#include "RimTools.h"
|
||||
|
||||
#include "QFileInfo"
|
||||
#include "RifReaderEclipseSummary.h"
|
||||
#include "QDir"
|
||||
#include "RifEclipseSummaryTools.h"
|
||||
#include "RiaLogging.h"
|
||||
#include <QDir>
|
||||
#include <QFileInfo>
|
||||
|
||||
|
||||
//==================================================================================================
|
||||
|
@@ -17,9 +17,11 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RiuMainWindowBase.h"
|
||||
#include "QSettings"
|
||||
|
||||
#include "RiaVersionInfo.h"
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@@ -19,8 +19,12 @@
|
||||
#pragma once
|
||||
|
||||
#include <QMainWindow>
|
||||
|
||||
struct RimMdiWindowGeometry;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class RiuMainWindowBase : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -39,8 +43,7 @@ public:
|
||||
void loadWinGeoAndDockToolBarLayout();
|
||||
void saveWinGeoAndDockToolBarLayout();
|
||||
void showWindow();
|
||||
|
||||
private:
|
||||
QString registryFolderName();
|
||||
|
||||
|
||||
};
|
||||
|
@@ -37,7 +37,7 @@
|
||||
|
||||
#include "cafFrameAnimationControl.h"
|
||||
|
||||
#include "qtimer.h"
|
||||
#include <QTimer>
|
||||
|
||||
|
||||
namespace caf
|
||||
|
@@ -37,23 +37,19 @@
|
||||
|
||||
#include "cafPdmUiFilePathEditor.h"
|
||||
|
||||
#include "cafPdmUiDefaultObjectEditor.h"
|
||||
|
||||
#include "cafFactory.h"
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmObject.h"
|
||||
#include "cafPdmUiDefaultObjectEditor.h"
|
||||
#include "cafPdmUiFieldEditorHandle.h"
|
||||
#include "cafPdmUiOrdering.h"
|
||||
|
||||
#include "cafPdmField.h"
|
||||
|
||||
#include <QLineEdit>
|
||||
#include <QLabel>
|
||||
#include <QBoxLayout>
|
||||
#include <QDir>
|
||||
#include <QFileDialog>
|
||||
#include <QIntValidator>
|
||||
|
||||
#include "cafFactory.h"
|
||||
#include "qboxlayout.h"
|
||||
#include "qtoolbutton.h"
|
||||
#include "qfiledialog.h"
|
||||
|
||||
#include <QLabel>
|
||||
#include <QLineEdit>
|
||||
|
||||
|
||||
namespace caf
|
||||
|
@@ -36,7 +36,9 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "cafPdmUiFieldEditorHandle.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QWidget>
|
||||
#include <QPointer>
|
||||
@@ -52,7 +54,6 @@ namespace caf
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
|
||||
class PdmUiFilePathEditorAttribute : public PdmUiEditorAttribute
|
||||
{
|
||||
public:
|
||||
@@ -77,6 +78,9 @@ public:
|
||||
};
|
||||
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
//==================================================================================================
|
||||
class PdmUiFilePathEditor : public PdmUiFieldEditorHandle
|
||||
{
|
||||
Q_OBJECT
|
||||
|
Reference in New Issue
Block a user