Browse Source

Fixed a couple of compilation warnings and removed some blank lines/dead code from QGCTextLabel.cc

QGC4.4
Bryant 12 years ago
parent
commit
3be737b10f
  1. 12
      src/ui/designer/QGCTextLabel.cc

12
src/ui/designer/QGCTextLabel.cc

@ -33,8 +33,6 @@ QGCTextLabel::~QGCTextLabel()
delete ui; delete ui;
} }
void QGCTextLabel::startEditMode() void QGCTextLabel::startEditMode()
{ {
// Hide elements // Hide elements
@ -122,14 +120,14 @@ void QGCTextLabel::readSettings(const QString& pre,const QVariantMap& settings)
//int commandId = settings.value(pre + "QGC_COMMAND_BUTTON_COMMANDID", 0).toInt(); //int commandId = settings.value(pre + "QGC_COMMAND_BUTTON_COMMANDID", 0).toInt();
//ui->editNameLabel->setText(settings.value(pre + "QGC_COMMAND_BUTTON_DESCRIPTION", "ERROR LOADING BUTTON").toString()); //ui->editNameLabel->setText(settings.value(pre + "QGC_COMMAND_BUTTON_DESCRIPTION", "ERROR LOADING BUTTON").toString());
//ui->nameLabel->setText(settings.value(pre + "QGC_COMMAND_BUTTON_DESCRIPTION", "ERROR LOADING BUTTON").toString()); //ui->nameLabel->setText(settings.value(pre + "QGC_COMMAND_BUTTON_DESCRIPTION", "ERROR LOADING BUTTON").toString());
} }
void QGCTextLabel::textMessageReceived(int uasid, int component, int severity, QString message) void QGCTextLabel::textMessageReceived(int uasid, int component, int severity, QString message)
{ {
Q_UNUSED(uasid);
Q_UNUSED(component);
Q_UNUSED(severity);
if (enabledNum != -1) if (enabledNum != -1)
{ {
//SUCCESS: Executed CMD: 241 //SUCCESS: Executed CMD: 241
@ -167,10 +165,6 @@ void QGCTextLabel::readSettings(const QSettings& settings)
ui->textLabel->setText(""); ui->textLabel->setText("");
connect(uas,SIGNAL(textMessageReceived(int,int,int,QString)),this,SLOT(textMessageReceived(int,int,int,QString))); connect(uas,SIGNAL(textMessageReceived(int,int,int,QString)),this,SLOT(textMessageReceived(int,int,int,QString)));
} }
else
{
}
} }
void QGCTextLabel::enableText(int num) void QGCTextLabel::enableText(int num)
{ {

Loading…
Cancel
Save