Make Notifications.cpp independent of TextSearch.h

sumatrapdfreader · Dec 25, 2018 · c69208a · c69208a
1 parent 6d0e319
commit c69208a
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 14 deletions.
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
@@ -24,6 +24,7 @@
 #include "Theme.h"
 #include "GlobalPrefs.h"
 #include "RenderCache.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 

diff --git a/src/DisplayModel.cpp b/src/DisplayModel.cpp
@@ -55,6 +55,7 @@
 #include "DisplayModel.h"
 #include "GlobalPrefs.h"
 #include "PdfSync.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 

diff --git a/src/Notifications.cpp b/src/Notifications.cpp
@@ -4,13 +4,7 @@
 #include "BaseUtil.h"
 #include "GdiPlusUtil.h"
 #include "WinUtil.h"
-
-class BaseEngine;
-// TODO: this is just to get ProgressUpdateUI. Move ProgressUpdateUI to
-// its own file
-#include "TextSelection.h"
-#include "TextSearch.h"
-
+#include "ProgressUpdateUI.h"
 #include "Colors.h"
 #include "Notifications.h"
 

diff --git a/src/Print.cpp b/src/Print.cpp
@@ -15,6 +15,7 @@
 #include "ChmModel.h"
 #include "DisplayModel.h"
 #include "GlobalPrefs.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 

diff --git a/src/Search.cpp b/src/Search.cpp
@@ -19,6 +19,7 @@
 #include "DisplayModel.h"
 #include "GlobalPrefs.h"
 #include "PdfSync.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 #include "SumatraPDF.h"

diff --git a/src/StressTesting.cpp b/src/StressTesting.cpp
@@ -24,6 +24,7 @@
 #include "EbookController.h"
 #include "GlobalPrefs.h"
 #include "RenderCache.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 #include "SumatraPDF.h"

diff --git a/src/SumatraPDF.cpp b/src/SumatraPDF.cpp
@@ -36,6 +36,7 @@
 #include "GlobalPrefs.h"
 #include "PdfSync.h"
 #include "RenderCache.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 #include "Colors.h"

diff --git a/src/SumatraStartup.cpp b/src/SumatraStartup.cpp
@@ -27,6 +27,7 @@
 #include "GlobalPrefs.h"
 #include "PdfSync.h"
 #include "RenderCache.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 #include "SumatraPDF.h"

diff --git a/src/TextSearch.cpp b/src/TextSearch.cpp
@@ -4,6 +4,7 @@
 #include "BaseUtil.h"
 #include "ScopedWin.h"
 #include "BaseEngine.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 

diff --git a/src/TextSearch.h b/src/TextSearch.h
@@ -3,13 +3,6 @@
 
 enum class TextSearchDirection : bool { Backward = false, Forward = true };
 
-class ProgressUpdateUI {
-  public:
-    virtual void UpdateProgress(int current, int total) = 0;
-    virtual bool WasCanceled() = 0;
-    virtual ~ProgressUpdateUI() {}
-};
-
 class TextSearch : public TextSelection {
   public:
     TextSearch(BaseEngine* engine, PageTextCache* textCache);

diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp
@@ -12,6 +12,7 @@
 #include "Controller.h"
 #include "DisplayModel.h"
 #include "GlobalPrefs.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 #include "Colors.h"

diff --git a/src/WindowInfo.cpp b/src/WindowInfo.cpp
@@ -19,6 +19,7 @@
 #include "DisplayModel.h"
 #include "EbookController.h"
 #include "GlobalPrefs.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"
 #include "SumatraPDF.h"

diff --git a/src/regress/Regress.cpp b/src/regress/Regress.cpp
@@ -34,6 +34,7 @@ To write new regression test:
 #include "Doc.h"
 // For Regress03 (Text Search)
 #include "EngineManager.h"
+#include "ProgressUpdateUI.h"
 #include "TextSelection.h"
 #include "TextSearch.h"