Revert "Applied clang-format on source"

This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e.

1 files changed, 206 insertions, 158 deletions

diff --git a/src/browserdialog.cpp b/src/browserdialog.cpp
index d5a43332..c2c65acc 100644
--- a/src/browserdialog.cpp
+++ b/src/browserdialog.cpp
@@ -19,228 +19,276 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "browserdialog.h"

 

+#include "ui_browserdialog.h"

 #include "browserview.h"

 #include "messagedialog.h"

-#include "persistentcookiejar.h"

 #include "report.h"

-#include "ui_browserdialog.h"

+#include "persistentcookiejar.h"

 

-#include "settings.h"

 #include <utility.h>

+#include "settings.h"

 

-#include <QDesktopWidget>

-#include <QDir>

-#include <QInputDialog>

-#include <QKeyEvent>

-#include <QMenu>

-#include <QNetworkCookie>

+#include <QWebEngineSettings>

 #include <QNetworkCookieJar>

+#include <QNetworkCookie>

+#include <QMenu>

+#include <QInputDialog>

 #include <QWebEngineHistory>

-#include <QWebEngineSettings>

+#include <QDir>

+#include <QDesktopWidget>

+#include <QKeyEvent>

+

 

-BrowserDialog::BrowserDialog(QWidget* parent)

-    : QDialog(parent), ui(new Ui::BrowserDialog), m_AccessManager(new QNetworkAccessManager(this)) {

-    ui->setupUi(this);

 

-    m_AccessManager->setCookieJar(

-        new PersistentCookieJar(QDir::fromNativeSeparators(Settings::instance().getCacheDirectory() + "/cookies.dat")));

+BrowserDialog::BrowserDialog(QWidget *parent)

+  : QDialog(parent)

+  , ui(new Ui::BrowserDialog)

+  , m_AccessManager(new QNetworkAccessManager(this))

+{

+  ui->setupUi(this);

 

-    Qt::WindowFlags flags = windowFlags() | Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint;

-    Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;

-    flags = flags & (~helpFlag);

-    setWindowFlags(flags);

+  m_AccessManager->setCookieJar(new PersistentCookieJar(

+      QDir::fromNativeSeparators(Settings::instance().getCacheDirectory() + "/cookies.dat")));

 

-    m_Tabs = this->findChild<QTabWidget*>("browserTabWidget");

+  Qt::WindowFlags flags = windowFlags() | Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint;

+  Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;

+  flags = flags & (~helpFlag);

+  setWindowFlags(flags);

 

-    installEventFilter(this);

+  m_Tabs = this->findChild<QTabWidget*>("browserTabWidget");

 

-    connect(m_Tabs, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int)));

+  installEventFilter(this);

 

-    ui->urlEdit->setVisible(false);

+  connect(m_Tabs, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int)));

+

+  ui->urlEdit->setVisible(false);

 }

 

-BrowserDialog::~BrowserDialog() { delete ui; }

+BrowserDialog::~BrowserDialog()

+{

+  delete ui;

+}

 

-void BrowserDialog::closeEvent(QCloseEvent* event) {

-    //  m_AccessManager->showCookies();

-    QDialog::closeEvent(event);

+void BrowserDialog::closeEvent(QCloseEvent *event)

+{

+//  m_AccessManager->showCookies();

+  QDialog::closeEvent(event);

 }

 

-void BrowserDialog::initTab(BrowserView* newView) {

-    // newView->page()->setNetworkAccessManager(m_AccessManager);

-    // newView->page()->setForwardUnsupportedContent(true);

+void BrowserDialog::initTab(BrowserView *newView)

+{

+  //newView->page()->setNetworkAccessManager(m_AccessManager);

+  //newView->page()->setForwardUnsupportedContent(true);

+

+  connect(newView, SIGNAL(loadProgress(int)), this, SLOT(progress(int)));

+  connect(newView, SIGNAL(titleChanged(QString)), this, SLOT(titleChanged(QString)));

+  connect(newView, SIGNAL(initTab(BrowserView*)), this, SLOT(initTab(BrowserView*)));

+  connect(newView, SIGNAL(startFind()), this, SLOT(startSearch()));

+  connect(newView, SIGNAL(urlChanged(QUrl)), this, SLOT(urlChanged(QUrl)));

+  connect(newView, SIGNAL(openUrlInNewTab(QUrl)), this, SLOT(openInNewTab(QUrl)));

+  connect(newView, SIGNAL(downloadRequested(QNetworkRequest)), this, SLOT(downloadRequested(QNetworkRequest)));

+  connect(newView, SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(unsupportedContent(QNetworkReply*)));

+

+  ui->backBtn->setEnabled(false);

+  ui->fwdBtn->setEnabled(false);

+  m_Tabs->addTab(newView, tr("new"));

+  newView->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true);

+  newView->settings()->setAttribute(QWebEngineSettings::AutoLoadImages, true);

+}

 

-    connect(newView, SIGNAL(loadProgress(int)), this, SLOT(progress(int)));

-    connect(newView, SIGNAL(titleChanged(QString)), this, SLOT(titleChanged(QString)));

-    connect(newView, SIGNAL(initTab(BrowserView*)), this, SLOT(initTab(BrowserView*)));

-    connect(newView, SIGNAL(startFind()), this, SLOT(startSearch()));

-    connect(newView, SIGNAL(urlChanged(QUrl)), this, SLOT(urlChanged(QUrl)));

-    connect(newView, SIGNAL(openUrlInNewTab(QUrl)), this, SLOT(openInNewTab(QUrl)));

-    connect(newView, SIGNAL(downloadRequested(QNetworkRequest)), this, SLOT(downloadRequested(QNetworkRequest)));

-    connect(newView, SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(unsupportedContent(QNetworkReply*)));

 

-    ui->backBtn->setEnabled(false);

-    ui->fwdBtn->setEnabled(false);

-    m_Tabs->addTab(newView, tr("new"));

-    newView->settings()->setAttribute(QWebEngineSettings::PluginsEnabled, true);

-    newView->settings()->setAttribute(QWebEngineSettings::AutoLoadImages, true);

+void BrowserDialog::openInNewTab(const QUrl &url)

+{

+  BrowserView *newView = new BrowserView(this);

+  initTab(newView);

+  newView->setUrl(url);

 }

 

-void BrowserDialog::openInNewTab(const QUrl& url) {

-    BrowserView* newView = new BrowserView(this);

-    initTab(newView);

-    newView->setUrl(url);

+

+BrowserView *BrowserDialog::getCurrentView()

+{

+  return qobject_cast<BrowserView*>(m_Tabs->currentWidget());

 }

 

-BrowserView* BrowserDialog::getCurrentView() { return qobject_cast<BrowserView*>(m_Tabs->currentWidget()); }

 

-void BrowserDialog::urlChanged(const QUrl& url) {

-    BrowserView* currentView = getCurrentView();

-    if (currentView != nullptr) {

-        ui->backBtn->setEnabled(currentView->history()->canGoBack());

-        ui->fwdBtn->setEnabled(currentView->history()->canGoForward());

-    }

-    ui->urlEdit->setText(url.toString());

+void BrowserDialog::urlChanged(const QUrl &url)

+{

+  BrowserView *currentView = getCurrentView();

+  if (currentView != nullptr) {

+    ui->backBtn->setEnabled(currentView->history()->canGoBack());

+    ui->fwdBtn->setEnabled(currentView->history()->canGoForward());

+  }

+  ui->urlEdit->setText(url.toString());

 }

 

-void BrowserDialog::openUrl(const QUrl& url) {

-    if (isHidden()) {

-        show();

-    }

-    openInNewTab(url);

+

+void BrowserDialog::openUrl(const QUrl &url)

+{

+  if (isHidden()) {

+    show();

+  }

+  openInNewTab(url);

 }

 

-void BrowserDialog::maximizeWidth() {

-    int viewportWidth = getCurrentView()->page()->contentsSize().width();

-    int frameWidth = width() - viewportWidth;

 

-    int contentWidth = getCurrentView()->page()->contentsSize().width();

+void BrowserDialog::maximizeWidth()

+{

+  int viewportWidth = getCurrentView()->page()->contentsSize ().width();

+  int frameWidth = width() - viewportWidth;

 

-    QDesktopWidget screen;

-    int currentScreen = screen.screenNumber(this);

-    int screenWidth = screen.screenGeometry(currentScreen).size().width();

+  int contentWidth = getCurrentView()->page()->contentsSize().width();

 

-    int targetWidth = std::min<int>(std::max<int>(viewportWidth, contentWidth) + frameWidth, screenWidth);

-    this->resize(targetWidth, height());

+  QDesktopWidget screen;

+  int currentScreen = screen.screenNumber(this);

+  int screenWidth = screen.screenGeometry(currentScreen).size().width();

+

+  int targetWidth = std::min<int>(std::max<int>(viewportWidth, contentWidth) + frameWidth, screenWidth);

+  this->resize(targetWidth, height());

 }

 

-void BrowserDialog::progress(int value) {

-    ui->loadProgress->setValue(value);

-    if (value == 100) {

-        maximizeWidth();

-        ui->loadProgress->setVisible(false);

-    } else {

-        ui->loadProgress->setVisible(true);

-    }

+

+void BrowserDialog::progress(int value)

+{

+  ui->loadProgress->setValue(value);

+  if (value == 100) {

+    maximizeWidth();

+    ui->loadProgress->setVisible(false);

+  } else {

+    ui->loadProgress->setVisible(true);

+  }

 }

 

-void BrowserDialog::titleChanged(const QString& title) {

-    BrowserView* view = qobject_cast<BrowserView*>(sender());

-    for (int i = 0; i < m_Tabs->count(); ++i) {

-        if (m_Tabs->widget(i) == view) {

-            m_Tabs->setTabText(i, title.mid(0, 15));

-            m_Tabs->setTabToolTip(i, title);

-        }

+

+void BrowserDialog::titleChanged(const QString &title)

+{

+  BrowserView *view = qobject_cast<BrowserView*>(sender());

+  for (int i = 0; i < m_Tabs->count(); ++i) {

+    if (m_Tabs->widget(i) == view) {

+      m_Tabs->setTabText(i, title.mid(0, 15));

+      m_Tabs->setTabToolTip(i, title);

     }

+  }

+}

+

+

+QString BrowserDialog::guessFileName(const QString &url)

+{

+  QRegExp uploadsExp(QString("http://.+/uploads/([^/]+)$"));

+  if (uploadsExp.indexIn(url) != -1) {

+    // these seem to be premium downloads

+    return uploadsExp.cap(1);

+  }

+

+  QRegExp filesExp(QString("http://.+\\?file=([^&]+)"));

+  if (filesExp.indexIn(url) != -1) {

+    // a regular manual download?

+    return filesExp.cap(1);

+  }

+  return "unknown";

 }

 

-QString BrowserDialog::guessFileName(const QString& url) {

-    QRegExp uploadsExp(QString("http://.+/uploads/([^/]+)$"));

-    if (uploadsExp.indexIn(url) != -1) {

-        // these seem to be premium downloads

-        return uploadsExp.cap(1);

+void BrowserDialog::unsupportedContent(QNetworkReply *reply)

+{

+  try {

+    QWebEnginePage *page = qobject_cast<QWebEnginePage*>(sender());

+    if (page == nullptr) {

+      qCritical("sender not a page");

+      return;

+    }

+    BrowserView *view = qobject_cast<BrowserView*>(page->view());

+    if (view == nullptr) {

+      qCritical("no view?");

+      return;

     }

 

-    QRegExp filesExp(QString("http://.+\\?file=([^&]+)"));

-    if (filesExp.indexIn(url) != -1) {

-        // a regular manual download?

-        return filesExp.cap(1);

+    emit requestDownload(view->url(), reply);

+  } catch (const std::exception &e) {

+    if (isVisible()) {

+      MessageDialog::showMessage(tr("failed to start download"), this);

     }

-    return "unknown";

+    qCritical("exception downloading unsupported content: %s", e.what());

+  }

 }

 

-void BrowserDialog::unsupportedContent(QNetworkReply* reply) {

-    try {

-        QWebEnginePage* page = qobject_cast<QWebEnginePage*>(sender());

-        if (page == nullptr) {

-            qCritical("sender not a page");

-            return;

-        }

-        BrowserView* view = qobject_cast<BrowserView*>(page->view());

-        if (view == nullptr) {

-            qCritical("no view?");

-            return;

-        }

 

-        emit requestDownload(view->url(), reply);

-    } catch (const std::exception& e) {

-        if (isVisible()) {

-            MessageDialog::showMessage(tr("failed to start download"), this);

-        }

-        qCritical("exception downloading unsupported content: %s", e.what());

-    }

+void BrowserDialog::downloadRequested(const QNetworkRequest &request)

+{

+  qCritical("download request %s ignored", request.url().toString().toUtf8().constData());

 }

 

-void BrowserDialog::downloadRequested(const QNetworkRequest& request) {

-    qCritical("download request %s ignored", request.url().toString().toUtf8().constData());

+

+void BrowserDialog::tabCloseRequested(int index)

+{

+  if (m_Tabs->count() == 1) {

+    this->close();

+  } else {

+    m_Tabs->widget(index)->deleteLater();

+    m_Tabs->removeTab(index);

+  }

 }

 

-void BrowserDialog::tabCloseRequested(int index) {

-    if (m_Tabs->count() == 1) {

-        this->close();

-    } else {

-        m_Tabs->widget(index)->deleteLater();

-        m_Tabs->removeTab(index);

-    }

+void BrowserDialog::on_backBtn_clicked()

+{

+  BrowserView *currentView = getCurrentView();

+  if (currentView != nullptr) {

+    currentView->back();

+  }

 }

 

-void BrowserDialog::on_backBtn_clicked() {

-    BrowserView* currentView = getCurrentView();

-    if (currentView != nullptr) {

-        currentView->back();

-    }

+void BrowserDialog::on_fwdBtn_clicked()

+{

+  BrowserView *currentView = getCurrentView();

+  if (currentView != nullptr) {

+    currentView->forward();

+  }

 }

 

-void BrowserDialog::on_fwdBtn_clicked() {

-    BrowserView* currentView = getCurrentView();

-    if (currentView != nullptr) {

-        currentView->forward();

-    }

+

+void BrowserDialog::startSearch()

+{

+  ui->searchEdit->setFocus();

 }

 

-void BrowserDialog::startSearch() { ui->searchEdit->setFocus(); }

 

-void BrowserDialog::on_searchEdit_returnPressed() {

-    //  BrowserView *currentView = getCurrentView();

-    //  if (currentView != nullptr) {

-    //    currentView->findText(ui->searchEdit->text(), QWebEnginePage::FindWrapsAroundDocument);

-    //  }

+void BrowserDialog::on_searchEdit_returnPressed()

+{

+//  BrowserView *currentView = getCurrentView();

+//  if (currentView != nullptr) {

+//    currentView->findText(ui->searchEdit->text(), QWebEnginePage::FindWrapsAroundDocument);

+//  }

 }

 

-void BrowserDialog::on_refreshBtn_clicked() { getCurrentView()->reload(); }

+void BrowserDialog::on_refreshBtn_clicked()

+{

+  getCurrentView()->reload();

+}

 

-void BrowserDialog::on_browserTabWidget_currentChanged(int index) {

-    BrowserView* currentView = qobject_cast<BrowserView*>(ui->browserTabWidget->widget(index));

-    if (currentView != nullptr) {

-        ui->backBtn->setEnabled(currentView->history()->canGoBack());

-        ui->fwdBtn->setEnabled(currentView->history()->canGoForward());

-    }

+void BrowserDialog::on_browserTabWidget_currentChanged(int index)

+{

+  BrowserView *currentView = qobject_cast<BrowserView*>(ui->browserTabWidget->widget(index));

+  if (currentView != nullptr) {

+    ui->backBtn->setEnabled(currentView->history()->canGoBack());

+    ui->fwdBtn->setEnabled(currentView->history()->canGoForward());

+  }

 }

 

-void BrowserDialog::on_urlEdit_returnPressed() {

-    QWebEngineView* currentView = getCurrentView();

-    if (currentView != nullptr) {

-        currentView->setUrl(QUrl(ui->urlEdit->text()));

-    }

+void BrowserDialog::on_urlEdit_returnPressed()

+{

+  QWebEngineView *currentView = getCurrentView();

+  if (currentView != nullptr) {

+    currentView->setUrl(QUrl(ui->urlEdit->text()));

+  }

 }

 

-bool BrowserDialog::eventFilter(QObject* object, QEvent* event) {

-    if (event->type() == QEvent::KeyPress) {

-        QKeyEvent* keyEvent = reinterpret_cast<QKeyEvent*>(event);

-        if ((keyEvent->modifiers() & Qt::ControlModifier) && (keyEvent->key() == Qt::Key_U)) {

-            ui->urlEdit->setVisible(!ui->urlEdit->isVisible());

-            return true;

-        }

+bool BrowserDialog::eventFilter(QObject *object, QEvent *event)

+{

+  if (event->type() == QEvent::KeyPress) {

+    QKeyEvent *keyEvent = reinterpret_cast<QKeyEvent*>(event);

+    if ((keyEvent->modifiers() & Qt::ControlModifier)

+        && (keyEvent->key() == Qt::Key_U)) {

+      ui->urlEdit->setVisible(!ui->urlEdit->isVisible());

+      return true;

     }

-    return QDialog::eventFilter(object, event);

+  }

+  return QDialog::eventFilter(object, event);

 }