mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small random whitespace cleanups

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-10-31 14:28:39 -07:00
parent 18b7a2778d
commit 8bdc9d1ec4
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
qt-ui/models.cpp
View file

@ -59,12 +59,14 @@ void CleanerTableModel::setHeaderDataStrings(const QStringList &newHeaders)
static QPixmap *trashIconPixmap; static QPixmap *trashIconPixmap;
// initialize the trash icon if necessary // initialize the trash icon if necessary
static void initTrashIcon() { static void initTrashIcon()
{
if (!trashIconPixmap) if (!trashIconPixmap)
trashIconPixmap = new QPixmap(QIcon(":trash").pixmap(defaultIconMetrics().sz_small)); trashIconPixmap = new QPixmap(QIcon(":trash").pixmap(defaultIconMetrics().sz_small));
} }
const QPixmap &trashIcon() { const QPixmap &trashIcon()
{
return *trashIconPixmap; return *trashIconPixmap;
} }
@ -72,8 +74,7 @@ CylindersModel::CylindersModel(QObject *parent) : rows(0)
{ {
// enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH}; // enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%") setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")
<< tr("Switch at") << tr("Switch at"));
);
initTrashIcon(); initTrashIcon();
} }
@ -1326,7 +1327,7 @@ QString DiveItem::displayDuration() const
{ {
int hrs, mins; int hrs, mins;
struct dive *dive = get_dive_by_uniq_id(diveId); struct dive *dive = get_dive_by_uniq_id(diveId);
mins = (dive->duration.seconds+59) / 60; mins = (dive->duration.seconds + 59) / 60;
hrs = mins / 60; hrs = mins / 60;
mins -= hrs * 60; mins -= hrs * 60;
@ -2354,7 +2355,6 @@ bool TagFilterModel::filterRow(int source_row, const QModelIndex &source_parent,
BuddyFilterModel::BuddyFilterModel(QObject *parent) : QStringListModel(parent), checkState(NULL) BuddyFilterModel::BuddyFilterModel(QObject *parent) : QStringListModel(parent), checkState(NULL)
{ {
} }
BuddyFilterModel *BuddyFilterModel::instance() BuddyFilterModel *BuddyFilterModel::instance()
@ -2397,8 +2397,8 @@ bool BuddyFilterModel::filterRow(int source_row, const QModelIndex &source_paren
QStringList buddyList = stringList(); QStringList buddyList = stringList();
if (!buddyList.isEmpty()) { if (!buddyList.isEmpty()) {
buddyList.removeLast(); // remove the "Show Empty Tags"; buddyList.removeLast(); // remove the "Show Empty Tags";
for(int i = 0; i < rowCount(); i++){ for (int i = 0; i < rowCount(); i++) {
if(checkState[i] && (diveBuddy.indexOf(stringList()[i]) != -1 || divemaster.indexOf(stringList()[i]) != -1 )){ if (checkState[i] && (diveBuddy.indexOf(stringList()[i]) != -1 || divemaster.indexOf(stringList()[i]) != -1)) {
return true; return true;
} }
} }
@ -2416,14 +2416,13 @@ void BuddyFilterModel::repopulate()
QStringList list; QStringList list;
struct dive *dive; struct dive *dive;
int i = 0; int i = 0;
for_each_dive (i, dive) for_each_dive (i, dive) {
{
QString buddy(dive->buddy); QString buddy(dive->buddy);
QString divemaster(dive->divemaster); QString divemaster(dive->divemaster);
if (!buddy.isEmpty() && !list.contains(buddy)) { if (!buddy.isEmpty() && !list.contains(buddy)) {
list.append(buddy); list.append(buddy);
} }
if(!divemaster.isEmpty() && !list.contains(divemaster)){ if (!divemaster.isEmpty() && !list.contains(divemaster)) {
list.append(divemaster); list.append(divemaster);
} }
} }
@ -2465,9 +2464,8 @@ bool BuddyFilterModel::setData(const QModelIndex &index, const QVariant &value,
return false; return false;
} }
LocationFilterModel::LocationFilterModel(QObject *parent): QStringListModel(parent), checkState(NULL) LocationFilterModel::LocationFilterModel(QObject *parent) : QStringListModel(parent), checkState(NULL)
{ {
} }
QVariant LocationFilterModel::data(const QModelIndex &index, int role) const QVariant LocationFilterModel::data(const QModelIndex &index, int role) const
@ -2514,8 +2512,8 @@ bool LocationFilterModel::filterRow(int source_row, const QModelIndex &source_pa
QStringList locationList = stringList(); QStringList locationList = stringList();
if (!locationList.isEmpty()) { if (!locationList.isEmpty()) {
locationList.removeLast(); // remove the "Show Empty Tags"; locationList.removeLast(); // remove the "Show Empty Tags";
for(int i = 0; i < rowCount(); i++){ for (int i = 0; i < rowCount(); i++) {
if(checkState[i] && (location.indexOf(stringList()[i]) != -1)){ if (checkState[i] && (location.indexOf(stringList()[i]) != -1)) {
return true; return true;
} }
} }
@ -2539,8 +2537,7 @@ void LocationFilterModel::repopulate()
QStringList list; QStringList list;
struct dive *dive; struct dive *dive;
int i = 0; int i = 0;
for_each_dive (i, dive) for_each_dive (i, dive) {
{
QString location(dive->location); QString location(dive->location);
if (!location.isEmpty() && !list.contains(location)) { if (!location.isEmpty() && !list.contains(location)) {
list.append(location); list.append(location);

4
qt-ui/simplewidgets.cpp
View file

@ -531,7 +531,7 @@ void LocationFilter::hideEvent(QHideEvent *event)
MultiFilterSortModel::instance()->removeFilterModel(LocationFilterModel::instance()); MultiFilterSortModel::instance()->removeFilterModel(LocationFilterModel::instance());
QWidget::hideEvent(event); QWidget::hideEvent(event);
} }
MultiFilter::MultiFilter(QWidget *parent): QScrollArea(parent) MultiFilter::MultiFilter(QWidget *parent) : QScrollArea(parent)
{ {
QWidget *w = new QWidget(); QWidget *w = new QWidget();
QHBoxLayout *l = new QHBoxLayout(); QHBoxLayout *l = new QHBoxLayout();
@ -540,7 +540,7 @@ MultiFilter::MultiFilter(QWidget *parent): QScrollArea(parent)
l->addWidget(new BuddyFilter()); l->addWidget(new BuddyFilter());
l->addWidget(new LocationFilter()); l->addWidget(new LocationFilter());
l->setContentsMargins(0,0,0,0); l->setContentsMargins(0, 0, 0, 0);
l->setSpacing(1); l->setSpacing(1);
w->setLayout(l); w->setLayout(l);
w->setMinimumSize(l->count() * 150, 200); w->setMinimumSize(l->count() * 150, 200);

3
qt-ui/simplewidgets.h
View file

@ -136,6 +136,7 @@ public:
TagFilter(QWidget *parent = 0); TagFilter(QWidget *parent = 0);
virtual void showEvent(QShowEvent *); virtual void showEvent(QShowEvent *);
virtual void hideEvent(QHideEvent *); virtual void hideEvent(QHideEvent *);
private: private:
Ui::FilterWidget ui; Ui::FilterWidget ui;
}; };
@ -146,6 +147,7 @@ public:
BuddyFilter(QWidget *parent = 0); BuddyFilter(QWidget *parent = 0);
virtual void showEvent(QShowEvent *); virtual void showEvent(QShowEvent *);
virtual void hideEvent(QHideEvent *); virtual void hideEvent(QHideEvent *);
private: private:
Ui::FilterWidget ui; Ui::FilterWidget ui;
}; };
@ -156,6 +158,7 @@ public:
LocationFilter(QWidget *parent = 0); LocationFilter(QWidget *parent = 0);
virtual void showEvent(QShowEvent *); virtual void showEvent(QShowEvent *);
virtual void hideEvent(QHideEvent *); virtual void hideEvent(QHideEvent *);
private: private:
Ui::FilterWidget ui; Ui::FilterWidget ui;
}; };