included sls defs in every file so that int is 32 bit

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@132 af1100a4-978c-4157-bff7-07162d2ba061

slsDetectorGui/include/qActionsWidget.h

@@ -8,6 +8,8 @@
 #ifndef QACTIONSWIDGET_H_
 #define QACTIONSWIDGET_H_
 
+#include "qDefs.h"
+
 /** Form Header */
 #include "ui_form_action.h"
 /** Project Class Headers */

slsDetectorGui/include/qCloneWidget.h

@@ -8,6 +8,9 @@
 #ifndef QCLONEWIDGET_H_
 #define QCLONEWIDGET_H_
 
+#include "qDefs.h"
+
+
 /** Qt Project Class Headers */
 class SlsQtH1D;
 #include "SlsQt1DPlot.h"

slsDetectorGui/include/qDebugStream.h

@@ -9,6 +9,9 @@
 #define QDEBUGSTREAM_H_
 
 
+#include "qDefs.h"
+
+
 #include <QApplication>
 #include <QWidget>
 #include <QString>

slsDetectorGui/include/qDefs.h

@@ -8,6 +8,7 @@
 #ifndef QDEFS_H
 #define QDEFS_H
 
+#include "sls_detector_defs.h"
 #include <iostream>
 #include <QMessageBox>
 using namespace std;

slsDetectorGui/include/qDetectorMain.h

@@ -7,6 +7,8 @@
 #ifndef QDETECTORMAIN_H
 #define QDETECTORMAIN_H
 
+#include "qDefs.h"
+
 /** Form Header */
 #include "ui_form_detectormain.h"
 /** Qt Project Class Headers */
@@ -22,7 +24,6 @@ class qTabDeveloper;
 class qTabMessages;
 /** Project Class Headers */
 class multiSlsDetector;
-#include "sls_detector_defs.h"
 /** Qt Include Headers */
 #include <QScrollArea>
 #include <QGridLayout>

slsDetectorGui/include/qDrawPlot.h

@@ -8,13 +8,14 @@
 #define QDRAWPLOT_H
 
 
+#include "qDefs.h"
+
 /** Project Class Headers */
 class multiSlsDetector;
 #include "detectorData.h"
 /** Qt Project Class Headers */
 #include "SlsQt1DPlot.h"
 #include "SlsQt2DPlotLayout.h"
-#include "qDefs.h"
 class qCloneWidget;
 /** Qt Include Headers */
 #include <QWidget>

slsDetectorGui/include/qScanWidget.h

@@ -8,6 +8,8 @@
 #ifndef QSCANWIDGET_H_
 #define QSCANWIDGET_H_
 
+#include "qDefs.h"
+
 /** Form Header */
 #include "ui_form_scan.h"
 /** Project Class Headers */

slsDetectorGui/include/qTabActions.h

@@ -8,13 +8,14 @@
 #ifndef QTABACTIONS_H_
 #define QTABACTIONS_H_
 
+#include "qDefs.h"
+
 
 /* Qt Project Class Headers */
 #include "qActionsWidget.h"
 #include "qScanWidget.h"
 /** C++ Project Class Headers */
 class multiSlsDetector;
-#include "sls_detector_defs.h"
 /** Qt Include Headers */
 #include <QWidget>
 #include <QPushButton>

slsDetectorGui/include/qTabAdvanced.h

@@ -8,11 +8,13 @@
 #ifndef QTABADVANCED_H_
 #define QTABADVANCED_H_
 
+#include "qDefs.h"
+
+
 /** Form Header */
 #include "ui_form_tab_advanced.h"
 /** Project Class Headers */
 class multiSlsDetector;
-#include "sls_detector_defs.h"
 /** Qt Project Class Headers */
 class qDrawPlot;
 /** Qt Include Header */

slsDetectorGui/include/qTabDataOutput.h

@@ -8,11 +8,13 @@
 #ifndef QTABDATAOUTPUT_H_
 #define QTABDATAOUTPUT_H_
 
+#include "qDefs.h"
+
+
 /** Form Header */
 #include "ui_form_tab_dataoutput.h"
 /** Project Class Headers */
 class multiSlsDetector;
-#include "sls_detector_defs.h"
 /** Qt Include Headers */
 #include <QString>
 

slsDetectorGui/include/qTabDebugging.h

@@ -8,12 +8,14 @@
 #ifndef QTABDEBUGGING_H_
 #define QTABDEBUGGING_H_
 
+#include "qDefs.h"
+
+
 /** Form Header */
 #include "ui_form_tab_debugging.h"
 /** Project Class Headers */
 class multiSlsDetector;
 class slsDetector;
-#include "sls_detector_defs.h"
 /** Qt Include Headers */
 #include <QTreeWidget>
 

slsDetectorGui/include/qTabDeveloper.h

@@ -8,9 +8,11 @@
 #ifndef QTABDEVELOPER_H_
 #define QTABDEVELOPER_H_
 
+#include "qDefs.h"
+
+
 /** Project Class Headers */
 class multiSlsDetector;
-#include "sls_detector_defs.h"
 /** Qt Include Headers */
 #include <QWidget>
 #include <QGridLayout>

slsDetectorGui/include/qTabMeasurement.h

@@ -7,6 +7,9 @@
 #ifndef QTABMEASUREMENT
 #define QTABMEASUREMENT
 
+#include "qDefs.h"
+
+
 /** Form Header */
 #include "ui_form_tab_measurement.h"
 /** Project Class Headers */

slsDetectorGui/include/qTabMessages.h

@@ -9,6 +9,9 @@
 #define QTABMESSAGES_H_
 
 
+#include "qDefs.h"
+
+
 
 /** Project Class Headers */
 class multiSlsDetector;

slsDetectorGui/include/qTabPlot.h

@@ -8,11 +8,13 @@
 #ifndef QTABPLOT_H_
 #define QTABPLOT_H_
 
+#include "qDefs.h"
+
+
 /** Form Header */
 #include "ui_form_tab_plot.h"
 /** Project Class Headers */
 class multiSlsDetector;
-#include "sls_detector_defs.h"
 /** Qt Project Class Headers */
 class qDrawPlot;
 /** Qt Include Headers */

slsDetectorGui/include/qTabSettings.h

@@ -8,11 +8,13 @@
 #ifndef QTABSETTINGS_H_
 #define QTABSETTINGS_H_
 
+#include "qDefs.h"
+
+
 /** Form Header */
 #include "ui_form_tab_settings.h"
 /** Project Class Headers */
 class multiSlsDetector;
-#include "sls_detector_defs.h"
 /** Qt Include Headers */
 #include <QStandardItemModel>
 

slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h

@@ -13,6 +13,13 @@
 #ifndef SLSQT1DPLOT_H
 #define SLSQT1DPLOT_H
 
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
+
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_marker.h>

slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h

@@ -6,6 +6,14 @@
 
 #ifndef SLSQT1DZOOMER_H
 #define SLSQT1DZOOMER_H
+
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
+
 #include <qwt_plot_zoomer.h>
 #include <qwt_plot_panner.h>
 #include <qwt_global.h>

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h

@@ -9,6 +9,13 @@
 #define SLSQT2DHIST_H
 
 
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
+
 
 #if QT_VERSION >= 0x040000
 #include <qprintdialog.h>

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h

@@ -14,6 +14,13 @@
 #ifndef SLSQT2DPLOT_H
 #define SLSQT2DPLOT_H
 
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
+
 
 #include <qwt_plot.h>
 #include <qlist.h>

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h

@@ -11,6 +11,13 @@
 #ifndef SLSQT2DPLOTLAYOUT_H
 #define SLSQT2DPLOTLAYOUT_H
 
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
+
 #include <qwidget.h>
 #include <qgroupbox.h>
 

slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h

@@ -9,6 +9,13 @@
 #ifndef SLSQT2DZOOMER_H
 #define SLSQT2DZOOMER_H
 
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
+
 /**included by Dhanya on 05.12.2012 to avoid compile time errors with the latest gcc*/
 #include <cstdio>
 /**end of Change by Dhanya*/

slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h

@@ -7,6 +7,13 @@
 #ifndef SLSQTNUMBERENTRY_H
 #define SLSQTNUMBERENTRY_H
 
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
+
 #include <qwidget.h>
 #include <qgroupbox.h>
 

slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h

@@ -7,6 +7,12 @@
 #ifndef SLSQTVALIDATORS_H
 #define SLSQTVALIDATORS_H
 
+#ifndef IAN
+typedef  double double32_t;
+typedef  float float32_t;
+typedef  int int32_t;
+#endif
+
 #include <iostream>
 #include <math.h>
 

slsDetectorGui/src/qActionsWidget.cpp

@@ -9,7 +9,6 @@
 #include "multiSlsDetector.h"
 // Qt Project Class Headers
 #include "qActionsWidget.h"
-#include "qDefs.h"
 // Qt Include Headers
 #include <QFileDialog>
 // C++ Include Headers

slsDetectorGui/src/qCloneWidget.cpp

@@ -7,7 +7,6 @@
 
 /** Qt Project Class Headers */
 #include "qCloneWidget.h"
-#include "qDefs.h"
 /** Qt Include Headers */
 #include <QImage>
 #include <QPainter>

slsDetectorGui/src/qDetectorMain.cpp

@@ -4,7 +4,6 @@
  * ********************************************************************/
 // Qt Project Class Headers
 #include "qDetectorMain.h"
-#include "qDefs.h"
 #include "qDrawPlot.h"
 #include "qTabMeasurement.h"
 #include "qTabDataOutput.h"
@@ -36,7 +35,7 @@ using namespace std;
 int main (int argc, char **argv) {
 
 	QApplication *theApp = new QApplication(argc, argv);
-	theApp->setStyle(new QPlastiqueStyle);
+	theApp->setStyle(new QPlastiqueStyle);//not default when desktop is windows
 	theApp->setWindowIcon(QIcon( ":/icons/images/mountain.png" ));
 	qDetectorMain *det=new qDetectorMain(argc, argv, theApp,0);
 	det->show();

slsDetectorGui/src/qScanWidget.cpp

@@ -9,7 +9,6 @@
 #include "multiSlsDetector.h"
 // Qt Project Class Headers
 #include "qScanWidget.h"
-#include "qDefs.h"
 // Qt Include Headers
 #include <QFileDialog>
 #include <QStackedLayout>

slsDetectorGui/src/qTabActions.cpp

@@ -6,7 +6,6 @@
  */
 // Qt Project Class Headers
 #include "qTabActions.h"
-#include "qDefs.h"
 // Project Class Headers
 #include "slsDetector.h"
 #include "multiSlsDetector.h"

slsDetectorGui/src/qTabAdvanced.cpp

@@ -5,7 +5,6 @@
  *      Author: l_maliakal_d
  */
 #include "qTabAdvanced.h"
-#include "qDefs.h"
 #include "qDrawPlot.h"
 /** Project Class Headers */
 #include "slsDetector.h"

slsDetectorGui/src/qTabDataOutput.cpp

@@ -10,7 +10,6 @@
  * ********************************************************************/
 
 #include "qTabDataOutput.h"
-#include "qDefs.h"
 // Project Class Headers
 #include "slsDetector.h"
 #include "multiSlsDetector.h"

slsDetectorGui/src/qTabDebugging.cpp

@@ -5,7 +5,6 @@
  *      Author: l_maliakal_d
  */
 #include "qTabDebugging.h"
-#include "qDefs.h"
 // Project Class Headers
 #include "slsDetector.h"
 #include "multiSlsDetector.h"

slsDetectorGui/src/qTabDeveloper.cpp

@@ -5,7 +5,6 @@
  *      Author: l_maliakal_d
  */
 #include "qTabDeveloper.h"
-#include "qDefs.h"
 //Project Class Headers
 #include "slsDetector.h"
 #include "multiSlsDetector.h"

slsDetectorGui/src/qTabMeasurement.cpp

@@ -7,7 +7,6 @@
 
 //Qt Project Class Headers
 #include "qTabMeasurement.h"
-#include "qDefs.h"
 #include "qDrawPlot.h"
 //Project Class Headers
 #include "slsDetector.h"

slsDetectorGui/src/qTabMessages.cpp

@@ -7,7 +7,6 @@
 
 /** Qt Project Class Headers */
 #include "qTabMessages.h"
-#include "qDefs.h"
 /** Project Class Headers */
 #include "slsDetector.h"
 #include "multiSlsDetector.h"

slsDetectorGui/src/qTabPlot.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "qTabPlot.h"
-#include "qDefs.h"
 #include "qDrawPlot.h"
 // Project Class Headers
 #include "slsDetector.h"

slsDetectorGui/src/qTabSettings.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "qTabSettings.h"
-#include "qDefs.h"
 // Project Class Headers
 #include "slsDetector.h"
 #include "multiSlsDetector.h"