smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: remove unused Config methods removeScreen removeScreens removeAllScreens removeOption removeOptions

Browse source
This commit is contained in:
sithlord48 2026-06-23 16:22:45 -04:00 committed by Nick Bolton
parent a45e81fb15
commit f66dbf69f3
2 changed files with 0 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
src/lib/server/Config.cpp
View file

@ -54,89 +54,6 @@ bool Config::addScreen(const std::string &name)
return true; return true;
} }
bool Config::renameScreen(const std::string &oldName, const std::string &newName)
{
// get canonical name and find cell
std::string oldCanonical = getCanonicalName(oldName);
CellMap::iterator index = m_map.find(oldCanonical);
if (index == m_map.end()) {
return false;
}
// accept if names are equal but replace with new name to maintain
// case. otherwise, the new name must not exist.
if (!CaselessCmp::equal(oldName, newName) && m_nameToCanonicalName.contains(newName)) {
return false;
}
// update cell
Cell tmpCell = index->second;
m_map.erase(index);
m_map.try_emplace(newName, tmpCell);
// update name
m_nameToCanonicalName.erase(oldCanonical);
m_nameToCanonicalName.try_emplace(newName, newName);
// update connections
Name oldNameObj(this, oldName);
for (index = m_map.begin(); index != m_map.end(); ++index) {
index->second.rename(oldNameObj, newName);
}
// update alias targets
if (CaselessCmp::equal(oldName, oldCanonical)) {
for (auto iter = m_nameToCanonicalName.begin(); iter != m_nameToCanonicalName.end(); ++iter) {
if (CaselessCmp::equal(iter->second, oldCanonical)) {
iter->second = newName;
}
}
}
// Update Settings
const auto aliasList = Settings::value(Settings::Screen::Aliases.arg(QString::fromStdString(oldName))).toStringList();
if (aliasList.isEmpty())
return true;
Settings::setValue(Settings::Screen::Aliases.arg(QString::fromStdString(oldName)), QVariant());
Settings::setValue(Settings::Screen::Aliases.arg(QString::fromStdString(newName)), aliasList);
return true;
}
void Config::removeScreen(const std::string &name)
{
// get canonical name and find cell
std::string canonical = getCanonicalName(name);
CellMap::iterator index = m_map.find(canonical);
if (index == m_map.end()) {
return;
}
// remove from map
m_map.erase(index);
// disconnect
Name nameObj(this, name);
for (index = m_map.begin(); index != m_map.end(); ++index) {
index->second.remove(nameObj);
}
Settings::setValue(Settings::Screen::Aliases.arg(QString::fromStdString(name)), QVariant());
// remove aliases (and canonical name)
for (auto iter = m_nameToCanonicalName.begin(); iter != m_nameToCanonicalName.end();) {
if (iter->second == canonical) {
m_nameToCanonicalName.erase(iter++);
} else {
++iter;
}
}
}
void Config::removeAllScreens()
{
m_map.clear();
m_nameToCanonicalName.clear();
}
bool Config::addAlias(const std::string &canonical, const std::string &alias) bool Config::addAlias(const std::string &canonical, const std::string &alias)
{ {
// alias name must not exist // alias name must not exist
@ -232,48 +149,6 @@ bool Config::addOption(const std::string &name, OptionID option, OptionValue val
return true; return true;
} }
bool Config::removeOption(const std::string &name, OptionID option)
{
// find options
ScreenOptions *options = nullptr;
if (name.empty()) {
options = &m_globalOptions;
} else {
CellMap::iterator index = m_map.find(name);
if (index != m_map.end()) {
options = &index->second.m_options;
}
}
if (options == nullptr) {
return false;
}
// remove option
options->erase(option);
return true;
}
bool Config::removeOptions(const std::string &name)
{
// find options
ScreenOptions *options = nullptr;
if (name.empty()) {
options = &m_globalOptions;
} else {
CellMap::iterator index = m_map.find(name);
if (index != m_map.end()) {
options = &index->second.m_options;
}
}
if (options == nullptr) {
return false;
}
// remove options
options->clear();
return true;
}
bool Config::isValidScreenName(const std::string &name) const bool Config::isValidScreenName(const std::string &name) const
{ {
// name is valid if matches validname // name is valid if matches validname

36
src/lib/server/Config.h
View file

@ -205,27 +205,6 @@ public:
*/ */
bool addScreen(const std::string &name); bool addScreen(const std::string &name);
//! Rename screen
/*!
Renames a screen. All references to the name are updated.
Returns true iff successful.
*/
bool renameScreen(const std::string &oldName, const std::string &newName);
//! Remove screen
/*!
Removes a screen. This also removes aliases for the screen and
disconnects any connections to the screen. \c name may be an
alias.
*/
void removeScreen(const std::string &name);
//! Remove all screens
/*!
Removes all screens, aliases, and connections.
*/
void removeAllScreens();
//! Add alias //! Add alias
/*! /*!
Adds an alias for a screen name. An alias can be used Adds an alias for a screen name. An alias can be used
@ -286,21 +265,6 @@ public:
*/ */
bool addOption(const std::string &name, OptionID option, OptionValue value); bool addOption(const std::string &name, OptionID option, OptionValue value);
//! Remove a screen option
/*!
Removes an option and its value from the named screen. Does
nothing if the option doesn't exist on the screen. Returns true
iff \c name is a known screen.
*/
bool removeOption(const std::string &name, OptionID option);
//! Remove a screen options
/*!
Removes all options and values from the named screen. Returns true
iff \c name is a known screen.
*/
bool removeOptions(const std::string &name);
//! Get the hot key input filter //! Get the hot key input filter
/*! /*!
Returns the hot key input filter. Clients can modify hotkeys using Returns the hot key input filter. Clients can modify hotkeys using