diff --git a/commands/kpCommandHistoryBase.cpp b/commands/kpCommandHistoryBase.cpp --- a/commands/kpCommandHistoryBase.cpp +++ b/commands/kpCommandHistoryBase.cpp @@ -632,7 +632,8 @@ QAction *action = new QAction(i18n ("%1: %2", undoOrRedo, (*it)->name ()), popupMenu); action->setData(i); popupMenu->addAction (action); - i++, it++; + i++; + it++; } if (it != commandList.end ()) diff --git a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp --- a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp +++ b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp @@ -325,7 +325,8 @@ kpDocumentMetaInfoDialog::~kpDocumentMetaInfoDialog () { - ::LastWidth = width (), ::LastHeight = height (); + ::LastWidth = width (); + ::LastHeight = height (); delete d; } diff --git a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp @@ -87,7 +87,8 @@ kpTransformRotateDialog::~kpTransformRotateDialog () { - s_lastWidth = width (), s_lastHeight = height (); + s_lastWidth = width (); + s_lastHeight = height (); } diff --git a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp @@ -89,7 +89,8 @@ kpTransformSkewDialog::~kpTransformSkewDialog () { - s_lastWidth = width (), s_lastHeight = height (); + s_lastWidth = width (); + s_lastHeight = height (); } diff --git a/document/kpDocument.cpp b/document/kpDocument.cpp --- a/document/kpDocument.cpp +++ b/document/kpDocument.cpp @@ -370,7 +370,8 @@ // public void kpDocument::setImage (const kpImage &image) { - m_oldWidth = width (), m_oldHeight = height (); + m_oldWidth = width (); + m_oldHeight = height (); *m_image = image; @@ -418,7 +419,8 @@ qCDebug(kpLogDocument) << "kpDocument::resize (" << w << "," << h << ")"; #endif - m_oldWidth = width (), m_oldHeight = height (); + m_oldWidth = width (); + m_oldHeight = height (); #if DEBUG_KP_DOCUMENT && 1 qCDebug(kpLogDocument) << "\toldWidth=" << m_oldWidth diff --git a/imagelib/effects/blitz.cpp b/imagelib/effects/blitz.cpp --- a/imagelib/effects/blitz.cpp +++ b/imagelib/effects/blitz.cpp @@ -488,12 +488,15 @@ matrix_x = -edge; while(x+matrix_x < w){ CONVOLVE_ACC(*m, *s); - ++matrix_x, ++m, ++s; + ++matrix_x; + ++m; + ++s; } --s; while(matrix_x <= edge){ CONVOLVE_ACC(*m, *s); - ++matrix_x, ++m; + ++matrix_x; + ++m; } } r = r < 0.0 ? 0.0 : r > 255.0 ? 255.0 : r+0.5; diff --git a/imagelib/kpFloodFill.cpp b/imagelib/kpFloodFill.cpp --- a/imagelib/kpFloodFill.cpp +++ b/imagelib/kpFloodFill.cpp @@ -110,8 +110,10 @@ : d (new kpFloodFillPrivate ()) { d->imagePtr = image; - d->x = x, d->y = y; - d->color = color, d->processedColorSimilarity = processedColorSimilarity; + d->x = x; + d->y = y; + d->color = color; + d->processedColorSimilarity = processedColorSimilarity; d->prepared = false; } diff --git a/layers/tempImage/kpTempImage.cpp b/layers/tempImage/kpTempImage.cpp --- a/layers/tempImage/kpTempImage.cpp +++ b/layers/tempImage/kpTempImage.cpp @@ -88,7 +88,8 @@ m_renderMode = rhs.m_renderMode; m_topLeft = rhs.m_topLeft; m_image = rhs.m_image; - m_width = rhs.m_width, m_height = rhs.m_height; + m_width = rhs.m_width; + m_height = rhs.m_height; m_userFunction = rhs.m_userFunction; m_userData = rhs.m_userData; diff --git a/mainWindow/kpMainWindow_Tools.cpp b/mainWindow/kpMainWindow_Tools.cpp --- a/mainWindow/kpMainWindow_Tools.cpp +++ b/mainWindow/kpMainWindow_Tools.cpp @@ -616,7 +616,7 @@ // Prevent statusbar updates d->docResizeToBeCompleted = true; - d->docResizeWidth = (size.width () > 0 ? size.width () : 1), + d->docResizeWidth = (size.width () > 0 ? size.width () : 1); d->docResizeHeight = (size.height () > 0 ? size.height () : 1); if (d->docResizeWidth == d->document->width () && diff --git a/mainWindow/kpMainWindow_View_Zoom.cpp b/mainWindow/kpMainWindow_View_Zoom.cpp --- a/mainWindow/kpMainWindow_View_Zoom.cpp +++ b/mainWindow/kpMainWindow_View_Zoom.cpp @@ -203,8 +203,11 @@ int index = 0; QList ::Iterator it = d->zoomList.begin (); - while (index < (int) d->zoomList.count () && zoomLevel > *it) - it++, index++; + while (index < d->zoomList.count () && zoomLevel > *it) + { + it++; + index++; + } if (zoomLevel != *it) d->zoomList.insert (it, zoomLevel); diff --git a/tools/kpTool.cpp b/tools/kpTool.cpp --- a/tools/kpTool.cpp +++ b/tools/kpTool.cpp @@ -61,9 +61,12 @@ d->key = key; d->action = nullptr; d->ignoreColorSignals = 0; - d->shiftPressed = false, d->controlPressed = false, d->altPressed = false; // set in beginInternal() + d->shiftPressed = false; + d->controlPressed = false; + d->altPressed = false; // set in beginInternal() d->beganDraw = false; - d->text = text, d->description = description; + d->text = text; + d->description = description; d->began = false; d->viewUnderStartPoint = nullptr; d->userShapeStartPoint = KP_INVALID_POINT; diff --git a/tools/kpTool_KeyboardEvents.cpp b/tools/kpTool_KeyboardEvents.cpp --- a/tools/kpTool_KeyboardEvents.cpp +++ b/tools/kpTool_KeyboardEvents.cpp @@ -97,16 +97,16 @@ switch (e->key ()) { - case Qt::Key_Home: dxLocal = -1, dyLocal = -1; break; - case Qt::Key_Up: dyLocal = -1; break; - case Qt::Key_PageUp: dxLocal = +1, dyLocal = -1; break; + case Qt::Key_Home: dxLocal = -1; dyLocal = -1; break; + case Qt::Key_Up: dyLocal = -1; break; + case Qt::Key_PageUp: dxLocal = +1; dyLocal = -1; break; - case Qt::Key_Left: dxLocal = -1; break; - case Qt::Key_Right: dxLocal = +1; break; + case Qt::Key_Left: dxLocal = -1; break; + case Qt::Key_Right: dxLocal = +1; break; - case Qt::Key_End: dxLocal = -1, dyLocal = +1; break; - case Qt::Key_Down: dyLocal = +1; break; - case Qt::Key_PageDown: dxLocal = +1, dyLocal = +1; break; + case Qt::Key_End: dxLocal = -1; dyLocal = +1; break; + case Qt::Key_Down: dyLocal = +1; break; + case Qt::Key_PageDown: dxLocal = +1; dyLocal = +1; break; } if (dx) @@ -155,7 +155,8 @@ if (view->transformViewToDoc (QPoint (newViewX, newViewY)) == view->transformViewToDoc (oldPoint)) { - newViewX += viewIncX, newViewY += viewIncY; + newViewX += viewIncX; + newViewY += viewIncY; #if DEBUG_KP_TOOL && 0 qCDebug(kpLogTools) << "\tneed adjust for doc - newPoint=" diff --git a/tools/rectangular/kpToolRectangularBase.cpp b/tools/rectangular/kpToolRectangularBase.cpp --- a/tools/rectangular/kpToolRectangularBase.cpp +++ b/tools/rectangular/kpToolRectangularBase.cpp @@ -79,7 +79,8 @@ { d->drawShapeFunc = drawShapeFunc; - d->toolWidgetLineWidth = nullptr, d->toolWidgetFillStyle = nullptr; + d->toolWidgetLineWidth = nullptr; + d->toolWidgetFillStyle = nullptr; } //--------------------------------------------------------------------- diff --git a/views/kpView.cpp b/views/kpView.cpp --- a/views/kpView.cpp +++ b/views/kpView.cpp @@ -77,7 +77,8 @@ d->buddyView = buddyView; d->scrollableContainer = scrollableContainer; - d->hzoom = 100, d->vzoom = 100; + d->hzoom = 100; + d->vzoom = 100; d->origin = QPoint (0, 0); d->showGrid = false; d->isBuddyViewScrollableContainerRectangleShown = false; diff --git a/views/kpZoomedThumbnailView.cpp b/views/kpZoomedThumbnailView.cpp --- a/views/kpZoomedThumbnailView.cpp +++ b/views/kpZoomedThumbnailView.cpp @@ -115,7 +115,8 @@ #if DEBUG_KP_ZOOMED_THUMBNAIL_VIEW && 1 qCDebug(kpLogViews) << "\twon't magnify - setting zoom to 100%"; #endif - hzoom = 100, vzoom = 100; + hzoom = 100; + vzoom = 100; } diff --git a/widgets/toolbars/options/kpToolWidgetBase.cpp b/widgets/toolbars/options/kpToolWidgetBase.cpp --- a/widgets/toolbars/options/kpToolWidgetBase.cpp +++ b/widgets/toolbars/options/kpToolWidgetBase.cpp @@ -530,7 +530,8 @@ const int wasSelectedRow = m_selectedRow; const int wasSelectedCol = m_selectedCol; - m_selectedRow = row, m_selectedCol = col; + m_selectedRow = row; + m_selectedCol = col; if (wasSelectedRow >= 0 && wasSelectedCol >= 0) {