Fix compilation errors in VS 2015

Fixes #139.
erengy · Aug 6, 2015 · fddda28 · fddda28
1 parent 32ce4b2
commit fddda28
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 48 deletions.
diff --git a/src/base/url.cpp b/src/base/url.cpp
@@ -164,7 +164,7 @@ std::wstring DecodeUrl(const std::wstring& input) {
         IsHexadecimalChar(input[i + 1]) && IsHexadecimalChar(input[i + 2])) {
       char c = 0;
       static const wchar_t* digits = L"0123456789ABCDEF";
-      for (size_t j = 0; j < 16; j++) {
+      for (char j = 0; j < 16; j++) {
         if (input[i + 1] == digits[j])
           c += j << 4;
         if (input[i + 2] == digits[j])

diff --git a/src/library/anime_db.cpp b/src/library/anime_db.cpp
@@ -636,38 +636,9 @@ bool Database::CheckOldUserDirectory() {
   return true;
 }
 
-void Database::ClearInvalidValues(Item& item) {
-  const std::wstring invalid_title = L"S"L"S"L"J"L"Master";
-  const std::wstring invalid_description =
-      L"Prepare yourself for another 9001 action-packed episodes";
-
-  if (item.GetEnglishTitle() == invalid_title)
-    item.SetEnglishTitle(L"");
-
-  auto synonyms = item.GetSynonyms();
-  if (!synonyms.empty()) {
-    foreach_(synonym, synonyms) {
-      if (*synonym == invalid_title)
-        *synonym = L"";
-    }
-    RemoveEmptyStrings(synonyms);
-    item.SetSynonyms(synonyms);
-  }
-
-  if (StartsWith(item.GetSynopsis(), invalid_description))
-    item.SetSynopsis(L"");
-}
-
 void Database::HandleCompatibility(const std::wstring& meta_version) {
   base::SemanticVersion version = meta_version;
 
-  if (version <= base::SemanticVersion(L"1.1.7")) {
-    LOG(LevelWarning, L"Clearing invalid values");
-    foreach_(item, items) {
-      ClearInvalidValues(item->second);
-    }
-  }
-
   if (version <= base::SemanticVersion(L"1.1.11")) {
     if (taiga::GetCurrentServiceId() == sync::kHummingbird) {
       LOG(LevelWarning, L"Clearing English titles");

diff --git a/src/library/anime_db.h b/src/library/anime_db.h
@@ -62,7 +62,6 @@ class Database {
   void WriteDatabaseNode(pugi::xml_node& database_node);
 
   bool CheckOldUserDirectory();
-  void ClearInvalidValues(Item& item);
   void HandleCompatibility(const std::wstring& meta_version);
   void ReadDatabaseInCompatibilityMode(pugi::xml_document& document);
   void ReadListInCompatibilityMode(pugi::xml_document& document);

diff --git a/src/ui/dlg/dlg_about.cpp b/src/ui/dlg/dlg_about.cpp
@@ -33,7 +33,7 @@
 
 namespace ui {
 
-static enum ThirdPartyLibrary {
+enum ThirdPartyLibrary {
   kJsoncpp,
   kLibcurl,
   kPugixml,

diff --git a/src/ui/dlg/dlg_anime_list.cpp b/src/ui/dlg/dlg_anime_list.cpp
@@ -1453,29 +1453,37 @@ void AnimeListDialog::ListView::InitializeColumns() {
   int i = 0;
 
   columns.insert(std::make_pair(kColumnAnimeStatus, ColumnData(
-      {kColumnAnimeStatus, true, i, i++, 0, ScaleX(16) + 6, ScaleX(16) + 6, LVCFMT_CENTER,
-       L"", L"anime_status"})));
+      {kColumnAnimeStatus, true, i, i++,
+       0, static_cast<unsigned short>(ScaleX(16) + 6), static_cast<unsigned short>(ScaleX(16) + 6),
+       LVCFMT_CENTER, L"", L"anime_status"})));
   columns.insert(std::make_pair(kColumnAnimeTitle, ColumnData(
-      {kColumnAnimeTitle, true, i, i++, 0, ScaleX(300), ScaleX(100), LVCFMT_LEFT,
-       L"Anime title", L"anime_title"})));
+      {kColumnAnimeTitle, true, i, i++,
+       0, static_cast<unsigned short>(ScaleX(300)), static_cast<unsigned short>(ScaleX(100)),
+       LVCFMT_LEFT, L"Anime title", L"anime_title"})));
   columns.insert(std::make_pair(kColumnUserProgress, ColumnData(
-      {kColumnUserProgress, true, i, i++, 0, ScaleX(200), ScaleX(60), LVCFMT_CENTER,
-       L"Progress", L"user_progress"})));
+      {kColumnUserProgress, true, i, i++,
+       0, static_cast<unsigned short>(ScaleX(200)), static_cast<unsigned short>(ScaleX(60)),
+       LVCFMT_CENTER, L"Progress", L"user_progress"})));
   columns.insert(std::make_pair(kColumnUserRating, ColumnData(
-      {kColumnUserRating, true, i, i++, 0, ScaleX(50), ScaleX(50), LVCFMT_CENTER,
-       L"Score", L"user_rating"})));
+      {kColumnUserRating, true, i, i++,
+       0, static_cast<unsigned short>(ScaleX(50)), static_cast<unsigned short>(ScaleX(50)),
+       LVCFMT_CENTER, L"Score", L"user_rating"})));
   columns.insert(std::make_pair(kColumnAnimeRating, ColumnData(
-      {kColumnAnimeRating, false, i, i++, 0, ScaleX(55), ScaleX(55), LVCFMT_CENTER,
-       L"Average", L"anime_average_rating"})));
+      {kColumnAnimeRating, false, i, i++,
+       0, static_cast<unsigned short>(ScaleX(55)), static_cast<unsigned short>(ScaleX(55)),
+       LVCFMT_CENTER, L"Average", L"anime_average_rating"})));
   columns.insert(std::make_pair(kColumnAnimeType, ColumnData(
-      {kColumnAnimeType, true, i, i++, 0, ScaleX(60), ScaleX(60), LVCFMT_CENTER,
-       L"Type", L"anime_type"})));
+      {kColumnAnimeType, true, i, i++,
+       0, static_cast<unsigned short>(ScaleX(60)), static_cast<unsigned short>(ScaleX(60)),
+       LVCFMT_CENTER, L"Type", L"anime_type"})));
   columns.insert(std::make_pair(kColumnAnimeSeason, ColumnData(
-      {kColumnAnimeSeason, true, i, i++, 0, ScaleX(90), ScaleX(90), LVCFMT_RIGHT,
-       L"Season", L"anime_season"})));
+      {kColumnAnimeSeason, true, i, i++,
+       0, static_cast<unsigned short>(ScaleX(90)), static_cast<unsigned short>(ScaleX(90)),
+       LVCFMT_RIGHT, L"Season", L"anime_season"})));
   columns.insert(std::make_pair(kColumnUserLastUpdated, ColumnData(
-      {kColumnUserLastUpdated, false, i, i++, 0, ScaleX(100), ScaleX(85), LVCFMT_CENTER,
-       L"Last updated", L"user_last_updated"})));
+      {kColumnUserLastUpdated, false, i, i++,
+       0, static_cast<unsigned short>(ScaleX(100)), static_cast<unsigned short>(ScaleX(85)),
+       LVCFMT_CENTER, L"Last updated", L"user_last_updated"})));
 }
 
 void AnimeListDialog::ListView::InsertColumns() {