Renamed due to collision with new QGCComboBox

src/ui/designer/QGCToolWidget.cc

@@ -10,7 +10,7 @@
 #include <QStandardPaths>
 
 #include "QGCParamSlider.h"
-#include "QGCComboBox.h"
+#include "QGCToolWidgetComboBox.h"
 #include "QGCTextLabel.h"
 #include "QGCXYPlot.h"
 #include "QGCCommandButton.h"
@@ -230,7 +230,7 @@ void QGCToolWidget::setParameterValue(int uas, int component, QString parameterN
             QString checkparam = settingsMap.value(widgetName + "\\" + QString::number(j) + "\\" + "QGC_PARAM_COMBOBOX_PARAMID").toString();
             if (checkparam == parameterName)
             {
-                item = new QGCComboBox(this);
+                item = new QGCToolWidgetComboBox(this);
                 addToolWidget(item);
                 item->readSettings(widgetName + "\\" + QString::number(j) + "\\",settingsMap);
                 paramToItemMap[parameterName] = item;
@@ -274,7 +274,7 @@ void QGCToolWidget::loadSettings(QVariantMap& settings)
             }
             else if (type == "COMBO")
             {
-                item = new QGCComboBox(this);
+                item = new QGCToolWidgetComboBox(this);
                 //qDebug() << "CREATED COMBOBOX";
             }
             else if (type == "XYPLOT")
@@ -330,7 +330,7 @@ void QGCToolWidget::loadSettings(QSettings& settings)
             }
             else if (type == "COMBO")
             {
-                item = new QGCComboBox(this);
+                item = new QGCToolWidgetComboBox(this);
                 item->setActiveUAS(mav);
                 qDebug() << "CREATED PARAM COMBOBOX";
             }

src/ui/designer/QGCComboBox.cc → src/ui/designer/QGCToolWidgetComboBox.cc

@@ -5,13 +5,13 @@
 #include <QToolTip>
 #include <QDebug>
 
-#include "QGCComboBox.h"
-#include "ui_QGCComboBox.h"
+#include "QGCToolWidgetComboBox.h"
+#include "ui_QGCToolWidgetComboBox.h"
 #include "UASInterface.h"
 #include "UASManager.h"
 
 
-QGCComboBox::QGCComboBox(QWidget *parent) :
+QGCToolWidgetComboBox::QGCToolWidgetComboBox(QWidget *parent) :
     QGCToolWidgetItem("Combo", parent),
     parameterName(""),
     parameterValue(0.0f),
@@ -19,7 +19,7 @@ QGCComboBox::QGCComboBox(QWidget *parent) :
     parameterMin(0.0f),
     parameterMax(0.0f),
     componentId(0),
-    ui(new Ui::QGCComboBox)
+    ui(new Ui::QGCToolWidgetComboBox)
 {
     ui->setupUi(this);
     uas = NULL;
@@ -64,12 +64,12 @@ QGCComboBox::QGCComboBox(QWidget *parent) :
     init();
 }
 
-QGCComboBox::~QGCComboBox()
+QGCToolWidgetComboBox::~QGCToolWidgetComboBox()
 {
     delete ui;
 }
 
-void QGCComboBox::showTooltip()
+void QGCToolWidgetComboBox::showTooltip()
 {
     QWidget* sender = dynamic_cast<QWidget*>(QObject::sender());
 
@@ -80,7 +80,7 @@ void QGCComboBox::showTooltip()
     }
 }
 
-void QGCComboBox::refreshParameter()
+void QGCToolWidgetComboBox::refreshParameter()
 {
     ui->editSelectParamComboBox->setEnabled(true);
     ui->editSelectComponentComboBox->setEnabled(true);
@@ -90,7 +90,7 @@ void QGCComboBox::refreshParameter()
     }
 }
 
-void QGCComboBox::setActiveUAS(UASInterface* activeUas)
+void QGCToolWidgetComboBox::setActiveUAS(UASInterface* activeUas)
 {
     if (activeUas)
     {
@@ -119,7 +119,7 @@ void QGCComboBox::setActiveUAS(UASInterface* activeUas)
     }
 }
 
-void QGCComboBox::requestParameter()
+void QGCToolWidgetComboBox::requestParameter()
 {
     if (!parameterName.isEmpty() && uas)
     {
@@ -127,18 +127,18 @@ void QGCComboBox::requestParameter()
     }
 }
 
-void QGCComboBox::showInfo(bool enable)
+void QGCToolWidgetComboBox::showInfo(bool enable)
 {
     ui->editInfoCheckBox->setChecked(enable);
     ui->infoLabel->setVisible(enable);
 }
 
-void QGCComboBox::selectComponent(int componentIndex)
+void QGCToolWidgetComboBox::selectComponent(int componentIndex)
 {
     this->componentId = ui->editSelectComponentComboBox->itemData(componentIndex).toInt();
 }
 
-void QGCComboBox::selectParameter(int paramIndex)
+void QGCToolWidgetComboBox::selectParameter(int paramIndex)
 {
     // Set name
     parameterName = ui->editSelectParamComboBox->itemText(paramIndex);
@@ -165,7 +165,7 @@ void QGCComboBox::selectParameter(int paramIndex)
     }
 }
 
-void QGCComboBox::setEditMode(bool editMode)
+void QGCToolWidgetComboBox::setEditMode(bool editMode)
 {
     if(!editMode) {
         // Store component id
@@ -203,7 +203,7 @@ void QGCComboBox::setEditMode(bool editMode)
     QGCToolWidgetItem::setEditMode(editMode);
 }
 
-void QGCComboBox::setParamPending()
+void QGCToolWidgetComboBox::setParamPending()
 {
     if (uas)  {
         uas->getParamManager()->setPendingParam(componentId, parameterName, parameterValue);
@@ -220,7 +220,7 @@ void QGCComboBox::setParamPending()
  * @brief parameterName Key/name of the parameter
  * @brief value Value of the parameter
  */
-void QGCComboBox::setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, QVariant value)
+void QGCToolWidgetComboBox::setParameterValue(int uas, int component, int paramCount, int paramIndex, QString parameterName, QVariant value)
 {
     Q_UNUSED(paramCount);
     // Check if this component and parameter are part of the list
@@ -301,7 +301,7 @@ void QGCComboBox::setParameterValue(int uas, int component, int paramCount, int
     }
 }
 
-void QGCComboBox::changeEvent(QEvent *e)
+void QGCToolWidgetComboBox::changeEvent(QEvent *e)
 {
     QWidget::changeEvent(e);
     switch (e->type()) {
@@ -314,7 +314,7 @@ void QGCComboBox::changeEvent(QEvent *e)
 }
 
 
-void QGCComboBox::writeSettings(QSettings& settings)
+void QGCToolWidgetComboBox::writeSettings(QSettings& settings)
 {
     settings.setValue("TYPE", "COMBOBOX");
     settings.setValue("QGC_PARAM_COMBOBOX_DESCRIPTION", ui->nameLabel->text());
@@ -331,7 +331,7 @@ void QGCComboBox::writeSettings(QSettings& settings)
     }
     settings.sync();
 }
-void QGCComboBox::readSettings(const QString& pre,const QVariantMap& settings)
+void QGCToolWidgetComboBox::readSettings(const QString& pre,const QVariantMap& settings)
 {
     parameterName = settings.value(pre + "QGC_PARAM_COMBOBOX_PARAMID").toString();
     componentId = settings.value(pre + "QGC_PARAM_COMBOBOX_COMPONENTID").toInt();
@@ -370,7 +370,7 @@ void QGCComboBox::readSettings(const QString& pre,const QVariantMap& settings)
     // Get param value after settings have been loaded
    // requestParameter();
 }
-void QGCComboBox::readSettings(const QSettings& settings)
+void QGCToolWidgetComboBox::readSettings(const QSettings& settings)
 {
     QVariantMap map;
     foreach (QString key,settings.allKeys())
@@ -410,19 +410,19 @@ void QGCComboBox::readSettings(const QSettings& settings)
     // Get param value after settings have been loaded
     //requestParameter();
 }
-void QGCComboBox::addButtonClicked()
+void QGCToolWidgetComboBox::addButtonClicked()
 {
     ui->editOptionComboBox->addItem(ui->editItemNameLabel->text());
     comboBoxTextToValMap[ui->editItemNameLabel->text()] = ui->editItemValueSpinBox->value();
 }
 
-void QGCComboBox::delButtonClicked()
+void QGCToolWidgetComboBox::delButtonClicked()
 {
     int index = ui->editOptionComboBox->currentIndex();
     comboBoxTextToValMap.remove(ui->editOptionComboBox->currentText());
     ui->editOptionComboBox->removeItem(index);
 }
-void QGCComboBox::comboBoxIndexChanged(QString val)
+void QGCToolWidgetComboBox::comboBoxIndexChanged(QString val)
 {
     ui->imageLabel->setPixmap(comboBoxIndexToPixmap[ui->editOptionComboBox->currentIndex()]);
     if (comboBoxTextToParamMap.contains(ui->editOptionComboBox->currentText()))

src/ui/designer/QGCComboBox.h → src/ui/designer/QGCToolWidgetComboBox.h

-#ifndef QGCCOMBOBOX_H
-#define QGCCOMBOBOX_H
+#ifndef QGCToolWidgetComboBox_H
+#define QGCToolWidgetComboBox_H
 
 #include <QWidget>
 #include <QAction>
@@ -11,16 +11,16 @@ class QGCUASParamManagerInterface;
 
 namespace Ui
 {
-class QGCComboBox;
+class QGCToolWidgetComboBox;
 }
 
-class QGCComboBox : public QGCToolWidgetItem
+class QGCToolWidgetComboBox : public QGCToolWidgetItem
 {
     Q_OBJECT
 
 public:
-    explicit QGCComboBox(QWidget *parent = 0);
-    ~QGCComboBox();
+    explicit QGCToolWidgetComboBox(QWidget *parent = 0);
+    ~QGCToolWidgetComboBox();
 
     virtual void setEditMode(bool editMode);
 
@@ -70,7 +70,7 @@ protected:
     void changeEvent(QEvent *e);
 
 private:
-    Ui::QGCComboBox *ui;
+    Ui::QGCToolWidgetComboBox *ui;
 };
 
-#endif // QGCCOMBOBOX_H
+#endif // QGCToolWidgetComboBox_H

src/ui/designer/QGCComboBox.ui → src/ui/designer/QGCToolWidgetComboBox.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QGCComboBox</class>
- <widget class="QWidget" name="QGCComboBox">
+ <class>QGCToolWidgetComboBox</class>
+ <widget class="QWidget" name="QGCToolWidgetComboBox">
   <property name="geometry">
    <rect>
     <x>0</x>