From beea5599b57d10c268c0585a9469368150e5afa0 Mon Sep 17 00:00:00 2001
From: Bryant <bwmairs@ucsc.edu>
Date: Wed, 5 Feb 2014 11:46:04 -0800
Subject: [PATCH] Renamed XBEELINK macro to QGC_XBEE_ENABLED to be consistent.

---
 QGCExternalLibs.pri               |  5 +++--
 src/ui/CommConfigurationWindow.cc | 20 ++++++++++----------
 src/ui/CommConfigurationWindow.h  |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index a690060e4..cfc3685e1 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -319,11 +319,11 @@ LinuxBuild : contains(MAVLINK_DIALECT, pixhawk) {
 #
 contains(DEFINES, DISABLE_KINECT) {
 	message("Skipping support for the Kinect (manual override)")
+	DEFINES -= DISABLE_KINECT
 } else:MacBuild | LinuxBuild {
     exists(/opt/local/include/libfreenect) | exists(/usr/local/include/libfreenect) {
         message("Including support for the Kinect")
 
-        #INCLUDEPATH += /usr/include/libusb-1.0
         DEFINES += QGC_LIBFREENECT_ENABLED
         LIBS += -lfreenect
         HEADERS += src/input/Freenect.h
@@ -387,10 +387,11 @@ XBEE_DEPENDENT_SOURCES += \
 	src/comm/XbeeLink.cpp \
 	src/comm/HexSpinBox.cpp \
 	src/ui/XbeeConfigurationWindow.cpp
-XBEE_DEFINES = XBEELINK
+XBEE_DEFINES = QGC_XBEE_ENABLED
 
 contains(DEFINES, DISABLE_XBEE) {
 	message("Skipping support for native XBee API (manual override)")
+	DEFINES -= DISABLE_XBEE
 } else:LinuxBuild {
 	exists(/usr/include/xbee.h) {
 		message("Including support for XBee API")
diff --git a/src/ui/CommConfigurationWindow.cc b/src/ui/CommConfigurationWindow.cc
index 5da032356..af39c4b48 100644
--- a/src/ui/CommConfigurationWindow.cc
+++ b/src/ui/CommConfigurationWindow.cc
@@ -42,10 +42,10 @@ This file is part of the QGROUNDCONTROL project
 #include "UDPLink.h"
 #include "TCPLink.h"
 #include "MAVLinkSimulationLink.h"
-#ifdef XBEELINK
+#ifdef QGC_XBEE_ENABLED
 #include "XbeeLink.h"
 #include "XbeeConfigurationWindow.h"
-#endif // XBEELINK
+#endif // QGC_XBEE_ENABLED
 #ifdef OPAL_RT
 #include "OpalLink.h"
 #include "OpalLinkConfigurationWindow.h"
@@ -93,9 +93,9 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
 #ifdef OPAL_RT
     ui.linkType->addItem(tr("Opal-RT Link"), QGC_LINK_OPAL);
 #endif
-#ifdef XBEELINK
+#ifdef QGC_XBEE_ENABLED
 	ui.linkType->addItem(tr("Xbee API"),QGC_LINK_XBEE);
-#endif // XBEELINK
+#endif // QGC_XBEE_ENABLED
     ui.linkType->setEditable(false);
 
     ui.connectionType->addItem("MAVLink", QGC_PROTOCOL_MAVLINK);
@@ -175,7 +175,7 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
         ui.linkGroupBox->setTitle(tr("Opal-RT Link"));
     }
 #endif
-#ifdef XBEELINK
+#ifdef QGC_XBEE_ENABLED
 	XbeeLink* xbee = dynamic_cast<XbeeLink*>(link); // new Konrad
 	if(xbee != 0)
 	{
@@ -186,14 +186,14 @@ CommConfigurationWindow::CommConfigurationWindow(LinkInterface* link, ProtocolIn
 		connect(xbee,SIGNAL(tryConnectBegin(bool)),ui.actionConnect,SLOT(setDisabled(bool)));
 		connect(xbee,SIGNAL(tryConnectEnd(bool)),ui.actionConnect,SLOT(setEnabled(bool)));
 	}
-#endif // XBEELINK
+#endif // QGC_XBEE_ENABLED
     if (serial == 0 && udp == 0 && sim == 0 && tcp == 0
 #ifdef OPAL_RT
             && opal == 0
 #endif
-#ifdef XBEELINK
+#ifdef QGC_XBEE_ENABLED
 			&& xbee == 0
-#endif // XBEELINK
+#endif // QGC_XBEE_ENABLED
        ) {
         qDebug() << "Link is NOT a known link, can't open configuration window";
     }
@@ -249,7 +249,7 @@ void CommConfigurationWindow::setLinkType(qgc_link_t linktype)
 	LinkInterface *tmpLink(NULL);
 	switch(linktype)
 	{
-#ifdef XBEELINK
+#ifdef QGC_XBEE_ENABLED
         case QGC_LINK_XBEE:
 			{
 				XbeeLink *xbee = new XbeeLink();
@@ -257,7 +257,7 @@ void CommConfigurationWindow::setLinkType(qgc_link_t linktype)
 				MainWindow::instance()->addLink(tmpLink);
 				break;
 			}
-#endif // XBEELINK
+#endif // QGC_XBEE_ENABLED
         case QGC_LINK_UDP:
 			{
 				UDPLink *udp = new UDPLink();
diff --git a/src/ui/CommConfigurationWindow.h b/src/ui/CommConfigurationWindow.h
index 406331604..7b59c7dbb 100644
--- a/src/ui/CommConfigurationWindow.h
+++ b/src/ui/CommConfigurationWindow.h
@@ -45,8 +45,8 @@ enum qgc_link_t {
     QGC_LINK_TCP,
     QGC_LINK_SIMULATION,
     QGC_LINK_FORWARDING,
-#ifdef XBEELINK
-	QGC_LINK_XBEE,
+#ifdef QGC_XBEE_ENABLED
+    QGC_LINK_XBEE,
 #endif
 #ifdef OPAL_RT
     QGC_LINK_OPAL
-- 
2.22.0