105 lines
3.6 KiB
Diff
105 lines
3.6 KiB
Diff
diff --git a/resources/rssguard.rc.in b/resources/rssguard.rc.in
|
|
index b15e3e5..af8028f 100644
|
|
--- a/resources/rssguard.rc.in
|
|
+++ b/resources/rssguard.rc.in
|
|
@@ -1,9 +1,11 @@
|
|
#include <windows.h>
|
|
|
|
+#ifdef _MSC_VER
|
|
#define VS_FF_DEBUG 0x00000001L
|
|
#define VOS__WINDOWS32 0x00000004L
|
|
#define VFT_UNKNOWN 0x00000000L
|
|
#define VFT2_UNKNOWN 0x00000000L
|
|
+#endif
|
|
|
|
IDI_ICON1 ICON "@CMAKE_PROJECT_NAME@.ico"
|
|
|
|
diff --git a/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp b/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp
|
|
index c0cf257..f425dcc 100644
|
|
--- a/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp
|
|
+++ b/src/librssguard-gmail/src/3rd-party/mimesis/mimesis.cpp
|
|
@@ -865,16 +865,16 @@ namespace Mimesis {
|
|
|
|
Part part;
|
|
|
|
- part.preamble = move(preamble);
|
|
- part.epilogue = move(epilogue);
|
|
- part.parts = move(parts);
|
|
- part.boundary = move(boundary);
|
|
+ part.preamble = std::move(preamble);
|
|
+ part.epilogue = std::move(epilogue);
|
|
+ part.parts = std::move(parts);
|
|
+ part.boundary = std::move(boundary);
|
|
part.multipart = true;
|
|
part.set_header("Content-Type", get_header("Content-Type"));
|
|
part.set_header("Content-Disposition", get_header("Content-Disposition"));
|
|
erase_header("Content-Disposition");
|
|
part.crlf = crlf;
|
|
- parts.emplace_back(move(part));
|
|
+ parts.emplace_back(std::move(part));
|
|
}
|
|
else {
|
|
multipart = true;
|
|
@@ -888,7 +888,7 @@ namespace Mimesis {
|
|
part.set_header("Content-Type", get_header("Content-Type"));
|
|
part.set_header("Content-Disposition", get_header("Content-Disposition"));
|
|
erase_header("Content-Disposition");
|
|
- part.body = move(body);
|
|
+ part.body = std::move(body);
|
|
}
|
|
}
|
|
|
|
@@ -919,7 +919,7 @@ namespace Mimesis {
|
|
set_header("Content-Disposition", part.get_header("Content-Disposition"));
|
|
|
|
if (part.multipart) {
|
|
- parts = move(part.parts);
|
|
+ parts = std::move(part.parts);
|
|
}
|
|
else {
|
|
multipart = false;
|
|
diff --git a/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp b/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp
|
|
index c0cf257..f425dcc 100644
|
|
--- a/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp
|
|
+++ b/src/librssguard-reddit/src/3rd-party/mimesis/mimesis.cpp
|
|
@@ -865,16 +865,16 @@ namespace Mimesis {
|
|
|
|
Part part;
|
|
|
|
- part.preamble = move(preamble);
|
|
- part.epilogue = move(epilogue);
|
|
- part.parts = move(parts);
|
|
- part.boundary = move(boundary);
|
|
+ part.preamble = std::move(preamble);
|
|
+ part.epilogue = std::move(epilogue);
|
|
+ part.parts = std::move(parts);
|
|
+ part.boundary = std::move(boundary);
|
|
part.multipart = true;
|
|
part.set_header("Content-Type", get_header("Content-Type"));
|
|
part.set_header("Content-Disposition", get_header("Content-Disposition"));
|
|
erase_header("Content-Disposition");
|
|
part.crlf = crlf;
|
|
- parts.emplace_back(move(part));
|
|
+ parts.emplace_back(std::move(part));
|
|
}
|
|
else {
|
|
multipart = true;
|
|
@@ -888,7 +888,7 @@ namespace Mimesis {
|
|
part.set_header("Content-Type", get_header("Content-Type"));
|
|
part.set_header("Content-Disposition", get_header("Content-Disposition"));
|
|
erase_header("Content-Disposition");
|
|
- part.body = move(body);
|
|
+ part.body = std::move(body);
|
|
}
|
|
}
|
|
|
|
@@ -919,7 +919,7 @@ namespace Mimesis {
|
|
set_header("Content-Disposition", part.get_header("Content-Disposition"));
|
|
|
|
if (part.multipart) {
|
|
- parts = move(part.parts);
|
|
+ parts = std::move(part.parts);
|
|
}
|
|
else {
|
|
multipart = false;
|