Clang-format (#3028)

* 1/3 Add .clang-format file and travis compilation check

* 2/3 Run clang-format

* 3/3 Fix compilation problems due to include reordering

* 3bis/3 AfterControlStatement: false
This commit is contained in:
ctrlaltca 2018-01-27 10:41:32 +01:00 committed by GitHub
parent 8dbdd24c8e
commit b29bd9e070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 13378 additions and 9535 deletions

View file

@ -1,12 +1,10 @@
#include "setsmodel.h"
SetsModel::SetsModel(CardDatabase *_db, QObject *parent)
: QAbstractTableModel(parent), sets(_db->getSetList())
SetsModel::SetsModel(CardDatabase *_db, QObject *parent) : QAbstractTableModel(parent), sets(_db->getSetList())
{
sets.sortByKey();
foreach(CardSet *set, sets)
{
if(set->getEnabled())
foreach (CardSet *set, sets) {
if (set->getEnabled())
enabledSets.insert(set);
}
}
@ -30,17 +28,15 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
CardSet *set = sets[index.row()];
if (index.column() == EnabledCol)
{
switch(role)
{
if (index.column() == EnabledCol) {
switch (role) {
case SortRole:
return enabledSets.contains(set) ? "1" : "0";
return enabledSets.contains(set) ? "1" : "0";
case Qt::CheckStateRole:
return static_cast< int >( enabledSets.contains(set) ? Qt::Checked : Qt::Unchecked );
return static_cast<int>(enabledSets.contains(set) ? Qt::Checked : Qt::Unchecked);
case Qt::DisplayRole:
default:
return QVariant();
return QVariant();
}
}
@ -48,20 +44,26 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
return QVariant();
switch (index.column()) {
case SortKeyCol: return QString("%1").arg(set->getSortKey(), 8, 10, QChar('0'));
case IsKnownCol: return set->getIsKnown();
case SetTypeCol: return set->getSetType();
case ShortNameCol: return set->getShortName();
case LongNameCol: return set->getLongName();
case ReleaseDateCol: return set->getReleaseDate().toString(Qt::ISODate);
default: return QVariant();
case SortKeyCol:
return QString("%1").arg(set->getSortKey(), 8, 10, QChar('0'));
case IsKnownCol:
return set->getIsKnown();
case SetTypeCol:
return set->getSetType();
case ShortNameCol:
return set->getShortName();
case LongNameCol:
return set->getLongName();
case ReleaseDateCol:
return set->getReleaseDate().toString(Qt::ISODate);
default:
return QVariant();
}
}
bool SetsModel::setData(const QModelIndex & index, const QVariant & value, int role)
bool SetsModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (role == Qt::CheckStateRole && index.column () == EnabledCol)
{
if (role == Qt::CheckStateRole && index.column() == EnabledCol) {
toggleRow(index.row(), value == Qt::Checked);
return true;
}
@ -73,14 +75,23 @@ QVariant SetsModel::headerData(int section, Qt::Orientation orientation, int rol
if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal))
return QVariant();
switch (section) {
case SortKeyCol: return QString("Key"); /* no tr() for translations needed, column just used for sorting --> hidden */
case IsKnownCol: return QString("Is known"); /* no tr() for translations needed, column is just used for sorting --> hidden */
case EnabledCol: return tr("Enabled");
case SetTypeCol: return tr("Set type");
case ShortNameCol: return tr("Set code");
case LongNameCol: return tr("Long name");
case ReleaseDateCol: return tr("Release date");
default: return QVariant();
case SortKeyCol:
return QString("Key"); /* no tr() for translations needed, column just used for sorting --> hidden */
case IsKnownCol:
return QString(
"Is known"); /* no tr() for translations needed, column is just used for sorting --> hidden */
case EnabledCol:
return tr("Enabled");
case SetTypeCol:
return tr("Set type");
case ShortNameCol:
return tr("Set code");
case LongNameCol:
return tr("Long name");
case ReleaseDateCol:
return tr("Release date");
default:
return QVariant();
}
}
@ -89,11 +100,9 @@ Qt::ItemFlags SetsModel::flags(const QModelIndex &index) const
if (!index.isValid())
return 0;
Qt::ItemFlags flags = QAbstractTableModel::flags(index) |
Qt::ItemIsDragEnabled |
Qt::ItemIsDropEnabled;
Qt::ItemFlags flags = QAbstractTableModel::flags(index) | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
if ( index.column() == EnabledCol)
if (index.column() == EnabledCol)
flags |= Qt::ItemIsUserCheckable;
return flags;
@ -113,7 +122,11 @@ QMimeData *SetsModel::mimeData(const QModelIndexList &indexes) const
return qobject_cast<QMimeData *>(result);
}
bool SetsModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int /*column*/, const QModelIndex &parent)
bool SetsModel::dropMimeData(const QMimeData *data,
Qt::DropAction action,
int row,
int /*column*/,
const QModelIndex &parent)
{
if (action != Qt::MoveAction)
return false;
@ -163,7 +176,7 @@ void SetsModel::toggleAll(bool enabled)
enabledSets.clear();
if (enabled)
foreach(CardSet *set, sets)
foreach (CardSet *set, sets)
enabledSets.insert(set);
emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
@ -188,18 +201,17 @@ void SetsModel::sort(int column, Qt::SortOrder order)
int numRows = rowCount();
int row;
for(row = 0; row < numRows; ++row)
for (row = 0; row < numRows; ++row)
setMap.insertMulti(index(row, column).data(SetsModel::SortRole).toString(), sets.at(row));
QList<CardSet *> tmp = setMap.values();
sets.clear();
if(order == Qt::AscendingOrder)
{
for(row = 0; row < tmp.size(); row++) {
if (order == Qt::AscendingOrder) {
for (row = 0; row < tmp.size(); row++) {
sets.append(tmp.at(row));
}
} else {
for(row = tmp.size() - 1; row >= 0; row--) {
for (row = tmp.size() - 1; row >= 0; row--) {
sets.append(tmp.at(row));
}
}
@ -211,10 +223,10 @@ void SetsModel::save(CardDatabase *db)
{
// order
for (int i = 0; i < sets.size(); i++)
sets[i]->setSortKey(i+1);
sets[i]->setSortKey(i + 1);
// enabled sets
foreach(CardSet *set, sets)
foreach (CardSet *set, sets)
set->setEnabled(enabledSets.contains(set));
sets.sortByKey();
@ -230,9 +242,8 @@ void SetsModel::restore(CardDatabase *db)
// enabled sets
enabledSets.clear();
foreach(CardSet *set, sets)
{
if(set->getEnabled())
foreach (CardSet *set, sets) {
if (set->getEnabled())
enabledSets.insert(set);
}