aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Theme.cc
diff options
context:
space:
mode:
authormathias <mathias>2004-12-18 01:29:22 (GMT)
committermathias <mathias>2004-12-18 01:29:22 (GMT)
commitb3fa5c242881b55a76c0e25b3cebaf15d0744f69 (patch)
treebcdb8e0df23428f3f3107e27e6af008d6a0409cc /src/FbTk/Theme.cc
parent6458b1b485c7481da6d2d1bf235b44fe3b700bd3 (diff)
downloadfluxbox-b3fa5c242881b55a76c0e25b3cebaf15d0744f69.zip
fluxbox-b3fa5c242881b55a76c0e25b3cebaf15d0744f69.tar.bz2
* 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
Diffstat (limited to 'src/FbTk/Theme.cc')
-rw-r--r--src/FbTk/Theme.cc8
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 @@
26#include "XrmDatabaseHelper.hh" 26#include "XrmDatabaseHelper.hh"
27#include "App.hh" 27#include "App.hh"
28#include "StringUtil.hh" 28#include "StringUtil.hh"
29#include "Directory.hh" 29#include "FileUtil.hh"
30#include "I18n.hh" 30#include "I18n.hh"
31#include "Image.hh" 31#include "Image.hh"
32 32
@@ -87,14 +87,14 @@ bool ThemeManager::load(const std::string &filename, int screen_num) {
87 std::string location = FbTk::StringUtil::expandFilename(filename); 87 std::string location = FbTk::StringUtil::expandFilename(filename);
88 std::string prefix = ""; 88 std::string prefix = "";
89 89
90 if (Directory::isDirectory(filename)) { 90 if (FileUtil::isDirectory(filename.c_str())) {
91 prefix = location; 91 prefix = location;
92 92
93 location.append("/theme.cfg"); 93 location.append("/theme.cfg");
94 if (!Directory::isRegularFile(location)) { 94 if (!FileUtil::isRegularFile(location.c_str())) {
95 location = prefix; 95 location = prefix;
96 location.append("/style.cfg"); 96 location.append("/style.cfg");
97 if (!Directory::isRegularFile(location)) { 97 if (!FileUtil::isRegularFile(location.c_str())) {
98 cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl; 98 cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl;
99 return false; 99 return false;
100 } 100 }