diff options
| author | Mike Skec <skec@protonmail.ch> | 2021-01-07 09:12:56 +1100 |
|---|---|---|
| committer | Felix Queißner <felix@ib-queissner.de> | 2021-01-07 09:44:02 +0100 |
| commit | 772cad15cef23559986869733f541b5f3ea4d130 (patch) | |
| tree | aac6034a69b78354597027faab80692daeb5443c /src | |
| parent | 9ed3c1693fbd777f64d390e5b2d795fa285ffb85 (diff) | |
| download | kristall-772cad15cef23559986869733f541b5f3ea4d130.tar.gz | |
uniform urls only used for identification now
the destinations themselves are left untouched
Diffstat (limited to 'src')
| -rw-r--r-- | src/cachehandler.cpp | 2 | ||||
| -rw-r--r-- | src/favouritecollection.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/cachehandler.cpp b/src/cachehandler.cpp index bd4c7e5..5003b1d 100644 --- a/src/cachehandler.cpp +++ b/src/cachehandler.cpp @@ -18,7 +18,7 @@ void CacheHandler::push(const QUrl &u, const QByteArray &body, const MimeType &m return; } - this->page_cache[urlstr] = std::make_shared<CachedPage>(url, body, mime); + this->page_cache[urlstr] = std::make_shared<CachedPage>(u, body, mime); qDebug() << "Pushed page to cache: " << url; diff --git a/src/favouritecollection.cpp b/src/favouritecollection.cpp index 15b68d4..253ec15 100644 --- a/src/favouritecollection.cpp +++ b/src/favouritecollection.cpp @@ -99,7 +99,7 @@ void FavouriteCollection::load(QSettings &settings) auto fav = std::make_unique<FavouriteNode>(); fav->favourite.title = settings.value("title").toString(); - fav->favourite.destination = IoUtil::uniformUrl(settings.value("url").toUrl()); + fav->favourite.destination = settings.value("url").toUrl(); group->children.emplace_back(std::move(fav)); } @@ -187,7 +187,7 @@ bool FavouriteCollection::editFavouriteTitle(const QUrl &u, const QString &new_t for(auto const & ident : group->children) { FavouriteNode* node = &ident->as<FavouriteNode>(); - if(node->favourite.destination == url) + if(IoUtil::uniformUrl(node->favourite.destination) == url) { node->favourite.title = new_title; return true; @@ -199,7 +199,7 @@ bool FavouriteCollection::editFavouriteTitle(const QUrl &u, const QString &new_t void FavouriteCollection::editFavouriteDest(const QModelIndex &index, const QUrl &url) { - this->getMutableFavourite(index)->destination = IoUtil::uniformUrl(url); + this->getMutableFavourite(index)->destination = url; } Favourite FavouriteCollection::getFavourite(const QUrl &u) const @@ -210,7 +210,7 @@ Favourite FavouriteCollection::getFavourite(const QUrl &u) const for(auto const & ident : group->children) { FavouriteNode* node = &ident->as<FavouriteNode>(); - if(node->favourite.destination == url) + if(IoUtil::uniformUrl(node->favourite.destination) == url) return node->favourite; } } @@ -355,7 +355,7 @@ bool FavouriteCollection::containsUrl(const QUrl &u) const { for(auto const & ident : group->children) { - if(ident->as<FavouriteNode>().favourite.destination == url) + if(IoUtil::uniformUrl(ident->as<FavouriteNode>().favourite.destination) == url) return true; } } @@ -368,7 +368,7 @@ bool FavouriteCollection::addUnsorted(const QUrl &url, const QString &t) return false; return addFavourite(tr("Unsorted"), Favourite { t, - IoUtil::uniformUrl(url), + url, }); } @@ -381,7 +381,7 @@ bool FavouriteCollection::removeUrl(const QUrl &u) for(auto it = group->children.begin(); it != group->children.end(); ++it, ++index) { auto & fav = it->get()->as<FavouriteNode>(); - if(fav.favourite.destination == url) { + if(IoUtil::uniformUrl(fav.favourite.destination) == url) { beginRemoveRows(QModelIndex { }, index, index + 1); group->children.erase(it); |