kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Add isNullOrEmpty string helper

Browse Source 
This adds isNullOrEmpty string helper that cheks if string is... well
null or empty. It is done to improve readability of the code and better
express intent.
This commit is contained in:
Kacper Donat
2025-02-20 17:47:06 +01:00
parent 8c8179feb9
commit cc2efa90f8
47 changed files with 113 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/Command.cpp
View File

@@ -1422,7 +1422,7 @@ Action * PythonCommand::createAction()
const char* PythonCommand::getWhatsThis() const
{
const char* whatsthis = getResource("WhatsThis");
if (!whatsthis || whatsthis[0] == '\0')
if (Base::Tools::isNullOrEmpty(whatsthis))
whatsthis = this->getName();
return whatsthis;
}
@@ -1445,7 +1445,7 @@ const char* PythonCommand::getStatusTip() const
const char* PythonCommand::getPixmap() const
{
const char* ret = getResource("Pixmap");
return (ret && ret[0] != '\0') ? ret : nullptr;
return !Base::Tools::isNullOrEmpty(ret) ? ret : nullptr;
}
const char* PythonCommand::getAccel() const
@@ -1740,7 +1740,7 @@ const char* PythonGroupCommand::getResource(const char* sName) const
const char* PythonGroupCommand::getWhatsThis() const
{
const char* whatsthis = getResource("WhatsThis");
if (!whatsthis || whatsthis[0] == '\0')
if (Base::Tools::isNullOrEmpty(whatsthis))
whatsthis = this->getName();
return whatsthis;
}
@@ -1763,7 +1763,7 @@ const char* PythonGroupCommand::getStatusTip() const
const char* PythonGroupCommand::getPixmap() const
{
const char* ret = getResource("Pixmap");
return (ret && ret[0] != '\0') ? ret : nullptr;
return !Base::Tools::isNullOrEmpty(ret) ? ret : nullptr;
}
const char* PythonGroupCommand::getAccel() const
@@ -1988,7 +1988,7 @@ void CommandManager::updateCommands(const char* sContext, int mode)
const Command* Gui::CommandManager::checkAcceleratorForConflicts(const char* accel, const Command* ignore) const
{
if (!accel || accel[0] == '\0')
if (Base::Tools::isNullOrEmpty(accel))
return nullptr;
QString newCombo = QString::fromLatin1(accel);
@@ -2004,7 +2004,7 @@ const Command* Gui::CommandManager::checkAcceleratorForConflicts(const char* acc
if (cmd == ignore)
continue;
auto existingAccel = cmd->getAccel();
if (!existingAccel || existingAccel[0] == '\0')
if (Base::Tools::isNullOrEmpty(existingAccel))
continue;
// Three possible conflict scenarios: