diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-21 00:17:42 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-21 00:17:42 (GMT) |
| commit | 36a952ca4dfc4672e1f0d2f7d255ef9c3bd046eb (patch) | |
| tree | d1ddfb7a9865608565fbb2f0d0688c662ab45817 /src/search | |
| parent | 0e5a46aa64bd9c53b0eb02aadd67637d9488b765 (diff) | |
| download | powder-36a952ca4dfc4672e1f0d2f7d255ef9c3bd046eb.zip powder-36a952ca4dfc4672e1f0d2f7d255ef9c3bd046eb.tar.gz | |
Better handling of save vector from client
Diffstat (limited to 'src/search')
| -rw-r--r-- | src/search/SearchModel.cpp | 6 | ||||
| -rw-r--r-- | src/search/SearchModel.h | 4 | ||||
| -rw-r--r-- | src/search/SearchView.cpp | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/search/SearchModel.cpp b/src/search/SearchModel.cpp index 96d340a..3b2d0e0 100644 --- a/src/search/SearchModel.cpp +++ b/src/search/SearchModel.cpp @@ -12,7 +12,9 @@ void SearchModel::UpdateSaveList(std::string query) lastError = ""; saveList.clear(); notifySaveListChanged(); - saveList = Client::Ref().SearchSaves(0, 12, query, ""); + vector<Save*> * tempSaveList = Client::Ref().SearchSaves(0, 12, query, ""); + saveList = *tempSaveList; + delete tempSaveList; if(!saveList.size()) { lastError = Client::Ref().GetLastError(); @@ -24,7 +26,7 @@ void SearchModel::UpdateSaveList(std::string query) notifySaveListChanged(); } -vector<Save> SearchModel::GetSaveList() +vector<Save*> SearchModel::GetSaveList() { return saveList; } diff --git a/src/search/SearchModel.h b/src/search/SearchModel.h index ca6a293..a2d73cb 100644 --- a/src/search/SearchModel.h +++ b/src/search/SearchModel.h @@ -14,13 +14,13 @@ class SearchModel private: string lastError; vector<SearchView*> observers; - vector<Save> saveList; + vector<Save*> saveList; void notifySaveListChanged(); public: SearchModel(); void AddObserver(SearchView * observer); void UpdateSaveList(std::string query); - vector<Save> GetSaveList(); + vector<Save*> GetSaveList(); string GetLastError() { return lastError; } }; diff --git a/src/search/SearchView.cpp b/src/search/SearchView.cpp index 2ddd76c..c50169d 100644 --- a/src/search/SearchView.cpp +++ b/src/search/SearchView.cpp @@ -52,7 +52,7 @@ void SearchView::NotifySaveListChanged(SearchModel * sender) int buttonWidth, buttonHeight, saveX = 0, saveY = 0, savesX = 4, savesY = 3, buttonPadding = 2; int buttonAreaWidth, buttonAreaHeight, buttonXOffset, buttonYOffset; - vector<Save> saves = sender->GetSaveList(); + vector<Save*> saves = sender->GetSaveList(); if(!saves.size()) { if(!errorLabel) |