mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-05-18 05:03:45 +03:00
Code

Fixed warnings

Browse Source
This commit is contained in:
Константин Макаренков 2025-04-18 10:47:42 +03:00
parent c7e4028637
commit 90cdcb86ea
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
limereport/items/lrtextitem.cpp
View File

@ -365,15 +365,15 @@ void TextItem::updateLayout()
bool TextItem::isNeedExpandContent() const bool TextItem::isNeedExpandContent() const
{ {
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx("$*\\{[^{]*\\}");
#else
bool result = false; bool result = false;
QRegularExpression rx("\\$*\\{[^{]*\\}"); const QString pattern = "\\$*\\{[^{]*\\}";
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
QRegExp rx(pattern);
#else
QRegularExpression rx(pattern);
#endif
result = content().contains(rx) || isContentBackedUp(); result = content().contains(rx) || isContentBackedUp();
return result; return result;
#endif
return content().contains(rx) || isContentBackedUp();
} }
QString TextItem::replaceBR(QString text) const { return text.replace("<br/>", "\n"); } QString TextItem::replaceBR(QString text) const { return text.replace("<br/>", "\n"); }

1
limereport/lrdatasourcemanager.cpp
View File

@ -489,7 +489,6 @@ QString DataSourceManager::replaceVariables(QString value)
} }
return value; return value;
#endif #endif
return QString();
} }
QString DataSourceManager::replaceVariables(QString query, QMap<QString, QString>& aliasesToParam) QString DataSourceManager::replaceVariables(QString query, QMap<QString, QString>& aliasesToParam)