Permalink
Browse files

removed ofxDirList dependency, replaced by ofDirectory

  • Loading branch information...
1 parent cdf703e commit e045599e4a6acd73103a8fa9b9981ef2cb8b2d40 @danomatika danomatika committed Nov 1, 2011
Showing with 5 additions and 25 deletions.
  1. +0 −19 example/controlPanelExample.xcodeproj/project.pbxproj
  2. +4 −4 src/simpleFileLister.cpp
  3. +1 −2 src/simpleFileLister.h
@@ -112,7 +112,6 @@
3065883C145F86170015FD7B /* vectorField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vectorField.h; sourceTree = "<group>"; };
3065883D145F86170015FD7B /* videoMotionExample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = videoMotionExample.cpp; sourceTree = "<group>"; };
3065883E145F86170015FD7B /* videoMotionExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = videoMotionExample.h; sourceTree = "<group>"; };
- 3065884A145F86430015FD7B /* ofxDirList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxDirList.h; sourceTree = "<group>"; };
3065887F145F864D0015FD7B /* guiBaseObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guiBaseObject.cpp; sourceTree = "<group>"; };
30658880145F864D0015FD7B /* guiBaseObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guiBaseObject.h; sourceTree = "<group>"; };
30658881145F864D0015FD7B /* guiCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guiCallback.cpp; sourceTree = "<group>"; };
@@ -318,23 +317,6 @@
path = vectorField;
sourceTree = "<group>";
};
- 30658845145F86430015FD7B /* ofxDirList */ = {
- isa = PBXGroup;
- children = (
- 30658849145F86430015FD7B /* src */,
- );
- name = ofxDirList;
- path = ../../../addons/ofxDirList;
- sourceTree = "<group>";
- };
- 30658849145F86430015FD7B /* src */ = {
- isa = PBXGroup;
- children = (
- 3065884A145F86430015FD7B /* ofxDirList.h */,
- );
- path = src;
- sourceTree = "<group>";
- };
3065884B145F864D0015FD7B /* ofxControlPanel */ = {
isa = PBXGroup;
children = (
@@ -698,7 +680,6 @@
children = (
306588F4145F882D0015FD7B /* ofxOpenCv */,
306588E3145F86550015FD7B /* ofxXmlSettings */,
- 30658845145F86430015FD7B /* ofxDirList */,
3065884B145F864D0015FD7B /* ofxControlPanel */,
);
name = addons;
@@ -22,13 +22,13 @@ int simpleFileLister::listDir(string directory){
bRevSort = false;
entries.clear();
- ofxDirList::reset();
- int numFiles = ofxDirList::listDir(directory);
+ ofDirectory::reset();
+ int numFiles = ofDirectory::listDir(directory);
entries.assign(numFiles, entry());
for(int i = 0; i < numFiles; i++){
- entries[i].filename = ofxDirList::getName(i);
- entries[i].fullpath = ofxDirList::getPath(i);
+ entries[i].filename = ofDirectory::getName(i);
+ entries[i].fullpath = ofDirectory::getPath(i);
}
lastDirectory = directory;
@@ -1,15 +1,14 @@
#pragma once
#include "ofMain.h"
-#include "ofxDirList.h"
typedef struct{
string filename;
string fullpath;
}entry;
-class simpleFileLister : public ofxDirList {
+class simpleFileLister : public ofDirectory {
public:

0 comments on commit e045599

Please sign in to comment.