Octave Plugin : Move definition of qtDataStreamVersion to RiaSocketServerDefines

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)
This commit is contained in:
Magne Sjaastad
2018-02-20 08:03:37 +01:00
parent f0d32e6e45
commit 79a32af209
3 changed files with 31 additions and 6 deletions

View File

@@ -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