From 71788c320d3b2101114319a93f8bf145214fcaee Mon Sep 17 00:00:00 2001
From: Sergey Lipskiy <gonetz@ngs.ru>
Date: Sun, 24 Oct 2021 17:11:42 +0700
Subject: [PATCH] Rename Ext_TxFilter.h to TxFilterExport.h Correct #include

---
 projects/msvc/GLideN64.vcxproj                    |  4 ++--
 projects/msvc/GLideN64.vcxproj.filters            |  8 ++++----
 src/DisplayLoadProgress.cpp                       |  2 +-
 src/GLideNHQ/TxFilterExport.cpp                   |  1 +
 src/GLideNHQ/{Ext_TxFilter.h => TxFilterExport.h} |  0
 src/GLideNHQ/TxHiResLoader.cpp                    | 12 ++++++------
 src/GLideNHQ/TxHiResNoCache.cpp                   |  2 +-
 src/GLideNHQ/TxInternal.h                         |  2 +-
 src/TextureFilterHandler.cpp                      |  2 +-
 src/Textures.cpp                                  |  2 +-
 src/VI.cpp                                        |  2 +-
 11 files changed, 19 insertions(+), 18 deletions(-)
 rename src/GLideNHQ/{Ext_TxFilter.h => TxFilterExport.h} (100%)

diff --git a/projects/msvc/GLideN64.vcxproj b/projects/msvc/GLideN64.vcxproj
index 56358ff6..0be3fd30 100644
--- a/projects/msvc/GLideN64.vcxproj
+++ b/projects/msvc/GLideN64.vcxproj
@@ -461,7 +461,7 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
     <ClInclude Include="..\..\src\GBI.h" />
     <ClInclude Include="..\..\src\gDP.h" />
     <ClInclude Include="..\..\src\GLideN64.h" />
-    <ClInclude Include="..\..\src\GLideNHQ\Ext_TxFilter.h" />
+    <ClInclude Include="..\..\src\GLideNHQ\TxFilterExport.h" />
     <ClInclude Include="..\..\src\Graphics\ColorBufferReader.h" />
     <ClInclude Include="..\..\src\Graphics\CombinerProgram.h" />
     <ClInclude Include="..\..\src\Graphics\Context.h" />
@@ -594,4 +594,4 @@ copy /Y "$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir_x64)")</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/projects/msvc/GLideN64.vcxproj.filters b/projects/msvc/GLideN64.vcxproj.filters
index 1687c729..aec78dbd 100644
--- a/projects/msvc/GLideN64.vcxproj.filters
+++ b/projects/msvc/GLideN64.vcxproj.filters
@@ -511,9 +511,6 @@
     <ClInclude Include="..\..\src\Log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\GLideNHQ\Ext_TxFilter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\PostProcessor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -823,10 +820,13 @@
     <ClInclude Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramUniformFactoryFast.h">
       <Filter>Header Files\Graphics\OpenGL\GLSL</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\GLideNHQ\TxFilterExport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\GLideN64.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/DisplayLoadProgress.cpp b/src/DisplayLoadProgress.cpp
index f968da9a..647ca326 100644
--- a/src/DisplayLoadProgress.cpp
+++ b/src/DisplayLoadProgress.cpp
@@ -1,7 +1,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <cstdlib>
-#include "GLideNHQ/Ext_TxFilter.h"
+#include "GLideNHQ/TxFilterExport.h"
 #include <Graphics/Context.h>
 #include <Graphics/Parameters.h>
 
diff --git a/src/GLideNHQ/TxFilterExport.cpp b/src/GLideNHQ/TxFilterExport.cpp
index 243fdb68..93c81925 100644
--- a/src/GLideNHQ/TxFilterExport.cpp
+++ b/src/GLideNHQ/TxFilterExport.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "TxFilter.h"
+#include "TxFilterExport.h"
 
 TxFilter *txFilter = nullptr;
 
diff --git a/src/GLideNHQ/Ext_TxFilter.h b/src/GLideNHQ/TxFilterExport.h
similarity index 100%
rename from src/GLideNHQ/Ext_TxFilter.h
rename to src/GLideNHQ/TxFilterExport.h
diff --git a/src/GLideNHQ/TxHiResLoader.cpp b/src/GLideNHQ/TxHiResLoader.cpp
index fa26766f..3949830e 100644
--- a/src/GLideNHQ/TxHiResLoader.cpp
+++ b/src/GLideNHQ/TxHiResLoader.cpp
@@ -1,7 +1,7 @@
 #include "TxHiResLoader.h"
 #include "TxDbg.h"
 #include "TxDbg.h"
-#include "Ext_TxFilter.h"
+#include "TxFilterExport.h"
 
 #include <string.h>
 #include <math.h>
@@ -58,7 +58,7 @@ uint32_t TxHiResLoader::checkFileName(char* ident, char* filename,
 	};
 
 	pfilename = filename + strlen(filename) - 4;
-	
+
 	if (strcmp(pfilename, ".png") &&
 		strcmp(pfilename, ".bmp")) {
 #if !DEBUG
@@ -68,7 +68,7 @@ uint32_t TxHiResLoader::checkFileName(char* ident, char* filename,
 		INFO(80, wst("Error: not png or bmp!\n"));
 		return 0;
 	}
-	
+
 	/* make sure filename contains ident */
 	pfilename = strstr(filename, ident);
 	if (!pfilename) {
@@ -152,8 +152,8 @@ uint32_t TxHiResLoader::checkFileName(char* ident, char* filename,
 	return length;
 }
 
-uint8_t* TxHiResLoader::loadFileInfoTex(char* fname, 
-	int siz, int* pWidth, int* pHeight, 
+uint8_t* TxHiResLoader::loadFileInfoTex(char* fname,
+	int siz, int* pWidth, int* pHeight,
 	uint32_t fmt,
 	ColorFormat* pFormat)
 {
@@ -320,7 +320,7 @@ uint8_t* TxHiResLoader::loadFileInfoTex(char* fname,
 						tex = _txImage->readPNG(fp, &width, &height, &format);
 					else
 						tex = _txImage->readBMP(fp, &width, &height, &format);
-				 
+
 					fclose(fp);
 				}
 		 }
diff --git a/src/GLideNHQ/TxHiResNoCache.cpp b/src/GLideNHQ/TxHiResNoCache.cpp
index 351c835d..353e6163 100644
--- a/src/GLideNHQ/TxHiResNoCache.cpp
+++ b/src/GLideNHQ/TxHiResNoCache.cpp
@@ -1,7 +1,7 @@
 #include "TxHiResNoCache.h"
 
 #include "TxDbg.h"
-#include "Ext_TxFilter.h"
+#include "TxFilterExport.h"
 #include <osal_files.h>
 
 TxHiResNoCache::TxHiResNoCache(int maxwidth,
diff --git a/src/GLideNHQ/TxInternal.h b/src/GLideNHQ/TxInternal.h
index f70509cf..37b42025 100644
--- a/src/GLideNHQ/TxInternal.h
+++ b/src/GLideNHQ/TxInternal.h
@@ -24,7 +24,7 @@
 #ifndef __INTERNAL_H__
 #define __INTERNAL_H__
 
-#include "Ext_TxFilter.h"
+#include "TxFilterExport.h"
 #include "txWidestringWrapper.h"
 
 #include <Graphics/Parameters.h>
diff --git a/src/TextureFilterHandler.cpp b/src/TextureFilterHandler.cpp
index a06e54f8..e76ebdd4 100644
--- a/src/TextureFilterHandler.cpp
+++ b/src/TextureFilterHandler.cpp
@@ -1,6 +1,6 @@
 #include <stdarg.h>
 #include <osal_files.h>
-#include "GLideNHQ/Ext_TxFilter.h"
+#include "GLideNHQ/TxFilterExport.h"
 #include <Graphics/Context.h>
 #include <Graphics/Parameters.h>
 
diff --git a/src/Textures.cpp b/src/Textures.cpp
index b579f5ed..a450530a 100644
--- a/src/Textures.cpp
+++ b/src/Textures.cpp
@@ -14,7 +14,7 @@
 #include "convert.h"
 #include "FrameBuffer.h"
 #include "Config.h"
-#include "GLideNHQ/Ext_TxFilter.h"
+#include "GLideNHQ/TxFilterExport.h"
 #include "TextureFilterHandler.h"
 #include "DisplayLoadProgress.h"
 #include "Graphics/Context.h"
diff --git a/src/VI.cpp b/src/VI.cpp
index 0ff3ddb2..6a8719e2 100644
--- a/src/VI.cpp
+++ b/src/VI.cpp
@@ -15,7 +15,7 @@
 #include "DebugDump.h"
 #include "osal_keys.h"
 #include "DisplayWindow.h"
-#include "GLideNHQ/Ext_TxFilter.h"
+#include "GLideNHQ/TxFilterExport.h"
 #include <Graphics/Context.h>
 
 using namespace std;