[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/calligra-gemini-ko] /: Fix up some code style issues
From:       Dan Leinir Turthra Jensen <admin () leinir ! dk>
Date:       2014-11-01 13:28:14
Message-ID: E1XkYj0-0007uA-M5 () scm ! kde ! org
[Download RAW message or body]

Git commit af4129c82a4d5e21e0f82fd395ae9b2e6f7e7126 by Dan Leinir Turthra Jensen.
Committed on 01/11/2014 at 13:25.
Pushed by leinir into branch 'calligra-gemini-ko'.

Fix up some code style issues

M  +2    -1    libs/main/KoDocumentSectionDelegate.cpp
M  +1    -2    qtquick/CQCanvasBase.cpp
M  +1    -1    qtquick/CQCanvasControllerItem.cpp
M  +4    -3    qtquick/CQLinkArea.cpp
M  +6    -4    qtquick/CQPresentationCanvas.cpp
M  +4    -2    qtquick/CQPresentationModel.cpp
M  +3    -3    qtquick/CQSpreadsheetCanvas.cpp
M  +2    -1    qtquick/CQSpreadsheetListModel.cpp
M  +1    -2    qtquick/CQTextDocumentCanvas.cpp

http://commits.kde.org/calligra/af4129c82a4d5e21e0f82fd395ae9b2e6f7e7126

diff --git a/libs/main/KoDocumentSectionDelegate.cpp \
b/libs/main/KoDocumentSectionDelegate.cpp index a47d3ed..e918b36 100644
--- a/libs/main/KoDocumentSectionDelegate.cpp
+++ b/libs/main/KoDocumentSectionDelegate.cpp
@@ -482,8 +482,9 @@ void KoDocumentSectionDelegate::drawThumbnail(QPainter *p, const \
QStyleOptionVie  offset.setX(r.width()/2 - img.width()/2);
         offset.setY(r.height()/2 - img.height()/2);
 
-        if (!img.isNull() && img.width() > 0 && img.height() > 0)
+        if (!img.isNull() && img.width() > 0 && img.height() > 0) {
             p->drawImage(r.topLeft() + offset, img);
+        }
     }
     p->restore();
 }
diff --git a/qtquick/CQCanvasBase.cpp b/qtquick/CQCanvasBase.cpp
index c85405c..e8ba696 100644
--- a/qtquick/CQCanvasBase.cpp
+++ b/qtquick/CQCanvasBase.cpp
@@ -76,8 +76,7 @@ void CQCanvasBase::setShapeTransparency(const qreal& \
newTransparency)  
 void CQCanvasBase::setCanvasController(CQCanvasController* controller)
 {
-    if (d->canvasController != controller)
-    {
+    if (d->canvasController != controller) {
         d->canvasController = controller;
         emit canvasControllerChanged();
     }
diff --git a/qtquick/CQCanvasControllerItem.cpp b/qtquick/CQCanvasControllerItem.cpp
index db92cbe..a778763 100644
--- a/qtquick/CQCanvasControllerItem.cpp
+++ b/qtquick/CQCanvasControllerItem.cpp
@@ -84,7 +84,7 @@ CQCanvasControllerItem::~CQCanvasControllerItem()
     delete d;
 }
 
-void CQCanvasControllerItem::paint(QPainter* painter, const \
QStyleOptionGraphicsItem* , QWidget* ) +void CQCanvasControllerItem::paint(QPainter* \
painter, const QStyleOptionGraphicsItem* , QWidget*)  {
     if (!d->zooming || d->placeholder.isNull()) {
         return;
diff --git a/qtquick/CQLinkArea.cpp b/qtquick/CQLinkArea.cpp
index 1220d9f..a821959 100644
--- a/qtquick/CQLinkArea.cpp
+++ b/qtquick/CQLinkArea.cpp
@@ -91,11 +91,11 @@ void CQLinkArea::setLinks(const QVariantList& newLinks)
     // run through the new data and cache a data list with the information
     // so we don't have to interpret the QObjects all the time
     d->realLinks.clear();
-    foreach(const QVariant& var, newLinks)
-    {
+    foreach(const QVariant& var, newLinks) {
         QObject* obj = var.value<QObject*>();
-        if (!obj)
+        if (!obj) {
             continue;
+        }
         LinkLayerLink link;
         link.linkRect = \
obj->property("linkRect").toRectF().adjusted(-d->wiggleFactor, -d->wiggleFactor, \
d->wiggleFactor, d->wiggleFactor);  link.linkTarget = \
obj->property("linkTarget").toUrl(); @@ -170,5 +170,6 @@ void \
CQLinkArea::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)  
 void CQLinkArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event)
 {
+    Q_UNUSED(event)
     emit doubleClicked();
 }
diff --git a/qtquick/CQPresentationCanvas.cpp b/qtquick/CQPresentationCanvas.cpp
index 082b0d2..6a054a2 100644
--- a/qtquick/CQPresentationCanvas.cpp
+++ b/qtquick/CQPresentationCanvas.cpp
@@ -73,8 +73,9 @@ public:
         qDeleteAll(linkTargets);
         linkTargets.clear();
 
-        if (!view)
+        if (!view) {
             return;
+        }
         foreach(const KoShape* shape, view->activePage()->shapes()) {
             if (!shape->hyperLink().isEmpty()) {
                 QObject * obj = new QObject(view);
@@ -210,8 +211,9 @@ QObject* CQPresentationCanvas::textEditor() const
 void CQPresentationCanvas::deselectEverything()
 {
     KoTextEditor* editor = KoTextEditor::getTextEditorFromCanvas(d->canvasBase);
-    if (editor)
+    if (editor) {
         editor->clearSelection();
+    }
     d->canvasBase->shapeManager()->selection()->deselectAll();
 }
 
@@ -246,9 +248,9 @@ void CQPresentationCanvas::openFile(const QString& uri)
             // why their canvas is so terribly empty.
             d->document->initEmpty();
         }
-    }
-    else
+    } else {
         d->document->openUrl (KUrl (uri));
+    }
 
     d->document->setModified(false);
     qApp->processEvents();
diff --git a/qtquick/CQPresentationModel.cpp b/qtquick/CQPresentationModel.cpp
index 4edd86e..288c438 100644
--- a/qtquick/CQPresentationModel.cpp
+++ b/qtquick/CQPresentationModel.cpp
@@ -51,16 +51,18 @@ CQPresentationModel::~CQPresentationModel()
 
 QVariant CQPresentationModel::data(const QModelIndex& index, int role) const
 {
-    if (!index.isValid() && d->document)
+    if (!index.isValid() && d->document) {
         return QVariant();
+    }
 
     switch(role) {
         case ThumbnailRole: {
             if (d->thumbnails.contains(index.row())) {
                 QPixmap thumb = d->thumbnails.value(index.row());
 
-                if (!thumb.isNull())
+                if (!thumb.isNull()) {
                     return thumb;
+                }
 
                 d->thumbnails.remove(index.row());
             }
diff --git a/qtquick/CQSpreadsheetCanvas.cpp b/qtquick/CQSpreadsheetCanvas.cpp
index 7d1e2b8..8181fe7 100644
--- a/qtquick/CQSpreadsheetCanvas.cpp
+++ b/qtquick/CQSpreadsheetCanvas.cpp
@@ -59,8 +59,9 @@ public:
         qDeleteAll(linkTargets);
         linkTargets.clear();
 
-        if (!canvas)
+        if (!canvas) {
             return;
+        }
         foreach(const KoShape* shape, canvas->activeSheet()->shapes()) {
             if (!shape->hyperLink().isEmpty()) {
                 QObject * obj = new QObject(canvas);
@@ -102,8 +103,7 @@ public:
         // For now leave it like this, more important things are needed.
         QTextLayout* layout = block.layout();
         QTextLine line = layout->lineForTextPosition(fragment.position() - \
                block.position());
-        if (!line.isValid())
-        {
+        if (!line.isValid()) {
             // fragment has no valid position and consequently no line...
             return QRectF();
         }
diff --git a/qtquick/CQSpreadsheetListModel.cpp b/qtquick/CQSpreadsheetListModel.cpp
index 9324217..6edfcb9 100644
--- a/qtquick/CQSpreadsheetListModel.cpp
+++ b/qtquick/CQSpreadsheetListModel.cpp
@@ -56,8 +56,9 @@ CQSpreadsheetListModel::~CQSpreadsheetListModel()
 
 QVariant CQSpreadsheetListModel::data(const QModelIndex& index, int role) const
 {
-    if (!index.isValid() || !d->map)
+    if (!index.isValid() || !d->map) {
         return QVariant();
+    }
 
     switch(role) {
         case SheetNameRole:
diff --git a/qtquick/CQTextDocumentCanvas.cpp b/qtquick/CQTextDocumentCanvas.cpp
index a4f9362..2a50142 100644
--- a/qtquick/CQTextDocumentCanvas.cpp
+++ b/qtquick/CQTextDocumentCanvas.cpp
@@ -183,8 +183,7 @@ public:
         QTextBlock block = textEditor->document()->findBlock(position);
         QTextLayout* layout = block.layout();
         QTextLine line = layout->lineForTextPosition(position - block.position());
-        if (!line.isValid())
-        {
+        if (!line.isValid()) {
             // fragment has no valid position and consequently no line...
             return QRectF();
         }


[prev in list] [next in list] [prev in thread] [next in thread]