Skip to content

Commit

Permalink
Fix mythbrowser build under QT5
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartm committed Mar 1, 2015
1 parent 2762be7 commit 00d744f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
Expand Up @@ -327,7 +327,7 @@ bool BookmarkManager::keyPressEvent(QKeyEvent *event)

if (item)
{
Bookmark *site = qVariantValue<Bookmark*>(item->GetData());
Bookmark *site = item->GetData().value<Bookmark*>();

if (item->state() == MythUIButtonListItem::NotChecked)
{
Expand Down Expand Up @@ -370,7 +370,7 @@ void BookmarkManager::slotBookmarkClicked(MythUIButtonListItem *item)
if (!item)
return;

Bookmark *site = qVariantValue<Bookmark*>(item->GetData());
Bookmark *site = item->GetData().value<Bookmark*>();
if (!site)
return;

Expand Down Expand Up @@ -428,7 +428,7 @@ void BookmarkManager::ShowEditDialog(bool edit)

if (item && item->GetData().isValid())
{
site = qVariantValue<Bookmark*>(item->GetData());
site = item->GetData().value<Bookmark*>();
m_savedBookmark = *site;
}
else
Expand Down Expand Up @@ -471,7 +471,7 @@ void BookmarkManager::ReloadBookmarks(void)
item = m_bookmarkList->GetItemAt(x);
if (item && item->GetData().isValid())
{
Bookmark *site = qVariantValue<Bookmark*>(item->GetData());
Bookmark *site = item->GetData().value<Bookmark*>();
if (site && (*site == m_savedBookmark))
{
m_bookmarkList->SetItemCurrent(item);
Expand Down Expand Up @@ -499,7 +499,7 @@ void BookmarkManager::slotSetHomepage(void)
MythUIButtonListItem *item = m_bookmarkList->GetItemCurrent();
if (item && item->GetData().isValid())
{
Bookmark *site = qVariantValue<Bookmark*>(item->GetData());
Bookmark *site = item->GetData().value<Bookmark*>();
if (site)
UpdateHomepageInDB(site);
}
Expand Down Expand Up @@ -543,7 +543,7 @@ void BookmarkManager::slotDoDeleteCurrent(bool doDelete)
if (item)
{
QString category = "";
Bookmark *site = qVariantValue<Bookmark*>(item->GetData());
Bookmark *site = item->GetData().value<Bookmark*>();
if (site)
{
category = site->category;
Expand Down Expand Up @@ -616,7 +616,7 @@ void BookmarkManager::slotShowMarked(void)
MythUIButtonListItem *item = m_bookmarkList->GetItemCurrent();
if (item && item->GetData().isValid())
{
Bookmark *site = qVariantValue<Bookmark*>(item->GetData());
Bookmark *site = item->GetData().value<Bookmark*>();
m_savedBookmark = *site;
}

Expand Down Expand Up @@ -679,7 +679,7 @@ void BookmarkManager::slotClearMarked(void)
{
item->setChecked(MythUIButtonListItem::NotChecked);

Bookmark *site = qVariantValue<Bookmark*>(item->GetData());
Bookmark *site = item->GetData().value<Bookmark*>();
if (site)
site->selected = false;
}
Expand Down

0 comments on commit 00d744f

Please sign in to comment.