client merge done

1 files changed, 32 insertions, 27 deletions

diff --git a/client/main.cpp b/client/main.cpp
index 84706bf..0f6b816 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -14,50 +14,55 @@
 #include "mainwindow.h"
 #include "main.h"
 #include "ui_mainwindow.h"
+#include "mytcpsocket.h"
+#include "timetest.h"
 
 QSqlDatabase dbRef = QSqlDatabase();
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
-    MainWindow w;
-    dbRef = QSqlDatabase::addDatabase("QMYSQL");
+	QApplication a(argc, argv);
+	TimeTest time;
+	MyTcpSocket s;
+	// s.doConnect();
+	MainWindow w;
+	dbRef = QSqlDatabase::addDatabase("QMYSQL");
 
-    w.show();
-    return a.exec();
+	w.show();
+	return a.exec();
 }
 
 /* QT_CHARTS_USE_NAMESPACE
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
+	QApplication a(argc, argv);
 
 //![1]
-    QLineSeries *series = new QLineSeries();
-    for (int i = 0; i < 500; i++) {
-        QPointF p((qreal) i, qSin(M_PI / 50 * i) * 100);
-        p.ry() += QRandomGenerator::global()->bounded(20);
-        *series << p;
-    }
+	QLineSeries *series = new QLineSeries();
+	for (int i = 0; i < 500; i++) {
+		QPointF p((qreal) i, qSin(M_PI / 50 * i) * 100);
+		p.ry() += QRandomGenerator::global()->bounded(20);
+		*series << p;
+	}
 //![1]
 
-    Chart *chart = new Chart();
-    chart->addSeries(series);
-    chart->setTitle("Zoom in/out example");
-    chart->setAnimationOptions(QChart::SeriesAnimations);
-    chart->legend()->hide();
-    chart->createDefaultAxes();
+	Chart *chart = new Chart();
+	chart->addSeries(series);
+	chart->setTitle("Zoom in/out example");
+	chart->setAnimationOptions(QChart::SeriesAnimations);
+	chart->legend()->hide();
+	chart->createDefaultAxes();
 
-    ChartView *chartView = new ChartView(chart);
-    chartView->setRenderHint(QPainter::Antialiasing);
+	ChartView *chartView = new ChartView(chart);
+	chartView->setRenderHint(QPainter::Antialiasing);
 
-    QMainWindow window;
-    window.setCentralWidget(chartView);
-    window.resize(400, 300);
-    window.grabGesture(Qt::PanGesture);
-    window.grabGesture(Qt::PinchGesture);
-    window.show();
+	QMainWindow window;
+	window.setCentralWidget(chartView);
+	window.resize(400, 300);
+	window.grabGesture(Qt::PanGesture);
+	window.grabGesture(Qt::PinchGesture);
+	window.show();
 
-    return a.exec();
+	return a.exec();
 } */