From 56a3380b46f406ffaf093405ac2db4515b0a4f80 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Mon, 28 May 2012 16:44:39 +0000 Subject: Removes the ArrayList classes, and replaces all instances with std::vector implementations. --- FoundationEx/ArrayList.h | 170 ----------------------------------------------- 1 file changed, 170 deletions(-) delete mode 100644 FoundationEx/ArrayList.h (limited to 'FoundationEx/ArrayList.h') diff --git a/FoundationEx/ArrayList.h b/FoundationEx/ArrayList.h deleted file mode 100644 index c0985c3..0000000 --- a/FoundationEx/ArrayList.h +++ /dev/null @@ -1,170 +0,0 @@ -/* Project FoundationEx - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. - - SUBSYSTEM: FoundationEx - FILE: ArrayList.h - AUTHOR: John DiCamillo - - - OVERVIEW - ======== - Simple untyped array list - - The E: That is going to be removed very very soon. For now, it has been aliased to std::vector - (or std::vector for FloatList). Full conversion to std::vector is still needed. -*/ - -#ifndef ArrayList_h -#define ArrayList_h - -#ifdef WIN32 -#include -#include -#endif - -#include - -// +-------------------------------------------------------------------+ - -class ArrayList -{ -public: - ArrayList() { array.clear(); } - ArrayList(const ArrayList& l); - ~ArrayList() { } - - DWORD operator[](int i) const; - DWORD& operator[](int i); - DWORD at(int i) const; - DWORD& at(int i); - - void append(const ArrayList& list); - void append(const DWORD val); - void insert(const DWORD val, int index=0); - void insertSort(DWORD val); - - DWORD first() const { return *array.begin(); } - DWORD last() const { return array.back(); } - void remove(DWORD val); - void removeIndex(int index); - - void clear(); - - int size() const { return array.size(); } - bool isEmpty() const { return array.size() == 0; } - - bool contains(DWORD val) const; - int count(DWORD val) const; - int index(DWORD val) const; - - void sort(); - void shuffle(); - - bool check(int& index) const; - -private: - void swap(int i, int j); - void resize(int newsize); - - - std::vector array; - - friend class ArrayListIter; -}; - -// +-------------------------------------------------------------------+ - -class ArrayListIter -{ -public: - ArrayListIter() : list(0), step(-1) { } - ArrayListIter(const ArrayListIter& i) : list(i.list), step(i.step) { } - ArrayListIter(ArrayList& l) : list(&l), step(-1) { } - - int operator++() { return next() != 0; } - int operator--() { return prev() != 0; } - - void reset() { step = -1; } - DWORD next(); - DWORD prev(); - DWORD value(); - void removeItem(); - - void attach(ArrayList& l); - ArrayList& container(); - int size(); - int index() { return step; } - -private: - ArrayList* list; - int step; -}; - - -// +-------------------------------------------------------------------+ -// +-------------------------------------------------------------------+ -// +-------------------------------------------------------------------+ - -class FloatList : public ArrayList -{ -public: - FloatList() { array.clear(); } - FloatList(const FloatList& l); - ~FloatList() {} - - float operator[](int i) const; - float& operator[](int i); - float at(int i) const; - float& at(int i); - - void append(const float val); - void append(const FloatList& list); - void insert(const float val, int index=0); - void insertSort(float val); - - float first() const { return *array.begin(); } - float last() const { return array.back(); } - void remove(float val); - - bool contains(float val) const; - int count(float val) const; - int index(float val) const; - -private: - - std::vector array; - - friend class FloatListIter; -}; - -// +-------------------------------------------------------------------+ - -class FloatListIter -{ -public: - FloatListIter() : list(0), step(-1) { } - FloatListIter(const FloatListIter& i) : list(i.list), step(i.step) { } - FloatListIter(FloatList& l) : list(&l), step(-1) { } - - int operator++() { return next() != 0; } - int operator--() { return prev() != 0; } - - void reset() { step = -1; } - float next(); - float prev(); - float value(); - void removeItem(); - - void attach(FloatList& l); - FloatList& container(); - int size(); - int index() { return step; } - -private: - FloatList* list; - int step; -}; - -#endif ArrayList_h - -- cgit v1.1