From cc499488dbab9167870e6088f9a1793f95894c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 6 Jul 2014 11:15:15 +0200 Subject: Fix liteloader, some cleanups. --- gui/pages/ModFolderPage.cpp | 1 - gui/pages/ScreenshotsPage.cpp | 61 +------------------------------------------ gui/pages/VersionPage.cpp | 1 - 3 files changed, 1 insertion(+), 62 deletions(-) (limited to 'gui/pages') diff --git a/gui/pages/ModFolderPage.cpp b/gui/pages/ModFolderPage.cpp index 2035e57a..7e0eea52 100644 --- a/gui/pages/ModFolderPage.cpp +++ b/gui/pages/ModFolderPage.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/gui/pages/ScreenshotsPage.cpp b/gui/pages/ScreenshotsPage.cpp index f3ec0c1d..466b3c19 100644 --- a/gui/pages/ScreenshotsPage.cpp +++ b/gui/pages/ScreenshotsPage.cpp @@ -21,66 +21,7 @@ #include "logic/screenshots/ImgurAlbumCreation.h" #include "logic/tasks/SequentialTask.h" -template -class RWStorage -{ -public: - void add(K key, V value) - { - QWriteLocker l(&lock); - cache[key] = value; - stale_entries.remove(key); - } - V get(K key) - { - QReadLocker l(&lock); - if(cache.contains(key)) - { - return cache[key]; - } - else return V(); - } - bool get(K key, V& value) - { - QReadLocker l(&lock); - if(cache.contains(key)) - { - value = cache[key]; - return true; - } - else return false; - } - bool has(K key) - { - QReadLocker l(&lock); - return cache.contains(key); - } - bool stale(K key) - { - QReadLocker l(&lock); - if(!cache.contains(key)) - return true; - return stale_entries.contains(key); - } - void setStale(K key) - { - QReadLocker l(&lock); - if(cache.contains(key)) - { - stale_entries.insert(key); - } - } - void clear() - { - QWriteLocker l(&lock); - cache.clear(); - } -private: - QReadWriteLock lock; - QMap cache; - QSet stale_entries; -}; - +#include "logic/RWStorage.h" typedef RWStorage SharedIconCache; typedef std::shared_ptr SharedIconCachePtr; diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp index d3df5b46..ec83ef87 100644 --- a/gui/pages/VersionPage.cpp +++ b/gui/pages/VersionPage.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include -- cgit v1.2.3