From cf0c940b15366301a7094e27d8e25e774419b112 Mon Sep 17 00:00:00 2001 From: Albert S Date: Fri, 24 Jun 2022 17:05:44 +0200 Subject: [PATCH] shared: Move SaveFileResult enum to own header --- shared/savefileresult.h | 30 ++++++++++++++++++++++++++++++ shared/shared.pro | 1 + shared/sqlitedbservice.h | 24 +----------------------- 3 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 shared/savefileresult.h diff --git a/shared/savefileresult.h b/shared/savefileresult.h new file mode 100644 index 0000000..e164db9 --- /dev/null +++ b/shared/savefileresult.h @@ -0,0 +1,30 @@ +#ifndef SAVEFILERESULT_H +#define SAVEFILERESULT_H + +#include + +enum SaveFileResult +{ + OK, + SKIPPED, + DBFAIL, + PROCESSFAIL, + NOTFOUND, + NOACCESS +}; + +static inline QString SaveFileResultToString(SaveFileResult sfr) +{ + QStringList SaveFileResultStr; + + SaveFileResultStr << "OK" + << "SKIPPED" + << "DBFAIL" + << "PROCESSFAIL" + << "NOTFOUND" + << "NOACCESS"; + + return SaveFileResultStr[(int)sfr]; +} + +#endif // SAVEFILERESULT_H diff --git a/shared/shared.pro b/shared/shared.pro index a1b6f07..cdd68e9 100644 --- a/shared/shared.pro +++ b/shared/shared.pro @@ -88,6 +88,7 @@ HEADERS += sqlitesearch.h \ pdfprocessor.h \ processor.h \ sandboxedprocessor.h \ + savefileresult.h \ searchresult.h \ sqlitedbservice.h \ tagstripperprocessor.h \ diff --git a/shared/sqlitedbservice.h b/shared/sqlitedbservice.h index ee0a69d..b5d0fb4 100644 --- a/shared/sqlitedbservice.h +++ b/shared/sqlitedbservice.h @@ -7,29 +7,7 @@ #include "filedata.h" #include "../shared/sqlitesearch.h" #include "../shared/token.h" -enum SaveFileResult -{ - OK, - SKIPPED, - DBFAIL, - PROCESSFAIL, - NOTFOUND, - NOACCESS -}; - -static inline QString SaveFileResultToString(SaveFileResult sfr) -{ - QStringList SaveFileResultStr; - - SaveFileResultStr << "OK" - << "SKIPPED" - << "DBFAIL" - << "PROCESSFAIL" - << "NOTFOUND" - << "NOACCESS"; - - return SaveFileResultStr[(int)sfr]; -} +#include "savefileresult.h" class SqliteDbService {