mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 01:20:25 +08:00
Added QT_NO_KEYWORDS definition to avoid conflicts between boost and qt macros
This commit is contained in:
4
guilib/src/3rdParty/QMultiComboBox.cpp
vendored
4
guilib/src/3rdParty/QMultiComboBox.cpp
vendored
@@ -192,7 +192,7 @@ void QMultiComboBox::setItemChecked(int row, bool checked)
|
||||
if (wasChecked != checked)
|
||||
{
|
||||
item->setCheckState(checked?Qt::Checked:Qt::Unchecked);
|
||||
emit itemChanged();
|
||||
Q_EMIT itemChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,7 +213,7 @@ void QMultiComboBox::scanItemSelect(QListWidgetItem* item)
|
||||
}
|
||||
list[i]->setSelected(false);
|
||||
}
|
||||
emit itemChanged();
|
||||
Q_EMIT itemChanged();
|
||||
}
|
||||
|
||||
void QMultiComboBox::initStyleOption(QStyleOptionComboBox *option) const
|
||||
|
||||
4
guilib/src/3rdParty/QMultiComboBox.h
vendored
4
guilib/src/3rdParty/QMultiComboBox.h
vendored
@@ -56,11 +56,11 @@ public:
|
||||
QVariant itemData(int row);
|
||||
void setItemChecked(int row, bool checked);
|
||||
|
||||
signals:
|
||||
Q_SIGNALS:
|
||||
/// item changed
|
||||
void itemChanged();
|
||||
|
||||
public slots:
|
||||
public Q_SLOTS:
|
||||
|
||||
/// react on changes of the item checkbox
|
||||
void scanItemSelect(QListWidgetItem* item);
|
||||
|
||||
Reference in New Issue
Block a user