From f11db00aef5bee84679e7204b1679ceaf9de315f Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Fri, 5 Apr 2019 10:14:41 +0200 Subject: [PATCH] removed old typedef --- slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h | 3 --- .../slsDetectorPlotting/include/SlsQt1DZoomer.h | 7 ------- slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h | 8 -------- slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h | 5 ----- .../slsDetectorPlotting/include/SlsQt2DPlotLayout.h | 5 ----- .../slsDetectorPlotting/include/SlsQt2DZoomer.h | 5 ----- .../slsDetectorPlotting/include/SlsQtNumberEntry.h | 5 ----- .../slsDetectorPlotting/include/SlsQtValidators.h | 6 ------ slsReceiverSoftware/include/circularFifo.h | 6 ------ slsSupportLib/include/sls_detector_defs.h | 5 ----- 10 files changed, 55 deletions(-) diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h index 554a17fab..40c066edf 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h @@ -13,9 +13,6 @@ #ifndef SLSQT1DPLOT_H #define SLSQT1DPLOT_H -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; #include "ansi.h" diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h index 3bcb35ee7..7b109ba58 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h @@ -7,13 +7,6 @@ #ifndef SLSQT1DZOOMER_H #define SLSQT1DZOOMER_H -#ifndef IAN -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; -#endif - - #include #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h index a71a32676..a9b8a6028 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h @@ -9,14 +9,6 @@ #define SLSQT2DHIST_H -#ifndef IAN -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; -#endif - - - #if QT_VERSION >= 0x040000 #include #endif diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h index 8b1944392..619eb410f 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h @@ -14,11 +14,6 @@ #ifndef SLSQT2DPLOT_H #define SLSQT2DPLOT_H -#ifndef IAN -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; -#endif diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h index 2d2315f77..d40f7332d 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h @@ -12,11 +12,6 @@ #ifndef SLSQT2DPLOTLAYOUT_H #define SLSQT2DPLOTLAYOUT_H -#ifndef IAN -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; -#endif #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h index 5fed37f1a..d4f8d4376 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h @@ -9,11 +9,6 @@ #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*/ diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h index dbeb0a31e..fa152604b 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h @@ -7,11 +7,6 @@ #ifndef SLSQTNUMBERENTRY_H #define SLSQTNUMBERENTRY_H -#ifndef IAN -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; -#endif #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h index bd2d70efd..197b162a2 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h @@ -7,12 +7,6 @@ #ifndef SLSQTVALIDATORS_H #define SLSQTVALIDATORS_H -#ifndef IAN -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; -#endif - #include #include diff --git a/slsReceiverSoftware/include/circularFifo.h b/slsReceiverSoftware/include/circularFifo.h index 569561424..d85c0fac7 100644 --- a/slsReceiverSoftware/include/circularFifo.h +++ b/slsReceiverSoftware/include/circularFifo.h @@ -11,12 +11,6 @@ #include #include -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; - - - /** Circular Fifo (a.k.a. Circular Buffer) * Thread safe for one reader, and one writer */ template diff --git a/slsSupportLib/include/sls_detector_defs.h b/slsSupportLib/include/sls_detector_defs.h index 9f7f4a3c7..ef309509b 100755 --- a/slsSupportLib/include/sls_detector_defs.h +++ b/slsSupportLib/include/sls_detector_defs.h @@ -21,11 +21,6 @@ #include "ansi.h" -typedef double double32_t; -typedef float float32_t; -typedef int int32_t; - - /** default ports */ #define DEFAULT_PORTNO 1952 #define DEFAULT_UDP_PORTNO 50001