client merge done

1 files changed, 27 insertions, 0 deletions

diff --git a/client/timetest.h b/client/timetest.h
new file mode 100644
index 0000000..aa1d8a5
--- /dev/null
+++ b/client/timetest.h
@@ -0,0 +1,27 @@
+#ifndef TIMETEST_H
+#define TIMETEST_H
+#include <QTimer>
+#include <QDebug>
+#include <QObject>
+#include <QDateTime>
+
+class TimeTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit TimeTest(QObject *parent = 0);
+
+signals:
+public slots:
+    qint16 myfunction();
+
+private:
+    QTimer *timer;
+
+
+
+
+};
+
+
+#endif // TIMETEST_H