equal
deleted
inserted
replaced
58 QLabel * conflictLabel; |
58 QLabel * conflictLabel; |
59 QIcon * dropDownIcon; |
59 QIcon * dropDownIcon; |
60 QIcon * conflictIcon; |
60 QIcon * conflictIcon; |
61 QString defaultText; |
61 QString defaultText; |
62 bool enableSignal; |
62 bool enableSignal; |
|
63 QList<QTableWidgetItem*> conflictItems; |
63 bool p_hasConflicts; |
64 bool p_hasConflicts; |
64 |
65 |
65 signals: |
66 signals: |
66 void bindUpdate(int bindID); |
67 void bindUpdate(int bindID); |
67 void resetAllBinds(); |
68 void resetAllBinds(); |