diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-31 09:24:44 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-31 09:24:44 (GMT) |
| commit | e0c9dab8cb981172c5de81f5963e28db67f1b295 (patch) | |
| tree | dd78e82f54a7ed87915a7d5100437cd42ac0c415 /src/preview | |
| parent | 708d52bcc5f0e13fa6540751e2402ccfdf02bec7 (diff) | |
| download | powder-e0c9dab8cb981172c5de81f5963e28db67f1b295.zip powder-e0c9dab8cb981172c5de81f5963e28db67f1b295.tar.gz | |
Move more SDL dependancies out of program, OpenGLCanvas for JNI and JNI methods.
Diffstat (limited to 'src/preview')
| -rw-r--r-- | src/preview/Comment.h | 4 | ||||
| -rw-r--r-- | src/preview/PreviewModel.cpp | 4 | ||||
| -rw-r--r-- | src/preview/PreviewModel.h | 4 | ||||
| -rw-r--r-- | src/preview/PreviewView.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/preview/Comment.h b/src/preview/Comment.h index a53f6cd..c9a807c 100644 --- a/src/preview/Comment.h +++ b/src/preview/Comment.h @@ -8,13 +8,13 @@ #ifndef COMMENT_H_ #define COMMENT_H_ -class Comment +class SaveComment { public: int authorID; std::string authorName; std::string comment; - Comment(int userID, std::string username, std::string commentText): + SaveComment(int userID, std::string username, std::string commentText): authorID(userID), authorName(username), comment(commentText) { } diff --git a/src/preview/PreviewModel.cpp b/src/preview/PreviewModel.cpp index 71c4d4a..267571e 100644 --- a/src/preview/PreviewModel.cpp +++ b/src/preview/PreviewModel.cpp @@ -56,7 +56,7 @@ void * PreviewModel::updateSavePreviewT() void * PreviewModel::updateSaveCommentsT() { - std::vector<Comment*> * tempComments = Client::Ref().GetComments(tSaveID, 0, 10); + std::vector<SaveComment*> * tempComments = Client::Ref().GetComments(tSaveID, 0, 10); updateSaveCommentsFinished = true; return tempComments; } @@ -139,7 +139,7 @@ Save * PreviewModel::GetSave() return save; } -std::vector<Comment*> * PreviewModel::GetComments() +std::vector<SaveComment*> * PreviewModel::GetComments() { return saveComments; } diff --git a/src/preview/PreviewModel.h b/src/preview/PreviewModel.h index 91ca972..26b6822 100644 --- a/src/preview/PreviewModel.h +++ b/src/preview/PreviewModel.h @@ -23,7 +23,7 @@ class PreviewModel { vector<PreviewView*> observers; Save * save; Thumbnail * savePreview; - std::vector<Comment*> * saveComments; + std::vector<SaveComment*> * saveComments; void notifyPreviewChanged(); void notifySaveChanged(); void notifySaveCommentsChanged(); @@ -53,7 +53,7 @@ public: PreviewModel(); Thumbnail * GetPreview(); Save * GetSave(); - std::vector<Comment*> * GetComments(); + std::vector<SaveComment*> * GetComments(); void AddObserver(PreviewView * observer); void UpdateSave(int saveID, int saveDate); void SetFavourite(bool favourite); diff --git a/src/preview/PreviewView.cpp b/src/preview/PreviewView.cpp index dac5311..d48a5a5 100644 --- a/src/preview/PreviewView.cpp +++ b/src/preview/PreviewView.cpp @@ -199,7 +199,7 @@ void PreviewView::NotifyCommentsChanged(PreviewModel * sender) int currentY = 0; ui::Label * tempUsername; ui::Textblock * tempComment; - std::vector<Comment*> * tempComments = sender->GetComments(); + std::vector<SaveComment*> * tempComments = sender->GetComments(); if(tempComments) { for(int i = 0; i < tempComments->size(); i++) |