* moved FbTk/Directory.cc/hh over to FbTk/FileUtil.cc/hh which contain now

  file and directory - helproutines.

* created the FileUtil-namespace which contains file-related functions, moved
  those functions out of Directory - code

* changes to the rest of the files to follow those changes

1 files changed, 4 insertions, 4 deletions

diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 40c68e9..5225686 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -26,7 +26,7 @@
 #include "XrmDatabaseHelper.hh"
 #include "App.hh"
 #include "StringUtil.hh"
-#include "Directory.hh"
+#include "FileUtil.hh"
 #include "I18n.hh"
 #include "Image.hh"
 
@@ -87,14 +87,14 @@ bool ThemeManager::load(const std::string &filename, int screen_num) {
     std::string location = FbTk::StringUtil::expandFilename(filename);
     std::string prefix = "";
 
-    if (Directory::isDirectory(filename)) {
+    if (FileUtil::isDirectory(filename.c_str())) {
         prefix = location;
 
         location.append("/theme.cfg");
-        if (!Directory::isRegularFile(location)) {
+        if (!FileUtil::isRegularFile(location.c_str())) {
             location = prefix;
             location.append("/style.cfg");
-            if (!Directory::isRegularFile(location)) {
+            if (!FileUtil::isRegularFile(location.c_str())) {
                 cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl;
                 return false;
             }