[core] Rename ThreadedObject to Thread

Now that the old Thread class is gone, we can give ThreadedObject
a better name.

7 files changed, 14 insertions, 14 deletions

diff --git a/platform/android/src/asset_manager_file_source.cpp b/platform/android/src/asset_manager_file_source.cpp
index 71e03f10b3..aa65e3ff48 100644
--- a/platform/android/src/asset_manager_file_source.cpp
+++ b/platform/android/src/asset_manager_file_source.cpp
@@ -3,7 +3,7 @@
 #include <mbgl/storage/file_source_request.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/util.hpp>
-#include <mbgl/util/threaded_object.hpp>
+#include <mbgl/util/thread.hpp>
 #include <mbgl/util/url.hpp>
 
 #include <android/asset_manager.h>
@@ -40,7 +40,7 @@ private:
 
 AssetManagerFileSource::AssetManagerFileSource(jni::JNIEnv& env, jni::Object<android::AssetManager> assetManager_)
     : assetManager(assetManager_.NewGlobalRef(env)),
-      impl(std::make_unique<util::ThreadedObject<Impl>>("AssetManagerFileSource",
+      impl(std::make_unique<util::Thread<Impl>>("AssetManagerFileSource",
           AAssetManager_fromJava(&env, jni::Unwrap(**assetManager)))) {
 }
 
diff --git a/platform/android/src/asset_manager_file_source.hpp b/platform/android/src/asset_manager_file_source.hpp
index 9a86da6c40..dcad95664a 100644
--- a/platform/android/src/asset_manager_file_source.hpp
+++ b/platform/android/src/asset_manager_file_source.hpp
@@ -9,7 +9,7 @@
 namespace mbgl {
 
 namespace util {
-template <typename T> class ThreadedObject;
+template <typename T> class Thread;
 } // namespace util
 
 class AssetManagerFileSource : public FileSource {
@@ -23,7 +23,7 @@ private:
     class Impl;
 
     jni::UniqueObject<android::AssetManager> assetManager;
-    std::unique_ptr<util::ThreadedObject<Impl>> impl;
+    std::unique_ptr<util::Thread<Impl>> impl;
 };
 
 } // namespace mbgl
diff --git a/platform/android/src/run_loop.cpp b/platform/android/src/run_loop.cpp
index 9a63c9929b..3c605b70e8 100644
--- a/platform/android/src/run_loop.cpp
+++ b/platform/android/src/run_loop.cpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/util/platform.hpp>
 #include <mbgl/util/thread_local.hpp>
-#include <mbgl/util/threaded_object.hpp>
+#include <mbgl/util/thread.hpp>
 #include <mbgl/util/timer.hpp>
 
 #include <android/looper.h>
@@ -105,7 +105,7 @@ RunLoop::Impl::Impl(RunLoop* runLoop_, RunLoop::Type type) : runLoop(runLoop_) {
     case Type::Default:
         ret = ALooper_addFd(loop, fds[PIPE_OUT], ALOOPER_POLL_CALLBACK,
             ALOOPER_EVENT_INPUT, looperCallbackDefault, this);
-        alarm = std::make_unique<ThreadedObject<Alarm>>("Alarm", this);
+        alarm = std::make_unique<Thread<Alarm>>("Alarm", this);
         running = true;
         break;
     }
diff --git a/platform/android/src/run_loop_impl.hpp b/platform/android/src/run_loop_impl.hpp
index 1706051bed..15cbfa14ae 100644
--- a/platform/android/src/run_loop_impl.hpp
+++ b/platform/android/src/run_loop_impl.hpp
@@ -15,7 +15,7 @@ struct ALooper;
 namespace mbgl {
 namespace util {
 
-template <typename T> class ThreadedObject;
+template <typename T> class Thread;
 class Alarm;
 
 class RunLoop::Impl {
@@ -53,7 +53,7 @@ private:
     JNIEnv *env = nullptr;
     bool detach = false;
 
-    std::unique_ptr<ThreadedObject<Alarm>> alarm;
+    std::unique_ptr<Thread<Alarm>> alarm;
 
     std::recursive_mutex mtx;
     std::list<Runnable*> runnables;
diff --git a/platform/default/asset_file_source.cpp b/platform/default/asset_file_source.cpp
index 5b8a18dd8d..343f3b70ce 100644
--- a/platform/default/asset_file_source.cpp
+++ b/platform/default/asset_file_source.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/storage/file_source_request.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/string.hpp>
-#include <mbgl/util/threaded_object.hpp>
+#include <mbgl/util/thread.hpp>
 #include <mbgl/util/url.hpp>
 #include <mbgl/util/util.hpp>
 #include <mbgl/util/io.hpp>
@@ -57,7 +57,7 @@ private:
 };
 
 AssetFileSource::AssetFileSource(const std::string& root)
-    : impl(std::make_unique<util::ThreadedObject<Impl>>("AssetFileSource", root)) {
+    : impl(std::make_unique<util::Thread<Impl>>("AssetFileSource", root)) {
 }
 
 AssetFileSource::~AssetFileSource() = default;
diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp
index a01c89e3ef..dc3e71b0c0 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -8,7 +8,7 @@
 
 #include <mbgl/util/platform.hpp>
 #include <mbgl/util/url.hpp>
-#include <mbgl/util/threaded_object.hpp>
+#include <mbgl/util/thread.hpp>
 #include <mbgl/util/work_request.hpp>
 
 #include <cassert>
@@ -194,7 +194,7 @@ DefaultFileSource::DefaultFileSource(const std::string& cachePath,
                                      std::unique_ptr<FileSource>&& assetFileSource_,
                                      uint64_t maximumCacheSize)
         : assetFileSource(std::move(assetFileSource_))
-        , impl(std::make_unique<util::ThreadedObject<Impl>>("DefaultFileSource", assetFileSource, cachePath, maximumCacheSize)) {
+        , impl(std::make_unique<util::Thread<Impl>>("DefaultFileSource", assetFileSource, cachePath, maximumCacheSize)) {
 }
 
 DefaultFileSource::~DefaultFileSource() = default;
diff --git a/platform/default/local_file_source.cpp b/platform/default/local_file_source.cpp
index 9d84764433..21a291d8d4 100644
--- a/platform/default/local_file_source.cpp
+++ b/platform/default/local_file_source.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/storage/file_source_request.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/string.hpp>
-#include <mbgl/util/threaded_object.hpp>
+#include <mbgl/util/thread.hpp>
 #include <mbgl/util/url.hpp>
 #include <mbgl/util/util.hpp>
 #include <mbgl/util/io.hpp>
@@ -53,7 +53,7 @@ public:
 };
 
 LocalFileSource::LocalFileSource()
-    : impl(std::make_unique<util::ThreadedObject<Impl>>("LocalFileSource")) {
+    : impl(std::make_unique<util::Thread<Impl>>("LocalFileSource")) {
 }
 
 LocalFileSource::~LocalFileSource() = default;