From 9f342fe31c2fba9404acd7b7ad7b46cb1c9d8c37 Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Sat, 6 Jun 2020 17:09:26 +0200 Subject: [PATCH] GUI: delete some unused color settings --- src/gui/Src/BasicView/Disassembly.cpp | 8 -------- src/gui/Src/BasicView/Disassembly.h | 8 -------- src/gui/Src/Gui/AppearanceDialog.cpp | 4 ---- src/gui/Src/Utils/Configuration.cpp | 8 -------- 4 files changed, 28 deletions(-) diff --git a/src/gui/Src/BasicView/Disassembly.cpp b/src/gui/Src/BasicView/Disassembly.cpp index 73b5a03c..bc4475ec 100644 --- a/src/gui/Src/BasicView/Disassembly.cpp +++ b/src/gui/Src/BasicView/Disassembly.cpp @@ -98,14 +98,6 @@ void Disassembly::updateColors() mModifiedBytesBackgroundColor = ConfigColor("DisassemblyModifiedBytesBackgroundColor"); mRestoredBytesColor = ConfigColor("DisassemblyRestoredBytesColor"); mRestoredBytesBackgroundColor = ConfigColor("DisassemblyRestoredBytesBackgroundColor"); - mByte00Color = ConfigColor("DisassemblyByte00Color"); - mByte00BackgroundColor = ConfigColor("DisassemblyByte00BackgroundColor"); - mByte7FColor = ConfigColor("DisassemblyByte7FColor"); - mByte7FBackgroundColor = ConfigColor("DisassemblyByte7FBackgroundColor"); - mByteFFColor = ConfigColor("DisassemblyByteFFColor"); - mByteFFBackgroundColor = ConfigColor("DisassemblyByteFFBackgroundColor"); - mByteIsPrintColor = ConfigColor("DisassemblyByteIsPrintColor"); - mByteIsPrintBackgroundColor = ConfigColor("DisassemblyByteIsPrintBackgroundColor"); mAutoCommentColor = ConfigColor("DisassemblyAutoCommentColor"); mAutoCommentBackgroundColor = ConfigColor("DisassemblyAutoCommentBackgroundColor"); mMnemonicBriefColor = ConfigColor("DisassemblyMnemonicBriefColor"); diff --git a/src/gui/Src/BasicView/Disassembly.h b/src/gui/Src/BasicView/Disassembly.h index f51de17f..48d1c2e9 100644 --- a/src/gui/Src/BasicView/Disassembly.h +++ b/src/gui/Src/BasicView/Disassembly.h @@ -204,14 +204,6 @@ protected: QColor mModifiedBytesBackgroundColor; QColor mRestoredBytesColor; QColor mRestoredBytesBackgroundColor; - QColor mByte00Color; - QColor mByte00BackgroundColor; - QColor mByte7FColor; - QColor mByte7FBackgroundColor; - QColor mByteFFColor; - QColor mByteFFBackgroundColor; - QColor mByteIsPrintColor; - QColor mByteIsPrintBackgroundColor; QColor mAutoCommentColor; QColor mAutoCommentBackgroundColor; diff --git a/src/gui/Src/Gui/AppearanceDialog.cpp b/src/gui/Src/Gui/AppearanceDialog.cpp index b7341c14..d2f069b2 100644 --- a/src/gui/Src/Gui/AppearanceDialog.cpp +++ b/src/gui/Src/Gui/AppearanceDialog.cpp @@ -407,10 +407,6 @@ void AppearanceDialog::colorInfoListInit() colorInfoListAppend(tr("Bytes"), "DisassemblyBytesColor", "DisassemblyBytesBackgroundColor"); colorInfoListAppend(tr("Modified Bytes"), "DisassemblyModifiedBytesColor", "DisassemblyModifiedBytesBackgroundColor"); colorInfoListAppend(tr("Restored Bytes"), "DisassemblyRestoredBytesColor", "DisassemblyRestoredBytesBackgroundColor"); - colorInfoListAppend(tr("0x00 Bytes"), "DisassemblyByte00Color", "DisassemblyByte00BackgroundColor"); - colorInfoListAppend(tr("0x7F Bytes"), "DisassemblyByte7FColor", "DisassemblyByte7FBackgroundColor"); - colorInfoListAppend(tr("0xFF Bytes"), "DisassemblyByteFFColor", "DisassemblyByteFFBackgroundColor"); - colorInfoListAppend(tr("IsPrint Bytes"), "DisassemblyByteIsPrintColor", "DisassemblyByteIsPrintBackgroundColor"); colorInfoListAppend(tr("Relocation underline"), "DisassemblyRelocationUnderlineColor", ""); colorInfoListAppend(ArchValue(tr("EIP"), tr("RIP")), "DisassemblyCipColor", "DisassemblyCipBackgroundColor"); colorInfoListAppend(tr("Breakpoints"), "DisassemblyBreakpointColor", "DisassemblyBreakpointBackgroundColor"); diff --git a/src/gui/Src/Utils/Configuration.cpp b/src/gui/Src/Utils/Configuration.cpp index 9d6f2936..91cc451f 100644 --- a/src/gui/Src/Utils/Configuration.cpp +++ b/src/gui/Src/Utils/Configuration.cpp @@ -59,14 +59,6 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false) defaultColors.insert("DisassemblyModifiedBytesBackgroundColor", Qt::transparent); defaultColors.insert("DisassemblyRestoredBytesColor", QColor("#808080")); defaultColors.insert("DisassemblyRestoredBytesBackgroundColor", Qt::transparent); - defaultColors.insert("DisassemblyByte00Color", QColor("#008000")); - defaultColors.insert("DisassemblyByte00BackgroundColor", Qt::transparent); - defaultColors.insert("DisassemblyByte7FColor", QColor("#808000")); - defaultColors.insert("DisassemblyByte7FBackgroundColor", Qt::transparent); - defaultColors.insert("DisassemblyByteFFColor", QColor("#800000")); - defaultColors.insert("DisassemblyByteFFBackgroundColor", Qt::transparent); - defaultColors.insert("DisassemblyByteIsPrintColor", QColor("#800080")); - defaultColors.insert("DisassemblyByteIsPrintBackgroundColor", Qt::transparent); defaultColors.insert("DisassemblyRelocationUnderlineColor", QColor("#000000")); defaultColors.insert("DisassemblyCommentColor", QColor("#000000")); defaultColors.insert("DisassemblyCommentBackgroundColor", Qt::transparent);