fix coding style using astyle

astyle --indent=spaces=4 --brackets=linux --indent-labels --pad=oper --unpad=paren --one-line=keep-statements --convert-tabs --indent-preprocessor

1 files changed, 54 insertions, 32 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 00962db..a87ad25 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -17,8 +17,8 @@
 #include "searchlineedit.h"
 
 MainWindow::MainWindow(QWidget *parent)
-    : GraphicsView(parent)
-    , m_settings(new QSettings("Nokia", "WebScraps", this))
+        : GraphicsView(parent)
+        , m_settings(new QSettings("Nokia", "WebScraps", this))
 {
     setScene(new QGraphicsScene);
     setMouseTracking(true);
@@ -54,7 +54,7 @@ MainWindow::MainWindow(QWidget *parent)
     // define transitions
     QSignalTransition *transitionToBrowser = seeScraps->addTransition(m_gotoBrowserButton, SIGNAL(clicked()), browseWeb);
     QSignalTransition *transitionToScraps = browseWeb->addTransition(m_gotoScrapsButton, SIGNAL(clicked()), seeScraps);
-    QSignalTransition *transitionToScraps2 = browseWeb->addTransition(m_webView, SIGNAL(scrapAdded(QUrl,QSize,QRect,QPoint)), seeScraps);
+    QSignalTransition *transitionToScraps2 = browseWeb->addTransition(m_webView, SIGNAL(scrapAdded(QUrl, QSize, QRect, QPoint)), seeScraps);
 
     // associate animations and actions
     transitionToBrowser->addAnimation(m_scrapsToBrowserAnimation);
@@ -78,7 +78,8 @@ MainWindow::MainWindow(QWidget *parent)
 void MainWindow::addScrap(QUrl url, QSize pageSize,
                           QRect scrapRect, QPoint position,
                           qreal xScale, qreal yScale,
-                          int refreshIntervalMins) {
+                          int refreshIntervalMins)
+{
     WebScrap *webscrap = new WebScrap(url, pageSize, scrapRect);
     webscrap->setRefreshInterval(refreshIntervalMins * 60 * 1000); // milliseconds
     WebScrapContainer *container = new WebScrapContainer(webscrap, scene(), xScale, yScale);
@@ -93,7 +94,8 @@ void MainWindow::addScrap(QUrl url, QSize pageSize,
     addScrapToAnimations(container);
 }
 
-void MainWindow::initBrowser() {
+void MainWindow::initBrowser()
+{
     m_webView = new WebView(scene());
     m_webView->setPos(sceneRect().topLeft());
     m_webView->setOpacity(0);
@@ -102,10 +104,11 @@ void MainWindow::initBrowser() {
     m_webView->load(QUrl("http://qt.nokia.com/"));
     connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(adjustLocation()));
     connect(m_webView, SIGNAL(titleChanged(const QString&)), SLOT(adjustTitle()));
-    connect(m_webView, SIGNAL(scrapAdded(QUrl,QSize,QRect,QPoint)), SLOT(addScrap(QUrl, QSize, QRect, QPoint)));
+    connect(m_webView, SIGNAL(scrapAdded(QUrl, QSize, QRect, QPoint)), SLOT(addScrap(QUrl, QSize, QRect, QPoint)));
 }
 
-void MainWindow::createScrapsToolbar(QGraphicsScene *scene) {
+void MainWindow::createScrapsToolbar(QGraphicsScene *scene)
+{
     m_scrapsToolbar = new GraphicsToolBar(scene);
     m_scrapsToolbar->hide();
     m_dropDownList = new QComboBox;
@@ -130,7 +133,8 @@ void MainWindow::createScrapsToolbar(QGraphicsScene *scene) {
     connect(m_searchBar, SIGNAL(textChanged(QString)), SLOT(searchTextChanged(QString)));
 }
 
-void MainWindow::createBrowserToolbar(QGraphicsScene *scene) {
+void MainWindow::createBrowserToolbar(QGraphicsScene *scene)
+{
     m_browserToolbar = new GraphicsToolBar(scene);
     m_browserToolbar->hide();
     m_addressBar = new AddressBar;
@@ -196,11 +200,12 @@ void MainWindow::adjustTitle()
     setWindowTitle(title);
 }
 
-void MainWindow::createAnimations() {
+void MainWindow::createAnimations()
+{
     m_scrapsEnter = new QParallelAnimationGroup(this); // scraps will be added to this later
     m_scrapsLeave = new QParallelAnimationGroup(this); // scraps will be added to this later
     m_scrapsFlyOffset = QApplication::desktop()->screenGeometry().bottomRight()
-                                - QApplication::desktop()->screenGeometry().topLeft();
+                        - QApplication::desktop()->screenGeometry().topLeft();
     QAbstractAnimation *browserEnter = createBrowserAnim(Enter, this);
     QAbstractAnimation *browserLeave = createBrowserAnim(Leave, this);
 
@@ -213,7 +218,8 @@ void MainWindow::createAnimations() {
     m_scrapsToBrowserAnimation->addAnimation(browserEnter);
 }
 
-void MainWindow::addScrapToAnimations(WebScrapContainer *container) {
+void MainWindow::addScrapToAnimations(WebScrapContainer *container)
+{
     Q_ASSERT(m_scrapsEnter);
     Q_ASSERT(m_scrapsLeave);
 
@@ -233,7 +239,8 @@ void MainWindow::addScrapToAnimations(WebScrapContainer *container) {
     container->setLeaveAnimation(leaveAnim);
 }
 
-void MainWindow::removeScrapFromAnimations(WebScrapContainer *container) {
+void MainWindow::removeScrapFromAnimations(WebScrapContainer *container)
+{
     QPropertyAnimation *enterAnim = container->enterAnimation();
     m_scrapsEnter->removeAnimation(enterAnim);
     enterAnim->deleteLater();
@@ -243,7 +250,8 @@ void MainWindow::removeScrapFromAnimations(WebScrapContainer *container) {
     leaveAnim->deleteLater();
 }
 
-QAbstractAnimation* MainWindow::createBrowserAnim(const Movement move, QObject *parent) {
+QAbstractAnimation* MainWindow::createBrowserAnim(const Movement move, QObject *parent)
+{
     QPropertyAnimation *anim = new QPropertyAnimation(m_webView, "opacity", parent);
     anim->setDuration(250);
     if (move == Enter) {
@@ -257,16 +265,17 @@ QAbstractAnimation* MainWindow::createBrowserAnim(const Movement move, QObject *
     return anim;
 }
 
-QAbstractAnimation* MainWindow::createToolbarAnim(GraphicsToolBar *fromToolbar, GraphicsToolBar *toToolbar, RotateDirection direction, QObject *parent) {
+QAbstractAnimation* MainWindow::createToolbarAnim(GraphicsToolBar *fromToolbar, GraphicsToolBar *toToolbar, RotateDirection direction, QObject *parent)
+{
     QSequentialAnimationGroup *seqAnim = new QSequentialAnimationGroup(parent);
     QPropertyAnimation *rotateAnim1 = new QPropertyAnimation(fromToolbar->rotation(), "angle", seqAnim);
     fromToolbar->rotation()->setOrigin(QVector3D(fromToolbar->rect().center()));
     rotateAnim1->setDuration(250);
     rotateAnim1->setStartValue(0.0);
     if (direction == Clockwise)
-    	rotateAnim1->setEndValue(80.0);
+        rotateAnim1->setEndValue(80.0);
     else
-    	rotateAnim1->setEndValue(-80.0);
+        rotateAnim1->setEndValue(-80.0);
 
     QPointF delta = fromToolbar->rect().center() - toToolbar->rect().center();
     toToolbar->setPos(fromToolbar->pos());
@@ -287,7 +296,8 @@ QAbstractAnimation* MainWindow::createToolbarAnim(GraphicsToolBar *fromToolbar,
     return seqAnim;
 }
 
-void MainWindow::bubbleUpScrap(QGraphicsWidget *scrap) {
+void MainWindow::bubbleUpScrap(QGraphicsWidget *scrap)
+{
     if (!scrap && sender())
         scrap = qobject_cast<QGraphicsWidget*>(sender());
     if (scrap) {
@@ -300,7 +310,8 @@ void MainWindow::bubbleUpScrap(QGraphicsWidget *scrap) {
     }
 }
 
-void MainWindow::bubbleUpScraps(QList<QGraphicsWidget*> scraps) {
+void MainWindow::bubbleUpScraps(QList<QGraphicsWidget*> scraps)
+{
     if (!scraps.isEmpty()) {
         foreach(QGraphicsWidget *s, m_scraps) {
             if (scraps.contains(s) && s->zValue() < 1000)
@@ -311,7 +322,8 @@ void MainWindow::bubbleUpScraps(QList<QGraphicsWidget*> scraps) {
     }
 }
 
-void MainWindow::removeSenderScrap() {
+void MainWindow::removeSenderScrap()
+{
     WebScrapContainer *scrap = 0;
     if (sender())
         scrap = qobject_cast<WebScrapContainer*>(sender());
@@ -320,7 +332,7 @@ void MainWindow::removeSenderScrap() {
         for (int i = 0; i < m_scraps.count(); i++) {
             if (m_scraps.at(i) == scrap) {
                 m_scraps.removeAt(i);
-                m_dropDownList->removeItem(i+1);
+                m_dropDownList->removeItem(i + 1);
             }
         }
         scrap->deleteLater();
@@ -329,7 +341,8 @@ void MainWindow::removeSenderScrap() {
     adjustTitle();
 }
 
-void MainWindow::updateDropDownList() {
+void MainWindow::updateDropDownList()
+{
     WebScrap *scrap = 0;
     if (sender())
         scrap = qobject_cast<WebScrap*>(sender());
@@ -344,7 +357,8 @@ void MainWindow::updateDropDownList() {
     }
 }
 
-void MainWindow::scrapDropDownListActivated(int index) {
+void MainWindow::scrapDropDownListActivated(int index)
+{
     WebScrapContainer *scrap = m_dropDownList->itemData(index).value<WebScrapContainer*>();
     for (int i = 0; i < m_scraps.count(); i++) {
         WebScrapContainer *ithScrap = qobject_cast<WebScrapContainer*>(m_scraps.at(i));
@@ -353,7 +367,8 @@ void MainWindow::scrapDropDownListActivated(int index) {
     bubbleUpScrap(scrap);
 }
 
-void MainWindow::searchTextChanged(const QString& text) {
+void MainWindow::searchTextChanged(const QString& text)
+{
     QList<QGraphicsWidget*> matchingScraps;
     for (int i = 0; i < m_scraps.count(); i++) {
         WebScrapContainer *ithScrap = qobject_cast<WebScrapContainer*>(m_scraps.at(i));
@@ -365,7 +380,8 @@ void MainWindow::searchTextChanged(const QString& text) {
     bubbleUpScraps(matchingScraps);
 }
 
-void MainWindow::saveSettings() {
+void MainWindow::saveSettings()
+{
     m_settings->setValue("mainwindow/size", size());
     m_settings->setValue("mainwindow/pos", pos());
     m_settings->setValue("browser/url", m_webView->url().toString());
@@ -393,7 +409,8 @@ void MainWindow::saveSettings() {
     m_settings->endArray();
 }
 
-void MainWindow::loadSettings() {
+void MainWindow::loadSettings()
+{
     if (m_settings->contains("mainwindow/size"))
         resize(m_settings->value("mainwindow/size", size()).toSize());
     if (m_settings->contains("mainwindow/pos"))
@@ -420,33 +437,38 @@ void MainWindow::loadSettings() {
         addScrap(QUrl("http://dilbert.com/"),  QSize(640, 199),
                  QRect(20, 197, 640, 199), QPoint(14, 285));
         addScrap(QUrl("http://www.cnn.com/"), QSize(248, 281),
-                 QRect(9, 508, 248, 281), QPoint(677,39));
+                 QRect(9, 508, 248, 281), QPoint(677, 39));
         addScrap(QUrl("http://www.techcrunch.com/"), QSize(667, 257),
-                 QRect(5, 174, 667, 257), QPoint(543,363), 0.6, 0.6);
+                 QRect(5, 174, 667, 257), QPoint(543, 363), 0.6, 0.6);
         resize(950, 540);
     }
     m_settings->endArray();
 }
 
-void MainWindow::setWebTitleShown(bool shown) {
+void MainWindow::setWebTitleShown(bool shown)
+{
     m_isWebTitleShown = shown;
 }
 
-bool MainWindow::webTitleShown() const {
+bool MainWindow::webTitleShown() const
+{
     return m_isWebTitleShown;
 }
 
-void MainWindow::showBrowserToolbar() {
+void MainWindow::showBrowserToolbar()
+{
     QAbstractAnimation *anim = createToolbarAnim(m_scrapsToolbar, m_browserToolbar, AntiClockwise, this);
     anim->start(QAbstractAnimation::DeleteWhenStopped);
 }
 
-void MainWindow::showScrapsToolbar() {
+void MainWindow::showScrapsToolbar()
+{
     QAbstractAnimation *anim = createToolbarAnim(m_browserToolbar, m_scrapsToolbar, Clockwise, this);
     anim->start(QAbstractAnimation::DeleteWhenStopped);
 }
 
-void MainWindow::disableScrapSelection() {
+void MainWindow::disableScrapSelection()
+{
     if (m_selectScrapsButton)
         m_selectScrapsButton->setChecked(false);
 }