Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit b4a1366

Browse files
AtilioAAtilioA
committed
Lista 2 mergando errado e lista 3
1 parent d2491bf commit b4a1366

27 files changed

+115
-21
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ hs_err_pid*
5454

5555
*.exe
5656
*.json
57+
*.out

‎cpp/lista2jordana/Cliente.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "Cliente.hpp"
22

3-
Cliente::Cliente(string nome, string RG, string CPF, string end, string tel, string email)
3+
Cliente::Cliente(string end, string tel, string email)
44
{
55
this->pedidos = new vector<Pedido *>;
66

‎cpp/lista2jordana/Organizacao.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ void Organizacao::setNomeFantasia(string nomeFantasia)
1818
this->nomeFantasia = nomeFantasia;
1919
}
2020

21-
tm Organizacao::getDataNascimento()
22-
{
23-
return this->dataNascimento;
24-
}
25-
26-
void Organizacao::setDataNascimento(tm dataNas)
27-
{
28-
this->dataNascimento = dataNas;
29-
}
30-
3121
string Organizacao::getRazaoSocial()
3222
{
3323
return this->razaoSocial;

‎cpp/lista2jordana/Organizacao.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ class Organizacao
2525
void setRazaoSocial(string razaoSocial);
2626
string getCNPJ();
2727
void setCNPJ(string CNPJ);
28-
}
28+
};
2929

3030
#endif

‎cpp/lista2jordana/Pessoa.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ class Pessoa
2727
void setRG(string RG);
2828
void setCPF(string CPF);
2929
string getCPF();
30-
}
30+
};
3131

3232
#endif

‎cpp/lista2jordana/lista2.cpp‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@ int main()
2020

2121
cout << "Testando inicializacao de objetos.\n" << endl;
2222

23-
cli = new Cliente("Tiaguin", "168", "59", "rua", "777", "_battlenet");
24-
cli->setNome("Renan");
25-
prod = new Produto(2832, "V5", "gel", 10);
26-
prod->setNome("docin");
27-
prod->setCodigo(2832);
23+
cli = new Cliente("rua", "777", "_battlenet");
2824
fun = new Funcionario("Tiaguin", "2832", "168", "59", "rua", "777", "_battlenet");
29-
fun->setNome("Tiaguin");
3025

31-
// itemPed = new vector<ItemDePedido *>;
3226
ped = new Pedido(fun, itemPed, "Aguardando");
3327
cli->adicionarPedido(ped);
3428

35-
cout << "Funcionario encarregado pelo primeiro pedido do cliente " << cli->getNome() << ": " << cli->getPedidos()->at(0)->getFuncionario()->getNome() << endl;
29+
// cout << "Funcionario encarregado pelo primeiro pedido do cliente " << cli->getNome() << ": " << cli->getPedidos()->at(0)->getFuncionario()->getNome() << endl;
3630

3731
cout << "\nDeletando objetos..." << endl;
3832
delete cli;

‎cpp/lista3jordana/Conta.cpp‎

Whitespace-only changes.

‎cpp/lista3jordana/Conta.hpp‎

Whitespace-only changes.

‎cpp/lista3jordana/ContaCorrenteC.cpp‎

Whitespace-only changes.

‎cpp/lista3jordana/ContaCorrenteC.hpp‎

Whitespace-only changes.

0 commit comments

Comments
 (0)