mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Martin Kleusberg
2019-11-05 22:25:08 +01:00
parent ba1270cedb
commit ca682b2067
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CondFormat.cpp
View File

@@ -15,6 +15,8 @@ CondFormat::Alignment CondFormat::fromCombinedAlignment(Qt::Alignment align)
return AlignCenter;
if (align.testFlag(Qt::AlignJustify))
return AlignJustify;
return AlignLeft;
}
CondFormat::CondFormat(const QString& filter,
@@ -169,4 +171,6 @@ Qt::AlignmentFlag CondFormat::alignmentFlag() const
case AlignJustify:
return Qt::AlignJustify;
}
return Qt::AlignLeft;
}

2
src/Data.cpp
View File

@@ -56,6 +56,8 @@ bool containsRightToLeft(const QString& text) {
case QChar::DirRLO:
case QChar::DirRLI:
return true;
default:
break;
}
}
return false;

11
src/TableBrowser.cpp
View File

@@ -626,11 +626,11 @@ void TableBrowser::clearAllCondFormats(size_t column)
void TableBrowser::clearRowIdFormats(const QModelIndex index)
{
std::vector<CondFormat>& rowIdFormats = m_settings[currentlyBrowsedTableName()].rowIdFormats[index.column()];
std::vector<CondFormat>& rowIdFormats = m_settings[currentlyBrowsedTableName()].rowIdFormats[static_cast<size_t>(index.column())];
rowIdFormats.erase(std::remove_if(rowIdFormats.begin(), rowIdFormats.end(), [&](const CondFormat& format) {
return format.filter() == QString("=%1").arg(m_model->data(index.sibling(index.row(), 0)).toString());
}), rowIdFormats.end());
m_model->setCondFormats(true, index.column(), rowIdFormats);
m_model->setCondFormats(true, static_cast<size_t>(index.column()), rowIdFormats);
emit projectModified();
}
@@ -650,19 +650,20 @@ void TableBrowser::editCondFormats(size_t column)
}
void TableBrowser::modifySingleFormat(const bool isRowIdFormat, const QString& filter, const QModelIndex refIndex, std::function<void(CondFormat&)> changeFunction)
{
const size_t column = static_cast<size_t>(refIndex.column());
BrowseDataTableSettings& settings = m_settings[currentlyBrowsedTableName()];
std::vector<CondFormat>& formats = isRowIdFormat ? settings.rowIdFormats[refIndex.column()] : settings.condFormats[refIndex.column()];
std::vector<CondFormat>& formats = isRowIdFormat ? settings.rowIdFormats[column] : settings.condFormats[column];
auto it = std::find_if(formats.begin(), formats.end(), [&filter](const CondFormat& format) {
return format.filter() == filter;
});
if(it != formats.end()) {
changeFunction(*it);
m_model->addCondFormat(isRowIdFormat, refIndex.column(), *it);
m_model->addCondFormat(isRowIdFormat, column, *it);
} else {
// Create a new conditional format based on the current reference index and then modify it as requested using the passed function.
CondFormat newCondFormat(filter, m_model, refIndex, m_model->encoding());
changeFunction(newCondFormat);
addCondFormat(isRowIdFormat, refIndex.column(), newCondFormat);
addCondFormat(isRowIdFormat, column, newCondFormat);
}
}