From aefe4ba9cd81296c865606a2d9341377c21c247a Mon Sep 17 00:00:00 2001
From: giomba <giomba@linux.it>
Date: Fri, 16 Aug 2019 15:34:25 +0200
Subject: [PATCH] Minor fixes to make it run on Linux

---
 nicolodi/EditWindow.cpp | 12 +++++-------
 nicolodi/EditWindow.h   |  2 +-
 nicolodi/Pin.cpp        |  2 +-
 nicolodi/db.cpp         | 28 ++++++++++++++--------------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/nicolodi/EditWindow.cpp b/nicolodi/EditWindow.cpp
index 83dc0ca..d88b829 100644
--- a/nicolodi/EditWindow.cpp
+++ b/nicolodi/EditWindow.cpp
@@ -1,10 +1,7 @@
 #include "EditWindow.h"
 #include "ui_EditWindow.h"
 
-EditWindow::EditWindow(int idSocio, QString pin, QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::EditWindow)
-{
+EditWindow::EditWindow(int idSocio, QWidget* parent) : QMainWindow(parent), ui(new Ui::EditWindow) {
     ui->setupUi(this);
 
     if (!db.open()) {
@@ -21,10 +18,10 @@ EditWindow::EditWindow(int idSocio, QString pin, QWidget *parent) :
     model->setEditStrategy(QSqlTableModel::OnManualSubmit);
 
     // Indici dei campi in join
-    //professioneIdx = model->fieldIndex("professione");
-    //fonteIdx = model->fieldIndex("fonte");
+    professioneIdx = model->fieldIndex("professione");
+    fonteIdx = model->fieldIndex("fonte");
 
-    // La strategia di join da usare per le rleazioni e' LeftJoin
+    // La strategia di join da usare per le relazioni è LeftJoin
     model->setJoinMode(QSqlRelationalTableModel::LeftJoin);
 
     // Imposta le relazioni
@@ -73,6 +70,7 @@ void EditWindow::showError(const QSqlError &err)
 
 EditWindow::~EditWindow()
 {
+    delete model;
     delete ui;
 }
 
diff --git a/nicolodi/EditWindow.h b/nicolodi/EditWindow.h
index 7d26999..b6fd778 100644
--- a/nicolodi/EditWindow.h
+++ b/nicolodi/EditWindow.h
@@ -17,7 +17,7 @@ class EditWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit EditWindow(int idSocio, QString pin, QWidget *parent = nullptr);
+    explicit EditWindow(int idSocio, QWidget* parent = nullptr);
     ~EditWindow();
 
     bool doNotShow = false;
diff --git a/nicolodi/Pin.cpp b/nicolodi/Pin.cpp
index 373e6bf..d73d1c1 100644
--- a/nicolodi/Pin.cpp
+++ b/nicolodi/Pin.cpp
@@ -72,7 +72,7 @@ void Pin::on_pushButtonOk_clicked()
     // delle editwindow
     // Un socio e' valido se ha idSocio maggiore di zero
     if (idSocio > 0) {
-        EditWindow *ew = new EditWindow(idSocio, pin, this);
+        EditWindow *ew = new EditWindow(idSocio, this);
         ew->setAttribute(Qt::WA_DeleteOnClose);
         ew->setWindowModality(Qt::ApplicationModal);
         if (!ew->doNotShow) {
diff --git a/nicolodi/db.cpp b/nicolodi/db.cpp
index 47eafdf..399d1a9 100644
--- a/nicolodi/db.cpp
+++ b/nicolodi/db.cpp
@@ -10,10 +10,10 @@ void connectDatabase() {
     /* open database and attach query */
     db = QSqlDatabase::addDatabase("QMYSQL");  /* QMYSQL <-- database driver */
 
-    // db.setHostName(settings.value("hostname").toString());
-    // db.setDatabaseName(settings.value("database").toString());
-    // db.setUserName(settings.value("username").toString());
-    // db.setPassword(settings.value("password").toString());
+    db.setHostName(settings.value("hostname").toString());
+    db.setDatabaseName(settings.value("database").toString());
+    db.setUserName(settings.value("username").toString());
+    db.setPassword(settings.value("password").toString());
 
     // db.setHostName(settings.value("hostname","serverozzo.golem.linux.it").toString());
     // db.setDatabaseName(settings.value("database","golem_gestionale").toString());
@@ -21,17 +21,17 @@ void connectDatabase() {
     // db.setUserName(settings.value("username").toString());
     // db.setPassword(settings.value("password").toString());
 
-    QString hostname = settings.value("hostname","localhost").toString();
-    QString database = settings.value("database","golem_gestionale").toString();
-    int port = settings.value("port", "3306").toInt();
-    QString username = settings.value("username", "admin").toString();
-    QString password = settings.value("password", "password").toString();
+    // QString hostname = settings.value("hostname","localhost").toString();
+    // QString database = settings.value("database","golem_gestionale").toString();
+    // int port = settings.value("port", "3306").toInt();
+    // QString username = settings.value("username", "admin").toString();
+    // QString password = settings.value("password", "password").toString();
 
-    db.setHostName(hostname);
-    db.setDatabaseName(database);
-    db.setPort(port);
-    db.setUserName(username);
-    db.setPassword(password);
+    // db.setHostName(hostname);
+    // db.setDatabaseName(database);
+    // db.setPort(port);
+    // db.setUserName(username);
+    // db.setPassword(password);
 
     // query = QSqlQuery(db);
 }