This commit is contained in:
DavidXanatos 2022-05-28 15:20:17 +02:00
parent 6426c5b920
commit 74bcbc6c7a
3 changed files with 4 additions and 4 deletions

View File

@ -59,9 +59,9 @@ SB_STATUS CSbieIni::SetBool(const QString& Setting, bool Value)
return SetText(Setting, Value ? "y" : "n"); return SetText(Setting, Value ? "y" : "n");
} }
QString CSbieIni::GetText(const QString& Setting, const QString& Default, bool bWithGlobal) const QString CSbieIni::GetText(const QString& Setting, const QString& Default, bool bWithGlobal, bool bNoExpand) const
{ {
int flags = (bWithGlobal ? 0 : CONF_GET_NO_GLOBAL) | CONF_GET_NO_EXPAND; int flags = (bWithGlobal ? 0 : CONF_GET_NO_GLOBAL) | (bNoExpand ? CONF_GET_NO_EXPAND : 0);
QString Value = m_pAPI->SbieIniGet(m_Name, Setting, flags); QString Value = m_pAPI->SbieIniGet(m_Name, Setting, flags);
if (Value.isNull()) Value = Default; if (Value.isNull()) Value = Default;
return Value; return Value;

View File

@ -20,7 +20,7 @@ public:
virtual SB_STATUS SetNum64(const QString& Setting, __int64 Value); virtual SB_STATUS SetNum64(const QString& Setting, __int64 Value);
virtual SB_STATUS SetBool(const QString& Setting, bool Value); virtual SB_STATUS SetBool(const QString& Setting, bool Value);
virtual QString GetText(const QString& Setting, const QString& Default = QString(), bool bWithGlobal = false) const; virtual QString GetText(const QString& Setting, const QString& Default = QString(), bool bWithGlobal = false, bool bNoExpand = true) const;
virtual int GetNum(const QString& Setting, int Default = 0, bool bWithGlobal = false) const; virtual int GetNum(const QString& Setting, int Default = 0, bool bWithGlobal = false) const;
virtual __int64 GetNum64(const QString& Setting, __int64 Default = 0, bool bWithGlobal = false) const; virtual __int64 GetNum64(const QString& Setting, __int64 Default = 0, bool bWithGlobal = false) const;
virtual bool GetBool(const QString& Setting, bool Default = false, bool bWithGlobal = false) const; virtual bool GetBool(const QString& Setting, bool Default = false, bool bWithGlobal = false) const;

View File

@ -329,7 +329,7 @@ bool CSbieTemplates::CheckTemplate(const QString& Name)
{ {
QSharedPointer<CSbieIni> pTemplate = QSharedPointer<CSbieIni>(new CSbieIni("Template_" + Name, m_pAPI)); QSharedPointer<CSbieIni> pTemplate = QSharedPointer<CSbieIni>(new CSbieIni("Template_" + Name, m_pAPI));
QString scan = pTemplate->GetText("Tmpl.Scan"); QString scan = pTemplate->GetText("Tmpl.Scan", QString(), false, false);
BOOL scanIpc = (scan.indexOf(L'i') != -1); BOOL scanIpc = (scan.indexOf(L'i') != -1);
BOOL scanWin = (scan.indexOf(L'w') != -1); BOOL scanWin = (scan.indexOf(L'w') != -1);
BOOL scanSvc = (scan.indexOf(L's') != -1); BOOL scanSvc = (scan.indexOf(L's') != -1);