Format code using clang-format

This commit is contained in:
Luis Ángel San Martín
2019-05-30 19:46:37 +02:00
parent e0eb94e3ae
commit e3ec56aa43
356 changed files with 19824 additions and 21874 deletions

View File

@ -23,8 +23,7 @@ YACReaderComicsViewsManager::YACReaderComicsViewsManager(QSettings *settings, Li
{
comicsViewStack = new QStackedWidget();
switch ((YACReader::ComicsViewStatus)settings->value(COMICS_VIEW_STATUS).toInt())
{
switch ((YACReader::ComicsViewStatus)settings->value(COMICS_VIEW_STATUS).toInt()) {
case Flow:
comicsView = classicComicsView = new ClassicComicsView();
comicsViewStatus = Flow;
@ -61,11 +60,11 @@ YACReaderComicsViewsManager::YACReaderComicsViewsManager(QSettings *settings, Li
//connections
connect(emptyFolderWidget, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
connect(emptyFolderWidget, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
connect(emptyFolderWidget, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString>>)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString>>)));
connect(emptyFolderWidget, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString>>)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString>>)));
}
QWidget * YACReaderComicsViewsManager::containerWidget()
QWidget *YACReaderComicsViewsManager::containerWidget()
{
return comicsViewStack;
}
@ -114,47 +113,46 @@ void YACReaderComicsViewsManager::showNoSearchResultsView()
//TODO recover the current comics selection and restore it in the destination
void YACReaderComicsViewsManager::toggleComicsView()
{
if(comicsViewStack->currentWidget()==comicsView) {
QTimer::singleShot(0,this,SLOT(showComicsViewTransition()));
QTimer::singleShot(100,this,SLOT(_toggleComicsView()));
} else
{
if (comicsViewStack->currentWidget() == comicsView) {
QTimer::singleShot(0, this, SLOT(showComicsViewTransition()));
QTimer::singleShot(100, this, SLOT(_toggleComicsView()));
} else {
_toggleComicsView();
}
}
//PROTECTED
void YACReaderComicsViewsManager::disconnectComicsViewConnections(ComicsView * widget)
void YACReaderComicsViewsManager::disconnectComicsViewConnections(ComicsView *widget)
{
disconnect(widget, SIGNAL(comicRated(int,QModelIndex)), libraryWindow->comicsModel, SLOT(updateRating(int,QModelIndex)));
disconnect(libraryWindow->showHideMarksAction,SIGNAL(toggled(bool)),widget,SLOT(setShowMarks(bool)));
disconnect(widget,SIGNAL(selected(unsigned int)),libraryWindow,SLOT(openComic()));
disconnect(widget,SIGNAL(openComic(ComicDB)),libraryWindow,SLOT(openComic(ComicDB)));
disconnect(libraryWindow->selectAllComicsAction,SIGNAL(triggered()),widget,SLOT(selectAll()));
disconnect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
disconnect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
disconnect(comicsView,SIGNAL(customContextMenuViewRequested(QPoint)),libraryWindow,SLOT(showComicsViewContextMenu(QPoint)));
disconnect(comicsView,SIGNAL(customContextMenuItemRequested(QPoint)),libraryWindow,SLOT(showComicsItemContextMenu(QPoint)));
disconnect(widget, SIGNAL(comicRated(int, QModelIndex)), libraryWindow->comicsModel, SLOT(updateRating(int, QModelIndex)));
disconnect(libraryWindow->showHideMarksAction, SIGNAL(toggled(bool)), widget, SLOT(setShowMarks(bool)));
disconnect(widget, SIGNAL(selected(unsigned int)), libraryWindow, SLOT(openComic()));
disconnect(widget, SIGNAL(openComic(ComicDB)), libraryWindow, SLOT(openComic(ComicDB)));
disconnect(libraryWindow->selectAllComicsAction, SIGNAL(triggered()), widget, SLOT(selectAll()));
disconnect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString>>)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString>>)));
disconnect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString>>)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString>>)));
disconnect(comicsView, SIGNAL(customContextMenuViewRequested(QPoint)), libraryWindow, SLOT(showComicsViewContextMenu(QPoint)));
disconnect(comicsView, SIGNAL(customContextMenuItemRequested(QPoint)), libraryWindow, SLOT(showComicsItemContextMenu(QPoint)));
}
void YACReaderComicsViewsManager::doComicsViewConnections()
{
connect(comicsView, SIGNAL(comicRated(int,QModelIndex)), libraryWindow->comicsModel, SLOT(updateRating(int,QModelIndex)));
connect(libraryWindow->showHideMarksAction,SIGNAL(toggled(bool)),comicsView,SLOT(setShowMarks(bool)));
connect(comicsView,SIGNAL(selected(unsigned int)),libraryWindow,SLOT(openComic()));
connect(comicsView,SIGNAL(openComic(ComicDB)),libraryWindow,SLOT(openComic(ComicDB)));
connect(comicsView, SIGNAL(comicRated(int, QModelIndex)), libraryWindow->comicsModel, SLOT(updateRating(int, QModelIndex)));
connect(libraryWindow->showHideMarksAction, SIGNAL(toggled(bool)), comicsView, SLOT(setShowMarks(bool)));
connect(comicsView, SIGNAL(selected(unsigned int)), libraryWindow, SLOT(openComic()));
connect(comicsView, SIGNAL(openComic(ComicDB)), libraryWindow, SLOT(openComic(ComicDB)));
connect(libraryWindow->selectAllComicsAction,SIGNAL(triggered()),comicsView,SLOT(selectAll()));
connect(libraryWindow->selectAllComicsAction, SIGNAL(triggered()), comicsView, SLOT(selectAll()));
connect(comicsView,SIGNAL(customContextMenuViewRequested(QPoint)),libraryWindow,SLOT(showComicsViewContextMenu(QPoint)));
connect(comicsView,SIGNAL(customContextMenuItemRequested(QPoint)),libraryWindow,SLOT(showComicsItemContextMenu(QPoint)));
connect(comicsView, SIGNAL(customContextMenuViewRequested(QPoint)), libraryWindow, SLOT(showComicsViewContextMenu(QPoint)));
connect(comicsView, SIGNAL(customContextMenuItemRequested(QPoint)), libraryWindow, SLOT(showComicsItemContextMenu(QPoint)));
//Drops
connect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
connect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString> >)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString> >)));
connect(comicsView, SIGNAL(copyComicsToCurrentFolder(QList<QPair<QString, QString>>)), libraryWindow, SLOT(copyAndImportComicsToCurrentFolder(QList<QPair<QString, QString>>)));
connect(comicsView, SIGNAL(moveComicsToCurrentFolder(QList<QPair<QString, QString>>)), libraryWindow, SLOT(moveAndImportComicsToCurrentFolder(QList<QPair<QString, QString>>)));
}
void YACReaderComicsViewsManager::switchToComicsView(ComicsView * from, ComicsView * to)
void YACReaderComicsViewsManager::switchToComicsView(ComicsView *from, ComicsView *to)
{
//setup views
disconnectComicsViewConnections(from);
@ -173,9 +171,8 @@ void YACReaderComicsViewsManager::switchToComicsView(ComicsView * from, ComicsVi
//load content into current view
libraryWindow->loadCoversFromCurrentModel();
if(!libraryWindow->searchEdit->text().isEmpty())
{
comicsView->enableFilterMode(true);
if (!libraryWindow->searchEdit->text().isEmpty()) {
comicsView->enableFilterMode(true);
}
}
@ -186,17 +183,15 @@ void YACReaderComicsViewsManager::showComicsViewTransition()
void YACReaderComicsViewsManager::_toggleComicsView()
{
switch(comicsViewStatus)
{
case Flow:
{
switch (comicsViewStatus) {
case Flow: {
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/info.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
if(gridComicsView == nullptr)
if (gridComicsView == nullptr)
gridComicsView = new GridComicsView();
switchToComicsView(classicComicsView, gridComicsView);
@ -206,16 +201,15 @@ void YACReaderComicsViewsManager::_toggleComicsView()
break;
}
case Grid:
{
case Grid: {
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/flow.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
if(infoComicsView == nullptr)
infoComicsView = new InfoComicsView();
if (infoComicsView == nullptr)
infoComicsView = new InfoComicsView();
switchToComicsView(gridComicsView, infoComicsView);
comicsViewStatus = Info;
@ -223,15 +217,14 @@ void YACReaderComicsViewsManager::_toggleComicsView()
break;
}
case Info:
{
case Info: {
QIcon icoViewsButton;
icoViewsButton.addFile(":/images/main_toolbar/grid.png", QSize(), QIcon::Normal);
libraryWindow->toggleComicsViewAction->setIcon(icoViewsButton);
#ifdef Q_OS_MAC
libraryWindow->libraryToolBar->updateViewSelectorIcon(icoViewsButton);
#endif
if(classicComicsView == nullptr)
if (classicComicsView == nullptr)
classicComicsView = new ClassicComicsView();
switchToComicsView(infoComicsView, classicComicsView);
@ -243,6 +236,6 @@ void YACReaderComicsViewsManager::_toggleComicsView()
libraryWindow->settings->setValue(COMICS_VIEW_STATUS, comicsViewStatus);
if(comicsViewStack->currentWidget()==comicsViewTransition)
if (comicsViewStack->currentWidget() == comicsViewTransition)
showComicsView();
}