lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.100.140:8099/sane/code_app

This commit is contained in:
luoliangyi 2022-10-12 13:38:02 +08:00
parent 65b2470793 1f5d96a154
commit 57e36a06b2
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scanner/HGImgThumb.cpp
View File

@ -4644,7 +4644,7 @@ void HGImgThumb::Show()
repaint(); repaint();
} }
void HGImgThumb::ThreadFunc(HGThread thread, HGPointer param) void HGAPI HGImgThumb::ThreadFunc(HGThread thread, HGPointer param)
{ {
Q_UNUSED(thread); Q_UNUSED(thread);

2
app/scanner/HGImgThumb.h
View File

@ -192,7 +192,7 @@ private:
QRect getNullScrollPos(); QRect getNullScrollPos();
void Show(); void Show();
static void ThreadFunc(HGThread thread, HGPointer param); static void HGAPI ThreadFunc(HGThread thread, HGPointer param);
private: private:
HGLock m_lockFront; HGLock m_lockFront;

2
app/scanner/dialog_exportimagefile.cpp
View File

@ -47,7 +47,7 @@ Dialog_ExportImageFile::~Dialog_ExportImageFile()
delete ui; delete ui;
} }
void Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param) void HGAPI Dialog_ExportImageFile::ThreadFunc(HGThread thread, HGPointer param)
{ {
(void)thread; (void)thread;
Dialog_ExportImageFile *p = (Dialog_ExportImageFile *)param; Dialog_ExportImageFile *p = (Dialog_ExportImageFile *)param;

2
app/scanner/dialog_exportimagefile.h
View File

@ -19,7 +19,7 @@ public:
~Dialog_ExportImageFile(); ~Dialog_ExportImageFile();
private: private:
static void ThreadFunc(HGThread thread, HGPointer param); static void HGAPI ThreadFunc(HGThread thread, HGPointer param);
signals: signals:
void updateProgress(int value); void updateProgress(int value);

2
app/scanner/dialog_multirotateimagefile.cpp
View File

@ -34,7 +34,7 @@ Dialog_MultiRotateImageFile::~Dialog_MultiRotateImageFile()
delete ui; delete ui;
} }
void Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer param) void HGAPI Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer param)
{ {
(void)thread; (void)thread;
Dialog_MultiRotateImageFile *p = (Dialog_MultiRotateImageFile *)param; Dialog_MultiRotateImageFile *p = (Dialog_MultiRotateImageFile *)param;

2
app/scanner/dialog_multirotateimagefile.h
View File

@ -20,7 +20,7 @@ signals:
void refreshImageFile(const QString &fileName); void refreshImageFile(const QString &fileName);
private: private:
static void ThreadFunc(HGThread thread, HGPointer param); static void HGAPI ThreadFunc(HGThread thread, HGPointer param);
signals: signals:
void updateProgress(int value); void updateProgress(int value);

4
app/scanner/dialog_updateprogress.cpp
View File

@ -34,7 +34,7 @@ Dialog_updateProgress::~Dialog_updateProgress()
delete ui; delete ui;
} }
HGInt Dialog_updateProgress::HttpDownloadThreadFunc(HGULonglong totalSize, HGULonglong nowSize, HGPointer param) HGInt HGAPI Dialog_updateProgress::HttpDownloadThreadFunc(HGULonglong totalSize, HGULonglong nowSize, HGPointer param)
{ {
Dialog_updateProgress *p = (Dialog_updateProgress *)param; Dialog_updateProgress *p = (Dialog_updateProgress *)param;
if (p->m_stopThread) if (p->m_stopThread)
@ -50,7 +50,7 @@ HGInt Dialog_updateProgress::HttpDownloadThreadFunc(HGULonglong totalSize, HGULo
return 0; return 0;
} }
void Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param) void HGAPI Dialog_updateProgress::ThreadFunc(HGThread thread, HGPointer param)
{ {
(void)thread; (void)thread;
Dialog_updateProgress *p = (Dialog_updateProgress *)param; Dialog_updateProgress *p = (Dialog_updateProgress *)param;

4
app/scanner/dialog_updateprogress.h
View File

@ -19,8 +19,8 @@ public:
const QString &savePath, QWidget *parent = nullptr); const QString &savePath, QWidget *parent = nullptr);
~Dialog_updateProgress(); ~Dialog_updateProgress();
private: private:
static HGInt HttpDownloadThreadFunc(HGULonglong totalSize, HGULonglong nowSize, HGPointer param); static HGInt HGAPI HttpDownloadThreadFunc(HGULonglong totalSize, HGULonglong nowSize, HGPointer param);
static void ThreadFunc(HGThread thread, HGPointer param); static void HGAPI ThreadFunc(HGThread thread, HGPointer param);
signals: signals:
void updateProgress(int value); void updateProgress(int value);

2
app/scanner/mainwindow.cpp
View File

@ -2404,7 +2404,7 @@ int MainWindow::sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigne
return 0; return 0;
} }
void MainWindow::CrashFunc(HGPointer crashAddr, HGPointer param) void HGAPI MainWindow::CrashFunc(HGPointer crashAddr, HGPointer param)
{ {
MainWindow *p = (MainWindow *)param; MainWindow *p = (MainWindow *)param;

2
app/scanner/mainwindow.h
View File

@ -222,7 +222,7 @@ protected:
private: private:
static int sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigned int* len, void *param); static int sane_ex_callback(SANE_Handle hdev, int code, void *data, unsigned int* len, void *param);
static void CrashFunc(HGPointer crashAddr, HGPointer param); static void HGAPI CrashFunc(HGPointer crashAddr, HGPointer param);
HGUInt getDpi(); HGUInt getDpi();
QString getCacheFileName(HGImage img); QString getCacheFileName(HGImage img);

2
app/upgrade/mainwindow.cpp
View File

@ -83,7 +83,7 @@ bool MainWindow::Upgrade(const std::string& pkgPath)
return ret; return ret;
} }
void MainWindow::ThreadFunc(HGThread thread, HGPointer param) void HGAPI MainWindow::ThreadFunc(HGThread thread, HGPointer param)
{ {
(void)thread; (void)thread;
MainWindow* p = (MainWindow*)param; MainWindow* p = (MainWindow*)param;

2
app/upgrade/mainwindow.h
View File

@ -23,7 +23,7 @@ signals:
private: private:
static bool Upgrade(const std::string& pkgPath); static bool Upgrade(const std::string& pkgPath);
static void ThreadFunc(HGThread thread, HGPointer param); static void HGAPI ThreadFunc(HGThread thread, HGPointer param);
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;