Finished

src/kode/LesData2.h → src/kode/LesData3.cpp

 /**
  *   Enkel verktykasse for  lese:  tegn og tall.
  *
- *   @file     LesData2.H
+ *   FULLSTENDIG IDENTISK til 'LesData2.h' bare at adskilt
+ *   funksjonenes DEKLARASJON og DEFINISJON (som er p DENNE filen).
+ *
+ *   @file     LesData3.CPP
  *   @author   Frode Haug, NTNU
  */
 
 
-#ifndef __LESDATA2_H
-#define __LESDATA2_H
-
-
 #include <iostream>            //  cin, cout
 #include <iomanip>             //  setprecision
 #include <cctype>              //  toupper
 #include <cstdlib>             //  atoi, atof
-
-const int  MAXCHAR = 200;      //  Max.tegn i input-buffer.
-
-char  lesChar(const char* t);
-float lesFloat(const char* t, const float min, const float max);
-int   lesInt(const char* t, const int min, const int max);
+#include "LesData3.h"          //  Prototypene for denne filens innhold
 
 
 /**
@@ -90,5 +84,3 @@ int lesInt(const char* t, const int min, const int max)  {
 
     return tall;
 }
-
-#endif
\ No newline at end of file

src/kode/LesData3.h

+/**
+ *   Enkel verktykasse for  lese:  tegn og tall.
+ *
+ *   FULLSTENDIG IDENTISK til 'LesData2.h' bare at adskilt
+ *   funksjonenes DEKLARASJON (som er p DENNE filen) og DEFINISJON.
+ *
+ *   @file     LesData3.H
+ *   @author   Frode Haug, NTNU
+ */
+
+
+#ifndef __LESDATA3_H
+#define __LESDATA3_H
+
+
+const int  MAXCHAR = 200;      //  Max.tegn i input-buffer.
+
+
+char  lesChar(const char* t);
+float lesFloat(const char* t, const float min, const float max);
+int   lesInt(const char* t, const int min, const int max);
+
+#endif
\ No newline at end of file

src/kode/MVP.cpp

@@ -6,13 +6,13 @@
  * 
  */
 
-
+/*
 #include <iostream> //  cout, cin
 #include <string>   //  string
 #include <vector>   //  vector
 #include <iomanip>  //  setw
 #include <fstream>  //  ifstream, ofstream
-#include "LesData2.h"
+#include "LesData3.h"
 using namespace std;
 
 
@@ -116,11 +116,12 @@ void Player::newPlayer(const string nme) {
 
     cout << "\n\tPlayers club: ";   getline(cin, club);
 }
-
+*/
 /**
  * edits selected player from list
  * 
  */
+ /*
 void Player::editSelectedPlayer() {
     cout << "\n\tPlayers Name: ";   getline(cin, name);
 
@@ -132,11 +133,12 @@ void Player::editSelectedPlayer() {
 
 }
 
-
+*/
 /*
  * Writes out all info on player
  *
  */
+/*
 void Player::writePlayer() const
 {
 
@@ -148,13 +150,13 @@ void Player::writePlayer() const
          << "Amount of draws:   " << draws << '\n'
          << "Amount of wins:    " << wins << "\n\n";
 }
-
+*/
 /*
  * Finds player based on name and returns pointer
  *
  * @param name
  * @return Player*
- */
+ *//*
 Player *findPlayer(const string name)
 {
     for (size_t i = 0; i < gPlayers.size(); i++)
@@ -203,12 +205,13 @@ void Tournament::theTournament() {
 
 
 
-
+*/
 /**
  * Add a player
  *
  * @see - Player::newPlayer()
  */
+ /*
 void addPlayer()
 {
     Player *newPlayer;
@@ -221,12 +224,12 @@ void addPlayer()
     gPlayers.push_back(newPlayer);
     cout << "\n\nPlayer added!\n\n";
 }
-
+*/
 /**
  * Writes out all players and their stats
  * 
  * @see writePlayer() const
- */
+ *//*
 void viewPlayers() {
 
     for(size_t i = 0; i < gPlayers.size(); i++){
@@ -234,14 +237,14 @@ void viewPlayers() {
         gPlayers[i]->writePlayer();
     }
 }
-
+*/
 /**
  * find player to edit
  * 
  * @see viewPlayers()
  * @see editSelectedPlayer()
  * @see returnName()
- */
+ *//*
 void editPlayer()   {
 
     int choise,
@@ -270,11 +273,11 @@ void editPlayer()   {
         }
     }
 }
-
+*/
 /**
  * Sets up a new match
  * 
- */
+ *//*
 void newMatch() {
     string name;
     int WorD,
@@ -320,10 +323,10 @@ void printScore(){
         cout<<"\t" <<gPlayers[i]->returnName() <<"\t" <<gPlayers[i]->returnScore() <<"\n";
     }
 }
-
+*/
 /**
  * writes the programs menu options
- */
+ *//*
 void writeMenu()
 {
     cout << "\nMenu: \n"
@@ -336,3 +339,4 @@ void writeMenu()
 }
 
 
+*/
\ No newline at end of file

src/kode/Tournament.cpp

@@ -9,7 +9,7 @@
 #include <vector>   //  vector
 #include <iomanip>  //  setw
 #include <fstream>  //  ifstream, ofstream
-#include "LesData2.h"
+#include "LesData3.h"
 #include "player.h"
 #include "functions.h"
 

src/kode/Tournament.h

@@ -10,7 +10,7 @@
 #include <vector>   //  vector
 #include <iomanip>  //  setw
 #include <fstream>  //  ifstream, ofstream
-#include "LesData2.h"
+#include "LesData3.h"
 #include "player.h"
 
 using namespace std;

src/kode/checkmate.cpp

@@ -3,7 +3,7 @@
 #include <vector>   //  vector
 #include <iomanip>  //  setw
 #include <fstream>  //  ifstream, ofstream
-#include "LesData2.h"
+#include "LesData3.h"
 #include "player.h"
 #include "Tournament.h"
 #include "functions.h"
@@ -51,31 +51,35 @@ int main()
 
         cout << endl << menuToPrint;
         command = lesChar("\nCommand: ");
-        command= tolower(command);
+        cout << command;
         switch (command)
         {
-        case 's':
+        case 'S':
             startNewTournament();
             break;
-        case 'v':
+        case 'V':
             viewPlayers();
             break;
-        case 'e':
+        case 'E':
             editPlayer();
             break;
-        case 'a':
+        case 'A':
             int id;
             id = lesInt("\nWhat is the new player's ID?\n",0,10000);
             newPlayer(id);
             break;
-        case 'd':
+        case 'D':
             deletePlayer();
             break;
-        case 'r':
+        case 'R':
             printRanking();
             break;
-            case 'n':
+        case 'N':
             gTournaments[0]->enterResults();
+            break;
+        case 'Q':
+            cout << endl << "Closing the program";
+            break;
         default:
             cout << endl << "Please enter a valid command.";
             break;

src/kode/deletePlayer.cpp

@@ -2,7 +2,7 @@
 #include <string>                    //  STRING-KLASSEN
 
 #include "player.h"
-#include "LesData2.h"
+#include "LesData3.h"
 #include "functions.h"
 
 using namespace std;

src/kode/editPlayer.cpp

@@ -3,7 +3,7 @@
 #include <vector>   //  vector
 #include <iomanip>  //  setw
 #include <fstream>  //  ifstream, ofstream
-#include "LesData2.h"
+#include "LesData3.h"
 #include "player.h"
 #include "Tournament.h"
 #include "functions.h"

src/kode/newPlayer.cpp

@@ -6,7 +6,7 @@
 #include <string>                    //  STRING-KLASSEN
 
 #include "player.h"
-#include "LesData2.h"
+#include "LesData3.h"
 #include "functions.h"
 
 using namespace std;

src/kode/player.cpp

@@ -5,9 +5,11 @@
 #include <string>   //  string
 #include <vector>   //  vector
 #include <fstream>  //  ifstream, ofstream
+#include <iostream> //  cout, cin
+#include <iomanip>  //  setw
 
 #include "player.h"
-#include "LesData2.h"
+#include "LesData3.h"
 #include "functions.h"
 
 using namespace std;

src/kode/printRanking.cpp

 #include <string>   //  string
 #include <vector>   //  vector
 #include <fstream>  //  ifstream, ofstream
+#include <iostream> //  cout, cin
 
 #include "player.h"
-#include "LesData2.h"
+#include "LesData3.h"
 #include "functions.h"
 
 using namespace std;

src/kode/startNewTournament.cpp

@@ -9,7 +9,7 @@
 #include <vector>   //  vector
 #include <iomanip>  //  setw
 #include <fstream>  //  ifstream, ofstream
-#include "LesData2.h"
+#include "LesData3.h"
 #include "player.h"
 #include "functions.h"
 
@@ -26,9 +26,8 @@ void startNewTournament()
         cout << endl << "Are you certain you wish to start a new tournament?"
              << "This will delete all existing tournament data, including the player list.";
         answer = lesChar(" Y/N\n");
-        answer= tolower(answer);
-    }while (answer != 'y' && answer != 'n');
-    if (answer == 'n')
+    }while (answer != 'Y' && answer != 'N');
+    if (answer == 'N')
     {
         return;
     }

src/kode/viewPlayers.cpp

@@ -5,7 +5,7 @@
 
 using namespace std;
 
-vector<Player*> playerList;
+extern vector<Player*> playerList;
 
 /**
  * Prints a list of all players with identification