From 9e98607f1b6a2c757de51fca6c1649cbdf536597 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 3 Jun 2019 14:31:17 +0300
Subject: [PATCH] Fix references to deprecated functions

---
 examples/grep.cpp                  | 12 ++-----
 examples/ls.cpp                    |  2 +-
 examples/z.cpp                     |  7 ++--
 source/core/windows/semaphore.cpp  |  2 +-
 source/fs/android/dir_location.cpp |  5 +++
 source/fs/dir.cpp                  | 54 +++++++++++-------------------
 source/fs/osx/dir_location.cpp     | 12 ++++++-
 source/fs/unix/dir_location.cpp    | 12 +++++--
 source/fs/windows/dir_location.cpp | 12 +++++--
 tests/datetime.cpp                 |  2 +-
 tests/pipe.cpp                     |  2 +-
 tests/thread.cpp                   |  2 +-
 tests/timezone.cpp                 |  2 +-
 13 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/examples/grep.cpp b/examples/grep.cpp
index c87ee72..66d70f3 100644
--- a/examples/grep.cpp
+++ b/examples/grep.cpp
@@ -9,19 +9,13 @@ using namespace Msp;
 int main(int argc, char **argv)
 {
 	bool debug = false;
+	string re_str;
 	GetOpt getopt;
 	getopt.add_option('d', "debug", debug, GetOpt::NO_ARG);
+	getopt.add_argument("regex", re_str, GetOpt::REQUIRED_ARG);
 	getopt(argc, argv);
 
-	const vector<string> &args = getopt.get_args();
-
-	if(args.empty())
-	{
-		cerr<<"Usage: "<<argv[0]<<" <regex>\n";
-		return 1;
-	}
-
-	Regex regex(args[0]);
+	Regex regex(re_str);
 	if(debug)
 		cout<<regex.disassemble();
 	string line;
diff --git a/examples/ls.cpp b/examples/ls.cpp
index a31c19b..3e87318 100644
--- a/examples/ls.cpp
+++ b/examples/ls.cpp
@@ -31,9 +31,9 @@ Ls::Ls(int argc, char **argv):
 {
 	GetOpt getopt;
 	getopt.add_option('l', "long", long_format, GetOpt::NO_ARG);
+	getopt.add_argument("file", args, GetOpt::OPTIONAL_ARG);
 	getopt(argc, argv);
 
-	args = getopt.get_args();
 	if(args.empty())
 		args.push_back(".");
 }
diff --git a/examples/z.cpp b/examples/z.cpp
index 54f0eb7..d98392c 100644
--- a/examples/z.cpp
+++ b/examples/z.cpp
@@ -26,13 +26,14 @@ public:
 Z::Z(int argc, char **argv):
 	input_file(0)
 {
+	string input_fn;
 	GetOpt getopt;
 	getopt.add_option('d', "decompress", decompress, GetOpt::NO_ARG);
+	getopt.add_argument("filename", input_fn, GetOpt::OPTIONAL_ARG);
 	getopt(argc, argv);
 
-	const vector<string> &args = getopt.get_args();
-	if(!args.empty())
-		input_file = new IO::File(args[0]);
+	if(!input_fn.empty())
+		input_file = new IO::File(input_fn);
 
 	input = (input_file ? static_cast<IO::Base *>(input_file) : static_cast<IO::Base *>(&IO::cin));
 	output = &IO::cout;
diff --git a/source/core/windows/semaphore.cpp b/source/core/windows/semaphore.cpp
index 749d993..c81f815 100644
--- a/source/core/windows/semaphore.cpp
+++ b/source/core/windows/semaphore.cpp
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include <msp/core/systemerror.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include "semaphore.h"
 
 namespace Msp {
diff --git a/source/fs/android/dir_location.cpp b/source/fs/android/dir_location.cpp
index f9e0ea5..da6b5c7 100644
--- a/source/fs/android/dir_location.cpp
+++ b/source/fs/android/dir_location.cpp
@@ -13,6 +13,11 @@ Path get_home_dir()
 }
 
 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());
 	return thread->get_internal_data_path();
diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index bd9eaa5..8625b78 100644
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -130,18 +130,16 @@ list<string> list_filtered(const Path &path, const string &filter)
 	return result;
 }
 
-Path get_user_data_dir()
+Path get_sys_conf_dir(const string &)
 {
-	const string &name = Application::get_name();
-	if(name.empty())
-		throw logic_error("application name not known");
-	return get_user_data_dir(name);
+	return get_sys_conf_dir();
 }
 
-Path get_sys_conf_dir(const string &argv0)
+Path get_sys_conf_dir()
 {
-	if(argv0.empty())
-		throw invalid_argument("get_sys_conf_dir");
+	const char *argv0 = Application::get_argv0();
+	if(!argv0)
+		throw logic_error("no startup command");
 
 	Path dir = get_bin_dir(argv0);
 
@@ -156,58 +154,46 @@ Path get_sys_conf_dir(const string &argv0)
 		return dir;
 }
 
-Path get_sys_conf_dir()
+Path get_sys_data_dir(const string &, const string &)
 {
-	const char *argv0 = Application::get_argv0();
-	if(!argv0)
-		throw logic_error("no startup command");
-	return get_sys_conf_dir(argv0);
+	return get_sys_data_dir();
 }
 
-Path get_sys_data_dir(const string &argv0, const string &appname)
+Path get_sys_data_dir()
 {
-	if(argv0.empty() || appname.empty())
-		throw invalid_argument("get_sys_data_dir");
+	const char *argv0 = Application::get_argv0();
+	if(!argv0)
+		throw logic_error("no startup command");
 
 	Path dir = get_bin_dir(argv0);
 
 	if(dir[-1]=="bin" || dir[-1]=="sbin")
-		return dir/".."/"share"/appname;
+		return dir/".."/"share"/Application::get_name();
 	else if(dir[-1]=="MacOS")
 		return dir/".."/"Resources";
 	else
 		return dir;
 }
 
-Path get_sys_data_dir()
+Path get_sys_lib_dir(const string &, const string &)
 {
-	const char *argv0 = Application::get_argv0();
-	if(!argv0)
-		throw logic_error("no startup command");
-	return get_sys_data_dir(argv0, Application::get_name());
+	return get_sys_lib_dir();
 }
 
-Path get_sys_lib_dir(const string &argv0, const string &appname)
+Path get_sys_lib_dir()
 {
-	if(argv0.empty() || appname.empty())
-		throw invalid_argument("get_sys_lib_dir");
+	const char *argv0 = Application::get_argv0();
+	if(!argv0)
+		throw logic_error("no startup command");
 
 	Path dir = get_bin_dir(argv0);
 
 	if(dir[-1]=="bin" || dir[-1]=="sbin")
-		return dir/".."/"lib"/appname;
+		return dir/".."/"lib"/Application::get_name();
 	else
 		return dir;
 }
 
-Path get_sys_lib_dir()
-{
-	const char *argv0 = Application::get_argv0();
-	if(!argv0)
-		throw logic_error("no startup command");
-	return get_sys_lib_dir(argv0, Application::get_name());
-}
-
 Path path_lookup(const string &name, const list<Path> &paths)
 {
 	for(list<Path>::const_iterator i=paths.begin(); i!=paths.end(); ++i)
diff --git a/source/fs/osx/dir_location.cpp b/source/fs/osx/dir_location.cpp
index 7ce89f7..7e9985b 100644
--- a/source/fs/osx/dir_location.cpp
+++ b/source/fs/osx/dir_location.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/application.h>
 #include "dir.h"
 
 using namespace std;
@@ -22,8 +23,17 @@ Path get_home_dir()
 	return ".";
 }
 
-Path get_user_data_dir(const string &appname)
+Path get_user_data_dir(const string &)
 {
+	return get_user_data_dir();
+}
+
+Path get_user_data_dir()
+{
+	const string &appname = Application::get_name();
+	if(appname.empty())
+		throw logic_error("no application name");
+
 	char buf[1024];
 	unsigned len = get_application_support_dir(buf, sizeof(buf));
 	if(len)
diff --git a/source/fs/unix/dir_location.cpp b/source/fs/unix/dir_location.cpp
index e81b8b9..804229e 100644
--- a/source/fs/unix/dir_location.cpp
+++ b/source/fs/unix/dir_location.cpp
@@ -1,4 +1,5 @@
 #include <cstdlib>
+#include <msp/core/application.h>
 #include "dir.h"
 
 using namespace std;
@@ -14,10 +15,17 @@ Path get_home_dir()
 	return ".";
 }
 
-Path get_user_data_dir(const string &appname)
+Path get_user_data_dir(const string &)
 {
+	return get_user_data_dir();
+}
+
+Path get_user_data_dir()
+{
+	const string &appname = Application::get_name();
 	if(appname.empty())
-		throw invalid_argument("get_user_data_dir");
+		throw logic_error("no application name");
+
 	return get_home_dir()/("."+appname);
 }
 
diff --git a/source/fs/windows/dir_location.cpp b/source/fs/windows/dir_location.cpp
index ea542be..a1d24de 100644
--- a/source/fs/windows/dir_location.cpp
+++ b/source/fs/windows/dir_location.cpp
@@ -1,4 +1,5 @@
 #include <shlobj.h>
+#include <msp/core/application.h>
 #include "dir.h"
 
 using namespace std;
@@ -14,10 +15,17 @@ Path get_home_dir()
 	return ".";
 }
 
-Path get_user_data_dir(const string &appname)
+Path get_user_data_dir(const string &)
 {
+	return get_user_data_dir();
+}
+
+Path get_user_data_dir()
+{
+	const string &appname = Application::get_name();
 	if(appname.empty())
-		throw invalid_argument("get_user_data_dir");
+		throw logic_error("no application name");
+
 	char datadir[MAX_PATH];
 	if(SHGetFolderPath(0, CSIDL_LOCAL_APPDATA, 0, 0, datadir)==S_OK)
 		return Path(datadir)/appname;
diff --git a/tests/datetime.cpp b/tests/datetime.cpp
index 45a8699..fafd6d5 100644
--- a/tests/datetime.cpp
+++ b/tests/datetime.cpp
@@ -1,7 +1,7 @@
 #include <msp/time/datetime.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/timestamp.h>
 #include <msp/time/timezone.h>
-#include <msp/time/units.h>
 #include <msp/test/test.h>
 
 using namespace std;
diff --git a/tests/pipe.cpp b/tests/pipe.cpp
index 0310bdf..f9aa5bc 100644
--- a/tests/pipe.cpp
+++ b/tests/pipe.cpp
@@ -1,7 +1,7 @@
 #include <msp/core/thread.h>
 #include <msp/io/pipe.h>
 #include <msp/io/poll.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/test/test.h>
 
 using namespace Msp;
diff --git a/tests/thread.cpp b/tests/thread.cpp
index 9529af8..7f92502 100644
--- a/tests/thread.cpp
+++ b/tests/thread.cpp
@@ -1,7 +1,7 @@
 #include <list>
 #include <vector>
 #include <msp/core/thread.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 #include <msp/test/test.h>
 
diff --git a/tests/timezone.cpp b/tests/timezone.cpp
index c59cdd3..1b4a72f 100644
--- a/tests/timezone.cpp
+++ b/tests/timezone.cpp
@@ -1,4 +1,4 @@
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/timezone.h>
 #include <msp/test/test.h>
 
-- 
2.43.0