Ref T689 Settings validation can produce more descriptive error messages.

This commit is contained in:
Mat Sutcliffe
2019-06-23 17:08:45 +01:00
parent 6f9f6ccc9d
commit 668a77d083
16 changed files with 34 additions and 21 deletions

View File

@@ -52,7 +52,7 @@ namespace BlackMisc
static const char *key() { return "mapping/modelconverterxbin"; }
//! \copydoc BlackMisc::TSettingTrait::isValid
static bool isValid(const QString &value)
static bool isValid(const QString &value, QString &)
{
if (value.isEmpty()) { return true; }
const QFile f(value);

View File

@@ -36,8 +36,8 @@ namespace BlackMisc
//! \copydoc BlackMisc::TSettingTrait::defaultValue
static QString defaultValue() { return "tcp:host=127.0.0.1,port=45003"; }
//! \copydoc BlackMisc::TSettingTrait::defaultValue
static bool isValid(const QString &dBusAddress) { return BlackMisc::CDBusServer::isSessionOrSystemAddress(dBusAddress) || BlackMisc::CDBusServer::isQtDBusAddress(dBusAddress); }
//! \copydoc BlackMisc::TSettingTrait::isValid
static bool isValid(const QString &dBusAddress, QString &) { return BlackMisc::CDBusServer::isSessionOrSystemAddress(dBusAddress) || BlackMisc::CDBusServer::isQtDBusAddress(dBusAddress); }
};
} // ns
} // ns

View File

@@ -97,7 +97,7 @@ namespace BlackMisc
static const QString &humanReadable() { static const QString name("swift plugin"); return name; }
//! \copydoc BlackMisc::TSettingTrait::isValid
static bool isValid(const CSwiftPluginSettings &value) { return value.getEmulatedSimulator().isSingleSimulator(); }
static bool isValid(const CSwiftPluginSettings &value, QString &) { return value.getEmulatedSimulator().isSingleSimulator(); }
};
} // ns
} // ns

View File

@@ -35,8 +35,8 @@ namespace BlackMisc
//! \copydoc BlackMisc::TSettingTrait::defaultValue
static QString defaultValue() { return "tcp:host=127.0.0.1,port=45001"; }
//! \copydoc BlackMisc::TSettingTrait::defaultValue
static bool isValid(const QString &dBusAddress) { return BlackMisc::CDBusServer::isSessionOrSystemAddress(dBusAddress) || BlackMisc::CDBusServer::isQtDBusAddress(dBusAddress); }
//! \copydoc BlackMisc::TSettingTrait::isValid
static bool isValid(const QString &dBusAddress, QString &) { return BlackMisc::CDBusServer::isSessionOrSystemAddress(dBusAddress) || BlackMisc::CDBusServer::isQtDBusAddress(dBusAddress); }
};
} // ns
} // ns