From 8c16677f55fe27708fcccf22cab772b1abd514ba Mon Sep 17 00:00:00 2001
From: mmhguo <604881159@qq.com>
Date: 星期三, 30 七月 2025 09:20:11 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719 0729
---
Server/付林涛/code/tianKai/addfile.h | 6 +++++-
1 files changed, 5 insertions(+), 1 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 a4fe1d1..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"
@@ -5,6 +5,9 @@
#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;
}
@@ -18,7 +21,8 @@
~AddFile();
signals:
- void addFileSignal(QString, QString);
+ void addFileSignal(std::shared_ptr<char>, int);
+ void addFileMsg(QString);
private slots:
void on_pushButton_3_clicked();
void on_pushButton_clicked();
--
Gitblit v1.8.0