Update file(s): 2024-08-12

horsicq · Aug 12, 2024 · aab2eed · aab2eed
1 parent 1df5409
commit aab2eed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/SearchValues/searchvalueswidget.cpp b/SearchValues/searchvalueswidget.cpp
@@ -210,6 +210,7 @@ void SearchValuesWidget::_search(DialogSearch::SEARCHMODE mode)
         XBinary::SEARCHDATA searchData;
 
         DialogSearch dialogSearch(this, getDevice(), &searchData, mode, options);
+        dialogSearch.setGlobal(getShortcuts(), getGlobalOptions());
 
         XOptions::_adjustStayOnTop(&dialogSearch, true);
 

diff --git a/formatwidget.cpp b/formatwidget.cpp
@@ -1659,7 +1659,7 @@ void FormatWidget::_deleteSubdevices(SubDevice **ppSubdevices, qint32 nCount)
     }
 }
 
-XComboBoxEx *FormatWidget::createComboBox(QTableWidget *pTableWidget, QMap<quint64, QString> mapData, qint32 nType, int nData, XComboBoxEx::CBTYPE cbtype, quint64 nMask,
+XComboBoxEx *FormatWidget::createComboBox(QTableWidget *pTableWidget, QMap<quint64, QString> mapData, qint32 nType, qint32 nData, XComboBoxEx::CBTYPE cbtype, quint64 nMask,
                                           int nExtraData)
 {
     XComboBoxEx *result = new XComboBoxEx(this);

diff --git a/formatwidget.h b/formatwidget.h
@@ -136,7 +136,7 @@ class FormatWidget : public XShortcutsWidget {
     void _deleteObjects(QObject **ppObjects, qint32 nCount);
     void _deleteSubdevices(SubDevice **ppSubdevices, qint32 nCount);
 
-    XComboBoxEx *createComboBox(QTableWidget *pTableWidget, QMap<quint64, QString> mapData, qint32 nType, int nData, XComboBoxEx::CBTYPE cbtype, quint64 nMask = 0,
+    XComboBoxEx *createComboBox(QTableWidget *pTableWidget, QMap<quint64, QString> mapData, qint32 nType, qint32 nData, XComboBoxEx::CBTYPE cbtype, quint64 nMask = 0,
                                 int nExtraData = -1);
     InvWidget *createInvWidget(QTableWidget *pTableWidget, qint32 nType, qint32 nData, InvWidget::TYPE widgetType);
     XDateTimeEditX *createTimeDateEdit(QTableWidget *pTableWidget, qint32 nType, qint32 nData);