summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-04-05 14:50:58 +0200
committerPetr Mrázek <peterix@gmail.com>2015-04-13 00:21:55 +0200
commitf061bf7a27b306f0ef98992673dbf17a502313cb (patch)
treea5e31dac5448a05dc5da607f6b353f4d6e44eb5d /logic
parentd8ea3501eb4de18baf474c3860e7d4aa1737f6ca (diff)
downloadMultiMC-f061bf7a27b306f0ef98992673dbf17a502313cb.tar
MultiMC-f061bf7a27b306f0ef98992673dbf17a502313cb.tar.gz
MultiMC-f061bf7a27b306f0ef98992673dbf17a502313cb.tar.lz
MultiMC-f061bf7a27b306f0ef98992673dbf17a502313cb.tar.xz
MultiMC-f061bf7a27b306f0ef98992673dbf17a502313cb.zip
NOISSUE use QObjectPtr for translations and screenshots
Diffstat (limited to 'logic')
-rw-r--r--logic/QObjectPtr.h4
-rw-r--r--logic/trans/TranslationDownloader.h7
2 files changed, 8 insertions, 3 deletions
diff --git a/logic/QObjectPtr.h b/logic/QObjectPtr.h
index 74c6e82a..2bde1bd8 100644
--- a/logic/QObjectPtr.h
+++ b/logic/QObjectPtr.h
@@ -46,6 +46,10 @@ public:
{
return m_ptr.get() != nullptr;
}
+ const std::shared_ptr <T> unwrap() const
+ {
+ return m_ptr;
+ }
private:
std::shared_ptr <T> m_ptr;
diff --git a/logic/trans/TranslationDownloader.h b/logic/trans/TranslationDownloader.h
index 450b714b..6bcb223f 100644
--- a/logic/trans/TranslationDownloader.h
+++ b/logic/trans/TranslationDownloader.h
@@ -4,6 +4,7 @@
#include <QUrl>
#include <memory>
#include <QObject>
+#include <net/NetJob.h>
class ByteArrayDownload;
class NetJob;
@@ -25,6 +26,6 @@ private slots:
private:
std::shared_ptr<ByteArrayDownload> m_index_task;
- std::shared_ptr<NetJob> m_dl_job;
- std::shared_ptr<NetJob> m_index_job;
-}; \ No newline at end of file
+ NetJobPtr m_dl_job;
+ NetJobPtr m_index_job;
+};