initial merge of qt client

1 files changed, 24 insertions, 33 deletions

diff --git a/client/main.cpp b/client/main.cpp
index 28a3d91..84706bf 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -1,42 +1,33 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Charts module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 or (at your option) any later version
-** approved by the KDE Free Qt Foundation. The licenses are as published by
-** the Free Software Foundation and appearing in the file LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "chart.h"
-#include "chartview.h"
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMainWindow>
 #include <QtCore/QtMath>
 #include <QtCore/QRandomGenerator>
 #include <QtCharts/QLineSeries>
 #include <QtCharts/QValueAxis>
+#include <QApplication>
+#include <QMessageBox>
+#include <iostream>
+#include <stdio.h>
+
+#include "chart.h"
+#include "chartview.h"
+#include "mainwindow.h"
+#include "main.h"
+#include "ui_mainwindow.h"
 
-QT_CHARTS_USE_NAMESPACE
+QSqlDatabase dbRef = QSqlDatabase();
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    MainWindow w;
+    dbRef = QSqlDatabase::addDatabase("QMYSQL");
+
+    w.show();
+    return a.exec();
+}
+
+/* QT_CHARTS_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
@@ -69,4 +60,4 @@ int main(int argc, char *argv[])
     window.show();
 
     return a.exec();
-}
+} */