Skip to content

Commit 1d4b465

Browse files
committed
More fixes (but not enough to compile)
1 parent 298d63a commit 1d4b465

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

Source/Core/Common/HttpRequest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ HttpRequest::Response HttpRequest::Impl::Fetch(const std::string& url, Method me
279279
list = curl_slist_append(list, (name + ": " + *value).c_str());
280280
}
281281

282-
list = curl_slist_append(list, "User-Agent: Dolphin-PPN/1.0");
282+
list = curl_slist_append(list, "User-Agent: Dolphin-MPN/1.0");
283283

284284
curl_easy_setopt(m_curl.get(), CURLOPT_HTTPHEADER, list);
285285

Source/Core/Common/HttpRequest.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ class HttpRequest final
2828
// Return false to abort the request
2929
using ProgressCallback = std::function<bool(s64 dltotal, s64 dlnow, s64 ultotal, s64 ulnow)>;
3030

31+
void SetProgressCallback(ProgressCallback callback) {
32+
m_callback = std::move(callback);
33+
}
34+
35+
3136
explicit HttpRequest(std::chrono::milliseconds timeout_ms = std::chrono::milliseconds{3000},
3237
ProgressCallback callback = nullptr);
3338
~HttpRequest();
@@ -62,5 +67,6 @@ class HttpRequest final
6267
private:
6368
class Impl;
6469
std::unique_ptr<Impl> m_impl;
70+
ProgressCallback m_callback;
6571
};
6672
} // namespace Common

Source/Core/DolphinQt/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,14 @@ add_executable(dolphin-emu
276276
Main.cpp
277277
MainWindow.cpp
278278
MainWindow.h
279+
ProjectPlus/DownloadUpdateDialog.cpp
280+
ProjectPlus/DownloadUpdateDialog.h
281+
ProjectPlus/DownloadWorker.cpp
282+
ProjectPlus/DownloadWorker.h
283+
ProjectPlus/InstallUpdateDialog.cpp
284+
ProjectPlus/InstallUpdateDialog.h
285+
ProjectPlus/UpdateDialog.cpp
286+
ProjectPlus/UpdateDialog.h
279287
MenuBar.cpp
280288
MenuBar.h
281289
NetPlay/ChunkedProgressDialog.cpp
@@ -296,14 +304,6 @@ add_executable(dolphin-emu
296304
NANDRepairDialog.h
297305
NKitWarningDialog.cpp
298306
NKitWarningDialog.h
299-
ProjectPlus/DownloadUpdateDialog.cpp
300-
ProjectPlus/DownloadUpdateDialog.h
301-
ProjectPlus/DownloadWorker.cpp
302-
ProjectPlus/DownloadWorker.h
303-
ProjectPlus/InstallUpdateDialog.cpp
304-
ProjectPlus/InstallUpdateDialog.h
305-
ProjectPlus/UpdateDialog.cpp
306-
ProjectPlus/UpdateDialog.h
307307
QtUtils/AspectRatioWidget.cpp
308308
QtUtils/AspectRatioWidget.h
309309
QtUtils/BlockUserInputFilter.cpp

Source/Core/DolphinQt/DolphinQt.vcxproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@
174174
<ClCompile Include="InfinityBase/InfinityBaseWindow.cpp" />
175175
<ClCompile Include="Main.cpp" />
176176
<ClCompile Include="MainWindow.cpp" />
177+
<ClCompile Include="ProjectPlus/DownloadUpdateDialog.cpp" />
178+
<ClCompile Include="ProjectPlus/DownloadWorker.cpp" />
179+
<ClCompile Include="ProjectPlus/InstallUpdateDialog.cpp" />
180+
<ClCompile Include="ProjectPlus/UpdateDialog.cpp" />
177181
<ClCompile Include="MenuBar.cpp" />
178182
<ClCompile Include="NetPlay\ChunkedProgressDialog.cpp" />
179183
<ClCompile Include="NetPlay\GameDigestDialog.cpp" />
@@ -184,9 +188,6 @@
184188
<ClCompile Include="NetPlay\PadMappingDialog.cpp" />
185189
<ClCompile Include="NANDRepairDialog.cpp" />
186190
<ClCompile Include="NKitWarningDialog.cpp" />
187-
<ClCompile Include="ProjectPlus/DownloadUpdateDialog.cpp" />
188-
<ClCompile Include="ProjectPlus/InstallUpdateDialog.cpp" />
189-
<ClCompile Include="ProjectPlus/UpdateDialog.cpp" />
190191
<ClCompile Include="pch_qt.cpp">
191192
<PrecompiledHeader>Create</PrecompiledHeader>
192193
</ClCompile>
@@ -394,6 +395,10 @@
394395
<QtMoc Include="HotkeyScheduler.h" />
395396
<QtMoc Include="InfinityBase/InfinityBaseWindow.h" />
396397
<QtMoc Include="MainWindow.h" />
398+
<QtMoc Include="ProjectPlus/DownloadUpdateDialog.h" />
399+
<QtMoc Include="ProjectPlus/DownloadWorker.h" />
400+
<QtMoc Include="ProjectPlus/InstallUpdateDialog.h" />
401+
<QtMoc Include="ProjectPlus/UpdateDialog.h" />
397402
<QtMoc Include="MenuBar.h" />
398403
<QtMoc Include="NetPlay\ChunkedProgressDialog.h" />
399404
<QtMoc Include="NetPlay\GameDigestDialog.h" />
@@ -404,9 +409,6 @@
404409
<QtMoc Include="NetPlay\PadMappingDialog.h" />
405410
<QtMoc Include="NANDRepairDialog.h" />
406411
<QtMoc Include="NKitWarningDialog.h" />
407-
<QtMoc Include="ProjectPlus/DownloadUpdateDialog.h" />
408-
<QtMoc Include="ProjectPlus/InstallUpdateDialog.h" />
409-
<QtMoc Include="ProjectPlus/UpdateDialog.h" />
410412
<QtMoc Include="QtUtils\AspectRatioWidget.h" />
411413
<QtMoc Include="QtUtils\BlockUserInputFilter.h" />
412414
<QtMoc Include="QtUtils\DoubleClickEventFilter.h" />

0 commit comments

Comments
 (0)