Merge dev into master for Release 2018.05 of ResInsight

Author: JacobStoren

.clang-format

@@ -8,18 +8,18 @@ AlignConsecutiveDeclarations: true
 AlignEscapedNewlinesLeft: true
 AlignOperands:   true
 AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: Empty
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
+BinPackArguments: false
+BinPackParameters: false
 BraceWrapping:
   AfterClass:      true
   AfterControlStatement: true
@@ -35,7 +35,7 @@ BraceWrapping:
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializersBeforeComma: true
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     130

.clang-tidy

@@ -0,0 +1,5 @@
+---
+Checks:          '-*,modernize-use-nullptr'
+HeaderFilterRegex: ''
+AnalyzeTemporaryDtors: false
+...

.gitignore

@@ -68,3 +68,4 @@ Ankh.NoLoad
 /Resinsight_Host.files
 /Resinsight_Host.creator
 /Resinsight_Host.config
+*.RESINSIGHT_IDX

ApplicationCode/Application/CMakeLists_files.cmake

@@ -1,26 +1,27 @@
 
-# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
-if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
-    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
-endif()
-
 set (SOURCE_GROUP_HEADER_FILES
-${CEE_CURRENT_LIST_DIR}RiaApplication.h
-${CEE_CURRENT_LIST_DIR}RiaDefines.h
-${CEE_CURRENT_LIST_DIR}RiaPreferences.h
-${CEE_CURRENT_LIST_DIR}RiaPorosityModel.h
-${CEE_CURRENT_LIST_DIR}RiaSummaryCurveDefinition.h
-${CEE_CURRENT_LIST_DIR}RiaRftPltCurveDefinition.h
+${CMAKE_CURRENT_LIST_DIR}/RiaApplication.h
+${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.h
+${CMAKE_CURRENT_LIST_DIR}/RiaDefines.h
+${CMAKE_CURRENT_LIST_DIR}/RiaFractureDefines.h
+${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.h
+${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.h
+${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.h
+${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.h
+${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
-${CEE_CURRENT_LIST_DIR}RiaApplication.cpp
-${CEE_CURRENT_LIST_DIR}RiaDefines.cpp
-${CEE_CURRENT_LIST_DIR}RiaMain.cpp
-${CEE_CURRENT_LIST_DIR}RiaPreferences.cpp
-${CEE_CURRENT_LIST_DIR}RiaPorosityModel.cpp
-${CEE_CURRENT_LIST_DIR}RiaSummaryCurveDefinition.cpp
-${CEE_CURRENT_LIST_DIR}RiaRftPltCurveDefinition.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaApplication.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaDefines.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaFractureDefines.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaMain.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
@@ -33,8 +34,10 @@ ${SOURCE_GROUP_SOURCE_FILES}
 
 set (QT_MOC_HEADERS
 ${QT_MOC_HEADERS}
-${CEE_CURRENT_LIST_DIR}RiaApplication.h
+${CMAKE_CURRENT_LIST_DIR}/RiaApplication.h
+${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.h
+${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.h
 )
 
 
-source_group( "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )
+source_group( "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake )