Octave Plugin : Move definition of qtDataStreamVersion to riSettings

After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)

ApplicationCode/SocketInterface/RiaSocketServer.h

@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "RiaSocketServerDefines.h"
+
 #include <QObject>
 #include <vector>
 #include <QDataStream>
@@ -34,11 +36,9 @@ class QTimer;
 class RimEclipseCase;
 class RiaSocketCommand;
 
-namespace riOctavePlugin
+//--------------------------------------------------------------------------------------------------
-{
+///
-    const int qtDataStreamVersion = QDataStream::Qt_4_0;
+//--------------------------------------------------------------------------------------------------
-}
-
 class RiaSocketServer : public QObject
 {
     Q_OBJECT

ApplicationCode/SocketInterface/RiaSocketServerDefines.h

@@ -0,0 +1,25 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2018 Statoil ASA
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include <QDataStream>
+
+namespace riOctavePlugin
+{
+    const int qtDataStreamVersion = QDataStream::Qt_4_0;
+}
+

OctavePlugin/riSettings.h

@@ -16,7 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "../ApplicationCode/SocketInterface/RiaSocketServer.h"
+#include "../ApplicationCode/SocketInterface/RiaSocketServerDefines.h" 
 
 namespace riOctavePlugin
 {