Remplacement des 3 fonctions getnbcorrec, getcorrecorig et getcorrecdest par une unique fonction renvoyant un wxArrayString[2]

CosMoS/bdd.cpp

@@ -314,33 +314,18 @@ void class_bdd::SetResultPubli(int row, unsigned int bitfield)
 		wxMessageBox("Erreur lors de la mise à jour de la valeur", "Erreur", wxOK | wxICON_ERROR);
 }
 
-int class_bdd::GetNbCorrecs()
+wxArrayString* class_bdd::GetListCorrecs()
 {
-	int count = 0;
+	wxArrayString* out = new wxArrayString[2];
+	
 	sqlite3_prepare_v2(db, "SELECT * FROM Correc;", -1, &stmt, NULL);
 	while (sqlite3_step(stmt) == SQLITE_ROW)
-		count++;
-	sqlite3_finalize(stmt);
-	return count;
-}
-
-wxString* class_bdd::GetCorrecOrig()
-{
-	wxString* out = new wxString[GetNbCorrecs()];
-	sqlite3_prepare_v2(db, "SELECT * FROM Correc;", -1, &stmt, NULL);
-	for (int i=0; sqlite3_step(stmt) == SQLITE_ROW; i++)
-		out[i] = sqlite3_column_text(stmt, 0);
-	sqlite3_finalize(stmt);
-	return out;
-}
-
-wxString* class_bdd::GetCorrecDest()
-{
-	wxString* out = new wxString[GetNbCorrecs()];
-	sqlite3_prepare_v2(db, "SELECT * FROM Correc;", -1, &stmt, NULL);
-	for (int i=0; sqlite3_step(stmt) == SQLITE_ROW; i++)
-		out[i] = sqlite3_column_text(stmt, 1);
+	{
+		out[0].Add(sqlite3_column_text(stmt,0));
+		out[1].Add(sqlite3_column_text(stmt,1));
+	}
 	sqlite3_finalize(stmt);
+	
 	return out;
 }
 

CosMoS/bdd.h

@@ -33,13 +33,10 @@ class class_bdd
 		void GenerateGrid();
 		
 		// modification des booléens de publi
-		void SetResultPubli(int row, unsigned int bitfield);							//modifie le statut de publi dans la bdd et la grille (publi(1<<1)/publichu(1<<2)/cs_associe(1<<3)
+		void SetResultPubli(int row, unsigned int bitfield);							//(publi(1<<1)/publichu(1<<2)/cs_associe(1<<3)
 		
 		// gestion des corrections
-		//TODO: Utiliser un wxArrayString[2] pour GetListCorrecs
-		int GetNbCorrecs();
-		wxString* GetCorrecOrig();
-		wxString* GetCorrecDest();
+		wxArrayString* GetListCorrecs();
 		void AddCorrec(const wxString& id, int col, const wxString& dest);
 		void SetCorrec(const wxString& orig, const wxString& dest);
 		void DelCorrec(const wxString& orig);

CosMoS/correc.cpp

@@ -11,20 +11,18 @@ void correc::Update()
 {
 	if (grid_correcs->GetNumberRows() != 0)
 		grid_correcs->DeleteRows(0, grid_correcs->GetNumberRows()); //reset de la grille
-	grid_correcs->AppendRows(bdd->GetNbCorrecs());
-	wxString* correc_orig = bdd->GetCorrecOrig();
-	wxString* correc_dest = bdd->GetCorrecDest();
-	for (int i=0; i<bdd->GetNbCorrecs(); i++)
+	wxArrayString* list_correcs = bdd->GetListCorrecs();
+	grid_correcs->AppendRows(list_correcs[0].Count());
+	for (unsigned int i=0; i < list_correcs[0].Count(); i++)
 	{
 		grid_correcs->SetRowLabelValue(i, "X");
-		grid_correcs->SetCellValue(i, 0, correc_orig[i]);
-		grid_correcs->SetCellValue(i, 1, correc_dest[i]);
+		grid_correcs->SetCellValue(i, 0, list_correcs[0][i]);
+		grid_correcs->SetCellValue(i, 1, list_correcs[1][i]);
 	}
 	grid_correcs->AutoSizeRows(false);
 	grid_correcs->AutoSizeColumns(false);
 	Fit();
-	delete[] correc_orig;
-	delete[] correc_dest;
+	delete[] list_correcs;
 }
 
 void correc::OnCellChange( wxGridEvent& event )