Renamed the final filenames for this time:

RICursors		RiuCursors
RIMainWindow	RiuMainWindow
RIPreferencesDialog	RiuPreferencesDialog
RIProcessMonitor	RiuProcessMonitor
RIResultInfoPanel	RiuResultInfoPanel
RIViewer		RiuViewer
p4#: 21072

ApplicationCode/Application/RiaApplication.cpp

@@ -30,9 +30,9 @@
 #include "RiaBaseDefs.h"
 
 #include "RiaApplication.h"
-#include "RIMainWindow.h"
-#include "RIViewer.h"
-#include "RIProcessMonitor.h"
+#include "RiuMainWindow.h"
+#include "RiuViewer.h"
+#include "RiuProcessMonitor.h"
 #include "RiaPreferences.h"
 
 #include "RimResultCase.h"

ApplicationCode/CMakeLists.txt

@@ -97,14 +97,14 @@ list( APPEND CPP_SOURCES
 )
 
 list( APPEND CPP_SOURCES
-    UserInterface/RICursors.cpp
-    UserInterface/RIMainWindow.cpp
-    UserInterface/RIPreferencesDialog.cpp
-    UserInterface/RIResultInfoPanel.cpp
-    UserInterface/RIViewer.cpp
+    UserInterface/RiuCursors.cpp
+    UserInterface/RiuMainWindow.cpp
+    UserInterface/RiuPreferencesDialog.cpp
+    UserInterface/RiuResultInfoPanel.cpp
+    UserInterface/RiuViewer.cpp
     UserInterface/RiuSimpleHistogramWidget.cpp
 	UserInterface/RiuMultiCaseImportDialog.cpp
-    UserInterface/RIProcessMonitor.cpp
+    UserInterface/RiuProcessMonitor.cpp
 
 )
 
@@ -115,11 +115,11 @@ set ( QT_MOC_HEADERS
     ProjectDataModel/RimUiTreeModelPdm.h
     ProjectDataModel/RimUiTreeView.h
     
-    UserInterface/RIMainWindow.h
-    UserInterface/RIPreferencesDialog.h
-    UserInterface/RIResultInfoPanel.h
-    UserInterface/RIViewer.h
-    UserInterface/RIProcessMonitor.h
+    UserInterface/RiuMainWindow.h
+    UserInterface/RiuPreferencesDialog.h
+    UserInterface/RiuResultInfoPanel.h
+    UserInterface/RiuViewer.h
+    UserInterface/RiuProcessMonitor.h
 	SocketInterface/RiaSocketServer.h
 	UserInterface/RiuMultiCaseImportDialog.h
 )

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp

@@ -20,7 +20,7 @@
 
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirView.h"
-#include "RIViewer.h"
+#include "RiuViewer.h"
 #include "RimCase.h"
 #include "RigCaseData.h"
 #include "RigMainGrid.h"

ApplicationCode/ProjectDataModel/RimReservoirView.cpp

@@ -17,10 +17,10 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
-#include "RIViewer.h"
+#include "RiuViewer.h"
 
 #include "RimReservoirView.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 #include "RigGridBase.h"
 #include "RigCaseData.h"
 #include "RiaApplication.h"

ApplicationCode/ProjectDataModel/RimResultSlot.cpp

@@ -22,7 +22,7 @@
 #include "RimLegendConfig.h"
 #include "RimReservoirView.h"
 #include "RimCase.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 #include "RimUiTreeModelPdm.h"
 
 

ApplicationCode/ProjectDataModel/RimScriptCollection.cpp

@@ -22,7 +22,7 @@
 #include "RimScriptCollection.h"
 #include "cafPdmField.h"
 #include "cafUtils.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 #include "RimUiTreeModelPdm.h"
 #include "cafPdmUiFilePathEditor.h"
 

ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp

@@ -27,10 +27,10 @@
 #include "RimCellPropertyFilterCollection.h"
 
 #include "RimReservoirView.h"
-#include "RIViewer.h"
+#include "RiuViewer.h"
 #include "RimCalcScript.h"
 #include "RiaApplication.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 #include "RimInputProperty.h"
 #include "RimInputPropertyCollection.h"
 #include "cafPdmField.h"

ApplicationCode/ProjectDataModel/RimUiTreeView.cpp

@@ -25,10 +25,10 @@
 #include "RimReservoirView.h"
 #include "RimCalcScript.h"
 #include "RiaApplication.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 #include "RimInputPropertyCollection.h"
 #include "RimExportInputPropertySettings.h"
-#include "RIPreferencesDialog.h"
+#include "RiuPreferencesDialog.h"
 #include "RifEclipseInputFileTools.h"
 #include "RimInputCase.h"
 #include "RimBinaryExportSettings.h"

ApplicationCode/RiaMain.cpp

@@ -18,7 +18,7 @@
 
 #include "RiaStdInclude.h"
 #include "RiaApplication.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 
 
 int main(int argc, char *argv[])

ApplicationCode/SocketInterface/RiaSocketServer.cpp

@@ -24,7 +24,7 @@
 
 #include "RiaSocketServer.h"
 #include "RiaApplication.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 #include "RimCase.h"
 #include "RigCaseData.h"
 #include "RigCaseCellResultsData.h"

ApplicationCode/UserInterface/RiuCursors.cpp

@@ -18,7 +18,7 @@
 
 #include "RiaStdInclude.h"
 
-#include "RICursors.h"
+#include "RiuCursors.h"
 
 #include <QtCore/QString>
 #include <QtGui/QBitmap>

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -20,12 +20,12 @@
 #include "RiaBaseDefs.h"
 
 #include "RiaApplication.h"
-#include "RIMainWindow.h"
-#include "RIViewer.h"
-#include "RIResultInfoPanel.h"
-#include "RIProcessMonitor.h"
+#include "RiuMainWindow.h"
+#include "RiuViewer.h"
+#include "RiuResultInfoPanel.h"
+#include "RiuProcessMonitor.h"
 #include "RiaPreferences.h"
-#include "RIPreferencesDialog.h"
+#include "RiuPreferencesDialog.h"
 
 #include "RigCaseData.h"
 #include "RigCaseCellResultsData.h"
@@ -46,7 +46,7 @@
 
 //==================================================================================================
 ///
-/// \class RIMainWindow
+/// \class RiuMainWindow
 ///
 /// Contains our main window
 ///

ApplicationCode/UserInterface/RiuPreferencesDialog.cpp

@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
-#include "RIPreferencesDialog.h"
+#include "RiuPreferencesDialog.h"
 
 #include "cafAppEnum.h"
 #include "cafPdmObject.h"

ApplicationCode/UserInterface/RiuProcessMonitor.cpp

@@ -18,7 +18,7 @@
 
 #include "RiaStdInclude.h"
 
-#include "RIProcessMonitor.h"
+#include "RiuProcessMonitor.h"
 #include "cafUiProcess.h"
 #include "RiaApplication.h"
 

ApplicationCode/UserInterface/RiuResultInfoPanel.cpp

@@ -17,13 +17,13 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaStdInclude.h"
-#include "RIResultInfoPanel.h"
+#include "RiuResultInfoPanel.h"
 
 
 
 //==================================================================================================
 ///
-/// \class RIResultInfoPanel
+/// \class RiuResultInfoPanel
 /// \ingroup ResInsight
 ///
 /// 

ApplicationCode/UserInterface/RiuResultInfoPanel.h

@@ -27,7 +27,7 @@ class QTextEdit;
 
 //==================================================================================================
 //
-// RIResultInfoPanel 
+// RiuResultInfoPanel 
 //
 //==================================================================================================
 class RiuResultInfoPanel : public QWidget

ApplicationCode/UserInterface/RiuViewer.cpp

@@ -18,16 +18,16 @@
 
 #include "RiaStdInclude.h"
 
-#include "RIViewer.h"
+#include "RiuViewer.h"
 #include "RiaApplication.h"
-#include "RIMainWindow.h"
+#include "RiuMainWindow.h"
 
 #include "cvfqtOpenGLContext.h"
 #include "cvfqtPerformanceInfoHud.h"
 #include "cvfCamera.h"
 #include "cvfRendering.h"
 #include "cvfDrawableGeo.h"
-#include "RICursors.h"
+#include "RiuCursors.h"
 #include "RigCaseData.h"
 
 #include "cafUtils.h"
@@ -44,7 +44,7 @@ const double RI_MIN_NEARPLANE_DISTANCE = 0.1;
 
 //==================================================================================================
 ///
-/// \class RIViewer
+/// \class RiuViewer
 /// \ingroup ResInsight
 ///
 /// 

ApplicationCode/UserInterface/RiuViewer.h

@@ -38,7 +38,7 @@ namespace cvf
 
 //==================================================================================================
 //
-// RIViewer
+// RiuViewer
 //
 //==================================================================================================
 class RiuViewer : public caf::Viewer

cafViewer/cafCadNavigation.cpp

@@ -83,7 +83,7 @@ bool caf::CadNavigation::handleInputEvent(QInputEvent* inputEvent)
                     }
 
                     m_trackball->startNavigation(cvf::ManipulatorTrackball::ROTATE, translatedMousePosX, translatedMousePosY);
-                    //m_viewer->setCursor(RICursors::get(RICursors::ROTATE));
+                    //m_viewer->setCursor(RiuCursors::get(RiuCursors::ROTATE));
                     m_isRotating = true;
                     isEventHandled = true;
                 }
@@ -98,7 +98,7 @@ bool caf::CadNavigation::handleInputEvent(QInputEvent* inputEvent)
                 if (me->button() == Qt::MidButton)
                 {
                     m_trackball->endNavigation();
-                    //m_viewer->setCursor(RICursors::get(RICursors::PICK));
+                    //m_viewer->setCursor(RiuCursors::get(RiuCursors::PICK));
                     m_isRotating = false;
                     isEventHandled = true;
                 }

cafViewer/cafCeetronNavigation.cpp

@@ -237,19 +237,19 @@ void caf::CeetronNavigation::setCursorFromCurrentState()
     switch (navType)
     {
     case ManipulatorTrackball::PAN:	     
-        //m_viewer->setCursor(RICursors::get(RICursors::PAN));
+        //m_viewer->setCursor(RiuCursors::get(RiuCursors::PAN));
         return;
     case ManipulatorTrackball::WALK:	 
-        //m_viewer->setCursor(RICursors::get(RICursors::WALK));	    
+        //m_viewer->setCursor(RiuCursors::get(RiuCursors::WALK));	    
         return;
     case ManipulatorTrackball::ROTATE:	 
-        //m_viewer->setCursor(RICursors::get(RICursors::ROTATE));	
+        //m_viewer->setCursor(RiuCursors::get(RiuCursors::ROTATE));	
         return;
     default:
         break;
     }
 
-    // m_viewer->setCursor(RICursors::get(RICursors::PICK));
+    // m_viewer->setCursor(RiuCursors::get(RiuCursors::PICK));
 }
 
 //--------------------------------------------------------------------------------------------------