refactor: anonymous enum in ServerConfig => ServerConfig::AddResults enum class
This commit is contained in:
committed by
Chris Rizzitello
parent
79b445373b
commit
9413393057
@ -1026,7 +1026,7 @@ void MainWindow::autoAddScreen(const QString &name)
|
||||
if (name.isEmpty())
|
||||
return;
|
||||
|
||||
if (m_serverConfig.autoAddScreen(name) == kAutoAddScreenManualClient) {
|
||||
if (m_serverConfig.autoAddScreen(name) == AutoAddScreenManualClient) {
|
||||
showConfigureServer(
|
||||
tr("Please add the client (%1) to the grid.").arg(Settings::value(Settings::Core::ScreenName).toString())
|
||||
);
|
||||
|
||||
@ -330,23 +330,23 @@ int ServerConfig::autoAddScreen(const QString name)
|
||||
int targetIndex = -1;
|
||||
const auto screenName = Settings::value(Settings::Core::ScreenName).toString();
|
||||
if (!findScreenName(screenName, serverIndex) && !fixNoServer(screenName, serverIndex)) {
|
||||
return kAutoAddScreenManualServer;
|
||||
return AutoAddScreenManualServer;
|
||||
}
|
||||
|
||||
if (findScreenName(name, targetIndex)) {
|
||||
qDebug("ignoring screen already in config: %s", qPrintable(name));
|
||||
return kAutoAddScreenIgnore;
|
||||
return AutoAddScreenIgnore;
|
||||
}
|
||||
|
||||
auto result = static_cast<AddAction>(showAddClientDialog(name));
|
||||
|
||||
if (result == AddClientIgnore) {
|
||||
return kAutoAddScreenIgnore;
|
||||
return AutoAddScreenIgnore;
|
||||
}
|
||||
|
||||
if (result == AddClientOther) {
|
||||
addToFirstEmptyGrid(name);
|
||||
return kAutoAddScreenManualClient;
|
||||
return AutoAddScreenManualClient;
|
||||
}
|
||||
|
||||
bool success = false;
|
||||
@ -379,10 +379,10 @@ int ServerConfig::autoAddScreen(const QString name)
|
||||
|
||||
if (!success) {
|
||||
addToFirstEmptyGrid(name);
|
||||
return kAutoAddScreenManualClient;
|
||||
return AutoAddScreenManualClient;
|
||||
}
|
||||
|
||||
return kAutoAddScreenOk;
|
||||
return AutoAddScreenOk;
|
||||
}
|
||||
|
||||
const QString ServerConfig::getServerName() const
|
||||
|
||||
@ -276,10 +276,10 @@ private:
|
||||
|
||||
QTextStream &operator<<(QTextStream &outStream, const ServerConfig &config);
|
||||
|
||||
enum
|
||||
enum AddResults
|
||||
{
|
||||
kAutoAddScreenOk,
|
||||
kAutoAddScreenManualServer,
|
||||
kAutoAddScreenManualClient,
|
||||
kAutoAddScreenIgnore
|
||||
AutoAddScreenOk,
|
||||
AutoAddScreenManualServer,
|
||||
AutoAddScreenManualClient,
|
||||
AutoAddScreenIgnore
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user