From 39e746bbaf1da28b468faf82212296bbc13d491f Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Wed, 18 May 2022 08:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86ui=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=A7=BB=E5=8A=A8=E5=88=B0app=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {ui => app/scanner}/HGImgThumb.cpp |  2 +-
 {ui => app/scanner}/HGImgThumb.h   |  0
 {ui => app/scanner}/HGImgView.cpp  |  0
 {ui => app/scanner}/HGImgView.h    |  0
 {ui => app/scanner}/HGUIGlobal.cpp |  0
 {ui => app/scanner}/HGUIGlobal.h   |  0
 app/scanner/mainwindow.cpp         |  4 ++--
 build-qt/HGSolution/HGScanner.pro  | 12 ++++++------
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename {ui => app/scanner}/HGImgThumb.cpp (99%)
 rename {ui => app/scanner}/HGImgThumb.h (100%)
 rename {ui => app/scanner}/HGImgView.cpp (100%)
 rename {ui => app/scanner}/HGImgView.h (100%)
 rename {ui => app/scanner}/HGUIGlobal.cpp (100%)
 rename {ui => app/scanner}/HGUIGlobal.h (100%)

diff --git a/ui/HGImgThumb.cpp b/app/scanner/HGImgThumb.cpp
similarity index 99%
rename from ui/HGImgThumb.cpp
rename to app/scanner/HGImgThumb.cpp
index 347908bd..f8fa2a61 100644
--- a/ui/HGImgThumb.cpp
+++ b/app/scanner/HGImgThumb.cpp
@@ -1556,7 +1556,7 @@ HGResult HGImgThumb::moveItemsTo(const QStringList &fileNames, int index)
         items.push_back(item);
     }
 
-    if (index < m_frontItems.size())
+    if (index < (int)m_frontItems.size())
     {
         int indexEx = index;
         for (int i = 0; i < (int)items.size(); ++i)
diff --git a/ui/HGImgThumb.h b/app/scanner/HGImgThumb.h
similarity index 100%
rename from ui/HGImgThumb.h
rename to app/scanner/HGImgThumb.h
diff --git a/ui/HGImgView.cpp b/app/scanner/HGImgView.cpp
similarity index 100%
rename from ui/HGImgView.cpp
rename to app/scanner/HGImgView.cpp
diff --git a/ui/HGImgView.h b/app/scanner/HGImgView.h
similarity index 100%
rename from ui/HGImgView.h
rename to app/scanner/HGImgView.h
diff --git a/ui/HGUIGlobal.cpp b/app/scanner/HGUIGlobal.cpp
similarity index 100%
rename from ui/HGUIGlobal.cpp
rename to app/scanner/HGUIGlobal.cpp
diff --git a/ui/HGUIGlobal.h b/app/scanner/HGUIGlobal.h
similarity index 100%
rename from ui/HGUIGlobal.h
rename to app/scanner/HGUIGlobal.h
diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp
index a55abb29..687d363e 100644
--- a/app/scanner/mainwindow.cpp
+++ b/app/scanner/mainwindow.cpp
@@ -1598,7 +1598,7 @@ void MainWindow::on_act_save_triggered()
             if (!find)
             {
                 int jpegQuality = dlg.getJpegQuality();
-                int tiffCompressionBW = dlg.getTiffCompressionBW();
+                //int tiffCompressionBW = dlg.getTiffCompressionBW();
                 int tiffCompression = dlg.getTiffCompression();
                 int tiffQuality = dlg.getTiffQuality();
                 bool isOcr = dlg.isOcr();
@@ -1715,7 +1715,7 @@ void MainWindow::on_act_saveAs_triggered()
         if (!find)
         {
             int jpegQuality = dlg.getJpegQuality();
-            int tiffCompressionBW = dlg.getTiffCompressionBW();
+            //int tiffCompressionBW = dlg.getTiffCompressionBW();
             int tiffCompression = dlg.getTiffCompression();
             int tiffQuality = dlg.getTiffQuality();
             bool isOcr = dlg.isOcr();
diff --git a/build-qt/HGSolution/HGScanner.pro b/build-qt/HGSolution/HGScanner.pro
index 804ee4f9..e8576f92 100644
--- a/build-qt/HGSolution/HGScanner.pro
+++ b/build-qt/HGSolution/HGScanner.pro
@@ -126,9 +126,9 @@ SOURCES += \
     ../../app/scanner/config.cpp \
     ../../app/scanner/json.cpp \
     ../../app/scanner/cJSON.c \
-    ../../ui/HGImgThumb.cpp \
-    ../../ui/HGImgView.cpp \
-    ../../ui/HGUIGlobal.cpp \
+    ../../app/scanner/HGImgThumb.cpp \
+    ../../app/scanner/HGImgView.cpp \
+    ../../app/scanner/HGUIGlobal.cpp \
     ../../utility/HGString.cpp \
     ../../app/scanner/dialog_input.cpp
 
@@ -169,9 +169,9 @@ HEADERS += \
     ../../app/scanner/config.h \
     ../../app/scanner/json.h \
     ../../app/scanner/cJSON.h \
-    ../../ui/HGImgThumb.h \
-    ../../ui/HGImgView.h \
-    ../../ui/HGUIGlobal.h \
+    ../../app/scanner/HGImgThumb.h \
+    ../../app/scanner/HGImgView.h \
+    ../../app/scanner/HGUIGlobal.h \
     ../../utility/HGString.h \
     ../../app/scanner/dialog_input.h