diff --git a/src/apps/haiku-depot/MainWindow.cpp b/src/apps/haiku-depot/MainWindow.cpp index 04deabaaa1..4015947690 100644 --- a/src/apps/haiku-depot/MainWindow.cpp +++ b/src/apps/haiku-depot/MainWindow.cpp @@ -199,11 +199,11 @@ MainWindow::_InitDummyModel() "2.1.2 - Initial Haiku release."); wonderbrush.AddUserRating( UserRating(UserInfo("humdinger"), 4.5f, - "Awesome!", "en", "2.1.2") + "Awesome!", "en", "2.1.2", 0, 0) ); wonderbrush.AddUserRating( UserRating(UserInfo("bonefish"), 5.0f, - "The best!", "en", "2.1.2") + "The best!", "en", "2.1.2", 3, 1) ); wonderbrush.AddScreenshot( BitmapRef(new SharedBitmap(603), true)); @@ -231,17 +231,17 @@ MainWindow::_InitDummyModel() paladin.AddUserRating( UserRating(UserInfo("stippi"), 3.5f, "Could be more integrated from the sounds of it.", - "en", "1.2.0") + "en", "1.2.0", 0, 1) ); paladin.AddUserRating( UserRating(UserInfo("mmadia"), 5.0f, "It rocks! Give a try", - "en", "1.1.0") + "en", "1.1.0", 1, 0) ); paladin.AddUserRating( UserRating(UserInfo("bonefish"), 2.0f, "It just needs to use my jam-rewrite 'ham' and it will be great.", - "en", "1.1.0") + "en", "1.1.0", 3, 1) ); paladin.AddScreenshot( BitmapRef(new SharedBitmap(605), true)); @@ -321,14 +321,14 @@ MainWindow::_InitDummyModel() "custom installed sound fonts? Reading through this comment I find " "that I did not until now. Hopefully there are enough lines now to " "please the programmer with the text layouting and scrolling of " - "long ratings!", "en", "2.1.0") + "long ratings!", "en", "2.1.0", 4, 1) ); sequitur.AddUserRating( UserRating(UserInfo("stippi"), 3.5f, "It seems very capable. Still runs fine on Haiku. The interface " "is composed of many small, hard to click items. But you can " "configure a tool for each mouse button, which is great for the " - "work flow.", "en", "2.1.0") + "work flow.", "en", "2.1.0", 2, 1) ); sequitur.AddCategory(fModel.CategoryAudio()); diff --git a/src/apps/haiku-depot/PackageInfo.cpp b/src/apps/haiku-depot/PackageInfo.cpp index 7f1fdde597..7172b80929 100644 --- a/src/apps/haiku-depot/PackageInfo.cpp +++ b/src/apps/haiku-depot/PackageInfo.cpp @@ -242,21 +242,24 @@ UserRating::UserRating() fRating(0.0f), fComment(), fLanguage(), - fPackageVersion() + fPackageVersion(), + fUpVotes(0), + fDownVotes(0) { } UserRating::UserRating(const UserInfo& userInfo, float rating, const BString& comment, const BString& language, - const BString& packageVersion) + const BString& packageVersion, int32 upVotes, int32 downVotes) : fUserInfo(userInfo), fRating(rating), fComment(comment), fLanguage(language), - fPackageVersion(packageVersion) - + fPackageVersion(packageVersion), + fUpVotes(upVotes), + fDownVotes(downVotes) { } @@ -267,7 +270,9 @@ UserRating::UserRating(const UserRating& other) fRating(other.fRating), fComment(other.fComment), fLanguage(other.fLanguage), - fPackageVersion(other.fPackageVersion) + fPackageVersion(other.fPackageVersion), + fUpVotes(other.fUpVotes), + fDownVotes(other.fDownVotes) { } @@ -280,6 +285,8 @@ UserRating::operator=(const UserRating& other) fComment = other.fComment; fLanguage = other.fLanguage; fPackageVersion = other.fPackageVersion; + fUpVotes = other.fUpVotes; + fDownVotes = other.fDownVotes; return *this; } @@ -291,7 +298,9 @@ UserRating::operator==(const UserRating& other) const && fRating == other.fRating && fComment == other.fComment && fLanguage == other.fLanguage - && fPackageVersion == other.fPackageVersion; + && fPackageVersion == other.fPackageVersion + && fUpVotes == other.fUpVotes + && fDownVotes == other.fDownVotes; } diff --git a/src/apps/haiku-depot/PackageInfo.h b/src/apps/haiku-depot/PackageInfo.h index 7461a07b5d..c66aecd4ee 100644 --- a/src/apps/haiku-depot/PackageInfo.h +++ b/src/apps/haiku-depot/PackageInfo.h @@ -76,7 +76,8 @@ public: float rating, const BString& comment, const BString& language, - const BString& packageVersion); + const BString& packageVersion, + int32 upVotes, int32 downVotes); UserRating(const UserRating& other); UserRating& operator=(const UserRating& other); @@ -94,12 +95,18 @@ public: const BString& PackageVersion() const { return fPackageVersion; } + int32 UpVotes() const + { return fUpVotes; } + int32 DownVotes() const + { return fDownVotes; } private: UserInfo fUserInfo; float fRating; BString fComment; BString fLanguage; BString fPackageVersion; + int32 fUpVotes; + int32 fDownVotes; };