Minor fixes to make it run on Linux

This commit is contained in:
giomba 2019-08-16 15:34:25 +02:00
parent 5d8a743d20
commit aefe4ba9cd
4 changed files with 21 additions and 23 deletions

View File

@ -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;
}

View File

@ -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;

View File

@ -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) {

View File

@ -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);
}