mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Replaced deprecated functions

Browse Source
This commit is contained in:
Sanel Zukan 2009-04-16 11:32:31 +00:00
parent 64866783c4
commit ae3d4d7f17
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
evoke/EvokeService.cpp
View File

@ -14,6 +14,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <edelib/File.h> #include <edelib/File.h>
#include <edelib/FileTest.h>
#include <edelib/Debug.h> #include <edelib/Debug.h>
#include <edelib/Config.h> #include <edelib/Config.h>
#include <edelib/Resource.h> #include <edelib/Resource.h>
@ -36,9 +37,10 @@ EDELIB_NS_USING(EdbusMessage)
EDELIB_NS_USING(EdbusConnection) EDELIB_NS_USING(EdbusConnection)
EDELIB_NS_USING(EDBUS_SESSION) EDELIB_NS_USING(EDBUS_SESSION)
EDELIB_NS_USING(RES_SYS_ONLY) EDELIB_NS_USING(RES_SYS_ONLY)
EDELIB_NS_USING(file_exists)
EDELIB_NS_USING(file_remove) EDELIB_NS_USING(file_remove)
EDELIB_NS_USING(file_test)
EDELIB_NS_USING(str_trim) EDELIB_NS_USING(str_trim)
EDELIB_NS_USING(FILE_TEST_IS_REGULAR)
#ifdef USE_LOCAL_CONFIG #ifdef USE_LOCAL_CONFIG
#define CONFIG_GET_STRVAL(object, section, key, buff) object.get(section, key, buff, sizeof(buff)) #define CONFIG_GET_STRVAL(object, section, key, buff) object.get(section, key, buff, sizeof(buff))
@ -94,7 +96,7 @@ EvokeService* EvokeService::instance(void) {
} }
bool EvokeService::setup_lock(const char* name) { bool EvokeService::setup_lock(const char* name) {
if(file_exists(name)) if(file_test(name, FILE_TEST_IS_REGULAR))
return false; return false;
FILE* f = fopen(name, "w"); FILE* f = fopen(name, "w");

6
evoke/Splash.cpp
View File

@ -17,6 +17,7 @@
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <edelib/Util.h> #include <edelib/Util.h>
#include <edelib/Directory.h> #include <edelib/Directory.h>
#include <edelib/FileTest.h>
#include <edelib/Resource.h> #include <edelib/Resource.h>
#include <edelib/Run.h> #include <edelib/Run.h>
@ -28,9 +29,10 @@
EDELIB_NS_USING(String) EDELIB_NS_USING(String)
EDELIB_NS_USING(Resource) EDELIB_NS_USING(Resource)
EDELIB_NS_USING(build_filename) EDELIB_NS_USING(build_filename)
EDELIB_NS_USING(dir_exists) EDELIB_NS_USING(file_test)
EDELIB_NS_USING(run_async) EDELIB_NS_USING(run_async)
EDELIB_NS_USING(RES_SYS_ONLY) EDELIB_NS_USING(RES_SYS_ONLY)
EDELIB_NS_USING(FILE_TEST_IS_DIR)
#ifndef EDEWM_HAVE_NET_SPLASH #ifndef EDEWM_HAVE_NET_SPLASH
static Splash* global_splash = NULL; static Splash* global_splash = NULL;
@ -129,7 +131,7 @@ void Splash::run(void) {
splash_theme_path += E_DIR_SEPARATOR; splash_theme_path += E_DIR_SEPARATOR;
splash_theme_path += *splash_theme; splash_theme_path += *splash_theme;
if(!dir_exists(splash_theme_path.c_str())) { if(!file_test(splash_theme_path.c_str(), FILE_TEST_IS_DIR)) {
E_WARNING(E_STRLOC ": Unable to locate '%s' in '%s' theme directory\n", E_WARNING(E_STRLOC ": Unable to locate '%s' in '%s' theme directory\n",
splash_theme->c_str(), splash_theme_path.c_str()); splash_theme->c_str(), splash_theme_path.c_str());
return; return;