diff --git a/slsDetectorGui/include/qTabMessages.h b/slsDetectorGui/include/qTabMessages.h index ccc90691b..2decadc3c 100644 --- a/slsDetectorGui/include/qTabMessages.h +++ b/slsDetectorGui/include/qTabMessages.h @@ -30,7 +30,7 @@ public: * @param parent is the parent tab widget * @param det the detector reference */ - qTabMessages(QWidget *parent,multiSlsDetector*& detector); + qTabMessages(QWidget *parent,multiSlsDetector* detector); /** Destructor */ diff --git a/slsDetectorGui/include/svnInfoGui.h b/slsDetectorGui/include/svnInfoGui.h index 91de98058..a5a7f1b3a 100644 --- a/slsDetectorGui/include/svnInfoGui.h +++ b/slsDetectorGui/include/svnInfoGui.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" //#define SVNREPPATH "" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" -//#define SVNREV 0x126 +//#define SVNREV 0x127 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x126 +#define SVNREV 0x127 #define SVNDATE 0x20121218 // diff --git a/slsDetectorGui/src/qTabMessages.cpp b/slsDetectorGui/src/qTabMessages.cpp index a09f16d32..ff9bf1593 100644 --- a/slsDetectorGui/src/qTabMessages.cpp +++ b/slsDetectorGui/src/qTabMessages.cpp @@ -25,15 +25,16 @@ using namespace std; //------------------------------------------------------------------------------------------------------------------------------------------------- -qTabMessages::qTabMessages(QWidget *parent,multiSlsDetector*& detector):QWidget(parent),myDet(detector),qout(0){ - SetupWidgetWindow(); - Initialization(); +qTabMessages::qTabMessages(QWidget *parent,multiSlsDetector* detector):QWidget(parent),qout(0){//myDet(detector), + myDet=detector; + SetupWidgetWindow(); + Initialization(); } //------------------------------------------------------------------------------------------------------------------------------------------------- qTabMessages::~qTabMessages(){ - delete myDet; + // delete myDet; delete dispLog; delete qout; }