summaryrefslogtreecommitdiff
path: root/util
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 /util
parent6458b1b485c7481da6d2d1bf235b44fe3b700bd3 (diff)
downloadfluxbox_lack-b3fa5c242881b55a76c0e25b3cebaf15d0744f69.zip
fluxbox_lack-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 'util')
-rw-r--r--util/fbrun/FbRun.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index 8cb79b0..4b51c4b 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -27,7 +27,7 @@
27#include "EventManager.hh" 27#include "EventManager.hh"
28#include "Color.hh" 28#include "Color.hh"
29#include "KeyUtil.hh" 29#include "KeyUtil.hh"
30#include "Directory.hh" 30#include "FileUtil.hh"
31 31
32#ifdef HAVE_CONFIG_H 32#ifdef HAVE_CONFIG_H
33#include "config.h" 33#include "config.h"
@@ -393,18 +393,18 @@ void FbRun::tabCompleteApps() {
393 filename; 393 filename;
394 394
395 // directories in dirmode ? 395 // directories in dirmode ?
396 if (add_dirs && dir.isDirectory(fncomplete) && 396 if (add_dirs && FbTk::FileUtil::isDirectory(fncomplete.c_str()) &&
397 filename != ".." && filename != ".") { 397 filename != ".." && filename != ".") {
398 m_apps.push_back(fncomplete); 398 m_apps.push_back(fncomplete);
399 // executables in dirmode ? 399 // executables in dirmode ?
400 } else if (add_dirs && dir.isRegularFile(fncomplete) && 400 } else if (add_dirs && FbTk::FileUtil::isRegularFile(fncomplete.c_str()) &&
401 dir.isExecutable(fncomplete) && 401 FbTk::FileUtil::isExecutable(fncomplete.c_str()) &&
402 (prefix == "" || 402 (prefix == "" ||
403 fncomplete.substr(0, prefix.size()) == prefix)) { 403 fncomplete.substr(0, prefix.size()) == prefix)) {
404 m_apps.push_back(fncomplete); 404 m_apps.push_back(fncomplete);
405 // executables in $PATH ? 405 // executables in $PATH ?
406 } else if (dir.isRegularFile(fncomplete) && 406 } else if (FbTk::FileUtil::isRegularFile(fncomplete.c_str()) &&
407 dir.isExecutable(fncomplete) && 407 FbTk::FileUtil::isExecutable(fncomplete.c_str()) &&
408 (prefix == "" || 408 (prefix == "" ||
409 filename.substr(0, prefix.size()) == prefix)) { 409 filename.substr(0, prefix.size()) == prefix)) {
410 m_apps.push_back(filename); 410 m_apps.push_back(filename);
@@ -440,7 +440,7 @@ void FbRun::tabCompleteApps() {
440 } 440 }
441 if (m_apps[apps_item].find(prefix) == 0) { 441 if (m_apps[apps_item].find(prefix) == 0) {
442 m_current_apps_item = apps_item; 442 m_current_apps_item = apps_item;
443 if (add_dirs && FbTk::Directory::isDirectory(m_apps[m_current_apps_item])) 443 if (add_dirs && FbTk::FileUtil::isDirectory(m_apps[m_current_apps_item].c_str()))
444 setText(m_apps[m_current_apps_item] + "/"); 444 setText(m_apps[m_current_apps_item] + "/");
445 else 445 else
446 setText(m_apps[m_current_apps_item]); 446 setText(m_apps[m_current_apps_item]);