From 0ba41583fb4bfd14c1d46113d737fb2e214d3fe1 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sat, 6 Jan 2018 14:49:09 +0100 Subject: [PATCH] SF Bug #109 Revoked.png isn't a valid image It was unused and did not harm. No functional/optical impact. Delete image and all ist references --- img/Makefile | 2 +- img/imgres.rcc | 1 - img/revoked.png | Bin 5198 -> 0 bytes lib/pki_x509.cpp | 4 ++-- lib/pki_x509.h | 2 +- widgets/MainWindow.cpp | 3 +-- 6 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 img/revoked.png diff --git a/img/Makefile b/img/Makefile index 0d116a10..98b5270e 100644 --- a/img/Makefile +++ b/img/Makefile @@ -19,7 +19,7 @@ imgres.cpp: imgres.rcc @$(PRINT) " RCC [$(BASENAME)] $@" $(RCC) -o $@ $< -imgres.rcc: bigcert.png bigcrl.png bigcsr.png bigkey.png bigtemp.png crl.png halfkey.png invalidcertkey.png invalidcert.png key.png netscape.png reqkey.png req.png revoked.png spki.png template.png validcertkey.png validcert.png scard.png +imgres.rcc: bigcert.png bigcrl.png bigcsr.png bigkey.png bigtemp.png crl.png halfkey.png invalidcertkey.png invalidcert.png key.png netscape.png reqkey.png req.png spki.png template.png validcertkey.png validcert.png scard.png w32res.o: w32res.rc key.ico xca.ico xdb.ico @$(PRINT) " WINDRES $@" diff --git a/img/imgres.rcc b/img/imgres.rcc index 3e0af8dd..1e5cbaf5 100644 --- a/img/imgres.rcc +++ b/img/imgres.rcc @@ -16,7 +16,6 @@ netscape.png reqkey.png req.png - revoked.png spki.png template.png validcertkey.png diff --git a/img/revoked.png b/img/revoked.png deleted file mode 100644 index c4edd35c907383cac484006d95a6e72c2d678a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5198 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 CHKB(9 diff --git a/lib/pki_x509.cpp b/lib/pki_x509.cpp index ccf8c687..403713a1 100644 --- a/lib/pki_x509.cpp +++ b/lib/pki_x509.cpp @@ -23,7 +23,7 @@ bool pki_x509::dont_colorize_expiries = false; bool pki_x509::disable_netscape = false; -QPixmap *pki_x509::icon[6] = { NULL, NULL, NULL, NULL, NULL, NULL }; +QPixmap *pki_x509::icon[5]; pki_x509::pki_x509(X509 *c) :pki_x509super() @@ -949,7 +949,7 @@ QVariant pki_x509::getIcon(dbheader *hd) return QVariant(); if (!ca) return QVariant(); - pixnum = 5; + pixnum = 4; break; case HD_internal_name: k = getRefKey(); diff --git a/lib/pki_x509.h b/lib/pki_x509.h index eaa899a5..5ad0b050 100644 --- a/lib/pki_x509.h +++ b/lib/pki_x509.h @@ -42,7 +42,7 @@ class pki_x509 : public pki_x509super int sigAlg(); public: - static QPixmap *icon[6]; + static QPixmap *icon[5]; static bool dont_colorize_expiries; static bool disable_netscape; x509revList revList; diff --git a/widgets/MainWindow.cpp b/widgets/MainWindow.cpp index 89ba7103..c068c58b 100644 --- a/widgets/MainWindow.cpp +++ b/widgets/MainWindow.cpp @@ -264,8 +264,7 @@ void MainWindow::init_images() pki_x509::icon[1] = loadImg("validcertkey.png"); pki_x509::icon[2] = loadImg("invalidcert.png"); pki_x509::icon[3] = loadImg("invalidcertkey.png"); - pki_x509::icon[4] = loadImg("revoked.png"); - pki_x509::icon[5] = doneIco; + pki_x509::icon[4] = doneIco; pki_temp::icon = loadImg("template.png"); pki_crl::icon = loadImg("crl.png"); }