Change the code so they may be auto merged
This commit is contained in:
parent
427890b014
commit
73297802f0
|
@ -83,13 +83,13 @@ public slots:
|
||||||
void openSourceSlot();
|
void openSourceSlot();
|
||||||
void decompileSelectionSlot();
|
void decompileSelectionSlot();
|
||||||
void decompileFunctionSlot();
|
void decompileFunctionSlot();
|
||||||
void displayWarningSlot(QString title, QString text);
|
|
||||||
void labelHelpSlot();
|
|
||||||
void editSoftBpActionSlot();
|
|
||||||
void ActionTraceRecordBitSlot();
|
void ActionTraceRecordBitSlot();
|
||||||
void ActionTraceRecordByteSlot();
|
void ActionTraceRecordByteSlot();
|
||||||
void ActionTraceRecordWordSlot();
|
void ActionTraceRecordWordSlot();
|
||||||
void ActionTraceRecordDisableSlot();
|
void ActionTraceRecordDisableSlot();
|
||||||
|
void displayWarningSlot(QString title, QString text);
|
||||||
|
void labelHelpSlot();
|
||||||
|
void editSoftBpActionSlot();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void paintEvent(QPaintEvent* event);
|
void paintEvent(QPaintEvent* event);
|
||||||
|
|
Loading…
Reference in New Issue