Changeset 12054 for trunk

Timestamp:

09/09/11 10:10:28 (13 years ago)

Author:

tbretz

Message:

Removed a global namespace definition from the header file.

Location:

trunk/FACT++/gui

Files:

• QCameraWidget.cc (modified) (1 diff)
• QCameraWidget.h (modified) (2 diffs)

trunk/FACT++/gui/QCameraWidget.cc

@@ -2 +2 @@
 #include <sstream>
 #include <iostream>
+
+using namespace std;
 
     QCameraWidget::QCameraWidget(QWidget *pparent) : BasicGlCamera(pparent)

trunk/FACT++/gui/QCameraWidget.h

@@ -6 +6 @@
 #include <set>
 
-
-using namespace std;
-
 class QCameraWidget : public BasicGlCamera
 {
     Q_OBJECT
 
-    typedef pair<double, double> Position;
-    typedef vector<Position> Positions;
+    typedef std::pair<double, double> Position;
+    typedef std::vector<Position> Positions;
 
     //FIXME this variable seems to be deprecated
     Positions fGeom;
 
-    vector<bool> fBold;
-    vector<bool> fEnable;
+    std::vector<bool> fBold;
+    std::vector<bool> fEnable;
 
-    vector<int> highlightedPatches;
-    vector<int> highlightedPixels;
+    std::vector<int> highlightedPatches;
+    std::vector<int> highlightedPixels;
 
 
@@ -50 +47 @@
      char *GetObjectInfo(int px, int py);
 
-     void SetData(const valarray<double> &ddata);
-     void SetData(const valarray<float> &ddata);
+     void SetData(const std::valarray<double> &ddata);
+     void SetData(const std::valarray<float> &ddata);