finish merge

1 files changed, 6 insertions, 0 deletions

diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index e1736e6..49fcc26 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -11,6 +11,7 @@ MainWindow::MainWindow(QWidget *parent)
     , ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
+    client.ClientEcho();
 }
 
 MainWindow::~MainWindow()
@@ -19,6 +20,11 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::timeFunction()
+{
+    client.timeFunction();
+}
+
 void MainWindow::on_actionConnection_triggered()
 {
     _dbConenctor = new dbConnector(this);