diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-28 16:44:39 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-28 16:44:39 +0000 |
| commit | 56a3380b46f406ffaf093405ac2db4515b0a4f80 (patch) | |
| tree | e9e4c5553343f27e41d862c49b21fd69bf5161b9 /nGenEx/Layout.h | |
| parent | 41b40af36198fb013a2034a1954bbc4df50fea8b (diff) | |
| download | starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.zip starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.tar.gz starshatter-56a3380b46f406ffaf093405ac2db4515b0a4f80.tar.bz2 | |
Removes the ArrayList classes, and replaces all instances with std::vector implementations.
Diffstat (limited to 'nGenEx/Layout.h')
| -rw-r--r-- | nGenEx/Layout.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/nGenEx/Layout.h b/nGenEx/Layout.h index 8986719..94fd627 100644 --- a/nGenEx/Layout.h +++ b/nGenEx/Layout.h @@ -16,7 +16,6 @@ #define Layout_h
#include "ActiveWindow.h"
-#include "ArrayList.h"
// +--------------------------------------------------------------------+
@@ -34,15 +33,15 @@ public: virtual void AddCol(DWORD min_width, float col_factor);
virtual void AddRow(DWORD min_height, float row_factor);
- virtual void SetConstraints(const ArrayList& min_x,
- const ArrayList& min_y,
- const FloatList& weight_x,
- const FloatList& weight_y);
+ virtual void SetConstraints(const std::vector<DWORD>& min_x,
+ const std::vector<DWORD>& min_y,
+ const std::vector<float>& weight_x,
+ const std::vector<float>& weight_y);
- virtual void SetConstraints(const FloatList& min_x,
- const FloatList& min_y,
- const FloatList& weight_x,
- const FloatList& weight_y);
+ virtual void SetConstraints(const std::vector<float>& min_x,
+ const std::vector<float>& min_y,
+ const std::vector<float>& weight_x,
+ const std::vector<float>& weight_y);
virtual void SetConstraints(int ncols,
int nrows,
@@ -54,12 +53,12 @@ public: protected:
virtual void ScaleWeights();
- virtual void CalcCells(DWORD w, DWORD h, ArrayList& cell_x, ArrayList& cell_y);
+ virtual void CalcCells(DWORD w, DWORD h, std::vector<DWORD>& cell_x, std::vector<DWORD>& cell_y);
- ArrayList cols;
- ArrayList rows;
- FloatList col_weights;
- FloatList row_weights;
+ std::vector<DWORD> cols;
+ std::vector<DWORD> rows;
+ std::vector<float> col_weights;
+ std::vector<float> row_weights;
};
#endif Layout_h
|