Remove deprecated things

diff --git a/source/core/getopt.h b/source/core/getopt.h
index 64a946c80f1b4bd9ee35509c8f297fde0bdf6671..3b579a664feff1caec0786de762b305647e5fe78 100644 (file)
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 #include <msp/strings/lexicalcast.h>
 #include <string>
 #include <vector>
 #include <msp/strings/lexicalcast.h>

-#include "attributes.h"

 #include "noncopyable.h"
 
 namespace Msp {
 #include "noncopyable.h"
 
 namespace Msp {


@@ -216,10 +215,6 @@ public:
        GetOpt();
        ~GetOpt();
 
        GetOpt();
        ~GetOpt();
 

-       /** Returns any non-option arguments encountered during processing.
-       Deprecated; use add_argument instead. */
-       DEPRECATED const std::vector<std::string> &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
        /** 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 da6b5c70ac47c28093e530e962d0c4f580a212bb..155d14782aa5e37ce503d0093d138defddb47960 100644 (file)
--- a/source/fs/android/dir_location.cpp
+++ b/source/fs/android/dir_location.cpp
@@ -12,11 +12,6 @@ Path get_home_dir()
        return "/sdcard";
 }
 
        return "/sdcard";
 }
 

-Path get_user_data_dir(const string &)
-{
-       return get_user_data_dir();
-}
-

 Path get_user_data_dir()
 {
        Android::MainThread *thread = reinterpret_cast<Android::MainThread *>(Application::get_data());
 Path get_user_data_dir()
 {
        Android::MainThread *thread = reinterpret_cast<Android::MainThread *>(Application::get_data());

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index 3811c3f447f7f4b0b7677b17be8ce4d0f454f82a..7f81e4ea8301ef07ce7c4062bf65323de6f9dfc8 100644 (file)
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -130,11 +130,6 @@ list<string> list_filtered(const Path &path, const string &filter)
        return result;
 }
 
        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();
 Path get_sys_conf_dir()
 {
        const char *argv0 = Application::get_argv0();


@@ -154,11 +149,6 @@ Path get_sys_conf_dir()
                return 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();
 Path get_sys_data_dir()
 {
        const char *argv0 = Application::get_argv0();


@@ -175,11 +165,6 @@ Path get_sys_data_dir()
                return 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();
 Path get_sys_lib_dir()
 {
        const char *argv0 = Application::get_argv0();

diff --git a/source/fs/dir.h b/source/fs/dir.h
index 89d86ed9383c0f99661d80d1b169d82c87a2a585..be5fac8662533b908cd720059e25deece28a81f4 100644 (file)
--- a/source/fs/dir.h
+++ b/source/fs/dir.h
@@ -4,7 +4,6 @@
 #include <list>
 #include <stdexcept>
 #include <string>
 #include <list>
 #include <stdexcept>
 #include <string>

-#include <msp/core/attributes.h>

 #include "path.h"
 
 namespace Msp {
 #include "path.h"
 
 namespace Msp {


@@ -44,27 +43,15 @@ void chdir(const Path &);
 /// Returns the user's home directory
 Path get_home_dir();
 
 /// 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();
 
 /// 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();
 
 /// 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();
 
 /// 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();
 
 /// 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 7e9985b008228d25bce53ae5331839d4e933c428..89d6f576a9dc470e4c0efeabe9024c914ad2fb81 100644 (file)
--- a/source/fs/osx/dir_location.cpp
+++ b/source/fs/osx/dir_location.cpp
@@ -23,11 +23,6 @@ Path get_home_dir()
        return ".";
 }
 
        return ".";
 }
 

-Path get_user_data_dir(const string &)
-{
-       return get_user_data_dir();
-}
-

 Path get_user_data_dir()
 {
        const string &appname = Application::get_name();
 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 804229ebed253f967e593e11c0f91167108f4020..c980bb27a08bf5f5357299a0072f815b16ddf523 100644 (file)
--- a/source/fs/unix/dir_location.cpp
+++ b/source/fs/unix/dir_location.cpp
@@ -15,11 +15,6 @@ Path get_home_dir()
        return ".";
 }
 
        return ".";
 }
 

-Path get_user_data_dir(const string &)
-{
-       return get_user_data_dir();
-}
-

 Path get_user_data_dir()
 {
        const string &appname = Application::get_name();
 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 a1d24de672e7c51857dd361fcbd9fbb3877f7c8f..4c3b8668438d52d09c1b4816e745563b544dd75e 100644 (file)
--- a/source/fs/windows/dir_location.cpp
+++ b/source/fs/windows/dir_location.cpp
@@ -15,11 +15,6 @@ Path get_home_dir()
        return ".";
 }
 
        return ".";
 }
 

-Path get_user_data_dir(const string &)
-{
-       return get_user_data_dir();
-}
-

 Path get_user_data_dir()
 {
        const string &appname = Application::get_name();
 Path get_user_data_dir()
 {
        const string &appname = Application::get_name();

diff --git a/source/io/poll.h b/source/io/poll.h
index 40c15a70cb84389caa0d9df7a0273383dbc87ac2..0fb1ebc700a86126822464b3ec3c4bdcfd45e5a4 100644 (file)
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <vector>
 
 #include <map>
 #include <vector>

-#include <msp/core/attributes.h>

 #include <msp/core/noncopyable.h>
 #include <msp/time/timedelta.h>
 
 #include <msp/core/noncopyable.h>
 #include <msp/time/timedelta.h>
 


@@ -43,9 +42,6 @@ public:
                PolledObject(EventObject *o, PollEvent e): object(o), events(e) { }
        };
 
                PolledObject(EventObject *o, PollEvent e): object(o), events(e) { }
        };
 

-       typedef PolledObject Slot DEPRECATED;
-
-       typedef std::vector<PolledObject> SlotList DEPRECATED;

 private:
        struct Private;
 
 private:
        struct Private;
 

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index e0af57cc78fcc41363632e169e33a8219653e9f1..c15cd28eaed1752f6cc3c904ba57d2171dd030c5 100644 (file)
--- 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);
 void Timer::tick()
 {
        do_tick(-sec);

diff --git a/source/time/timer.h b/source/time/timer.h
index 62f248d23a722078472c461b9f04186c6cdd827d..8bd4d074a70ea569b19074b32e303323143fae81 100644 (file)
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -3,7 +3,6 @@
 
 #include <vector>
 #include <sigc++/sigc++.h>
 
 #include <vector>
 #include <sigc++/sigc++.h>

-#include <msp/core/attributes.h>

 #include <msp/core/mutex.h>
 #include <msp/core/noncopyable.h>
 #include <msp/core/semaphore.h>
 #include <msp/core/mutex.h>
 #include <msp/core/noncopyable.h>
 #include <msp/core/semaphore.h>


@@ -68,9 +67,6 @@ public:
        /** Cancels a previously added timer. */
        void cancel(Slot &);
 
        /** 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();
        /** 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 (file)
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