Added QT_NO_KEYWORDS definition to avoid conflicts between boost and qt macros

guilib/include/rtabmap/gui/CalibrationDialog.h

@@ -70,7 +70,7 @@ public:
 
 	StereoCameraModel stereoCalibration(const CameraModel & left, const CameraModel & right, bool ignoreStereoRectification) const;
 
-public slots:
+public Q_SLOTS:
 	void setBoardWidth(int width);
 	void setBoardHeight(int height);
 	void setSquareSize(double size);
@@ -81,7 +81,7 @@ public slots:
 	void restart();
 	bool save();
 
-private slots:
+private Q_SLOTS:
 	void unlock();
 
 protected:

guilib/include/rtabmap/gui/CameraViewer.h

@@ -53,7 +53,7 @@ public:
 		const ParametersMap & parameters = ParametersMap());
 	virtual ~CameraViewer();
 
-public slots:
+public Q_SLOTS:
 	void showImage(const rtabmap::SensorData & data);
 protected:
 	virtual bool handleEvent(UEvent * event);

guilib/include/rtabmap/gui/CloudViewer.h

@@ -357,7 +357,7 @@ public:
 	void buildPickingLocator(bool enable);
 	const std::map<std::string, vtkSmartPointer<vtkOBBTree> > & getLocators() const {return _locators;}
 
-public slots:
+public Q_SLOTS:
 	void setDefaultBackgroundColor(const QColor & color);
 	void setBackgroundColor(const QColor & color);
 	void setCloudVisibility(const std::string & id, bool isVisible);
@@ -366,7 +366,7 @@ public slots:
 	void setCloudPointSize(const std::string & id, int size);
 	virtual void clear();
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 
 protected:

guilib/include/rtabmap/gui/ConsoleWidget.h

@@ -50,13 +50,13 @@ public:
 	ConsoleWidget(QWidget * parent = 0);
 	virtual ~ConsoleWidget();
 
-public slots:
+public Q_SLOTS:
 	void appendMsg(const QString & msg, int level = 1);
 
-signals:
+Q_SIGNALS:
 	void msgReceived(const QString &, int);
 
-private slots:
+private Q_SLOTS:
 	void flushConsole();
 	void updateTextEditBufferSize();
 

guilib/include/rtabmap/gui/CreateSimpleCalibrationDialog.h

@@ -52,7 +52,7 @@ public:
 	void setCameraInfoDir(const QString & folder) {savingFolder_ = folder;}
 	const QString & cameraName() const {return cameraName_;}
 
-private slots:
+private Q_SLOTS:
 	void updateStereoView();
 	void updateSaveStatus();
 	void saveCalibration();

guilib/include/rtabmap/gui/DataRecorder.h

@@ -56,7 +56,7 @@ public:
 
 	const QString & path() const {return path_;}
 
-public slots:
+public Q_SLOTS:
 	void addData(const rtabmap::SensorData & data, const Transform & pose = Transform(), const cv::Mat & infMatrix = cv::Mat::eye(6,6,CV_64FC1));
 	void showImage(const cv::Mat & image, const cv::Mat & depth);
 protected:

guilib/include/rtabmap/gui/DatabaseViewer.h

@@ -80,7 +80,7 @@ protected:
 	virtual void closeEvent(QCloseEvent* event);
 	virtual bool eventFilter(QObject *obj, QEvent *event);
 
-private slots:
+private Q_SLOTS:
 	void writeSettings();
 	void restoreDefaultSettings();
 	void configModified();

guilib/include/rtabmap/gui/DepthCalibrationDialog.h

@@ -62,13 +62,13 @@ public:
 			const QString & workingDirectory,
 			const ParametersMap & parameters);
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 
-public slots:
+public Q_SLOTS:
 	void restoreDefaults();
 
-private slots:
+private Q_SLOTS:
 	void saveModel();
 	void cancel();
 

guilib/include/rtabmap/gui/EditDepthArea.h

@@ -55,7 +55,7 @@ public:
     void setPenWidth(int newWidth);
     int penWidth() const { return myPenWidth_; }
 
-public slots:
+public Q_SLOTS:
     void resetChanges();
 
 protected:

guilib/include/rtabmap/gui/ExportBundlerDialog.h

@@ -57,10 +57,10 @@ public:
 	double maxAngularSpeed() const;
 	double laplacianThreshold() const;
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 
-private slots:
+private Q_SLOTS:
 	void getPath();
 	void restoreDefaults();
 

guilib/include/rtabmap/gui/ExportCloudsDialog.h

@@ -116,13 +116,13 @@ public:
 
 	static bool removeDirRecursively(const QString & dirName);
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 
-public slots:
+public Q_SLOTS:
 	void restoreDefaults();
 
-private slots:
+private Q_SLOTS:
 	void loadSettings();
 	void saveSettings();
 	void updateReconstructionFlavor();

guilib/include/rtabmap/gui/ExportDialog.h

@@ -59,10 +59,10 @@ public:
 	bool isOdomExported() const;
 	bool isUserDataExported() const;
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 
-private slots:
+private Q_SLOTS:
 	void getPath();
 	void restoreDefaults();
 

guilib/include/rtabmap/gui/GraphViewer.h

@@ -145,11 +145,11 @@ public:
 	void setGPSGraphVisible(bool visible);
 	void setOrientationENU(bool enabled);
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 	void mapShownRequested();
 
-public slots:
+public Q_SLOTS:
 	void restoreDefaults();
 
 protected:

guilib/include/rtabmap/gui/ImageView.h

@@ -98,7 +98,7 @@ public:
 
 	virtual QSize sizeHint() const;
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 
 protected:
@@ -106,7 +106,7 @@ protected:
 	virtual void resizeEvent(QResizeEvent* event);
 	virtual void contextMenuEvent(QContextMenuEvent * e);
 
-private slots:
+private Q_SLOTS:
 	void sceneRectChanged(const QRectF &rect);
 
 private:

guilib/include/rtabmap/gui/LoopClosureViewer.h

@@ -53,7 +53,7 @@ public:
 	const Signature & sA() const {return sA_;}
 	const Signature & sB() const {return sB_;}
 
-public slots:
+public Q_SLOTS:
 	void setDecimation(int decimation) {decimation_ = decimation;}
 	void setMaxDepth(int maxDepth) {maxDepth_ = maxDepth;}
 	void setMinDepth(int minDepth) {minDepth_ = minDepth;}

guilib/include/rtabmap/gui/MainWindow.h

@@ -109,7 +109,7 @@ public:
 
 	bool isDatabaseUpdated() const { return _databaseUpdated; }
 
-public slots:
+public Q_SLOTS:
 	virtual void processStats(const rtabmap::Statistics & stat);
 	void updateCacheFromDatabase(const QString & path);
 	void openDatabase(const QString & path);
@@ -124,7 +124,7 @@ protected:
 	virtual void keyPressEvent(QKeyEvent *event);
 	virtual bool eventFilter(QObject *obj, QEvent *event);
 
-protected slots:
+protected Q_SLOTS:
 	virtual void changeState(MainWindow::State state);
 	virtual void newDatabase();
 	virtual void openDatabase();
@@ -144,7 +144,7 @@ protected slots:
 	virtual void triggerNewMap();
 	virtual void deleteMemory();
 
-protected slots:
+protected Q_SLOTS:
 	void beep();
 	void cancelProgress();
 	void configGUIModified();
@@ -220,7 +220,7 @@ protected slots:
 	void updateNodeVisibility(int, bool);
 	void updateGraphView();
 
-signals:
+Q_SIGNALS:
 	void statsReceived(const rtabmap::Statistics &);
 	void statsProcessed();
 	void cameraInfoReceived(const rtabmap::CameraInfo &);

guilib/include/rtabmap/gui/MapVisibilityWidget.h

@@ -50,14 +50,14 @@ public:
 protected:
 	virtual void showEvent(QShowEvent * event);
 
-private slots:
+private Q_SLOTS:
 	void signalVisibility();
 	void selectAll(bool);
 
 private:
 	void updateCheckBoxes();
 
-signals:
+Q_SIGNALS:
 	void visibilityChanged(int id, bool visible);
 
 private:

guilib/include/rtabmap/gui/OdometryViewer.h

@@ -60,13 +60,13 @@ public:
 		const ParametersMap & parameters = ParametersMap());
 	virtual ~OdometryViewer();
 
-public slots:
+public Q_SLOTS:
 	virtual void clear();
 
 protected:
 	virtual bool handleEvent(UEvent * event);
 
-private slots:
+private Q_SLOTS:
 	void reset();
 	void processData(const rtabmap::OdometryEvent & odom);
 

guilib/include/rtabmap/gui/PostProcessingDialog.h

@@ -76,13 +76,13 @@ public:
 	void setSBAVariance(double variance);
 	void setSBAType(Optimizer::Type type);
 
-signals:
+Q_SIGNALS:
 	void configChanged();
 
-public slots:
+public Q_SLOTS:
 	void restoreDefaults();
 
-private slots:
+private Q_SLOTS:
 	void updateVisibility();
 	void updateButtonBox();
 

guilib/include/rtabmap/gui/PreferencesDialog.h

@@ -277,11 +277,11 @@ public:
 	//
 	void setMonitoringState(bool monitoringState) {_monitoringState = monitoringState;}
 
-signals:
+Q_SIGNALS:
 	void settingsChanged(PreferencesDialog::PANEL_FLAGS);
 	void settingsChanged(rtabmap::ParametersMap);
 
-public slots:
+public Q_SLOTS:
 	void setInputRate(double value);
 	void setDetectionRate(double value);
 	void setTimeLimit(float value);
@@ -290,7 +290,7 @@ public slots:
 	void calibrate();
 	void calibrateSimple();
 
-private slots:
+private Q_SLOTS:
 	void closeDialog ( QAbstractButton * button );
 	void resetApply ( QAbstractButton * button );
 	void resetSettings(int panelNumber);

guilib/include/rtabmap/gui/ProgressDialog.h

@@ -56,19 +56,19 @@ public:
 	void setCancelButtonVisible(bool visible);
 	bool isCanceled() const {return _canceled;}
 
-signals:
+Q_SIGNALS:
 	void canceled();
 
 protected:
 	virtual void closeEvent(QCloseEvent * event);
 
-public slots:
+public Q_SLOTS:
 	void appendText(const QString & text ,const QColor & color = Qt::black);
 	void incrementStep(int steps = 1);
 	void clear();
 	void resetProgress();
 
-private slots:
+private Q_SLOTS:
 	void closeDialog();
 	void cancel();
 

guilib/include/rtabmap/gui/RecoveryState.h

@@ -87,7 +87,7 @@ public:
 		return false;
 	}
 
-public slots:
+public Q_SLOTS:
 	void cancel()
 	{
 		setCanceled(true);

guilib/include/rtabmap/gui/StatsToolBox.h

@@ -57,16 +57,16 @@ public:
 	void setCacheOn(bool on);
 	void clearCache();
 
-public slots:
+public Q_SLOTS:
 	void updateMenu(const QMenu * menu);
 
-signals:
+Q_SIGNALS:
 	void valueAdded(float);
 	void valueAdded(float, float);
 	void valuesChanged(const std::vector<float> &, const std::vector<float> &);
 	void plotRequested(const StatItem *, const QString &);
 
-private slots:
+private Q_SLOTS:
 	void preparePlotRequest();
 
 private:
@@ -102,18 +102,18 @@ public:
 	void closeFigures();
 	void setCacheOn(bool on);
 
-public slots:
+public Q_SLOTS:
 	void updateStat(const QString & statFullName, bool cacheOn);
 	void updateStat(const QString & statFullName, float y, bool cacheOn);
 	void updateStat(const QString & statFullName, float x, float y, bool cacheOn);
 	void updateStat(const QString & statFullName, const std::vector<float> & x, const std::vector<float> & y, bool cacheOn);
 	void clear();
 
-signals:
+Q_SIGNALS:
 	void menuChanged(const QMenu *);
 	void figuresSetupChanged();
 
-private slots:
+private Q_SLOTS:
 	void plot(const StatItem * stat, const QString & plotName = QString());
 	void figureDeleted(QObject * obj);
 

guilib/include/rtabmap/gui/TexturingState.h

@@ -64,7 +64,7 @@ public:
 		return false;
 	}
 
-public slots:
+public Q_SLOTS:
 	void cancel()
 	{
 		setCanceled(true);

guilib/include/rtabmap/utilite/UImageView.h

@@ -21,7 +21,7 @@ public:
 	~UImageView() {}
 	void setBackgroundBrush(const QBrush & brush) {brush_ = brush;}
 
-public slots:
+public Q_SLOTS:
 	void setImage(const QImage & image)
 	{
 		pixmap_ = QPixmap::fromImage(image);

guilib/include/rtabmap/utilite/UPlot.h

@@ -143,7 +143,7 @@ public:
 	void getData(QMap<float,float> & data) const; // only call in Qt MainThread
 	void draw(QPainter * painter, const QRect & limits);
 
-public slots:
+public Q_SLOTS:
 	/**
 	 *
 	 * Clear curve's values.
@@ -218,7 +218,7 @@ public slots:
 	void setData(const QVector<float> & y);
 	void setData(const std::vector<float> & y);
 
-signals:
+Q_SIGNALS:
 	/**
 	 *
 	 *  emitted when data is changed.
@@ -269,7 +269,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.
 	 */
@@ -354,12 +354,12 @@ public:
 	const UPlotCurve * curve() const {return _curve;}
 	QPixmap createSymbol(const QPen & pen, const QBrush & brush);
 
-signals:
+Q_SIGNALS:
 	void legendItemRemoved(const UPlotCurve *);
 	void moveUpRequest(UPlotLegendItem *);
 	void moveDownRequest(UPlotLegendItem *);
 
-private slots:
+private Q_SLOTS:
 	void updateStdDev();
 
 protected:
@@ -397,12 +397,12 @@ public:
 	void addItem(UPlotCurve * curve);
 	bool remove(const UPlotCurve * curve);
 
-private slots:
+private Q_SLOTS:
 	void removeLegendItem(const UPlotCurve * curve);
 	void moveUp(UPlotLegendItem * item);
 	void moveDown(UPlotLegendItem * item);
 
-signals:
+Q_SIGNALS:
 	void legendItemRemoved(const UPlotCurve * curve);
 	void legendItemToggled(const UPlotCurve * curve, bool toggled);
 	void legendItemMoved(const UPlotCurve * curve, int);
@@ -410,7 +410,7 @@ signals:
 protected:
 	virtual void contextMenuEvent(QContextMenuEvent * event);
 
-private slots:
+private Q_SLOTS:
 	void redirectToggled(bool);
 
 private:
@@ -531,7 +531,7 @@ public:
 	void setBackgroundColor(const QColor & color);
 	QRectF sceneRect() const;
 
-public slots:
+public Q_SLOTS:
 	/**
 	 *
 	 * Remove a curve. If UPlot is the parent of the curve, the curve is deleted.
@@ -545,7 +545,7 @@ public slots:
 	 */
 	void clearData();
 
-private slots:
+private Q_SLOTS:
 	void captureScreen();
 	void updateAxis(const UPlotCurve * curve);
 	void moveCurve(const UPlotCurve *, int index);