kill all tabs

6 files changed, 62 insertions, 56 deletions

diff --git a/grid.cpp b/grid.cpp
index b069782..df835c1 100644
--- a/grid.cpp
+++ b/grid.cpp
@@ -20,17 +20,17 @@ Grid::Grid(const Grid &grid) : rows(grid.rows), cols(grid.cols), numOfMoves(grid
 
 int *Grid::getRows(void)
 {
-	return &rows;
+    return &rows;
 }
 
 int *Grid::getCols(void)
 {
-	return &cols;
+    return &cols;
 }
 
 int *Grid::getNumOfMoves(void)
 {
-	return &numOfMoves;
+    return &numOfMoves;
 }
 
 vector<Piece> *Grid::getPieces(void)
@@ -40,12 +40,12 @@ vector<Piece> *Grid::getPieces(void)
 
 void Grid::setRows(int n)
 {
-	rows = n;
+    rows = n;
 }
 
 void Grid::setCols(int n)
 {
-	cols = n;
+    cols = n;
 }
 
 void Grid::addMove(string move)
@@ -56,3 +56,4 @@ void Grid::addMove(string move)
 void Grid::markPiecesPos(void)
 {
 }
+
diff --git a/grid.h b/grid.h
index 23294f7..d2a066b 100644
--- a/grid.h
+++ b/grid.h
@@ -15,30 +15,31 @@ using std::vector;
 class Grid
 {
     private:
-		int rows;
-		int cols;
-		int numOfMoves;
-		int lastMoved;
-		int lastMoveDir;
-		vector<Piece> pieces;
-		vector<string> moves;
-		string *board;
+        int rows;
+        int cols;
+        int numOfMoves;
+        int lastMoved;
+        int lastMoveDir;
+        vector<Piece> pieces;
+        vector<string> moves;
+        string *board;
 
     public:
         Grid(void);
         /* we do not need a copy constructor since the deault shallow copy will be fine */
         //Grid(const Grid &);
 
-		int *getRows(void);
-		int *getCols(void);
-		int *getNumOfMoves(void);
-		vector<Piece> *getPieces(void);
+        int *getRows(void);
+        int *getCols(void);
+        int *getNumOfMoves(void);
+        vector<Piece> *getPieces(void);
 
-		void setRows(int);
-		void setCols(int);
-		void addMove(string);
+        void setRows(int);
+        void setCols(int);
+        void addMove(string);
 
-		void markPiecesPos(void);
+        void markPiecesPos(void);
 };
 
 #endif
+
diff --git a/main.cpp b/main.cpp
index 90e56b8..3b80c54 100644
--- a/main.cpp
+++ b/main.cpp
@@ -70,11 +70,11 @@ string *fillBoard(Grid grid)
     {
         tmp = (*(grid.getPieces()))[ix];
         name = tmp.getName();
-		row = tmp.getRow();
-		col = tmp.getCol();
-		w = tmp.getW();
-		h = tmp.getH();
-		dir = tmp.getDir();
+        row = tmp.getRow();
+        col = tmp.getCol();
+        w = tmp.getW();
+        h = tmp.getH();
+        dir = tmp.getDir();
 
         int j;
         offset = (grid_w * (row-1)) + col;
@@ -122,11 +122,11 @@ void printGrid(Grid grid)
     {
         tmp = (*(grid.getPieces()))[ix];
         name = tmp.getName();
-		row = tmp.getRow();
-		col = tmp.getCol();
-		w = tmp.getW();
-		h = tmp.getH();
-		dir = tmp.getDir();
+        row = tmp.getRow();
+        col = tmp.getCol();
+        w = tmp.getW();
+        h = tmp.getH();
+        dir = tmp.getDir();
 
         int j;
         offset = (grid_w * (row-1)) + col;
@@ -159,32 +159,32 @@ void printGrid(Grid grid)
 /* load grid from a file */
 Grid loadGrid(char **argv)
 {
-	FILE *fname = fopen(argv[1], "r");
+    FILE *fname = fopen(argv[1], "r");
     if (fname == NULL)
     {
         perror("fopen");
         exit(EXIT_FAILURE);
     }
 
-	Grid grid;
-	Piece piece_tmp("");
+    Grid grid;
+    Piece piece_tmp("");
 
     /* used for line reading */
     size_t line_sz = 0;
     char *line = NULL;
     int matched_inputs = 0;
 
-	if (getline(&line, &line_sz, fname) != -1)
+    if (getline(&line, &line_sz, fname) != -1)
         sscanf(line, "%d %d\n", grid.getRows(), grid.getCols());
 
-	if (*grid.getRows() < 1 || *grid.getCols() < 1)
-	{
-		cout << "invalid grid dimensions, read in: " << *grid.getRows() << "h, "
-		     << *grid.getCols() << "w" << endl;
-	    exit(EXIT_FAILURE);
-	}
+    if (*grid.getRows() < 1 || *grid.getCols() < 1)
+    {
+        cout << "invalid grid dimensions, read in: " << *grid.getRows() << "h, "
+             << *grid.getCols() << "w" << endl;
+        exit(EXIT_FAILURE);
+    }
 
-	/* parse grid's dimensions */
+    /* parse grid's dimensions */
     int piece_row = -1;
     int piece_col = -1;
     int piece_w = -1;
@@ -198,7 +198,7 @@ Grid loadGrid(char **argv)
 
     for (i = 0; getline(&line, &line_sz, fname) != -1; i++)
     {
-	    matched_inputs = sscanf(line, "%d %d %d %d %c\n", &piece_row,
+        matched_inputs = sscanf(line, "%d %d %d %d %c\n", &piece_row,
                                 &piece_col, &piece_w, &piece_h, &piece_dir);
 
         if (matched_inputs != 5)
@@ -564,11 +564,11 @@ int main(int argc, char *argv[])
     /* seed rand() */
     srand((unsigned int ) time(NULL));
 
-	if (argc != 2)
-	{
-		cout << "usage: " << argv[0] << " <file>" << endl;
-		return -1;
-	}
+    if (argc != 2)
+    {
+        cout << "usage: " << argv[0] << " <file>" << endl;
+        return -1;
+    }
 
     Grid grid = loadGrid(argv);
     printGrid(grid);
@@ -609,6 +609,7 @@ int main(int argc, char *argv[])
         cout << "else" << endl;
 #endif
 
-	cout << "\n\tBye!" << endl;
+    cout << "\n\tBye!" << endl;
     return 0;
 }
+
diff --git a/main.h b/main.h
index 56cc773..eb53e21 100644
--- a/main.h
+++ b/main.h
@@ -32,3 +32,4 @@ string piece_tag[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c"
 string err_msg[4] = {"piece is correct", "piece has wrong dimensions", "piece has wrong direction", "piece is out of bounds"};
 
 #endif
+
diff --git a/piece.cpp b/piece.cpp
index 0d3eec1..dab969b 100644
--- a/piece.cpp
+++ b/piece.cpp
@@ -66,3 +66,4 @@ void Piece::setCol(int col_p)
 {
     col = col_p;
 }
+
diff --git a/piece.h b/piece.h
index 52c2a5b..d52e233 100644
--- a/piece.h
+++ b/piece.h
@@ -20,13 +20,13 @@ typedef struct
 class Piece
 {
     private:
-		string name;
-		int row;
-		int col;
-		int w;
-		int h;
-		char dir;
-		vector<POINT> haveBeen;
+        string name;
+        int row;
+        int col;
+        int w;
+        int h;
+        char dir;
+        vector<POINT> haveBeen;
 
     public:
         Piece(void);
@@ -46,3 +46,4 @@ class Piece
 };
 
 #endif
+