Skip to content

Commit

Permalink
Coding style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bionus
Bionus committed Jul 23, 2018
1 parent a94dcc0 commit db4999b
Show file tree
Hide file tree
Showing 59 changed files with 272 additions and 257 deletions.
2 changes: 1 addition & 1 deletion gui/src/batch/adduniquewindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AddUniqueWindow : public QDialog
void ok(bool close = true);
void replyFinished(Page *p);
void addLoadedImage();
void addImage(const QSharedPointer<Image>& img);
void addImage(const QSharedPointer<Image> &img);
void on_buttonFolder_clicked();
void on_lineFilename_textChanged(const QString &);

Expand Down
10 changes: 5 additions & 5 deletions gui/src/batch/batchwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ void batchWindow::statusImage(const QUrl &url, int percent)
{
const int i = indexOf(url);
if (i != -1)
ui->tableWidget->item(i, 5)->setText(QString::number(percent)+" %");
ui->tableWidget->item(i, 5)->setText(QString::number(percent) + " %");
}
void batchWindow::speedImage(const QUrl &url, double speed)
{
Expand All @@ -274,7 +274,7 @@ void batchWindow::speedImage(const QUrl &url, double speed)

int i = indexOf(url);
if (i != -1)
ui->tableWidget->item(i, 4)->setText(QLocale::system().toString(speed, 'f', speed < 10 ? 2 : 0)+" "+unit);
ui->tableWidget->item(i, 4)->setText(QLocale::system().toString(speed, 'f', speed < 10 ? 2 : 0) + " " + unit);

drawSpeed();
}
Expand All @@ -285,7 +285,7 @@ void batchWindow::sizeImage(const QUrl &url, double size)
{
const QString unit = getUnit(&size);
const QString label = size > 0
? QLocale::system().toString(size, 'f', size < 10 ? 2 : 0) + " "+unit
? QLocale::system().toString(size, 'f', size < 10 ? 2 : 0) + " " + unit
: QString();
ui->tableWidget->item(i, 3)->setText(label);
}
Expand Down Expand Up @@ -355,7 +355,7 @@ void batchWindow::drawSpeed()
{
for (int i = m_mean.count() - count; i < m_mean.count() - 1; i++)
{ speedMean += m_mean[i]; }
speedMean = static_cast<int>(speedMean/count);
speedMean = static_cast<int>(speedMean / count);
}
const QString unitMean = getUnit(&speedMean) + "/s";

Expand All @@ -367,7 +367,7 @@ void batchWindow::drawSpeed()
const QString fElapsed = elapsed > 3600000 ? tr("h 'h' m 'm' s 's'") : (elapsed > 60000 ? tr("m 'm' s 's'") : tr("s 's'"));
const QString fRemaining = remaining > 3600000 ? tr("h 'h' m 'm' s 's'") : (remaining > 60000 ? tr("m 'm' s 's'") : tr("s 's'"));

ui->labelSpeed->setText(QLocale::system().toString(speed, 'f', speed < 10 ? 2 : 0)+" "+unit);
ui->labelSpeed->setText(QLocale::system().toString(speed, 'f', speed < 10 ? 2 : 0) + " " + unit);
ui->labelSpeed->setToolTip(tr("<b>Average speed:</b> %1 %2<br/><br/><b>Elapsed time:</b> %3<br/><b>Remaining time:</b> %4").arg(QLocale::system().toString(speedMean, 'f', speedMean < 10 ? 2 : 0), unitMean, tElapsed.toString(fElapsed), tRemaining.toString(fRemaining)));
}

Expand Down
12 changes: 6 additions & 6 deletions gui/src/crashhandler/crashhandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class CrashHandlerPrivate
public:
CrashHandlerPrivate() { pHandler = NULL; }
~CrashHandlerPrivate() { delete pHandler; }
void InitCrashHandler(const QString& dumpPath);
static google_breakpad::ExceptionHandler* pHandler;
void InitCrashHandler(const QString &dumpPath);
static google_breakpad::ExceptionHandler *pHandler;
static bool bReportCrashesToSystem;
};

google_breakpad::ExceptionHandler* CrashHandlerPrivate::pHandler = NULL;
google_breakpad::ExceptionHandler *CrashHandlerPrivate::pHandler = NULL;
bool CrashHandlerPrivate::bReportCrashesToSystem = false;


Expand Down Expand Up @@ -71,7 +71,7 @@ bool DumpCallback(const char* _dump_dir,const char* _minidump_id,void *context,
QFile f(savePath("lastdump"));
if (f.open(QFile::WriteOnly))
{
f.write(QDir::toNativeSeparators(dir+"/"+mid+".dmp").toLatin1());
f.write(QDir::toNativeSeparators(dir + "/" + mid + ".dmp").toLatin1());
f.close();
}
}
Expand Down Expand Up @@ -126,7 +126,7 @@ void CrashHandlerPrivate::InitCrashHandler(const QString& dumpPath)
/* CrashHandler */
/************************************************************************/

CrashHandler* CrashHandler::instance()
CrashHandler *CrashHandler::instance()
{
static CrashHandler globalHandler;
return &globalHandler;
Expand All @@ -151,7 +151,7 @@ bool CrashHandler::writeMinidump()
return res;
}

void CrashHandler::Init( const QString& reportPath )
void CrashHandler::Init( const QString &reportPath )
{ d->InitCrashHandler(reportPath); }

#endif
6 changes: 3 additions & 3 deletions gui/src/crashhandler/crashhandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ class CrashHandlerPrivate;
class CrashHandler
{
public:
static CrashHandler* instance();
void Init(const QString& reportPath);
static CrashHandler *instance();
void Init(const QString &reportPath);
void setReportCrashesToSystem(bool report);
bool writeMinidump();

private:
CrashHandler();
~CrashHandler();
Q_DISABLE_COPY(CrashHandler)
CrashHandlerPrivate* d;
CrashHandlerPrivate *d;
};

#endif // CRASHHANDLER_H
30 changes: 15 additions & 15 deletions gui/src/main/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,21 @@ int main(int argc, char *argv[])
if (!gui)
{
Downloader *dwnldr = new Downloader(profile,
parser.value(tagsOption).split(" ", QString::SkipEmptyParts),
parser.value(postfilteringOption).split(" ", QString::SkipEmptyParts),
profile->getFilteredSites(parser.value(sourceOption).split(" ", QString::SkipEmptyParts)),
parser.value(pageOption).toInt(),
parser.value(limitOption).toInt(),
parser.value(perpageOption).toInt(),
parser.value(pathOption),
parser.value(filenameOption),
parser.value(userOption),
parser.value(passwordOption),
parser.isSet(blacklistOption),
profile->getBlacklist(),
parser.isSet(noDuplicatesOption),
parser.value(tagsMinOption).toInt(),
parser.value(tagsFormatOption));
parser.value(tagsOption).split(" ", QString::SkipEmptyParts),
parser.value(postfilteringOption).split(" ", QString::SkipEmptyParts),
profile->getFilteredSites(parser.value(sourceOption).split(" ", QString::SkipEmptyParts)),
parser.value(pageOption).toInt(),
parser.value(limitOption).toInt(),
parser.value(perpageOption).toInt(),
parser.value(pathOption),
parser.value(filenameOption),
parser.value(userOption),
parser.value(passwordOption),
parser.isSet(blacklistOption),
profile->getBlacklist(),
parser.isSet(noDuplicatesOption),
parser.value(tagsMinOption).toInt(),
parser.value(tagsFormatOption));

if (parser.isSet(returnCountOption))
dwnldr->getPageCount();
Expand Down
67 changes: 34 additions & 33 deletions gui/src/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,8 @@ void mainWindow::tabClosed(searchTab *tab)
QJsonObject obj;
tab->write(obj);
m_closedTabs.append(obj);
if (m_closedTabs.count() > CLOSED_TAB_HISTORY_MAX) {
if (m_closedTabs.count() > CLOSED_TAB_HISTORY_MAX)
{
m_closedTabs.removeFirst();
}
ui->actionRestoreLastClosedTab->setEnabled(true);
Expand Down Expand Up @@ -692,7 +693,7 @@ void mainWindow::saveFolder()
{
QString path = m_settings->value("Save/path").toString().replace("\\", "/");
if (path.right(1) == "/")
{ path = path.left(path.length()-1); }
{ path = path.left(path.length() - 1); }
QDir dir(path);
if (dir.exists())
{ showInGraphicalShell(path); }
Expand Down Expand Up @@ -820,7 +821,7 @@ void mainWindow::batchMove(int diff)
selection.select(index, index);
}

auto* selectionModel = new QItemSelectionModel(ui->tableBatchGroups->model(), this);
auto *selectionModel = new QItemSelectionModel(ui->tableBatchGroups->model(), this);
selectionModel->select(selection, QItemSelectionModel::ClearAndSelect);
ui->tableBatchGroups->setSelectionModel(selectionModel);
}
Expand Down Expand Up @@ -887,7 +888,7 @@ void mainWindow::updateBatchGroups(int y, int x)
}
}

Site* mainWindow::getSelectedSiteOrDefault()
Site *mainWindow::getSelectedSiteOrDefault()
{
if (m_selectedSites.isEmpty())
return m_profile->getSites().first();
Expand Down Expand Up @@ -1002,16 +1003,16 @@ void mainWindow::logClear()
void mainWindow::logOpen()
{ QDesktopServices::openUrl("file:///" + m_profile->getPath() + "/main.log"); }

void mainWindow::loadLanguage(const QString& rLanguage, bool quiet)
void mainWindow::loadLanguage(const QString &rLanguage, bool quiet)
{
if (m_currLang != rLanguage)
{
m_currLang = rLanguage;
QLocale locale = QLocale(m_currLang);
QLocale::setDefault(locale);

m_translator.load(savePath("languages/"+m_currLang+".qm", true));
m_qtTranslator.load(savePath("languages/qt/"+m_currLang+".qm", true));
m_translator.load(savePath("languages/" + m_currLang + ".qm", true));
m_qtTranslator.load(savePath("languages/qt/" + m_currLang + ".qm", true));

if (!quiet)
{
Expand All @@ -1023,7 +1024,7 @@ void mainWindow::loadLanguage(const QString& rLanguage, bool quiet)
}

// Update interface language
void mainWindow::changeEvent(QEvent* event)
void mainWindow::changeEvent(QEvent *event)
{
// Translation
if (event->type() == QEvent::LocaleChange)
Expand Down Expand Up @@ -1130,7 +1131,7 @@ void mainWindow::options()

void mainWindow::optionsClosed()
{
for (searchTab* tab : m_tabs)
for (searchTab *tab : m_tabs)
{
tab->optionsChanged();
tab->updateCheckboxes();
Expand Down Expand Up @@ -1381,22 +1382,22 @@ void mainWindow::getAllFinishedLogins()
for (int i = 0; i < packs; ++i)
{
Downloader *downloader = new Downloader(m_profile,
b.tags.split(' '),
b.postFiltering,
QList<Site*>() << b.site,
b.page + i * pagesPerPack,
(i == packs - 1 ? lastPageImages : imagesPerPack),
b.perpage,
b.path,
b.filename,
nullptr,
nullptr,
b.getBlacklisted,
m_profile->getBlacklist(),
false,
0,
"",
previous);
b.tags.split(' '),
b.postFiltering,
QList<Site *>() << b.site,
b.page + i * pagesPerPack,
(i == packs - 1 ? lastPageImages : imagesPerPack),
b.perpage,
b.path,
b.filename,
nullptr,
nullptr,
b.getBlacklisted,
m_profile->getBlacklist(),
false,
0,
"",
previous);
downloader->setData(j.key());
downloader->setQuit(false);

Expand Down Expand Up @@ -1757,7 +1758,7 @@ void mainWindow::getAllProgress(const QSharedPointer<Image> &img, qint64 bytesRe
}

int percent = 0;
if (bytesTotal> 0)
if (bytesTotal > 0)
{
const qreal pct = static_cast<qreal>(bytesReceived) / static_cast<qreal>(bytesTotal);
percent = qFloor(pct * 100);
Expand Down Expand Up @@ -1818,7 +1819,7 @@ void mainWindow::getAllPerformTags()
m_progressDialog->loadedImage(img->url(), Image::SaveResult::AlreadyExists);
if (siteId >= 0)
{
m_progressBars[siteId - 1]->setValue(m_progressBars[siteId - 1]->value()+1);
m_progressBars[siteId - 1]->setValue(m_progressBars[siteId - 1]->value() + 1);
if (m_progressBars[siteId - 1]->value() >= m_progressBars[siteId - 1]->maximum())
{ ui->tableBatchGroups->item(row, 0)->setIcon(getIcon(":/images/status/ok.png")); }
}
Expand Down Expand Up @@ -2193,7 +2194,7 @@ bool mainWindow::loadLinkList(const QString &filename)
{
ui->tableBatchGroups->setRowCount(ui->tableBatchGroups->rowCount() + 1);
QString last = queryGroup.unk;
int max = last.rightRef(last.indexOf("/")+1).toInt(), val = last.leftRef(last.indexOf("/")).toInt();
int max = last.rightRef(last.indexOf("/") + 1).toInt(), val = last.leftRef(last.indexOf("/")).toInt();

int row = ui->tableBatchGroups->rowCount() - 1;
addTableItem(ui->tableBatchGroups, row, 1, queryGroup.tags);
Expand All @@ -2208,7 +2209,7 @@ bool mainWindow::loadLinkList(const QString &filename)

queryGroup.unk = "true";
m_groupBatchs.append(queryGroup);
QTableWidgetItem *it = new QTableWidgetItem(getIcon(":/images/status/"+QString(val == max ? "ok" : (val > 0 ? "downloading" : "pending"))+".png"), "");
QTableWidgetItem *it = new QTableWidgetItem(getIcon(":/images/status/" + QString(val == max ? "ok" : (val > 0 ? "downloading" : "pending")) + ".png"), "");
it->setFlags(it->flags() ^ Qt::ItemIsEditable);
it->setTextAlignment(Qt::AlignCenter);
ui->tableBatchGroups->setItem(row, 0, it);
Expand Down Expand Up @@ -2256,7 +2257,7 @@ void mainWindow::siteDeleted(Site *site)
batchRemoveUniques(uniquesRows);
}

QIcon& mainWindow::getIcon(const QString &path)
QIcon &mainWindow::getIcon(const QString &path)
{
if (!m_icons.contains(path))
m_icons.insert(path, QIcon(path));
Expand Down Expand Up @@ -2426,7 +2427,7 @@ void mainWindow::trayClose()

void mainWindow::dragEnterEvent(QDragEnterEvent *event)
{
const QMimeData* mimeData = event->mimeData();
const QMimeData *mimeData = event->mimeData();

// Drop a text containing an URL
if (mimeData->hasText())
Expand Down Expand Up @@ -2456,9 +2457,9 @@ void mainWindow::dragEnterEvent(QDragEnterEvent *event)
}
}

void mainWindow::dropEvent(QDropEvent* event)
void mainWindow::dropEvent(QDropEvent *event)
{
const QMimeData* mimeData = event->mimeData();
const QMimeData *mimeData = event->mimeData();

// Drop a text containing an URL
if (mimeData->hasText())
Expand Down
16 changes: 8 additions & 8 deletions gui/src/mainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class mainWindow : public QMainWindow
void renameExisting();
void utilTagLoader();
// Language
void loadLanguage(const QString&, bool quiet = false);
void changeEvent(QEvent*) override;
void loadLanguage(const QString &, bool quiet = false);
void changeEvent(QEvent *) override;
// Favorites
void updateFavorites();
void updateKeepForLater();
Expand All @@ -80,13 +80,13 @@ class mainWindow : public QMainWindow
void updateBatchGroups(int, int);
void addGroup();
void addUnique();
void batchAddGroup(const DownloadQueryGroup& values);
void batchAddGroup(const DownloadQueryGroup &values);
void updateGroupCount();
void batchAddUnique(const DownloadQueryImage &query, bool save = true);
// Batch download
void getAll(bool all = true);
void getAllFinishedPage(Page *page);
void getAllFinishedImages(const QList<QSharedPointer<Image> > &images);
void getAllFinishedImages(const QList<QSharedPointer<Image>> &images);
void getAllImages();
void getAllGetImage(const BatchDownloadImage &download, int siteId);
void getAllGetImageSaved(const QSharedPointer<Image> &img, QMap<QString, Image::SaveResult> result);
Expand Down Expand Up @@ -131,7 +131,7 @@ class mainWindow : public QMainWindow
void trayMessageClicked();
void trayClose();
// Others
void closeEvent(QCloseEvent*) override;
void closeEvent(QCloseEvent *) override;
void onFirstLoad();
void init(const QStringList &args, const QMap<QString, QString> &params);
void parseArgs(const QStringList &args, const QMap<QString, QString> &params);
Expand All @@ -148,19 +148,19 @@ class mainWindow : public QMainWindow
void setSource(const QString &site);
void setTags(const QList<Tag> &tags, searchTab *from = nullptr);
void initialLoginsFinished();
QIcon& getIcon(const QString &path);
QIcon &getIcon(const QString &path);
void setWiki(const QString &wiki, searchTab *from = nullptr);
void siteDeleted(Site *site);

// Drag & drop
void dragEnterEvent(QDragEnterEvent *event) override;
void dropEvent(QDropEvent* event) override;
void dropEvent(QDropEvent *event) override;

protected:
int getRowForSite(int siteId);
void getAllGetImageIfNotBlacklisted(const BatchDownloadImage &download, int siteId);
void getAllImageOk(const BatchDownloadImage &download, int siteId, bool retry = false);
Site* getSelectedSiteOrDefault();
Site *getSelectedSiteOrDefault();
void initialLoginsDone();
void addTableItem(QTableWidget *table, int row, int col, const QString &text);

Expand Down
Loading

0 comments on commit db4999b

Please sign in to comment.