From: Mikko Rasa Date: Sun, 29 Aug 2021 08:50:29 +0000 (+0300) Subject: Remove deprecated things X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=commitdiff_plain;h=817e584903996a041692640720a5a272d847a3c7 Remove deprecated things --- diff --git a/source/core/getopt.h b/source/core/getopt.h index 64a946c..3b579a6 100644 --- a/source/core/getopt.h +++ b/source/core/getopt.h @@ -6,7 +6,6 @@ #include #include #include -#include "attributes.h" #include "noncopyable.h" namespace Msp { @@ -216,10 +215,6 @@ public: GetOpt(); ~GetOpt(); - /** Returns any non-option arguments encountered during processing. - Deprecated; use add_argument instead. */ - DEPRECATED const std::vector &get_args() const { return args_raw; } - /** Adds an option with both short and long forms. Processing depends on the type of the destination variable and whether an argument is taken or not. With an argument, the value is lexical_cast to the appropriate type diff --git a/source/fs/android/dir_location.cpp b/source/fs/android/dir_location.cpp index da6b5c7..155d147 100644 --- a/source/fs/android/dir_location.cpp +++ b/source/fs/android/dir_location.cpp @@ -12,11 +12,6 @@ Path get_home_dir() return "/sdcard"; } -Path get_user_data_dir(const string &) -{ - return get_user_data_dir(); -} - Path get_user_data_dir() { Android::MainThread *thread = reinterpret_cast(Application::get_data()); diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp index 3811c3f..7f81e4e 100644 --- a/source/fs/dir.cpp +++ b/source/fs/dir.cpp @@ -130,11 +130,6 @@ list list_filtered(const Path &path, const string &filter) return result; } -Path get_sys_conf_dir(const string &) -{ - return get_sys_conf_dir(); -} - Path get_sys_conf_dir() { const char *argv0 = Application::get_argv0(); @@ -154,11 +149,6 @@ Path get_sys_conf_dir() return dir; } -Path get_sys_data_dir(const string &, const string &) -{ - return get_sys_data_dir(); -} - Path get_sys_data_dir() { const char *argv0 = Application::get_argv0(); @@ -175,11 +165,6 @@ Path get_sys_data_dir() return dir; } -Path get_sys_lib_dir(const string &, const string &) -{ - return get_sys_lib_dir(); -} - Path get_sys_lib_dir() { const char *argv0 = Application::get_argv0(); diff --git a/source/fs/dir.h b/source/fs/dir.h index 89d86ed..be5fac8 100644 --- a/source/fs/dir.h +++ b/source/fs/dir.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "path.h" namespace Msp { @@ -44,27 +43,15 @@ void chdir(const Path &); /// Returns the user's home directory Path get_home_dir(); -/// Deprecated. Use the argument-less version instead. -DEPRECATED Path get_user_data_dir(const std::string &appname); - /// Returns a directory suitable for storing user-specific data. Path get_user_data_dir(); -/// Deprecated. Use the argument-less version instead. -DEPRECATED Path get_sys_conf_dir(const std::string &argv0); - /// Returns a directory containing system-wide configuration. Path get_sys_conf_dir(); -/// Deprecated. Use the argument-less version instead. -DEPRECATED Path get_sys_data_dir(const std::string &argv0, const std::string &appname); - /// Returns a directory containing immutable system-wide data. Path get_sys_data_dir(); -/// Deprecated. Use the argument-less version instead. -DEPRECATED Path get_sys_lib_dir(const std::string &argv0, const std::string &appname); - /// Returns a directory containing system-wide architecture-specific files. Path get_sys_lib_dir(); diff --git a/source/fs/osx/dir_location.cpp b/source/fs/osx/dir_location.cpp index 7e9985b..89d6f57 100644 --- a/source/fs/osx/dir_location.cpp +++ b/source/fs/osx/dir_location.cpp @@ -23,11 +23,6 @@ Path get_home_dir() return "."; } -Path get_user_data_dir(const string &) -{ - return get_user_data_dir(); -} - Path get_user_data_dir() { const string &appname = Application::get_name(); diff --git a/source/fs/unix/dir_location.cpp b/source/fs/unix/dir_location.cpp index 804229e..c980bb2 100644 --- a/source/fs/unix/dir_location.cpp +++ b/source/fs/unix/dir_location.cpp @@ -15,11 +15,6 @@ Path get_home_dir() return "."; } -Path get_user_data_dir(const string &) -{ - return get_user_data_dir(); -} - Path get_user_data_dir() { const string &appname = Application::get_name(); diff --git a/source/fs/windows/dir_location.cpp b/source/fs/windows/dir_location.cpp index a1d24de..4c3b866 100644 --- a/source/fs/windows/dir_location.cpp +++ b/source/fs/windows/dir_location.cpp @@ -15,11 +15,6 @@ Path get_home_dir() return "."; } -Path get_user_data_dir(const string &) -{ - return get_user_data_dir(); -} - Path get_user_data_dir() { const string &appname = Application::get_name(); diff --git a/source/io/poll.h b/source/io/poll.h index 40c15a7..0fb1ebc 100644 --- a/source/io/poll.h +++ b/source/io/poll.h @@ -3,7 +3,6 @@ #include #include -#include #include #include @@ -43,9 +42,6 @@ public: PolledObject(EventObject *o, PollEvent e): object(o), events(e) { } }; - typedef PolledObject Slot DEPRECATED; - - typedef std::vector SlotList DEPRECATED; private: struct Private; diff --git a/source/time/timer.cpp b/source/time/timer.cpp index e0af57c..c15cd28 100644 --- a/source/time/timer.cpp +++ b/source/time/timer.cpp @@ -54,14 +54,6 @@ void Timer::cancel(Slot &slot) } } -void Timer::tick(bool block) -{ - if(block) - tick(); - else - tick(zero); -} - void Timer::tick() { do_tick(-sec); diff --git a/source/time/timer.h b/source/time/timer.h index 62f248d..8bd4d07 100644 --- a/source/time/timer.h +++ b/source/time/timer.h @@ -3,7 +3,6 @@ #include #include -#include #include #include #include @@ -68,9 +67,6 @@ public: /** Cancels a previously added timer. */ void cancel(Slot &); - /** Deprecated. Use one of the other overloads. */ - DEPRECATED void tick(bool block); - /** Waits until a timer expires, then executes it. If no timers have been set, blocks until one is added from another thread. */ void tick(); diff --git a/source/time/units.h b/source/time/units.h deleted file mode 100644 index abb61d8..0000000 --- a/source/time/units.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef MSP_TIME_UNITS_H_ -#define MSP_TIME_UNITS_H_ - -#include "timedelta.h" - -// This header is deprecated -#error "Time units are in timedelta.h" - -#endif