From 487f5e20462deebf8d794c08071f9043a874ceb6 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Mon, 17 May 2021 19:02:03 +0200 Subject: [PATCH] Cleanup: Drop many superflous includes and unused loadImg() function --- lib/db_base.h | 4 ---- lib/func.cpp | 13 ------------- lib/func.h | 1 - widgets/MainWindow.h | 1 + 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/lib/db_base.h b/lib/db_base.h index 97208545..e79a5e18 100644 --- a/lib/db_base.h +++ b/lib/db_base.h @@ -15,9 +15,6 @@ #include "pki_base.h" #include "headerlist.h" -#include -#include -#include #include #include #include @@ -75,7 +72,6 @@ class db_base: public QAbstractItemModel virtual void remFromCont(const QModelIndex &idx); void changeView(); - QPixmap *loadImg(const char *name); void dump(const QString &dirname) const; QModelIndex index(int row, int column, const QModelIndex &parent)const; QModelIndex index(pki_base *pki)const; diff --git a/lib/func.cpp b/lib/func.cpp index 311f92ec..4352649c 100644 --- a/lib/func.cpp +++ b/lib/func.cpp @@ -29,15 +29,7 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include #include -#include #if defined(Q_OS_WIN32) #include @@ -99,11 +91,6 @@ Passwd readPass() return pw; } -QPixmap *loadImg(const char *name ) -{ - return new QPixmap(QString(":") + name); -} - const QStringList getLibExtensions() { return QStringList { diff --git a/lib/func.h b/lib/func.h index 8a8fd463..256a9536 100644 --- a/lib/func.h +++ b/lib/func.h @@ -42,7 +42,6 @@ typedef struct evp_md_st EVP_MD; int console_write(FILE *fp, const QByteArray &ba); Passwd readPass(); -QPixmap *loadImg(const char *name); int portable_app(); const QString getHomeDir(); const QString getLibDir(); diff --git a/widgets/MainWindow.h b/widgets/MainWindow.h index 1e777d86..aaba52be 100644 --- a/widgets/MainWindow.h +++ b/widgets/MainWindow.h @@ -21,6 +21,7 @@ #include #include #include +#include class db_x509; class pki_multi;