From 5e7c2f72b50f9a5507bfe0bb17ed4e905b5b2647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 19 Jul 2014 09:47:10 +0200 Subject: [PATCH] fixed MacOSX-Qt5 build --- YACReaderLibrary/empty_folder_widget.cpp | 2 +- YACReaderLibrary/library_window.cpp | 8 ++++---- shortcuts_management/actions_groups_model.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/YACReaderLibrary/empty_folder_widget.cpp b/YACReaderLibrary/empty_folder_widget.cpp index 6d440f51..b05eddd1 100644 --- a/YACReaderLibrary/empty_folder_widget.cpp +++ b/YACReaderLibrary/empty_folder_widget.cpp @@ -9,7 +9,7 @@ #include void testListView(QListView * l) { - QStringListModel * slm = new QStringListModel(QStringList() = {"Lorem ipsum", "Hailer skualer", "Mumbaluba X", "Finger layden", "Pacum tactus filer", "Aposum", "En","Lorem ipsum", "Hailer skualer", "Mumbaluba X", "Finger layden", "Pacum tactus filer", "Aposum", "En" }); + QStringListModel * slm = new QStringListModel(QStringList() << "Lorem ipsum" << "Hailer skualer"<< "Mumbaluba X" << "Finger layden" << "Pacum tactus filer" << "Aposum" << "En" << "Lorem ipsum" << "Hailer skualer" << "Mumbaluba X" << "Finger layden" << "Pacum tactus filer" << "Aposum" << "En" ); l->setModel(slm); } diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 686afd9e..65ccb6da 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -857,8 +857,8 @@ void LibraryWindow::createMenus() libraryMenu->addAction(removeLibraryAction); libraryMenu->addSeparator(); - libraryMenu->addAction(exportComicsInfo); - libraryMenu->addAction(importComicsInfo); + libraryMenu->addAction(exportComicsInfoAction); + libraryMenu->addAction(importComicsInfoAction); libraryMenu->addSeparator(); @@ -872,8 +872,8 @@ void LibraryWindow::createMenus() folderMenu->addAction(setFolderAsNotCompletedAction); folderMenu->addAction(setFolderAsCompletedAction); folderMenu->addSeparator(); - folderMenu->addAction(setFolderAsFinishedAction); - folderMenu->addAction(setFolderAsNotFinishedAction); + folderMenu->addAction(setFolderAsReadAction); + folderMenu->addAction(setFolderAsUnreadAction); //comic QMenu * comicMenu = new QMenu(tr("Comic")); diff --git a/shortcuts_management/actions_groups_model.cpp b/shortcuts_management/actions_groups_model.cpp index 47ba2e91..a337cbff 100644 --- a/shortcuts_management/actions_groups_model.cpp +++ b/shortcuts_management/actions_groups_model.cpp @@ -20,7 +20,7 @@ QModelIndex ActionsGroupsModel::index(int row, int column, const QModelIndex &pa if (!hasIndex(row, column, parent)) return QModelIndex(); - return createIndex(row, column, &groups.at(row).getActions()); + return createIndex(row, column); } QVariant ActionsGroupsModel::data(const QModelIndex &index, int role) const