Kaynağa Gözat

code formatting

fiffty-50 4 yıl önce
ebeveyn
işleme
771cca5b6a

+ 7 - 7
mainwindow.cpp

@@ -50,8 +50,8 @@ MainWindow::MainWindow(QWidget *parent)
     ui->toolBar->insertWidget(ui->actionNewFlight, spacer);
 
 
-    // create and show homeWidget
-    auto hw = new homeWidget(this);
+    // create and show HomeWidget
+    auto hw = new HomeWidget(this);
     ui->stackedWidget->addWidget(hw);
     ui->stackedWidget->setCurrentWidget(hw);
 
@@ -81,14 +81,14 @@ void MainWindow::on_actionQuit_triggered()
 
 void MainWindow::on_actionHome_triggered()
 {
-    auto hw = new homeWidget(this);
+    auto hw = new HomeWidget(this);
     ui->stackedWidget->addWidget(hw);
     ui->stackedWidget->setCurrentWidget(hw);
 }
 
 void MainWindow::on_actionLogbook_triggered()
 {
-    auto lw = new logbookWidget(this);
+    auto lw = new LogbookWidget(this);
     ui->stackedWidget->addWidget(lw);
     ui->stackedWidget->setCurrentWidget(lw);
 }
@@ -96,7 +96,7 @@ void MainWindow::on_actionLogbook_triggered()
 void MainWindow::on_actionSettings_triggered()
 {
     //nope();
-    auto sw = new settingsWidget(this);
+    auto sw = new SettingsWidget(this);
     ui->stackedWidget->addWidget(sw);
     ui->stackedWidget->setCurrentWidget(sw);
 }
@@ -118,7 +118,7 @@ void MainWindow::on_actionNewFlight_triggered()
 
 void MainWindow::on_actionAircraft_triggered()
 {
-    auto aw = new aircraftWidget(this);
+    auto aw = new AircraftWidget(this);
     ui->stackedWidget->addWidget(aw);
     ui->stackedWidget->setCurrentWidget(aw);
 }
@@ -131,7 +131,7 @@ void MainWindow::on_actionNewAircraft_triggered()
 
 void MainWindow::on_actionPilots_triggered()
 {
-    auto pw = new pilotsWidget(this);
+    auto pw = new PilotsWidget(this);
     ui->stackedWidget->addWidget(pw);
     ui->stackedWidget->setCurrentWidget(pw);
 }

+ 7 - 7
src/gui/widgets/aircraftwidget.cpp

@@ -22,9 +22,9 @@
 #define DEB(expr) \
     qDebug() << __PRETTY_FUNCTION__ << "\t" << expr
 
-aircraftWidget::aircraftWidget(QWidget *parent) :
+AircraftWidget::AircraftWidget(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::aircraftWidget)
+    ui(new Ui::AircraftWidget)
 {
     ui->setupUi(this);
 
@@ -67,17 +67,17 @@ aircraftWidget::aircraftWidget(QWidget *parent) :
             SLOT(tableView_selectionChanged(const QItemSelection &, const QItemSelection &)));
 }
 
-aircraftWidget::~aircraftWidget()
+AircraftWidget::~AircraftWidget()
 {
     delete ui;
 }
 
-void aircraftWidget::setSelectedAircraft(const qint32 &value)
+void AircraftWidget::setSelectedAircraft(const qint32 &value)
 {
     selectedAircraft = value;
 }
 
-void aircraftWidget::tableView_selectionChanged(const QItemSelection &index, const QItemSelection &)
+void AircraftWidget::tableView_selectionChanged(const QItemSelection &index, const QItemSelection &)
 {
     setSelectedAircraft(index.indexes()[0].data().toInt());
     DEB("Selected aircraft with ID#: " << selectedAircraft);
@@ -90,7 +90,7 @@ void aircraftWidget::tableView_selectionChanged(const QItemSelection &index, con
     ui->stackedWidget->setCurrentWidget(nt);
 }
 
-void aircraftWidget::on_deleteButton_clicked()
+void AircraftWidget::on_deleteButton_clicked()
 {
     if (selectedAircraft > 0) {
 
@@ -115,7 +115,7 @@ void aircraftWidget::on_deleteButton_clicked()
     }
 }
 
-void aircraftWidget::on_newButton_clicked()
+void AircraftWidget::on_newButton_clicked()
 {
     auto nt = new NewTail(QString(), Db::createNew, this);
     nt->show();

+ 5 - 5
src/gui/widgets/aircraftwidget.h

@@ -29,16 +29,16 @@
 #include "src/database/db.h"
 
 namespace Ui {
-class aircraftWidget;
+class AircraftWidget;
 }
 
-class aircraftWidget : public QWidget
+class AircraftWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit aircraftWidget(QWidget *parent = nullptr);
-    ~aircraftWidget();
+    explicit AircraftWidget(QWidget *parent = nullptr);
+    ~AircraftWidget();
 
     qint32 selectedAircraft = 0;
 
@@ -52,7 +52,7 @@ private slots:
     void on_newButton_clicked();
 
 private:
-    Ui::aircraftWidget *ui;
+    Ui::AircraftWidget *ui;
 };
 
 #endif // AIRCRAFTWIDGET_H

+ 2 - 2
src/gui/widgets/aircraftwidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>aircraftWidget</class>
- <widget class="QWidget" name="aircraftWidget">
+ <class>AircraftWidget</class>
+ <widget class="QWidget" name="AircraftWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

+ 6 - 6
src/gui/widgets/homewidget.cpp

@@ -23,29 +23,29 @@
     qDebug() << __PRETTY_FUNCTION__ << "\t" << expr
 
 
-homeWidget::homeWidget(QWidget *parent) :
+HomeWidget::HomeWidget(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::homeWidget)
+    ui(new Ui::HomeWidget)
 {
     ui->setupUi(this);
     showTotals();
 }
 
-homeWidget::~homeWidget()
+HomeWidget::~HomeWidget()
 {
     delete ui;
 }
 
-void homeWidget::on_pushButton_clicked()
+void HomeWidget::on_pushButton_clicked()
 {
     auto pl = new Pilot("pilots", 498);
     auto np = new NewPilot(*pl, Db::editExisting, this);
     np->show();
 }
 
-void homeWidget::showTotals()
+void HomeWidget::showTotals()
 {
-    auto tw = new totalsWidget(this);
+    auto tw = new TotalsWidget(this);
     ui->stackedWidget->addWidget(tw);
     ui->stackedWidget->setCurrentWidget(tw);
     ui->stackedWidget->show();

+ 5 - 5
src/gui/widgets/homewidget.h

@@ -34,22 +34,22 @@
 
 
 namespace Ui {
-class homeWidget;
+class HomeWidget;
 }
 
-class homeWidget : public QWidget
+class HomeWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit homeWidget(QWidget *parent = nullptr);
-    ~homeWidget();
+    explicit HomeWidget(QWidget *parent = nullptr);
+    ~HomeWidget();
 
 private slots:
     void on_pushButton_clicked();
 
 private:
-    Ui::homeWidget *ui;
+    Ui::HomeWidget *ui;
 
     void showTotals();
 };

+ 2 - 2
src/gui/widgets/homewidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>homeWidget</class>
- <widget class="QWidget" name="homeWidget">
+ <class>HomeWidget</class>
+ <widget class="QWidget" name="HomeWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

+ 10 - 10
src/gui/widgets/logbookwidget.cpp

@@ -22,9 +22,9 @@
 #define DEB(expr) \
     qDebug() << __PRETTY_FUNCTION__ << "\t" << expr
 
-logbookWidget::logbookWidget(QWidget *parent) :
+LogbookWidget::LogbookWidget(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::logbookWidget)
+    ui(new Ui::LogbookWidget)
 {
     ui->setupUi(this);
     ui->filterDateEdit->setDate(QDate::currentDate());
@@ -66,17 +66,17 @@ logbookWidget::logbookWidget(QWidget *parent) :
             SLOT(tableView_selectionChanged(const QItemSelection &, const QItemSelection &)));
 }
 
-logbookWidget::~logbookWidget()
+LogbookWidget::~LogbookWidget()
 {
     delete ui;
 }
 
-void logbookWidget::setSelectedFlight(const qint32 &value)
+void LogbookWidget::setSelectedFlight(const qint32 &value)
 {
     selectedFlight = value;
 }
 
-void logbookWidget::tableView_selectionChanged(const QItemSelection &index,
+void LogbookWidget::tableView_selectionChanged(const QItemSelection &index,
                                                const QItemSelection &)// TO DO
 {
     setSelectedFlight(index.indexes()[0].data().toInt());
@@ -85,7 +85,7 @@ void logbookWidget::tableView_selectionChanged(const QItemSelection &index,
 
 
 
-void logbookWidget::on_newFlightButton_clicked()
+void LogbookWidget::on_newFlightButton_clicked()
 {
     //NewFlight nf(this);
     //nf.exec();
@@ -94,7 +94,7 @@ void logbookWidget::on_newFlightButton_clicked()
     nope->exec();
 }
 
-void logbookWidget::on_editFlightButton_clicked() // To Do: Fix! - use new flight, pre-filled with entry loaded from DB
+void LogbookWidget::on_editFlightButton_clicked() // To Do: Fix! - use new flight, pre-filled with entry loaded from DB
 {
     QMessageBox *nope = new QMessageBox(this); // edit widget currently INOP
     nope->setText("This feature is temporarily INOP.");
@@ -103,7 +103,7 @@ void logbookWidget::on_editFlightButton_clicked() // To Do: Fix! - use new fligh
     //ef.exec();
 }
 
-void logbookWidget::on_deleteFlightPushButton_clicked()
+void LogbookWidget::on_deleteFlightPushButton_clicked()
 {
     if (selectedFlight > 0) {
         QVector<QString> columns = {
@@ -141,7 +141,7 @@ void logbookWidget::on_deleteFlightPushButton_clicked()
     }
 }
 
-void logbookWidget::on_filterFlightsByDateButton_clicked()
+void LogbookWidget::on_filterFlightsByDateButton_clicked()
 {
     QDate date(ui->filterDateEdit->date());
     QString startdate = date.toString("yyyy-MM-dd");
@@ -157,7 +157,7 @@ void logbookWidget::on_filterFlightsByDateButton_clicked()
     ui->tableView->setModel(DateFilteredModel);
 }
 
-void logbookWidget::on_showAllButton_clicked()
+void LogbookWidget::on_showAllButton_clicked()
 {
     QSqlTableModel *ShowAllModel = new QSqlTableModel;
     ShowAllModel->setTable("Logbook");

+ 5 - 5
src/gui/widgets/logbookwidget.h

@@ -29,19 +29,19 @@
 #include "src/classes/flight.h"
 
 namespace Ui {
-class logbookWidget;
+class LogbookWidget;
 }
 
 
 
-class logbookWidget : public QWidget
+class LogbookWidget : public QWidget
 {
     Q_OBJECT
 
 
 public:
-    explicit logbookWidget(QWidget *parent = nullptr);
-    ~logbookWidget();
+    explicit LogbookWidget(QWidget *parent = nullptr);
+    ~LogbookWidget();
 
     qint32 selectedFlight = 0;
     void setSelectedFlight(const qint32 &value);
@@ -60,7 +60,7 @@ private slots:
     void tableView_selectionChanged(const QItemSelection &index, const QItemSelection &);
 
 private:
-    Ui::logbookWidget *ui;
+    Ui::LogbookWidget *ui;
 
 };
 

+ 2 - 2
src/gui/widgets/logbookwidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>logbookWidget</class>
- <widget class="QWidget" name="logbookWidget">
+ <class>LogbookWidget</class>
+ <widget class="QWidget" name="LogbookWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

+ 7 - 7
src/gui/widgets/pilotswidget.cpp

@@ -22,9 +22,9 @@
 #define DEB(expr) \
     qDebug() << __PRETTY_FUNCTION__ << "\t" << expr
 
-pilotsWidget::pilotsWidget(QWidget *parent) :
+PilotsWidget::PilotsWidget(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::pilotsWidget)
+    ui(new Ui::PilotsWidget)
 {
     ui->setupUi(this);
 
@@ -67,12 +67,12 @@ pilotsWidget::pilotsWidget(QWidget *parent) :
             SLOT(tableView_selectionChanged(const QItemSelection &, const QItemSelection &)));
 }
 
-pilotsWidget::~pilotsWidget()
+PilotsWidget::~PilotsWidget()
 {
     delete ui;
 }
 
-void pilotsWidget::tableView_selectionChanged(const QItemSelection &index, const QItemSelection &)
+void PilotsWidget::tableView_selectionChanged(const QItemSelection &index, const QItemSelection &)
 {
     setSelectedPilot(index.indexes()[0].data().toInt());
     DEB("Selected Pilot with ID#: " << selectedPilot);
@@ -84,18 +84,18 @@ void pilotsWidget::tableView_selectionChanged(const QItemSelection &index, const
     ui->stackedWidget->setCurrentWidget(np);
 }
 
-void pilotsWidget::setSelectedPilot(const qint32 &value)
+void PilotsWidget::setSelectedPilot(const qint32 &value)
 {
     selectedPilot = value;
 }
 
-void pilotsWidget::on_newButton_clicked()
+void PilotsWidget::on_newButton_clicked()
 {
     auto np = new NewPilot(Db::createNew, this);
     np->show();
 }
 
-void pilotsWidget::on_deletePushButton_clicked()
+void PilotsWidget::on_deletePushButton_clicked()
 {
     if (selectedPilot > 0) {
 

+ 5 - 5
src/gui/widgets/pilotswidget.h

@@ -28,16 +28,16 @@
 #include "src/gui/dialogues/newpilot.h"
 
 namespace Ui {
-class pilotsWidget;
+class PilotsWidget;
 }
 
-class pilotsWidget : public QWidget
+class PilotsWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit pilotsWidget(QWidget *parent = nullptr);
-    ~pilotsWidget();
+    explicit PilotsWidget(QWidget *parent = nullptr);
+    ~PilotsWidget();
 
     void setSelectedPilot(const qint32 &value);
 
@@ -49,7 +49,7 @@ private slots:
     void on_deletePushButton_clicked();
 
 private:
-    Ui::pilotsWidget *ui;
+    Ui::PilotsWidget *ui;
 
     qint32 selectedPilot = 0;
 };

+ 2 - 2
src/gui/widgets/pilotswidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>pilotsWidget</class>
- <widget class="QWidget" name="pilotsWidget">
+ <class>PilotsWidget</class>
+ <widget class="QWidget" name="PilotsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

+ 8 - 8
src/gui/widgets/settingswidget.cpp

@@ -21,9 +21,9 @@
 
 
 
-settingsWidget::settingsWidget(QWidget *parent) :
+SettingsWidget::SettingsWidget(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::settingsWidget)
+    ui(new Ui::SettingsWidget)
 {
     ui->setupUi(this);
     QSettings settings;
@@ -67,7 +67,7 @@ settingsWidget::settingsWidget(QWidget *parent) :
 
 }
 
-settingsWidget::~settingsWidget()
+SettingsWidget::~SettingsWidget()
 {
     delete ui;
 }
@@ -76,13 +76,13 @@ settingsWidget::~settingsWidget()
  * Slots
  */
 
-void settingsWidget::on_flightNumberPrefixLineEdit_textEdited(const QString &arg1)
+void SettingsWidget::on_flightNumberPrefixLineEdit_textEdited(const QString &arg1)
 {
     QSettings settings;
     settings.setValue("userdata/flightnumberPrefix", arg1);
 }
 
-void settingsWidget::themeGroup_toggled(int id)
+void SettingsWidget::themeGroup_toggled(int id)
 {
     QSettings settings;
     settings.setValue("main/theme", id);
@@ -103,7 +103,7 @@ void settingsWidget::themeGroup_toggled(int id)
     }
 }
 
-void settingsWidget::on_aboutPushButton_clicked()
+void SettingsWidget::on_aboutPushButton_clicked()
 {
     auto mb = new QMessageBox(this);
     QString SQLITE_VERSION = DbInfo().version;
@@ -142,13 +142,13 @@ void settingsWidget::on_aboutPushButton_clicked()
     mb->open();
 }
 
-void settingsWidget::on_acSortComboBox_currentIndexChanged(int index)
+void SettingsWidget::on_acSortComboBox_currentIndexChanged(int index)
 {
     QSettings settings;
     settings.setValue("userdata/acSortColumn", index);
 }
 
-void settingsWidget::on_acAllowIncompleteComboBox_currentIndexChanged(int index)
+void SettingsWidget::on_acAllowIncompleteComboBox_currentIndexChanged(int index)
 {
     QSettings settings;
     settings.setValue("userdata/acAllowIncomplete", index);

+ 5 - 5
src/gui/widgets/settingswidget.h

@@ -29,16 +29,16 @@
 #include "src/database/db.h"
 
 namespace Ui {
-class settingsWidget;
+class SettingsWidget;
 }
 
-class settingsWidget : public QWidget
+class SettingsWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit settingsWidget(QWidget *parent = nullptr);
-    ~settingsWidget();
+    explicit SettingsWidget(QWidget *parent = nullptr);
+    ~SettingsWidget();
 
 private slots:
     void on_flightNumberPrefixLineEdit_textEdited(const QString &arg1);
@@ -52,7 +52,7 @@ private slots:
     void on_acAllowIncompleteComboBox_currentIndexChanged(int index);
 
 private:
-    Ui::settingsWidget *ui;
+    Ui::SettingsWidget *ui;
 
 };
 

+ 2 - 2
src/gui/widgets/settingswidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>settingsWidget</class>
- <widget class="QWidget" name="settingsWidget">
+ <class>SettingsWidget</class>
+ <widget class="QWidget" name="SettingsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

+ 3 - 3
src/gui/widgets/totalswidget.cpp

@@ -4,9 +4,9 @@
 #define DEB(expr) \
     qDebug() << __PRETTY_FUNCTION__ << "\t" << expr
 
-totalsWidget::totalsWidget(QWidget *parent) :
+TotalsWidget::TotalsWidget(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::totalsWidget)
+    ui(new Ui::TotalsWidget)
 {
     ui->setupUi(this);
     auto data = Stat::totals();
@@ -17,7 +17,7 @@ totalsWidget::totalsWidget(QWidget *parent) :
     }
 }
 
-totalsWidget::~totalsWidget()
+TotalsWidget::~TotalsWidget()
 {
     delete ui;
 }

+ 5 - 5
src/gui/widgets/totalswidget.h

@@ -9,19 +9,19 @@
 #include "src/classes/stat.h"
 
 namespace Ui {
-class totalsWidget;
+class TotalsWidget;
 }
 
-class totalsWidget : public QWidget
+class TotalsWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit totalsWidget(QWidget *parent = nullptr);
-    ~totalsWidget();
+    explicit TotalsWidget(QWidget *parent = nullptr);
+    ~TotalsWidget();
 
 private:
-    Ui::totalsWidget *ui;
+    Ui::TotalsWidget *ui;
 };
 
 #endif // TOTALSWIDGET_H

+ 2 - 2
src/gui/widgets/totalswidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>totalsWidget</class>
- <widget class="QWidget" name="totalsWidget">
+ <class>TotalsWidget</class>
+ <widget class="QWidget" name="TotalsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>