Added QT_NO_KEYWORDS build compilation to avoid conflicts with boost signals used in the ROS package

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@347 620bd6b2-0a58-f614-fd9a-1bd335dccda9

src/utilite/UPlot.cpp

@@ -419,7 +419,7 @@ void UPlotCurve::addValue(UPlotItem * data)
 	if(data)
 	{
 		this->_addValue(data);
-		emit dataChanged(this);
+		Q_EMIT dataChanged(this);
 	}
 }
 
@@ -464,7 +464,7 @@ void UPlotCurve::addValues(QVector<UPlotItem *> & data)
 	{
 		this->_addValue(data.at(i));
 	}
-	emit dataChanged(this);
+	Q_EMIT dataChanged(this);
 }
 
 void UPlotCurve::addValues(const QVector<float> & xs, const QVector<float> & ys)
@@ -474,7 +474,7 @@ void UPlotCurve::addValues(const QVector<float> & xs, const QVector<float> & ys)
 	{
 		this->_addValue(new UPlotItem(xs.at(i),ys.at(i),width));
 	}
-	emit dataChanged(this);
+	Q_EMIT dataChanged(this);
 }
 
 void UPlotCurve::addValues(const QVector<float> & ys)
@@ -494,7 +494,7 @@ void UPlotCurve::addValues(const QVector<float> & ys)
 		}
 		this->_addValue(new UPlotItem(x,ys.at(i),width));
 	}
-	emit dataChanged(this);
+	Q_EMIT dataChanged(this);
 }
 
 void UPlotCurve::addValues(const QVector<int> & ys)
@@ -514,7 +514,7 @@ void UPlotCurve::addValues(const QVector<int> & ys)
 		}
 		this->_addValue(new UPlotItem(x,ys.at(i),width));
 	}
-	emit dataChanged(this);
+	Q_EMIT dataChanged(this);
 }
 
 void UPlotCurve::addValues(const std::vector<int> & ys)
@@ -534,7 +534,7 @@ void UPlotCurve::addValues(const std::vector<int> & ys)
 		}
 		this->_addValue(new UPlotItem(x,ys.at(i),width));
 	}
-	emit dataChanged(this);
+	Q_EMIT dataChanged(this);
 }
 
 void UPlotCurve::addValues(const std::vector<float> & ys)
@@ -554,7 +554,7 @@ void UPlotCurve::addValues(const std::vector<float> & ys)
 		}
 		this->_addValue(new UPlotItem(x,ys.at(i),width));
 	}
-	emit dataChanged(this);
+	Q_EMIT dataChanged(this);
 }
 
 int UPlotCurve::removeItem(int index)
@@ -846,7 +846,7 @@ void UPlotCurve::setData(const QVector<float> & x, const QVector<float> & y)
 
 		//reset minMax, this will force the plot to update the axes
 		this->updateMinMax();
-		emit dataChanged(this);
+		Q_EMIT dataChanged(this);
 	}
 	else
 	{
@@ -883,7 +883,7 @@ void UPlotCurve::setData(const std::vector<float> & x, const std::vector<float>
 
 		//reset minMax, this will force the plot to update the axes
 		this->updateMinMax();
-		emit dataChanged(this);
+		Q_EMIT dataChanged(this);
 	}
 	else
 	{
@@ -923,7 +923,7 @@ void UPlotCurve::setData(const std::vector<float> & y)
 
 	//reset minMax, this will force the plot to update the axes
 	this->updateMinMax();
-	emit dataChanged(this);
+	Q_EMIT dataChanged(this);
 }
 
 void UPlotCurve::getData(QVector<float> & x, QVector<float> & y) const
@@ -1309,7 +1309,7 @@ void UPlotLegendItem::contextMenuEvent(QContextMenuEvent * event)
 	}
 	else if(action == _aRemoveCurve)
 	{
-		emit legendItemRemoved(_curve);
+		Q_EMIT legendItemRemoved(_curve);
 	}
 	else if (action == _aCopyToClipboard)
 	{
@@ -1436,7 +1436,7 @@ void UPlotLegend::removeLegendItem(const UPlotCurve * curve)
 {
 	if(this->remove(curve))
 	{
-		emit legendItemRemoved(curve);
+		Q_EMIT legendItemRemoved(curve);
 	}
 }
 
@@ -1456,7 +1456,7 @@ void UPlotLegend::redirectToggled(bool toggled)
 		UPlotLegendItem * item = qobject_cast<UPlotLegendItem*>(sender());
 		if(item)
 		{
-			emit legendItemToggled(item->curve(), _flat?!toggled:toggled);
+			Q_EMIT legendItemToggled(item->curve(), _flat?!toggled:toggled);
 		}
 	}
 }

src/utilite/UPlot.h

@@ -142,7 +142,7 @@ public:
 	void getData(QVector<float> & x, QVector<float> & y) const; // only call in Qt MainThread
 	void draw(QPainter * painter);
 
-public slots:
+public Q_SLOTS:
 	/**
 	 *
 	 * Clear curve's values.
@@ -212,7 +212,7 @@ public slots:
 	void addValues(const std::vector<float> & ys); // for convenience
 	void addValues(const std::vector<int> & ys); // for convenience
 
-signals:
+Q_SIGNALS:
 	/**
 	 *
 	 *  emitted when data is changed.
@@ -261,7 +261,7 @@ public:
 	UPlotCurveThreshold(const QString & name, float thesholdValue, Qt::Orientation orientation = Qt::Horizontal, QObject * parent = 0);
 	virtual ~UPlotCurveThreshold();
 
-public slots:
+public Q_SLOTS:
 	/**
 	 * Set threshold value.
 	 */
@@ -345,7 +345,7 @@ public:
 	virtual ~UPlotLegendItem();
 	const UPlotCurve * curve() const {return _curve;}
 
-signals:
+Q_SIGNALS:
 	void legendItemRemoved(const UPlotCurve *);
 
 protected:
@@ -380,17 +380,17 @@ public:
 	QPixmap createSymbol(const QPen & pen, const QBrush & brush);
 	bool remove(const UPlotCurve * curve);
 
-public slots:
+public Q_SLOTS:
 	void removeLegendItem(const UPlotCurve * curve);
 
-signals:
+Q_SIGNALS:
 	void legendItemRemoved(const UPlotCurve * curve);
 	void legendItemToggled(const UPlotCurve * curve, bool toggled);
 
 protected:
 	virtual void contextMenuEvent(QContextMenuEvent * event);
 
-private slots:
+private Q_SLOTS:
 	void redirectToggled(bool);
 
 private:
@@ -508,7 +508,7 @@ public:
 	void setGraphicsView(bool on);
 	QRectF sceneRect() const;
 
-public slots:
+public Q_SLOTS:
 	/**
 	 *
 	 * Remove a curve. If UPlot is the parent of the curve, the curve is deleted.
@@ -522,7 +522,7 @@ public slots:
 	 */
 	void clearData();
 
-private slots:
+private Q_SLOTS:
 	void captureScreen();
 	void updateAxis(const UPlotCurve * curve);