From ba557576d960281d774ac1e3c83f2e29786ed682 Mon Sep 17 00:00:00 2001
From: 李太白3028 <2410382594@qq.com>
Date: 星期三, 30 七月 2025 09:21:41 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719
---
Server/付林涛/code/tianKai/addfile.h | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/addfile.h" "b/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/addfile.h"
index b64c0e7..eedd401 100644
--- "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/addfile.h"
+++ "b/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/addfile.h"
@@ -3,6 +3,11 @@
#include <QMainWindow>
#include "addfile.h"
+#include <struct_data.h>
+#include "uploador.h"
+extern std::mutex _mutex;
+extern std::condition_variable _conv;
+extern int g_flag;
namespace Ui {
class AddFile;
}
@@ -15,12 +20,18 @@
explicit AddFile(QWidget *parent = 0);
~AddFile();
+signals:
+ void addFileSignal(std::shared_ptr<char>, int);
+ void addFileMsg(QString);
private slots:
void on_pushButton_3_clicked();
+ void on_pushButton_clicked();
+
private:
Ui::AddFile *ui;
-
-
+ UpLoador *m_upLoad;
};
#endif // ADDFILE_H
+
+
--
Gitblit v1.8.0