From 4150551d7853a9372241ba0b36d491740afbc6d8 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Mon, 22 May 2017 19:34:29 +0200 Subject: [PATCH] I just killed a few hours in the future by making alot of merge conflicts --- colorpicker/colorpickerscene.cpp | 3 +-- cropeditor/cropscene.cpp | 3 +-- cropeditor/drawing/textitem.cpp | 3 +-- io/ioutils.cpp | 14 +++----------- io/ioutils.hpp | 5 +---- mainwindow.cpp | 3 +-- platformspecifics/u32/u32backend.cpp | 3 +-- uploaders/customuploader.cpp | 6 ++---- uploaders/default/imguruploader.cpp | 8 +++----- uploaders/uploadersingleton.cpp | 3 +-- 10 files changed, 15 insertions(+), 36 deletions(-) diff --git a/colorpicker/colorpickerscene.cpp b/colorpicker/colorpickerscene.cpp index 308feb0..5a14828 100644 --- a/colorpicker/colorpickerscene.cpp +++ b/colorpicker/colorpickerscene.cpp @@ -6,8 +6,7 @@ #include #include -ColorPickerScene::ColorPickerScene(QPixmap *pixmap, QWidget *parentWidget) -: QGraphicsScene(), QGraphicsView(this, parentWidget) { +ColorPickerScene::ColorPickerScene(QPixmap *pixmap, QWidget *parentWidget) : QGraphicsScene(), QGraphicsView(this, parentWidget) { setFrameShape(QFrame::NoFrame); // Time taken to solve: A george99g and 38 minutes. setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); diff --git a/cropeditor/cropscene.cpp b/cropeditor/cropscene.cpp index cad1c59..7ff9575 100644 --- a/cropeditor/cropscene.cpp +++ b/cropeditor/cropscene.cpp @@ -108,8 +108,7 @@ void CropScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) { initPos = p; rect->setRect(p.x(), p.y(), 1, 1); } else { - rect->setRect(QRect(qMin(initPos.x(), p.x()), qMin(initPos.y(), p.y()), qAbs(initPos.x() - p.x()), - qAbs(initPos.y() - p.y()))); + rect->setRect(QRect(qMin(initPos.x(), p.x()), qMin(initPos.y(), p.y()), qAbs(initPos.x() - p.x()), qAbs(initPos.y() - p.y()))); } } QPolygonF poly; diff --git a/cropeditor/drawing/textitem.cpp b/cropeditor/drawing/textitem.cpp index 1c1a007..29e9211 100644 --- a/cropeditor/drawing/textitem.cpp +++ b/cropeditor/drawing/textitem.cpp @@ -15,8 +15,7 @@ void TextItem::mouseDragEvent(QGraphicsSceneMouseEvent *e, CropScene *scene) { textItem->setPen(scene->pen()); textItem->setBrush(scene->brush()); } else { - auto ee - = 180 + qRadiansToDegrees(qAtan2((textItem->pos().y() - e->scenePos().y()), (textItem->pos().x() - e->scenePos().x()))); + auto ee = 180 + qRadiansToDegrees(qAtan2((textItem->pos().y() - e->scenePos().y()), (textItem->pos().x() - e->scenePos().x()))); textItem->setRotation(ee); } } diff --git a/io/ioutils.cpp b/io/ioutils.cpp index e42000b..785f3d9 100644 --- a/io/ioutils.cpp +++ b/io/ioutils.cpp @@ -8,9 +8,7 @@ namespace ioutils { QNetworkAccessManager networkManager; } -void ioutils::getJson(QUrl target, - QList> headers, - std::function callback) { +void ioutils::getJson(QUrl target, QList> headers, std::function callback) { QNetworkRequest req(target); for (auto header : headers) { req.setRawHeader(header.first.toUtf8(), header.second.toUtf8()); @@ -23,10 +21,7 @@ void ioutils::getJson(QUrl target, }); } -void ioutils::postJson(QUrl target, - QList> headers, - QByteArray body, - std::function callback) { +void ioutils::postJson(QUrl target, QList> headers, QByteArray body, std::function callback) { QNetworkRequest req(target); for (auto header : headers) { req.setRawHeader(header.first.toUtf8(), header.second.toUtf8()); @@ -51,10 +46,7 @@ void ioutils::getData(QUrl target, QList> headers, std:: }); } -void ioutils::postData(QUrl target, - QList> headers, - QByteArray body, - std::function callback) { +void ioutils::postData(QUrl target, QList> headers, QByteArray body, std::function callback) { QNetworkRequest req(target); for (auto header : headers) { req.setRawHeader(header.first.toUtf8(), header.second.toUtf8()); diff --git a/io/ioutils.hpp b/io/ioutils.hpp index c2423a8..5f3b138 100644 --- a/io/ioutils.hpp +++ b/io/ioutils.hpp @@ -10,10 +10,7 @@ namespace ioutils { extern QNetworkAccessManager networkManager; void getJson(QUrl target, QList> headers, std::function callback); -void postJson(QUrl target, - QList> headers, - QByteArray body, - std::function callback); +void postJson(QUrl target, QList> headers, QByteArray body, std::function callback); void getData(QUrl target, QList> headers, std::function callback); void postData(QUrl target, QList> headers, QByteArray body, std::function callback); } diff --git a/mainwindow.cpp b/mainwindow.cpp index fa5a59a..6325544 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -169,8 +169,7 @@ void MainWindow::on_hotkeys_doubleClicked(const QModelIndex &) { QListWidgetItem *i = ui->hotkeys->selectedItems().at(0); QString str = i->data(Qt::UserRole + 1).toString(); bool ok; - QString seq = QInputDialog::getText(ui->centralWidget, "Hotkey Input", "Insert hotkey:", QLineEdit::Normal, - hotkeying::sequence(str), &ok); + QString seq = QInputDialog::getText(ui->centralWidget, "Hotkey Input", "Insert hotkey:", QLineEdit::Normal, hotkeying::sequence(str), &ok); if (ok && hotkeying::valid(seq)) hotkeying::hotkey(str, QKeySequence(seq), *fncs.value(str)); } } diff --git a/platformspecifics/u32/u32backend.cpp b/platformspecifics/u32/u32backend.cpp index 6bb7819..80d3cec 100644 --- a/platformspecifics/u32/u32backend.cpp +++ b/platformspecifics/u32/u32backend.cpp @@ -11,8 +11,7 @@ std::tuple PlatformBackend::getCursor() { if (cursorInfo.flags == CURSOR_SHOWING) { ICONINFO info; // It took me 5 hours to get to here if (GetIconInfo(cursorInfo.hCursor, &info)) { - return std::tuple(QPoint(info.xHotspot, info.yHotspot), - QtWin::fromHBITMAP(info.hbmColor, QtWin::HBitmapAlpha)); + return std::tuple(QPoint(info.xHotspot, info.yHotspot), QtWin::fromHBITMAP(info.hbmColor, QtWin::HBitmapAlpha)); } else return std::tuple(QPoint(0, 0), QPixmap()); } else diff --git a/uploaders/customuploader.cpp b/uploaders/customuploader.cpp index 7664be9..6e6f03a 100644 --- a/uploaders/customuploader.cpp +++ b/uploaders/customuploader.cpp @@ -78,8 +78,7 @@ CustomUploader::CustomUploader(QString absFilePath) { error(absFilePath, "imageformat not string"); } QString imageFormat = imageValue.toString(); - if (imageFormat == "base64" || QRegExp("base64\\([^+]+\\+[^+]+)").exactMatch(imageFormat) - || QRegExp("[^+]+\\+[^+]+").exactMatch(imageFormat)) { + if (imageFormat == "base64" || QRegExp("base64\\([^+]+\\+[^+]+)").exactMatch(imageFormat) || QRegExp("[^+]+\\+[^+]+").exactMatch(imageFormat)) { this->iFormat = imageFormat; } else error(absFilePath, "imageformat invalid"); @@ -231,8 +230,7 @@ void parseResult(QJsonDocument result, QByteArray data, QString returnPathspec, } else notifications::notify("KShare Custom Uploader " + name, "Upload done, but result empty!"); } else { - notifications::notify("KShare Custom Uploader " + name, - "Upload done, but result is not JSON Object! Result in clipboard."); + notifications::notify("KShare Custom Uploader " + name, "Upload done, but result is not JSON Object! Result in clipboard."); QApplication::clipboard()->setText(data); } } diff --git a/uploaders/default/imguruploader.cpp b/uploaders/default/imguruploader.cpp index ab09682..b0fd5a9 100644 --- a/uploaders/default/imguruploader.cpp +++ b/uploaders/default/imguruploader.cpp @@ -16,13 +16,11 @@ void ImgurUploader::doUpload(QPixmap *pixmap) { return; } ioutils::postJson(QUrl("https://api.imgur.com/3/image"), - QList>() - << QPair("Content-Type", "application/x-www-form-urlencoded") - << QPair("Authorization", "Client-ID 8a98f183fc895da"), + QList>() << QPair("Content-Type", "application/x-www-form-urlencoded") + << QPair("Authorization", "Client-ID 8a98f183fc895da"), byteArray, [](QJsonDocument res, QByteArray, QNetworkReply *) { QString result = res.object()["data"].toObject()["link"].toString(); screenshotutil::toClipboard(result); - notifications::notify("KShare imgur Uploader ", - result.isEmpty() ? "Failed upload!" : "Uploaded to imgur!"); + notifications::notify("KShare imgur Uploader ", result.isEmpty() ? "Failed upload!" : "Uploaded to imgur!"); }); } diff --git a/uploaders/uploadersingleton.cpp b/uploaders/uploadersingleton.cpp index 56eeba5..278a321 100644 --- a/uploaders/uploadersingleton.cpp +++ b/uploaders/uploadersingleton.cpp @@ -8,8 +8,7 @@ #include #include -UploaderSingleton::UploaderSingleton() -: QObject(), saveDir(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)) { +UploaderSingleton::UploaderSingleton() : QObject(), saveDir(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)) { if (QStandardPaths::writableLocation(QStandardPaths::PicturesLocation).isEmpty()) { qFatal("Cannot determine location for pictures"); }