GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: Migrated osName to libshared

Browse source
This commit is contained in:
Paul Beckingham 2017-01-08 11:52:04 -05:00
parent f5bcec66e5
commit 14e047e7c4
4 changed files with 2 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/calc.cpp
View file

@ -33,8 +33,8 @@
#include <Dates.h> #include <Dates.h>
#include <Context.h> #include <Context.h>
#include <Task.h> #include <Task.h>
#include <shared.h>
#include <format.h> #include <format.h>
#include <util.h>
#include <i18n.h> #include <i18n.h>
Context context; Context context;

2
src/commands/CmdDiagnostics.cpp
View file

@ -34,8 +34,8 @@
#include <RX.h> #include <RX.h>
#include <Context.h> #include <Context.h>
#include <i18n.h> #include <i18n.h>
#include <shared.h>
#include <format.h> #include <format.h>
#include <util.h>
#ifdef HAVE_COMMIT #ifdef HAVE_COMMIT
#include <commit.h> #include <commit.h>
#endif #endif

28
src/util.cpp
View file

@ -258,34 +258,6 @@ time_t timegm (struct tm *tm)
} }
#endif #endif
////////////////////////////////////////////////////////////////////////////////
std::string osName ()
{
#if defined (DARWIN)
return "Darwin";
#elif defined (SOLARIS)
return "Solaris";
#elif defined (CYGWIN)
return "Cygwin";
#elif defined (HAIKU)
return "Haiku";
#elif defined (OPENBSD)
return "OpenBSD";
#elif defined (FREEBSD)
return "FreeBSD";
#elif defined (NETBSD)
return "NetBSD";
#elif defined (LINUX)
return "Linux";
#elif defined (KFREEBSD)
return "GNU/kFreeBSD";
#elif defined (GNUHURD)
return "GNU/Hurd";
#else
return STRING_DOM_UNKNOWN;
#endif
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool nontrivial (const std::string& input) bool nontrivial (const std::string& input)
{ {

1
src/util.h
View file

@ -60,7 +60,6 @@ const std::vector <std::string> extractParents (
time_t timegm (struct tm *tm); time_t timegm (struct tm *tm);
#endif #endif
std::string osName ();
bool nontrivial (const std::string&); bool nontrivial (const std::string&);
int strippedLength (const std::string&); int strippedLength (const std::string&);
const char* optionalBlankLine (); const char* optionalBlankLine ();