fixes #1761 (Rename Icq10 folder and ICQ/2018 in version.h to ICQ-WIM)

35 files changed, 6 insertions, 6 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index 74a1662fa1..1a372e49e2 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -451,7 +451,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\Icq10\icq10.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\ICQ-WIM\ICQ-WIM.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln
index 7bb8ce1dfc..511f309d5f 100644
--- a/bin15/mir_icons.sln
+++ b/bin15/mir_icons.sln
@@ -68,7 +68,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MinecraftDynmap", "..
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\Icq10\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQ-WIM\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln
index f4488c5985..739fd05f3c 100644
--- a/bin15/miranda32.sln
+++ b/bin15/miranda32.sln
@@ -145,11 +145,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{30
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\Icq10\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQ-WIM\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\Icq10\icq_xstatus\xStatus_ICQ.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\ICQ-WIM\icq_xstatus\xStatus_ICQ.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\Icq10\icq10.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQ", "..\protocols\ICQ-WIM\ICQ-WIM.vcxproj", "{EFB2355B-82B3-4759-B7D8-95F8E9506291}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/protocols/Icq10/CMakeLists.txt b/protocols/ICQ-WIM/CMakeLists.txt
index bb361358c2..bb361358c2 100644
--- a/protocols/Icq10/CMakeLists.txt
+++ b/protocols/ICQ-WIM/CMakeLists.txt
diff --git a/protocols/Icq10/icq10.vcxproj b/protocols/ICQ-WIM/ICQ-WIM.vcxproj
index 98fb8261e0..98fb8261e0 100644
--- a/protocols/Icq10/icq10.vcxproj
+++ b/protocols/ICQ-WIM/ICQ-WIM.vcxproj
diff --git a/protocols/Icq10/icq10.vcxproj.filters b/protocols/ICQ-WIM/ICQ-WIM.vcxproj.filters
index fcae13a9d8..fcae13a9d8 100644
--- a/protocols/Icq10/icq10.vcxproj.filters
+++ b/protocols/ICQ-WIM/ICQ-WIM.vcxproj.filters
diff --git a/protocols/Icq10/proto_icq/CMakeLists.txt b/protocols/ICQ-WIM/proto_icq/CMakeLists.txt
index 596ac21624..596ac21624 100644
--- a/protocols/Icq10/proto_icq/CMakeLists.txt
+++ b/protocols/ICQ-WIM/proto_icq/CMakeLists.txt
diff --git a/protocols/Icq10/proto_icq/Proto_ICQ.vcxproj b/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj
index 21763bbc0b..21763bbc0b 100644
--- a/protocols/Icq10/proto_icq/Proto_ICQ.vcxproj
+++ b/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj
diff --git a/protocols/Icq10/proto_icq/Proto_ICQ.vcxproj.filters b/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj.filters
index 28f81e7f1b..28f81e7f1b 100644
--- a/protocols/Icq10/proto_icq/Proto_ICQ.vcxproj.filters
+++ b/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj.filters
diff --git a/protocols/Icq10/proto_icq/res/Away.ico b/protocols/ICQ-WIM/proto_icq/res/Away.ico
index 248a3e9916..248a3e9916 100644
--- a/protocols/Icq10/proto_icq/res/Away.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/Away.ico
diff --git a/protocols/Icq10/proto_icq/res/DND.ico b/protocols/ICQ-WIM/proto_icq/res/DND.ico
index 4833160eac..4833160eac 100644
--- a/protocols/Icq10/proto_icq/res/DND.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/DND.ico
diff --git a/protocols/Icq10/proto_icq/res/FFC.ico b/protocols/ICQ-WIM/proto_icq/res/FFC.ico
index e7ec4d3ae2..e7ec4d3ae2 100644
--- a/protocols/Icq10/proto_icq/res/FFC.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/FFC.ico
diff --git a/protocols/Icq10/proto_icq/res/Invisible.ico b/protocols/ICQ-WIM/proto_icq/res/Invisible.ico
index 6a337c2926..6a337c2926 100644
--- a/protocols/Icq10/proto_icq/res/Invisible.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/Invisible.ico
diff --git a/protocols/Icq10/proto_icq/res/NA.ico b/protocols/ICQ-WIM/proto_icq/res/NA.ico
index ec0621dc9f..ec0621dc9f 100644
--- a/protocols/Icq10/proto_icq/res/NA.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/NA.ico
diff --git a/protocols/Icq10/proto_icq/res/Occupied.ico b/protocols/ICQ-WIM/proto_icq/res/Occupied.ico
index 04ea2a5855..04ea2a5855 100644
--- a/protocols/Icq10/proto_icq/res/Occupied.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/Occupied.ico
diff --git a/protocols/Icq10/proto_icq/res/Offline.ico b/protocols/ICQ-WIM/proto_icq/res/Offline.ico
index af862168cd..af862168cd 100644
--- a/protocols/Icq10/proto_icq/res/Offline.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/Offline.ico
diff --git a/protocols/Icq10/proto_icq/res/Online.ico b/protocols/ICQ-WIM/proto_icq/res/Online.ico
index 2e33305a76..2e33305a76 100644
--- a/protocols/Icq10/proto_icq/res/Online.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/Online.ico
diff --git a/protocols/Icq10/proto_icq/res/Phone.ico b/protocols/ICQ-WIM/proto_icq/res/Phone.ico
index 74c80b66ed..74c80b66ed 100644
--- a/protocols/Icq10/proto_icq/res/Phone.ico
+++ b/protocols/ICQ-WIM/proto_icq/res/Phone.ico
diff --git a/protocols/Icq10/proto_icq/res/Proto_ICQ.rc b/protocols/ICQ-WIM/proto_icq/res/Proto_ICQ.rc
index 33d8faf243..33d8faf243 100644
--- a/protocols/Icq10/proto_icq/res/Proto_ICQ.rc
+++ b/protocols/ICQ-WIM/proto_icq/res/Proto_ICQ.rc
diff --git a/protocols/Icq10/proto_icq/src/resource.h b/protocols/ICQ-WIM/proto_icq/src/resource.h
index c74e04f59e..c74e04f59e 100644
--- a/protocols/Icq10/proto_icq/src/resource.h
+++ b/protocols/ICQ-WIM/proto_icq/src/resource.h
diff --git a/protocols/Icq10/res/resources.rc b/protocols/ICQ-WIM/res/resources.rc
index a792fb924f..a792fb924f 100644
--- a/protocols/Icq10/res/resources.rc
+++ b/protocols/ICQ-WIM/res/resources.rc
diff --git a/protocols/Icq10/res/version.rc b/protocols/ICQ-WIM/res/version.rc
index 5a5ddd63ed..5a5ddd63ed 100644
--- a/protocols/Icq10/res/version.rc
+++ b/protocols/ICQ-WIM/res/version.rc
diff --git a/protocols/Icq10/src/groupchats.cpp b/protocols/ICQ-WIM/src/groupchats.cpp
index 5d4253bc15..5d4253bc15 100644
--- a/protocols/Icq10/src/groupchats.cpp
+++ b/protocols/ICQ-WIM/src/groupchats.cpp
diff --git a/protocols/Icq10/src/http.cpp b/protocols/ICQ-WIM/src/http.cpp
index e0bd34d17a..e0bd34d17a 100644
--- a/protocols/Icq10/src/http.cpp
+++ b/protocols/ICQ-WIM/src/http.cpp
diff --git a/protocols/Icq10/src/http.h b/protocols/ICQ-WIM/src/http.h
index bdcac34f50..bdcac34f50 100644
--- a/protocols/Icq10/src/http.h
+++ b/protocols/ICQ-WIM/src/http.h
diff --git a/protocols/Icq10/src/main.cpp b/protocols/ICQ-WIM/src/main.cpp
index 0f1888952d..0f1888952d 100644
--- a/protocols/Icq10/src/main.cpp
+++ b/protocols/ICQ-WIM/src/main.cpp
diff --git a/protocols/Icq10/src/options.cpp b/protocols/ICQ-WIM/src/options.cpp
index 3ff4494232..3ff4494232 100644
--- a/protocols/Icq10/src/options.cpp
+++ b/protocols/ICQ-WIM/src/options.cpp
diff --git a/protocols/Icq10/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index 86fb3257fb..86fb3257fb 100644
--- a/protocols/Icq10/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
diff --git a/protocols/Icq10/src/proto.h b/protocols/ICQ-WIM/src/proto.h
index 46bcb56e8f..46bcb56e8f 100644
--- a/protocols/Icq10/src/proto.h
+++ b/protocols/ICQ-WIM/src/proto.h
diff --git a/protocols/Icq10/src/resource.h b/protocols/ICQ-WIM/src/resource.h
index beeac3d899..beeac3d899 100644
--- a/protocols/Icq10/src/resource.h
+++ b/protocols/ICQ-WIM/src/resource.h
diff --git a/protocols/Icq10/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp
index d77daf4075..d77daf4075 100644
--- a/protocols/Icq10/src/server.cpp
+++ b/protocols/ICQ-WIM/src/server.cpp
diff --git a/protocols/Icq10/src/stdafx.cxx b/protocols/ICQ-WIM/src/stdafx.cxx
index 66afad80f1..66afad80f1 100644
--- a/protocols/Icq10/src/stdafx.cxx
+++ b/protocols/ICQ-WIM/src/stdafx.cxx
diff --git a/protocols/Icq10/src/stdafx.h b/protocols/ICQ-WIM/src/stdafx.h
index 929854990c..929854990c 100644
--- a/protocols/Icq10/src/stdafx.h
+++ b/protocols/ICQ-WIM/src/stdafx.h
diff --git a/protocols/Icq10/src/utils.cpp b/protocols/ICQ-WIM/src/utils.cpp
index 6cf6219322..6cf6219322 100644
--- a/protocols/Icq10/src/utils.cpp
+++ b/protocols/ICQ-WIM/src/utils.cpp
diff --git a/protocols/Icq10/src/version.h b/protocols/ICQ-WIM/src/version.h
index fbf8c9aca9..3c290b0655 100644
--- a/protocols/Icq10/src/version.h
+++ b/protocols/ICQ-WIM/src/version.h
@@ -5,7 +5,7 @@
 
 #include <stdver.h>
 
-#define __PLUGIN_NAME            "ICQ/2018 protocol"
+#define __PLUGIN_NAME            "ICQ-WIM protocol"
 #define __FILENAME               "ICQ.dll"
 #define __DESCRIPTION            "ICQ protocol support for Miranda NG."
 #define __AUTHOR                 "George Hazan"