summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deco.h5
-rw-r--r--device.h2
-rw-r--r--qt-ui/completionmodels.h2
-rw-r--r--qt-ui/divecomputermanagementdialog.h6
-rw-r--r--qt-ui/divelistview.cpp10
-rw-r--r--qt-ui/downloadfromdivecomputer.cpp2
-rw-r--r--qt-ui/kmessagewidget.h8
-rw-r--r--qt-ui/mainwindow.h2
-rw-r--r--qt-ui/modeldelegates.h8
-rw-r--r--qt-ui/models.h8
-rw-r--r--qt-ui/printlayout.cpp12
-rw-r--r--qt-ui/profilegraphics.h6
-rw-r--r--qt-ui/tableview.h6
13 files changed, 38 insertions, 39 deletions
diff --git a/deco.h b/deco.h
index bf305b93b..0fc6cc2e5 100644
--- a/deco.h
+++ b/deco.h
@@ -5,9 +5,8 @@
extern "C" {
#endif
- extern double tolerated_by_tissue[];
-
- extern double buehlmann_N2_t_halflife[];
+extern double tolerated_by_tissue[];
+extern double buehlmann_N2_t_halflife[];
#ifdef __cplusplus
}
diff --git a/device.h b/device.h
index 3067f009e..57735a64b 100644
--- a/device.h
+++ b/device.h
@@ -9,7 +9,7 @@ extern "C" {
extern struct divecomputer *fake_dc(struct divecomputer* dc);
extern void create_device_node(const char *model, uint32_t deviceid, const char *serial, const char *firmware, const char *nickname);
extern void call_for_each_dc(FILE *f, void (*callback)(FILE *, const char *, uint32_t,
- const char *, const char *, const char *));
+ const char *, const char *, const char *));
#ifdef __cplusplus
}
diff --git a/qt-ui/completionmodels.h b/qt-ui/completionmodels.h
index 42b81946c..e4f1770e2 100644
--- a/qt-ui/completionmodels.h
+++ b/qt-ui/completionmodels.h
@@ -6,7 +6,7 @@
class BuddyCompletionModel : public QStringListModel {
Q_OBJECT
public:
- static BuddyCompletionModel* instance();
+ static BuddyCompletionModel* instance();
void updateModel();
};
diff --git a/qt-ui/divecomputermanagementdialog.h b/qt-ui/divecomputermanagementdialog.h
index 628c62ba2..008e6aba2 100644
--- a/qt-ui/divecomputermanagementdialog.h
+++ b/qt-ui/divecomputermanagementdialog.h
@@ -10,7 +10,7 @@ class DiveComputerManagementDialog : public QDialog{
Q_OBJECT
public:
- static DiveComputerManagementDialog *instance();
+ static DiveComputerManagementDialog *instance();
void update();
void init();
@@ -20,8 +20,8 @@ public slots:
void reject();
private:
- explicit DiveComputerManagementDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
- Ui::DiveComputerManagementDialog ui;
+ explicit DiveComputerManagementDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
+ Ui::DiveComputerManagementDialog ui;
DiveComputerModel *model;
};
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index 886d103c6..a14edd09d 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -301,16 +301,16 @@ void DiveListView::selectionChanged(const QItemSelection& selected, const QItemS
void DiveListView::mergeDives()
{
int i;
- struct dive *dive, *maindive = NULL;
+ struct dive *dive, *maindive = NULL;
- for_each_dive(i, dive) {
- if (dive->selected) {
+ for_each_dive(i, dive) {
+ if (dive->selected) {
if (!maindive)
maindive = dive;
else
maindive = merge_two_dives(maindive, dive);
- }
- }
+ }
+ }
mainWindow()->refreshDisplay();
}
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp
index 72ba7933d..ec0853fac 100644
--- a/qt-ui/downloadfromdivecomputer.cpp
+++ b/qt-ui/downloadfromdivecomputer.cpp
@@ -251,7 +251,7 @@ void DownloadFromDCWidget::reject()
QDialog::reject();
}
-void DownloadFromDCWidget::onDownloadThreadFinished()
+void DownloadFromDCWidget::onFinished()
{
if (currentState == DOWNLOADING) {
if (thread->error.isEmpty())
diff --git a/qt-ui/kmessagewidget.h b/qt-ui/kmessagewidget.h
index f49b421d6..88fb4ad37 100644
--- a/qt-ui/kmessagewidget.h
+++ b/qt-ui/kmessagewidget.h
@@ -99,10 +99,10 @@ class KMessageWidget : public QFrame
Q_PROPERTY(QIcon icon READ icon WRITE setIcon)
public:
enum MessageType {
- Positive,
- Information,
- Warning,
- Error
+ Positive,
+ Information,
+ Warning,
+ Error
};
/**
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index db6f41a39..0319c7b28 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -118,7 +118,7 @@ private:
void redrawProfile();
void file_save();
void file_save_as();
- void setupSplitters();
+ void setupSplitters();
};
MainWindow *mainWindow();
diff --git a/qt-ui/modeldelegates.h b/qt-ui/modeldelegates.h
index a16e472d6..eb9a0aa04 100644
--- a/qt-ui/modeldelegates.h
+++ b/qt-ui/modeldelegates.h
@@ -21,8 +21,8 @@ public:
explicit ComboBoxDelegate(QAbstractItemModel *model, QObject* parent = 0);
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
virtual void setEditorData(QWidget* editor, const QModelIndex& index) const;
- virtual void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const;
- virtual bool eventFilter(QObject* object, QEvent* event);
+ virtual void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+ virtual bool eventFilter(QObject* object, QEvent* event);
public slots:
void testActivation(const QString& currString = QString());
//HACK: try to get rid of this in the future.
@@ -37,7 +37,7 @@ class TankInfoDelegate : public ComboBoxDelegate{
public:
explicit TankInfoDelegate(QObject* parent = 0);
virtual void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
- virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+ virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
public slots:
void revertModelData(QWidget* widget, QAbstractItemDelegate::EndEditHint hint);
};
@@ -47,7 +47,7 @@ class WSInfoDelegate : public ComboBoxDelegate{
public:
explicit WSInfoDelegate(QObject* parent = 0);
virtual void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
- virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
+ virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
public slots:
void revertModelData(QWidget* widget, QAbstractItemDelegate::EndEditHint hint);
};
diff --git a/qt-ui/models.h b/qt-ui/models.h
index cfc6771bb..32ce3df47 100644
--- a/qt-ui/models.h
+++ b/qt-ui/models.h
@@ -22,8 +22,8 @@ class CleanerTableModel : public QAbstractTableModel{
Q_OBJECT
public:
CleanerTableModel();
- virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
- virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
+ virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
protected:
void setHeaderDataStrings(const QStringList& headers);
private:
@@ -194,8 +194,8 @@ public:
enum Layout{TREE, LIST, CURRENT};
Qt::ItemFlags flags(const QModelIndex &index) const;
- virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
- DiveTripModel(QObject* parent = 0);
+ virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ DiveTripModel(QObject* parent = 0);
Layout layout() const;
void setLayout(Layout layout);
diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp
index f667186da..76c33a330 100644
--- a/qt-ui/printlayout.cpp
+++ b/qt-ui/printlayout.cpp
@@ -166,14 +166,14 @@ void PrintLayout::printProfileDives(int divesPerRow, int divesPerColumn)
profile->plot(dive, true);
QPixmap profilePm = QPixmap::grabWidget(profile); // Qt4
painter.drawPixmap((scaledW + padW) * col,
- (scaledH + padH) * row + yOffsetProfile,
- profilePm);
+ (scaledH + padH) * row + yOffsetProfile,
+ profilePm);
// draw a table
model.setDive(dive);
QPixmap tablePm = QPixmap::grabWidget(table); // Qt4
painter.drawPixmap((scaledW + padW) * col,
- (scaledH + padH) * row + yOffsetTable,
- tablePm);
+ (scaledH + padH) * row + yOffsetTable,
+ tablePm);
col++;
}
@@ -337,8 +337,8 @@ void PrintLayout::printTable()
if (i > 0)
printer->newPage();
QRegion region(0, pageIndexes.at(i) - 1,
- table.width(),
- pageIndexes.at(i + 1) - pageIndexes.at(i) + 1);
+ table.width(),
+ pageIndexes.at(i + 1) - pageIndexes.at(i) + 1);
table.render(&painter, QPoint(0, 0), region);
}
}
diff --git a/qt-ui/profilegraphics.h b/qt-ui/profilegraphics.h
index 469bf871f..a45243ba3 100644
--- a/qt-ui/profilegraphics.h
+++ b/qt-ui/profilegraphics.h
@@ -117,11 +117,11 @@ private:
class GraphicsTextEditor : public QGraphicsTextItem{
Q_OBJECT
public:
- GraphicsTextEditor(QGraphicsItem* parent = 0);
+ GraphicsTextEditor(QGraphicsItem* parent = 0);
protected:
- virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event);
- virtual void keyReleaseEvent(QKeyEvent* event);
+ virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event);
+ virtual void keyReleaseEvent(QKeyEvent* event);
signals:
void textChanged(const QString& text);
diff --git a/qt-ui/tableview.h b/qt-ui/tableview.h
index 9ffee429e..fc22425d3 100644
--- a/qt-ui/tableview.h
+++ b/qt-ui/tableview.h
@@ -30,14 +30,14 @@ public:
void edit(const QModelIndex& index);
QTableView *view();
protected:
- virtual void showEvent(QShowEvent* );
- virtual void resizeEvent(QResizeEvent* );
+ virtual void showEvent(QShowEvent* );
+ virtual void resizeEvent(QResizeEvent* );
signals:
void addButtonClicked();
private:
- Ui::TableView ui;
+ Ui::TableView ui;
QPushButton *plusBtn;
};
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-28 01:12:27 +0000