From eaaf37093073b98a2bfb7a5b803cad886918f531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 23 Oct 2013 10:26:13 +0200 Subject: [PATCH] ?? --- YACReaderLibrary/comic_vine/comic_vine.pri | 8 ++++---- YACReaderLibrary/comic_vine/comic_vine_dialog.cpp | 2 +- YACReaderLibrary/comic_vine/comic_vine_dialog.h | 14 +++++++------- ...{scrapper_lineedit.cpp => scraper_lineedit.cpp} | 6 +++--- .../{scrapper_lineedit.h => scraper_lineedit.h} | 4 ++-- ...crapper_tableview.cpp => scraper_tableview.cpp} | 4 ++-- .../{scrapper_tableview.h => scraper_tableview.h} | 4 ++-- .../comic_vine/search_single_comic.cpp | 8 ++++---- YACReaderLibrary/comic_vine/search_single_comic.h | 8 ++++---- YACReaderLibrary/comic_vine/search_volume.cpp | 4 ++-- YACReaderLibrary/comic_vine/search_volume.h | 4 ++-- YACReaderLibrary/comic_vine/select_volume.cpp | 4 ++-- YACReaderLibrary/comic_vine/select_volume.h | 4 ++-- YACReaderLibrary/comic_vine/sort_volume_comics.cpp | 6 +++--- YACReaderLibrary/comic_vine/sort_volume_comics.h | 6 +++--- 15 files changed, 43 insertions(+), 43 deletions(-) rename YACReaderLibrary/comic_vine/{scrapper_lineedit.cpp => scraper_lineedit.cpp} (72%) rename YACReaderLibrary/comic_vine/{scrapper_lineedit.h => scraper_lineedit.h} (64%) rename YACReaderLibrary/comic_vine/{scrapper_tableview.cpp => scraper_tableview.cpp} (95%) rename YACReaderLibrary/comic_vine/{scrapper_tableview.h => scraper_tableview.h} (59%) diff --git a/YACReaderLibrary/comic_vine/comic_vine.pri b/YACReaderLibrary/comic_vine/comic_vine.pri index 156d4de3..f6b94c6e 100644 --- a/YACReaderLibrary/comic_vine/comic_vine.pri +++ b/YACReaderLibrary/comic_vine/comic_vine.pri @@ -2,7 +2,7 @@ HEADERS += \ comic_vine/comic_vine_dialog.h \ comic_vine/comic_vine_client.h \ - comic_vine/scrapper_lineedit.h \ + comic_vine/scraper_lineedit.h \ comic_vine/title_header.h \ comic_vine/series_question.h \ comic_vine/search_single_comic.h \ @@ -13,7 +13,7 @@ HEADERS += \ comic_vine/model/comics_model.h \ comic_vine/model/json_model.h \ comic_vine/model/response_parser.h \ - comic_vine/scrapper_tableview.h \ + comic_vine/scraper_tableview.h \ comic_vine/sort_volume_comics.h \ comic_vine/model/local_comic_list_model.h \ comic_vine/model/volume_comics_model.h @@ -21,7 +21,7 @@ HEADERS += \ SOURCES += \ comic_vine/comic_vine_dialog.cpp \ comic_vine/comic_vine_client.cpp \ - comic_vine/scrapper_lineedit.cpp \ + comic_vine/scraper_lineedit.cpp \ comic_vine/title_header.cpp \ comic_vine/series_question.cpp \ comic_vine/search_single_comic.cpp \ @@ -32,7 +32,7 @@ SOURCES += \ comic_vine/model/comics_model.cpp \ comic_vine/model/json_model.cpp \ comic_vine/model/response_parser.cpp \ - comic_vine/scrapper_tableview.cpp \ + comic_vine/scraper_tableview.cpp \ comic_vine/sort_volume_comics.cpp \ comic_vine/model/local_comic_list_model.cpp \ comic_vine/model/volume_comics_model.cpp diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp index 359d43e0..98179a3b 100644 --- a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp +++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp @@ -10,7 +10,7 @@ #include "yacreader_busy_widget.h" #include "comic_vine_client.h" -#include "scrapper_lineedit.h" +#include "scraper_lineedit.h" #include "title_header.h" #include "series_question.h" #include "search_single_comic.h" diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.h b/YACReaderLibrary/comic_vine/comic_vine_dialog.h index 80664fc0..884d8888 100644 --- a/YACReaderLibrary/comic_vine/comic_vine_dialog.h +++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.h @@ -50,14 +50,14 @@ protected slots: void showSortVolumeComics(const QString & json); private: - enum ScrapperMode + enum ScraperMode { - SingleComic, //the scrapper has been opened for a single comic - Volume, //the scrapper is trying to get comics info for a whole volume - SingleComicInList //the scrapper has been opened for a list of unrelated comics + SingleComic, //the scraper has been opened for a single comic + Volume, //the scraper is trying to get comics info for a whole volume + SingleComicInList //the scraper has been opened for a list of unrelated comics }; - enum ScrapperStatus + enum ScraperStatus { AutoSearching, AskingForInfo, @@ -67,8 +67,8 @@ private: SearchingVolume }; - ScrapperMode mode; - ScrapperStatus status; + ScraperMode mode; + ScraperStatus status; int currentIndex; diff --git a/YACReaderLibrary/comic_vine/scrapper_lineedit.cpp b/YACReaderLibrary/comic_vine/scraper_lineedit.cpp similarity index 72% rename from YACReaderLibrary/comic_vine/scrapper_lineedit.cpp rename to YACReaderLibrary/comic_vine/scraper_lineedit.cpp index fb3cb2bc..94d03e95 100644 --- a/YACReaderLibrary/comic_vine/scrapper_lineedit.cpp +++ b/YACReaderLibrary/comic_vine/scraper_lineedit.cpp @@ -1,7 +1,7 @@ -#include "scrapper_lineedit.h" +#include "scraper_lineedit.h" #include -ScrapperLineEdit::ScrapperLineEdit(const QString & title, QWidget * widget) +ScraperLineEdit::ScraperLineEdit(const QString & title, QWidget * widget) :QLineEdit(widget) { titleLabel = new QLabel(title,this); @@ -14,7 +14,7 @@ ScrapperLineEdit::ScrapperLineEdit(const QString & title, QWidget * widget) setFixedHeight(22); } -void ScrapperLineEdit::resizeEvent(QResizeEvent *) +void ScraperLineEdit::resizeEvent(QResizeEvent *) { QSize szl = titleLabel->sizeHint(); titleLabel->move(6,(rect().bottom() + 1 - szl.height())/2); diff --git a/YACReaderLibrary/comic_vine/scrapper_lineedit.h b/YACReaderLibrary/comic_vine/scraper_lineedit.h similarity index 64% rename from YACReaderLibrary/comic_vine/scrapper_lineedit.h rename to YACReaderLibrary/comic_vine/scraper_lineedit.h index d8e7b780..30665b11 100644 --- a/YACReaderLibrary/comic_vine/scrapper_lineedit.h +++ b/YACReaderLibrary/comic_vine/scraper_lineedit.h @@ -5,11 +5,11 @@ class QLabel; -class ScrapperLineEdit : public QLineEdit +class ScraperLineEdit : public QLineEdit { Q_OBJECT public: - ScrapperLineEdit(const QString & title, QWidget * widget = 0); + ScraperLineEdit(const QString & title, QWidget * widget = 0); protected: void resizeEvent(QResizeEvent *); private: diff --git a/YACReaderLibrary/comic_vine/scrapper_tableview.cpp b/YACReaderLibrary/comic_vine/scraper_tableview.cpp similarity index 95% rename from YACReaderLibrary/comic_vine/scrapper_tableview.cpp rename to YACReaderLibrary/comic_vine/scraper_tableview.cpp index ec47358d..543146b5 100644 --- a/YACReaderLibrary/comic_vine/scrapper_tableview.cpp +++ b/YACReaderLibrary/comic_vine/scraper_tableview.cpp @@ -1,8 +1,8 @@ -#include "scrapper_tableview.h" +#include "scraper_tableview.h" #include -ScrapperTableView::ScrapperTableView(QWidget *parent) : +ScraperTableView::ScraperTableView(QWidget *parent) : QTableView(parent) { QString tableStylesheet = "QTableView {color:white; border:0px;alternate-background-color: #2E2E2E;background-color: #2B2B2B; outline: 0px;}" diff --git a/YACReaderLibrary/comic_vine/scrapper_tableview.h b/YACReaderLibrary/comic_vine/scraper_tableview.h similarity index 59% rename from YACReaderLibrary/comic_vine/scrapper_tableview.h rename to YACReaderLibrary/comic_vine/scraper_tableview.h index 9369b178..deb151c7 100644 --- a/YACReaderLibrary/comic_vine/scrapper_tableview.h +++ b/YACReaderLibrary/comic_vine/scraper_tableview.h @@ -3,11 +3,11 @@ #include -class ScrapperTableView : public QTableView +class ScraperTableView : public QTableView { Q_OBJECT public: - explicit ScrapperTableView(QWidget *parent = 0); + explicit ScraperTableView(QWidget *parent = 0); signals: diff --git a/YACReaderLibrary/comic_vine/search_single_comic.cpp b/YACReaderLibrary/comic_vine/search_single_comic.cpp index ae881fe0..e3d668ec 100644 --- a/YACReaderLibrary/comic_vine/search_single_comic.cpp +++ b/YACReaderLibrary/comic_vine/search_single_comic.cpp @@ -1,6 +1,6 @@ #include "search_single_comic.h" -#include "scrapper_lineedit.h" +#include "scraper_lineedit.h" #include #include @@ -13,9 +13,9 @@ SearchSingleComic::SearchSingleComic(QWidget * parent) QLabel * label = new QLabel(tr("No results found, please provide some aditional information. At least one field is needed.")); label->setStyleSheet("QLabel {color:white; font-size:12px;font-family:Arial;}"); - titleEdit = new ScrapperLineEdit(tr("Title:")); - numberEdit = new ScrapperLineEdit(tr("Number:")); - volumeEdit = new ScrapperLineEdit(tr("Series:")); + titleEdit = new ScraperLineEdit(tr("Title:")); + numberEdit = new ScraperLineEdit(tr("Number:")); + volumeEdit = new ScraperLineEdit(tr("Series:")); numberEdit->setMaximumWidth(126); diff --git a/YACReaderLibrary/comic_vine/search_single_comic.h b/YACReaderLibrary/comic_vine/search_single_comic.h index b6f5f925..7f76d94c 100644 --- a/YACReaderLibrary/comic_vine/search_single_comic.h +++ b/YACReaderLibrary/comic_vine/search_single_comic.h @@ -3,7 +3,7 @@ #include -class ScrapperLineEdit; +class ScraperLineEdit; class SearchSingleComic : public QWidget { @@ -14,8 +14,8 @@ public: QString getComicInfo(); int getComicNumber(); private: - ScrapperLineEdit * titleEdit; - ScrapperLineEdit * numberEdit; - ScrapperLineEdit * volumeEdit; + ScraperLineEdit * titleEdit; + ScraperLineEdit * numberEdit; + ScraperLineEdit * volumeEdit; }; #endif // SEARCH_SINGLE_COMIC_H diff --git a/YACReaderLibrary/comic_vine/search_volume.cpp b/YACReaderLibrary/comic_vine/search_volume.cpp index 6924f5b3..108bfe92 100644 --- a/YACReaderLibrary/comic_vine/search_volume.cpp +++ b/YACReaderLibrary/comic_vine/search_volume.cpp @@ -1,6 +1,6 @@ #include "search_volume.h" -#include "scrapper_lineedit.h" +#include "scraper_lineedit.h" #include #include @@ -11,7 +11,7 @@ SearchVolume::SearchVolume(QWidget * parent) QLabel * label = new QLabel(tr("No results found, please provide some aditional information.")); label->setStyleSheet("QLabel {color:white; font-size:12px;font-family:Arial;}"); - volumeEdit = new ScrapperLineEdit(tr("Series:")); + volumeEdit = new ScraperLineEdit(tr("Series:")); QVBoxLayout * l = new QVBoxLayout; diff --git a/YACReaderLibrary/comic_vine/search_volume.h b/YACReaderLibrary/comic_vine/search_volume.h index 21ad8482..06bf6ffb 100644 --- a/YACReaderLibrary/comic_vine/search_volume.h +++ b/YACReaderLibrary/comic_vine/search_volume.h @@ -3,7 +3,7 @@ #include -class ScrapperLineEdit; +class ScraperLineEdit; class SearchVolume : public QWidget @@ -14,7 +14,7 @@ public: public slots: QString getVolumeInfo(); private: - ScrapperLineEdit * volumeEdit; + ScraperLineEdit * volumeEdit; }; #endif // SEARCH_VOLUME_H diff --git a/YACReaderLibrary/comic_vine/select_volume.cpp b/YACReaderLibrary/comic_vine/select_volume.cpp index ff36ef0a..bc14dfa2 100644 --- a/YACReaderLibrary/comic_vine/select_volume.cpp +++ b/YACReaderLibrary/comic_vine/select_volume.cpp @@ -9,7 +9,7 @@ #include #include -#include "scrapper_tableview.h" +#include "scraper_tableview.h" #include @@ -65,7 +65,7 @@ SelectVolume::SelectVolume(QWidget *parent) //iScroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); //iScroll->show(); - tableVolumes = new ScrapperTableView(); + tableVolumes = new ScraperTableView(); //connections connect(tableVolumes,SIGNAL(clicked(QModelIndex)),this,SLOT(loadVolumeInfo(QModelIndex))); diff --git a/YACReaderLibrary/comic_vine/select_volume.h b/YACReaderLibrary/comic_vine/select_volume.h index 6ecb9b65..9e16b766 100644 --- a/YACReaderLibrary/comic_vine/select_volume.h +++ b/YACReaderLibrary/comic_vine/select_volume.h @@ -7,7 +7,7 @@ class QLabel; class VolumesModel; class QModelIndex; -class ScrapperTableView; +class ScraperTableView; class SelectVolume : public QWidget { @@ -25,7 +25,7 @@ public slots: private: QLabel * cover; QLabel * detailLabel; - ScrapperTableView * tableVolumes; + ScraperTableView * tableVolumes; VolumesModel * model; }; diff --git a/YACReaderLibrary/comic_vine/sort_volume_comics.cpp b/YACReaderLibrary/comic_vine/sort_volume_comics.cpp index 0dbba8dd..699ee7c2 100644 --- a/YACReaderLibrary/comic_vine/sort_volume_comics.cpp +++ b/YACReaderLibrary/comic_vine/sort_volume_comics.cpp @@ -5,7 +5,7 @@ #include #include -#include "scrapper_tableview.h" +#include "scraper_tableview.h" #include "local_comic_list_model.h" #include "volume_comics_model.h" @@ -26,8 +26,8 @@ SortVolumeComics::SortVolumeComics(QWidget *parent) : QHBoxLayout * content = new QHBoxLayout; QHBoxLayout * sortButtonsLayout = new QHBoxLayout; - tableFiles = new ScrapperTableView(); - tableVolumeComics = new ScrapperTableView(); + tableFiles = new ScraperTableView(); + tableVolumeComics = new ScraperTableView(); tableFiles->setFixedSize(407,341); tableVolumeComics->setFixedSize(407,341); diff --git a/YACReaderLibrary/comic_vine/sort_volume_comics.h b/YACReaderLibrary/comic_vine/sort_volume_comics.h index f5e87207..ce85a66e 100644 --- a/YACReaderLibrary/comic_vine/sort_volume_comics.h +++ b/YACReaderLibrary/comic_vine/sort_volume_comics.h @@ -6,7 +6,7 @@ #include "comic_db.h" -class ScrapperTableView; +class ScraperTableView; class QPushButton; class LocalComicListModel; class VolumeComicsModel; @@ -26,8 +26,8 @@ protected slots: void synchronizeScroll(int pos); private: - ScrapperTableView * tableFiles; - ScrapperTableView * tableVolumeComics; + ScraperTableView * tableFiles; + ScraperTableView * tableVolumeComics; LocalComicListModel * localComicsModel; VolumeComicsModel * volumeComicsModel;