Author: mcalmer
Date: Sat Jul 17 19:03:27 2010
New Revision: 2691
URL: http://svn.opensuse.org/viewcvs/limal?rev=2691&view=rev
Log:
remove some more blocxx includes
Modified:
limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp
Modified: limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp?rev=2691&r1=2690&r2=2691&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/CA.cpp Sat Jul 17 19:03:27 2010
@@ -25,11 +25,8 @@
#include
#include
#include
-#include
#include
#include
-#include
-
#include
Modified: limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp
URL: http://svn.opensuse.org/viewcvs/limal/limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp?rev=2691&r1=2690&r2=2691&view=diff
==============================================================================
--- limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp (original)
+++ limal-branches/mc-devel/limal-ca-mgm/src/PathName.cpp Sat Jul 17 19:03:27 2010
@@ -37,7 +37,6 @@
#include
#include
-#include
#include
#include "Utils.hpp"
@@ -57,14 +56,11 @@
namespace path
{
-using namespace blocxx;
-
// -------------------------------------------------------------------
// anonymous namespace
namespace
{
-
size_t
findTildeEnd(const std::string &name)
{
@@ -86,7 +82,6 @@
std::string
expandTilde(const std::string &name)
{
- // FIXME: improve blocxx::UserInfo and use it!!!
if( name.compare(0, 1, "~") == 0)
{
std::string user;
@@ -101,8 +96,7 @@
{
if( ::getuid() != ::geteuid())
{
- EnvVars env(EnvVars::E_CURRENT_ENVIRONMENT);
- home = env.getValue("HOME").c_str();
+ home = getenv("HOME");
if( home.compare(0, 1, "~") == 0)
home = "";
@@ -133,7 +127,7 @@
if( !home.empty())
{
- return home + BLOCXX_FILENAME_SEPARATOR + rest;
+ return home + "/" + rest;
}
}
return name;
--
To unsubscribe, e-mail: limal-commit+unsubscribe@opensuse.org
For additional commands, e-mail: limal-commit+help@opensuse.org
