diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
--- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
+++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp
@@ -201,8 +201,8 @@
     const double horizScale = double (m_newWidth) / double (m_oldWidth);
     const double vertScale = double (m_newHeight) / double (m_oldHeight);
 
-    const int newX = (int) (m_oldSelectionPtr->x () * horizScale);
-    const int newY = (int) (m_oldSelectionPtr->y () * vertScale);
+    const int newX = static_cast<int> (m_oldSelectionPtr->x () * horizScale);
+    const int newY = static_cast<int> (m_oldSelectionPtr->y () * vertScale);
 
 
     QPolygon currentPoints = m_oldSelectionPtr->calculatePoints ();
diff --git a/commands/kpCommandHistoryBase.cpp b/commands/kpCommandHistoryBase.cpp
--- a/commands/kpCommandHistoryBase.cpp
+++ b/commands/kpCommandHistoryBase.cpp
@@ -524,7 +524,7 @@
                << " undoMaxLimitSizeLimit=" << m_undoMaxLimitSizeLimit
                << endl;
 #endif
-    if ((int) commandList->size () <= m_undoMinLimit)
+    if (static_cast<int> (commandList->size ()) <= m_undoMinLimit)
     {
     #if DEBUG_KP_COMMAND_HISTORY
         qCDebug(kpLogCommands) << "\t\tsize under undoMinLimit - done";
@@ -604,8 +604,8 @@
                    << " redoCmdList.size=" << m_redoCommandList.size ()
                    << endl;
     #endif
-        if (m_documentRestoredPosition > (int) m_redoCommandList.size () ||
-            -m_documentRestoredPosition > (int) m_undoCommandList.size ())
+        if (m_documentRestoredPosition > static_cast<int> (m_redoCommandList.size ()) ||
+            -m_documentRestoredPosition > static_cast<int> (m_undoCommandList.size ()))
         {
         #if DEBUG_KP_COMMAND_HISTORY
             qCDebug(kpLogCommands) << "\t\t\tinvalidate documentRestoredPosition";
@@ -652,7 +652,7 @@
     qCDebug(kpLogCommands) << "kpCommandHistoryBase::updateActions()";
 #endif
 
-    m_actionUndo->setEnabled ((bool) nextUndoCommand ());
+    m_actionUndo->setEnabled (static_cast<bool> (nextUndoCommand ()));
     // Don't want to keep changing toolbar text.
     // TODO: As a bad side-effect, the menu doesn't have "Undo: <action>"
     //       anymore.  In any case, the KDE4 KToolBarPopupAction
@@ -673,7 +673,7 @@
                << "ms" << endl;;
 #endif
 
-    m_actionRedo->setEnabled ((bool) nextRedoCommand ());
+    m_actionRedo->setEnabled (static_cast<bool> (nextRedoCommand ()));
     // Don't want to keep changing toolbar text.
     // TODO: As a bad side-effect, the menu doesn't have "Undo: <action>"
     //       anymore.  In any case, the KDE4 KToolBarPopupAction
diff --git a/commands/kpCommandSize.cpp b/commands/kpCommandSize.cpp
--- a/commands/kpCommandSize.cpp
+++ b/commands/kpCommandSize.cpp
@@ -55,7 +55,7 @@
     // handle 15bpp
     int roundedDepth = (depth > 8 ? (depth + 7) / 8 * 8 : depth);
     kpCommandSize::SizeType ret =
-        (kpCommandSize::SizeType) width * height * roundedDepth / 8;
+            static_cast<kpCommandSize::SizeType> (width) * height * roundedDepth / 8;
 
 #if DEBUG_KP_COMMAND_SIZE && 0
     qCDebug(kpLogCommands) << "kpCommandSize::PixmapSize() w=" << width
@@ -87,7 +87,7 @@
     // handle 15bpp
     int roundedDepth = (depth > 8 ? (depth + 7) / 8 * 8 : depth);
     kpCommandSize::SizeType ret =
-        (kpCommandSize::SizeType) width * height * roundedDepth / 8;
+        static_cast<kpCommandSize::SizeType> (width) * height * roundedDepth / 8;
 
 #if DEBUG_KP_COMMAND_SIZE && 0
     qCDebug(kpLogCommands) << "kpCommandSize::QImageSize() w=" << width
@@ -137,7 +137,7 @@
                << " sizeof(QChar)=" << sizeof (QChar)
                << endl;
 #endif
-    return ((SizeType) string.length () * sizeof (QChar));
+    return static_cast<SizeType> (static_cast<unsigned int> (string.length ()) * sizeof (QChar));
 }
 
 
@@ -151,6 +151,6 @@
                << endl;
 #endif
 
-    return ((SizeType) points.size () * sizeof (QPoint));
+    return static_cast<SizeType> (static_cast<unsigned int> (points.size ()) * sizeof (QPoint));
 }
 
diff --git a/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp b/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
--- a/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextBackspaceCommand.cpp
@@ -96,7 +96,8 @@
 // public virtual [base kpCommand]
 kpCommandSize::SizeType kpToolTextBackspaceCommand::size () const
 {
-    return (kpCommandSize::SizeType) m_deletedText.length () * sizeof (QChar);
+    return static_cast<kpCommandSize::SizeType>
+            (static_cast<unsigned int> (m_deletedText.length ()) * sizeof (QChar));
 }
 
 
@@ -120,7 +121,7 @@
 
     QList <QString> textLines = textSelection ()->textLines ();
 
-    for (int i = 0; i < (int) m_deletedText.length (); i++)
+    for (int i = 0; i < static_cast<int> (m_deletedText.length ()); i++)
     {
         if (m_deletedText [i] == '\n')
         {
diff --git a/commands/tools/selection/text/kpToolTextDeleteCommand.cpp b/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
--- a/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextDeleteCommand.cpp
@@ -59,16 +59,16 @@
 {
     QList <QString> textLines = textSelection ()->textLines ();
 
-    if (m_col < (int) textLines [m_row].length ())
+    if (m_col < static_cast<int> (textLines [m_row].length ()))
     {
         m_deletedText.prepend (textLines [m_row][m_col]);
 
         textLines [m_row] = textLines [m_row].left (m_col) +
                             textLines [m_row].mid (m_col + 1);
     }
     else
     {
-        if (m_row < (int) textLines.size () - 1)
+        if (m_row < static_cast<int> (textLines.size () - 1))
         {
             m_deletedText.prepend ('\n');
 
@@ -88,7 +88,8 @@
 // public virtual [base kpCommand]
 kpCommandSize::SizeType kpToolTextDeleteCommand::size () const
 {
-    return (kpCommandSize::SizeType) m_deletedText.length () * sizeof (QChar);
+    return static_cast<kpCommandSize::SizeType>
+            (static_cast<unsigned int> (m_deletedText.length ()) * sizeof (QChar));
 }
 
 
@@ -112,7 +113,7 @@
 
     QList <QString> textLines = textSelection ()->textLines ();
 
-    for (int i = 0; i < (int) m_deletedText.length (); i++)
+    for (int i = 0; i < static_cast<int> (m_deletedText.length ()); i++)
     {
         if (m_deletedText [i] == '\n')
         {
diff --git a/commands/tools/selection/text/kpToolTextInsertCommand.cpp b/commands/tools/selection/text/kpToolTextInsertCommand.cpp
--- a/commands/tools/selection/text/kpToolTextInsertCommand.cpp
+++ b/commands/tools/selection/text/kpToolTextInsertCommand.cpp
@@ -72,7 +72,8 @@
 // public virtual [base kpCommand]
 kpCommandSize::SizeType kpToolTextInsertCommand::size () const
 {
-    return (kpCommandSize::SizeType) m_newText.length () * sizeof (QChar);
+    return static_cast<kpCommandSize::SizeType>
+            (static_cast<unsigned int> (m_newText.length ()) * sizeof (QChar));
 }
 
 //---------------------------------------------------------------------
diff --git a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
--- a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
+++ b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp
@@ -289,11 +289,11 @@
     QLabel *originalLabel = new QLabel (i18n ("Original:"), dimensionsGroupBox);
     m_originalWidthInput = new QSpinBox;
     m_originalWidthInput->setRange(1, INT_MAX);
-    m_originalWidthInput->setValue(document()->width((bool)selection()));
+    m_originalWidthInput->setValue(document()->width(static_cast<bool> (selection())));
     QLabel *xLabel0 = new QLabel (i18n ("x"), dimensionsGroupBox);
     m_originalHeightInput = new QSpinBox;
     m_originalHeightInput->setRange(1, INT_MAX);
-    m_originalHeightInput->setValue(document()->height((bool)selection()));
+    m_originalHeightInput->setValue(document()->height(static_cast<bool> (selection())));
 
     QLabel *newLabel = new QLabel (i18n ("&New:"), dimensionsGroupBox);
     m_newWidthInput = new QSpinBox;
diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
--- a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
+++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp
@@ -117,7 +117,7 @@
     //  -- i.e. INT_MAX / 100 -- times the pixmap size)
     const int percent = pixmapSize ?
                             qMax (1,
-                                  (int) ((kpCommandSize::SizeType) fileSize * 100 / pixmapSize)) :
+                                  static_cast<int> (static_cast<kpCommandSize::SizeType> (fileSize * 100 / pixmapSize))) :
                             0;
 #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
     qCDebug(kpLogDialogs) << "kpDocumentSaveOptionsPreviewDialog::setFilePixmapAndSize()"
diff --git a/document/kpDocument_Selection.cpp b/document/kpDocument_Selection.cpp
--- a/document/kpDocument_Selection.cpp
+++ b/document/kpDocument_Selection.cpp
@@ -84,7 +84,7 @@
 
     d->environ->setQueueViewUpdates ();
     {
-        const bool hadSelection = (bool) m_selection;
+        const bool hadSelection = static_cast<bool> (m_selection);
         kpAbstractSelection *oldSelection = m_selection;
 
 
diff --git a/imagelib/effects/blitz.cpp b/imagelib/effects/blitz.cpp
--- a/imagelib/effects/blitz.cpp
+++ b/imagelib/effects/blitz.cpp
@@ -183,39 +183,45 @@
     memset(equalize_map, 0, 256*sizeof(CharPixel));
     for(i=0; i < 256; ++i){
         if(high.red != low.red)
-            equalize_map[i].red=(unsigned char)
+            equalize_map[i].red = static_cast<unsigned char>
                 ((255*(map[i].red-low.red))/(high.red-low.red));
         if(high.green != low.green)
-            equalize_map[i].green=(unsigned char)
+            equalize_map[i].green = static_cast<unsigned char>
                 ((255*(map[i].green-low.green))/(high.green-low.green));
         if(high.blue != low.blue)
-            equalize_map[i].blue=(unsigned char)
+            equalize_map[i].blue = static_cast<unsigned char>
                 ((255*(map[i].blue-low.blue))/(high.blue-low.blue));
     }
 
     // stretch the histogram and write
     dest = (QRgb *)img.bits();
     if(img.format() == QImage::Format_ARGB32_Premultiplied){
         for(i=0; i < count; ++i, ++dest){
             pixel = convertFromPremult(*dest);
-            r = (low.red != high.red) ? equalize_map[qRed(pixel)].red :
-                qRed(pixel);
-            g = (low.green != high.green) ? equalize_map[qGreen(pixel)].green :
-                qGreen(pixel);
-            b = (low.blue != high.blue) ?  equalize_map[qBlue(pixel)].blue :
-                qBlue(pixel);
+            r = static_cast<unsigned char> ((low.red != high.red) ?
+                                                equalize_map[qRed(pixel)].red : qRed(pixel));
+
+            g = static_cast<unsigned char> ((low.green != high.green) ?
+                                                equalize_map[qGreen(pixel)].green : qGreen(pixel));
+
+            b = static_cast<unsigned char> ((low.blue != high.blue) ?
+                                                equalize_map[qBlue(pixel)].blue : qBlue(pixel));
+
             *dest = convertToPremult(qRgba(r, g, b, qAlpha(pixel)));
         }
     }
     else{
         for(i=0; i < count; ++i){
             pixel = *dest;
-            r = (low.red != high.red) ? equalize_map[qRed(pixel)].red :
-                qRed(pixel);
-            g = (low.green != high.green) ? equalize_map[qGreen(pixel)].green :
-                qGreen(pixel);
-            b = (low.blue != high.blue) ?  equalize_map[qBlue(pixel)].blue :
-                qBlue(pixel);
+            r = static_cast<unsigned char> ((low.red != high.red) ?
+                                                equalize_map[qRed(pixel)].red : qRed(pixel));
+
+            g = static_cast<unsigned char> ((low.green != high.green) ?
+                                                equalize_map[qGreen(pixel)].green : qGreen(pixel));
+
+            b = static_cast<unsigned char> ((low.blue != high.blue) ?
+                                                equalize_map[qBlue(pixel)].blue : qBlue(pixel));
+
             *dest++ = qRgba(r, g, b, qAlpha(pixel));
         }
     }
@@ -266,10 +272,10 @@
             mh = h - my;
 
         p1 = (QRgb *)buffer.scanLine(y);
-        memset(as, 0, w * sizeof(int));
-        memset(rs, 0, w * sizeof(int));
-        memset(gs, 0, w * sizeof(int));
-        memset(bs, 0, w * sizeof(int));
+        memset(as, 0, static_cast<unsigned int> (w) * sizeof(int));
+        memset(rs, 0, static_cast<unsigned int> (w) * sizeof(int));
+        memset(gs, 0, static_cast<unsigned int> (w) * sizeof(int));
+        memset(bs, 0, static_cast<unsigned int> (w) * sizeof(int));
 
         if(img.format() == QImage::Format_ARGB32_Premultiplied){
             QRgb pixel;
@@ -288,7 +294,7 @@
             QRgb pixel;
             unsigned char *ptr;
             for(yy = 0; yy < mh; yy++){
-                ptr = (unsigned char *)img.scanLine(yy + my);
+                ptr = img.scanLine(yy + my);
                 for(x = 0; x < w; x++, ptr++){
                     pixel = colorTable[*ptr];
                     as[x] += qAlpha(pixel);
@@ -348,27 +354,27 @@
 {
     int i, matrix_size;
     float normalize, value;
-    float sigma2 = sigma*sigma*2.0;
-    float sigmaSQ2PI = M_SQ2PI*sigma;
+    float sigma2 = sigma*sigma*2.0f;
+    float sigmaSQ2PI = static_cast<float>(M_SQ2PI) * sigma;
     int max = quality ? 65535 : 255;
 
-    if(sigma == 0.0){
+    if(sigma == 0.0f){
         qWarning("Blitz::defaultConvolveMatrixSize(): Zero sigma is invalid!");
         return(5);
     }
 
-    if(radius > 0.0)
-        return((int)(2.0*std::ceil(radius)+1.0));
+    if(radius > 0.0f)
+        return(static_cast<int>(2.0f * std::ceil(radius) + 1.0f));
 
     matrix_size = 5;
     do{
         normalize = 0.0;
         for(i=(-matrix_size/2); i <= (matrix_size/2); ++i)
-            normalize += std::exp(-((float) i*i)/sigma2) / sigmaSQ2PI;
+            normalize += std::exp(-(static_cast<float> (i*i))/sigma2) / sigmaSQ2PI;
         i = matrix_size/2;
-        value = std::exp(-((float) i*i)/sigma2) / sigmaSQ2PI / normalize;
+        value = std::exp(-(static_cast<float> (i*i))/sigma2) / sigmaSQ2PI / normalize;
         matrix_size += 2;
-    } while((int)(max*value) > 0);
+    } while(static_cast<int>(max*value) > 0);
 
     matrix_size-=4;
     return(matrix_size);
@@ -411,9 +417,9 @@
     normalize = 0.0;
     for(i=0; i < matrix_size*matrix_size; ++i)
         normalize += matrix[i];
-    if(std::abs(normalize) <=  M_EPSILON)
-        normalize = 1.0;
-    normalize = 1.0/normalize;
+    if(std::abs(normalize) <=  static_cast<float> (M_EPSILON))
+        normalize = 1.0f;
+    normalize = 1.0f/normalize;
     for(i=0; i < matrix_size*matrix_size; ++i){
         normalize_matrix[i] = normalize*matrix[i];
     }
@@ -454,11 +460,11 @@
                         ++matrix_x; ++m; ++s;
                     }
                 }
-                r = r < 0.0 ? 0.0 : r > 255.0 ? 255.0 : r+0.5;
-                g = g < 0.0 ? 0.0 : g > 255.0 ? 255.0 : g+0.5;
-                b = b < 0.0 ? 0.0 : b > 255.0 ? 255.0 : b+0.5;
-                *dest++ = qRgba((unsigned char)r, (unsigned char)g,
-                                (unsigned char)b, qAlpha(*src++));
+                r = r < 0.0f ? 0.0f : r > 255.0f ? 255.0f : r + 0.5f;
+                g = g < 0.0f ? 0.0f : g > 255.0f ? 255.0f : g + 0.5f;
+                b = b < 0.0f ? 0.0f : b > 255.0f ? 255.0f : b + 0.5f;
+                *dest++ = qRgba(static_cast<unsigned char> (r), static_cast<unsigned char> (g),
+                                static_cast<unsigned char> (b), qAlpha(*src++));
             }
             // Okay, now process the middle part where the entire neighborhood
             // is on the image.
@@ -471,11 +477,11 @@
                         CONVOLVE_ACC(*m, *s);
                     }
                 }
-                r = r < 0.0 ? 0.0 : r > 255.0 ? 255.0 : r+0.5;
-                g = g < 0.0 ? 0.0 : g > 255.0 ? 255.0 : g+0.5;
-                b = b < 0.0 ? 0.0 : b > 255.0 ? 255.0 : b+0.5;
-                *dest++ = qRgba((unsigned char)r, (unsigned char)g,
-                                (unsigned char)b, qAlpha(*src++));
+                r = r < 0.0f ? 0.0f : r > 255.0f ? 255.0f : r + 0.5f;
+                g = g < 0.0f ? 0.0f : g > 255.0f ? 255.0f : g + 0.5f;
+                b = b < 0.0f ? 0.0f : b > 255.0f ? 255.0f : b + 0.5f;
+                *dest++ = qRgba(static_cast<unsigned char> (r), static_cast<unsigned char> (g),
+                                static_cast<unsigned char> (b), qAlpha(*src++));
             }
             // Finally process the right part where the neighborhood extends off
             // the right edge of the image
@@ -496,11 +502,11 @@
                         ++matrix_x, ++m;
                     }
                 }
-                r = r < 0.0 ? 0.0 : r > 255.0 ? 255.0 : r+0.5;
-                g = g < 0.0 ? 0.0 : g > 255.0 ? 255.0 : g+0.5;
-                b = b < 0.0 ? 0.0 : b > 255.0 ? 255.0 : b+0.5;
-                *dest++ = qRgba((unsigned char)r, (unsigned char)g,
-                                (unsigned char)b, qAlpha(*src++));
+                r = r < 0.0f ? 0.0f : r > 255.0f ? 255.0f : r + 0.5f;
+                g = g < 0.0f ? 0.0f : g > 255.0f ? 255.0f : g + 0.5f;
+                b = b < 0.0f ? 0.0f : b > 255.0f ? 255.0f : b + 0.5f;
+                *dest++ = qRgba(static_cast<unsigned char> (r), static_cast<unsigned char> (g),
+                                static_cast<unsigned char> (b), qAlpha(*src++));
             }
         }
     }
@@ -514,29 +520,29 @@
 
 QImage Blitz::gaussianSharpen(QImage &img, float radius, float sigma)
 {
-    if(sigma == 0.0){
+    if(sigma == 0.0f){
         qWarning("Blitz::gaussianSharpen(): Zero sigma is invalid!");
         return(img);
     }
 
     int matrix_size = defaultConvolveMatrixSize(radius, sigma, true);
     int len = matrix_size*matrix_size;
     float alpha, *matrix = new float[len];
-    float sigma2 = sigma*sigma*2.0;
-    float sigmaPI2 = 2.0*M_PI*sigma*sigma;
+    float sigma2 = sigma*sigma*2.0f;
+    float sigmaPI2 = 2.0f*static_cast<float> (M_PI)*sigma*sigma;
 
     int half = matrix_size/2;
     int x, y, i=0, j=half;
     float normalize=0.0;
     for(y=(-half); y <= half; ++y, --j){
         for(x=(-half); x <= half; ++x, ++i){
-            alpha = std::exp(-((float)x*x+y*y)/sigma2);
+            alpha = std::exp(-(static_cast<float> (x*x+y*y))/sigma2);
             matrix[i] = alpha/sigmaPI2;
             normalize += matrix[i];
         }
     }
 
-    matrix[i/2]=(-2.0)*normalize;
+    matrix[i/2]=(-2.0f)*normalize;
     QImage result(convolve(img, matrix_size, matrix));
     delete[] matrix;
     return(result);
@@ -546,24 +552,24 @@
 
 QImage Blitz::emboss(QImage &img, float radius, float sigma)
 {
-    if(sigma == 0.0){
+    if(sigma == 0.0f){
         qWarning("Blitz::emboss(): Zero sigma is invalid!");
         return(img);
     }
 
     int matrix_size = defaultConvolveMatrixSize(radius, sigma, true);
     int len = matrix_size*matrix_size;
 
     float alpha, *matrix = new float[len];
-    float sigma2 = sigma*sigma*2.0;
-    float sigmaPI2 = 2.0*M_PI*sigma*sigma;
+    float sigma2 = sigma*sigma*2.0f;
+    float sigmaPI2 = 2.0f*static_cast<float> (M_PI)*sigma*sigma;
 
     int half = matrix_size/2;
     int x, y, i=0, j=half;
     for(y=(-half); y <= half; ++y, --j){
         for(x=(-half); x <= half; ++x, ++i){
-            alpha = std::exp(-((float)x*x+y*y)/sigma2);
-            matrix[i]=((x < 0) || (y < 0) ? -8.0 : 8.0)*alpha/sigmaPI2;
+            alpha = std::exp(-(static_cast<float> (x*x+y*y))/sigma2);
+            matrix[i]=((x < 0) || (y < 0) ? -8.0f : 8.0f)*alpha/sigmaPI2;
             if(x == j)
                 matrix[i]=0.0;
         }
@@ -596,7 +602,7 @@
     QVector<QRgb> cTable;
     if(img.format() == QImage::Format_Indexed8){
         cTable = img.colorTable();
-        data = (unsigned int *)cTable.data();
+        data = static_cast<unsigned int *> (cTable.data());
         end = data + img.colorCount();
 
     }
@@ -629,16 +635,16 @@
     }
 
     // conversion factors
-    float sr = ((float) r2 - r1) / (max - min);
-    float sg = ((float) g2 - g1) / (max - min);
-    float sb = ((float) b2 - b1) / (max - min);
+    float sr = (static_cast<float> (r2 - r1) / (max - min));
+    float sg = (static_cast<float> (g2 - g1) / (max - min));
+    float sb = (static_cast<float> (b2 - b1) / (max - min));
 
     if(img.format() != QImage::Format_ARGB32_Premultiplied){
         while(data != end){
             mean = (qRed(*data) + qGreen(*data) + qBlue(*data)) / 3;
-            *data = qRgba((unsigned char)(sr * (mean - min) + r1 + 0.5),
-                          (unsigned char)(sg * (mean - min) + g1 + 0.5),
-                          (unsigned char)(sb * (mean - min) + b1 + 0.5),
+            *data = qRgba(static_cast<unsigned char> (sr * (mean - min) + r1 + 0.5f),
+                          static_cast<unsigned char> (sg * (mean - min) + g1 + 0.5f),
+                          static_cast<unsigned char> (sb * (mean - min) + b1 + 0.5f),
                           qAlpha(*data));
             ++data;
         }
@@ -649,9 +655,9 @@
             pixel = convertFromPremult(*data);
             mean = (qRed(pixel) + qGreen(pixel) + qBlue(pixel)) / 3;
             *data =
-                convertToPremult(qRgba((unsigned char)(sr * (mean - min) + r1 + 0.5),
-                                       (unsigned char)(sg * (mean - min) + g1 + 0.5),
-                                       (unsigned char)(sb * (mean - min) + b1 + 0.5),
+                convertToPremult(qRgba(static_cast<unsigned char> (sr * (mean - min) + r1 + 0.5f),
+                                       static_cast<unsigned char> (sg * (mean - min) + g1 + 0.5f),
+                                       static_cast<unsigned char> (sb * (mean - min) + b1 + 0.5f),
                                        qAlpha(*data)));
             ++data;
         }
diff --git a/imagelib/effects/kpEffectBalance.cpp b/imagelib/effects/kpEffectBalance.cpp
--- a/imagelib/effects/kpEffectBalance.cpp
+++ b/imagelib/effects/kpEffectBalance.cpp
@@ -130,22 +130,22 @@
 
     for (int i = 0; i < 256; i++)
     {
-        quint8 applied = (quint8) brightnessContrastGamma (i, brightness, contrast, gamma);
+        quint8 applied = static_cast<quint8> (brightnessContrastGamma (i, brightness, contrast, gamma));
 
         if (channels & kpEffectBalance::Red)
             transformRed [i] = applied;
         else
-            transformRed [i] = i;
+            transformRed [i] = static_cast<quint8> (i);
 
         if (channels & kpEffectBalance::Green)
             transformGreen [i] = applied;
         else
-            transformGreen [i] = i;
+            transformGreen [i] = static_cast<quint8> (i);
 
         if (channels & kpEffectBalance::Blue)
             transformBlue [i] = applied;
         else
-            transformBlue [i] = i;
+            transformBlue [i] = static_cast<quint8> (i);
     }
 
 #if DEBUG_KP_EFFECT_BALANCE
@@ -161,10 +161,10 @@
             {
                 const QRgb rgb = qimage.pixel (x, y);
 
-                const quint8 red = (quint8) qRed (rgb);
-                const quint8 green = (quint8) qGreen (rgb);
-                const quint8 blue = (quint8) qBlue (rgb);
-                const quint8 alpha = (quint8) qAlpha (rgb);
+                const quint8 red = static_cast<quint8> (qRed (rgb));
+                const quint8 green = static_cast<quint8> (qGreen (rgb));
+                const quint8 blue = static_cast<quint8> (qBlue (rgb));
+                const quint8 alpha = static_cast<quint8> (qAlpha (rgb));
 
                 qimage.setPixel (x, y,
                     qRgba (transformRed [red],
@@ -187,10 +187,10 @@
         {
             const QRgb rgb = qimage.color (i);
 
-            const quint8 red = (quint8) qRed (rgb);
-            const quint8 green = (quint8) qGreen (rgb);
-            const quint8 blue = (quint8) qBlue (rgb);
-            const quint8 alpha = (quint8) qAlpha (rgb);
+            const quint8 red = static_cast<quint8> (qRed (rgb));
+            const quint8 green = static_cast<quint8> (qGreen (rgb));
+            const quint8 blue = static_cast<quint8> (qBlue (rgb));
+            const quint8 alpha = static_cast<quint8> (qAlpha (rgb));
 
             qimage.setColor (i,
                 qRgba (transformRed [red],
diff --git a/imagelib/effects/kpEffectBlurSharpen.cpp b/imagelib/effects/kpEffectBlurSharpen.cpp
--- a/imagelib/effects/kpEffectBlurSharpen.cpp
+++ b/imagelib/effects/kpEffectBlurSharpen.cpp
@@ -157,7 +157,8 @@
     #if DEBUG_KP_EFFECT_BLUR_SHARPEN
         QTime timer; timer.start ();
     #endif
-        qimage = Blitz::gaussianSharpen (qimage, radius, sigma);
+        qimage = Blitz::gaussianSharpen (qimage, static_cast<float> (radius),
+                                         static_cast<float> (sigma));
     #if DEBUG_KP_EFFECT_BLUR_SHARPEN
         qCDebug(kpLogImagelib) << "\titeration #" + QString::number (i)
                   << ": " + QString::number (timer.elapsed ()) << "ms" << endl;
diff --git a/imagelib/effects/kpEffectHSV.cpp b/imagelib/effects/kpEffectHSV.cpp
--- a/imagelib/effects/kpEffectHSV.cpp
+++ b/imagelib/effects/kpEffectHSV.cpp
@@ -51,69 +51,86 @@
         min = qMin(r, g);
         if(b != min)
         {
-            *pHue = (float)(r - g) / ((b - min) * 6) + (float)2 / 3;
-            *pSaturation = (float)1 - (float)min / (float)b;
+            *pHue = static_cast<float> (r - g) / ((b - min) * 6) + static_cast<float> (2) / 3;
+            *pSaturation = 1.0f - static_cast<float> (min) / static_cast<float> (b);
         }
         else
         {
             *pHue = 0;
             *pSaturation = 0;
         }
-        *pValue = (float)b / 255;
+        *pValue = static_cast<float> (b) / 255;
     }
     else if(g >= r)
     {
         // Green
         min = qMin(b, r);
         if(g != min)
         {
-            *pHue = (float)(b - r) / ((g - min) * 6) + (float)1 / 3;
-            *pSaturation = (float)1 - (float)min / (float)g;
+            *pHue = static_cast<float> (b - r) / ((g - min) * 6) + static_cast<float> (1) / 3;
+            *pSaturation = 1.0f - static_cast<float> (min) / static_cast<float> (g);
         }
         else
         {
             *pHue = 0;
             *pSaturation = 0;
         }
-        *pValue = (float)g / 255;
+        *pValue = static_cast<float> (g) / 255;
     }
     else
     {
         // Red
         min = qMin(g, b);
         if(r != min)
         {
-            *pHue = (float)(g - b) / ((r - min) * 6);
+            *pHue = static_cast<float> (g - b) / ((r - min) * 6);
             if(*pHue < 0)
-                (*pHue) += (float)1;
-            *pSaturation = (float)1 - (float)min / (float)r;
+                (*pHue) += 1.0f;
+            *pSaturation = 1.0f - static_cast<float> (min) / static_cast<float> (r);
         }
         else
         {
             *pHue = 0;
             *pSaturation = 0;
         }
-        *pValue = (float)r / 255;
+        *pValue = static_cast<float> (r) / 255;
     }
 }
 
 static unsigned int HSVToColor(int alpha, float hue, float saturation, float value)
 {
     //Q_ASSERT (hue >= 0 && hue <= 1 && saturation >= 0 && saturation <= 1 && value >= 0 && value <= 1);
 
-    hue *= (float)5.999999;
-    int h = (int)hue;
+    hue *= 5.999999f;
+    int h = static_cast<int> (hue);
     float f = hue - h;
-    float p = value * ((float)1 - saturation);
-    float q = value * ((float)1 - ((h & 1) == 0 ? (float)1 - f : f) * saturation);
+    float p = value * (1.0f - saturation);
+    float q = value * (1.0f - ((h & 1) == 0 ? 1.0f - f : f) * saturation);
     switch(h)
     {
-        case 0: return qRgba((int)(value * 255.999999), (int)(q * 255.999999), (int)(p * 255.999999), alpha);
-        case 1: return qRgba((int)(q * 255.999999), (int)(value * 255.999999), (int)(p * 255.999999), alpha);
-        case 2: return qRgba((int)(p * 255.999999), (int)(value * 255.999999), (int)(q * 255.999999), alpha);
-        case 3: return qRgba((int)(p * 255.999999), (int)(q * 255.999999), (int)(value * 255.999999), alpha);
-        case 4: return qRgba((int)(q * 255.999999), (int)(p * 255.999999), (int)(value * 255.999999), alpha);
-        case 5: return qRgba((int)(value * 255.999999), (int)(p * 255.999999), (int)(q * 255.999999), alpha);
+        case 0: return qRgba(static_cast<int> (value * 255.999999f),
+                             static_cast<int> (q * 255.999999f),
+                             static_cast<int> (p * 255.999999f), alpha);
+
+        case 1: return qRgba(static_cast<int> (q * 255.999999f),
+                             static_cast<int> (value * 255.999999f),
+                             static_cast<int> (p * 255.999999f), alpha);
+
+        case 2: return qRgba(static_cast<int> (p * 255.999999f),
+                             static_cast<int> (value * 255.999999f),
+                             static_cast<int> (q * 255.999999f), alpha);
+
+        case 3: return qRgba(static_cast<int> (p * 255.999999f),
+                             static_cast<int> (q * 255.999999f),
+                             static_cast<int> (value * 255.999999f), alpha);
+
+        case 4: return qRgba(static_cast<int> (q * 255.999999f),
+                             static_cast<int> (p * 255.999999f),
+                             static_cast<int> (value * 255.999999f), alpha);
+
+        case 5: return qRgba(static_cast<int> (value * 255.999999f),
+                             static_cast<int> (p * 255.999999f),
+                             static_cast<int> (q * 255.999999f), alpha);
     }
     return qRgba(0, 0, 0, alpha);
 }
@@ -125,12 +142,12 @@
     
     const int alpha = qAlpha(pix);
 
-    h += (float)hueDiv360;
+    h += static_cast<float> (hueDiv360);
     h -= floor(h);
 
-    s = qMax((float)0, qMin((float)1, s + (float)saturation));
+    s = qMax(0.0f, qMin(1.0f, s + static_cast<float> (saturation)));
 
-    v = qMax((float)0, qMin((float)1, v + (float)value));
+    v = qMax(0.0f, qMin(1.0f, v + static_cast<float> (value)));
 
     return ::HSVToColor(alpha, h, s, v);
 }
diff --git a/imagelib/effects/kpEffectToneEnhance.cpp b/imagelib/effects/kpEffectToneEnhance.cpp
--- a/imagelib/effects/kpEffectToneEnhance.cpp
+++ b/imagelib/effects/kpEffectToneEnhance.cpp
@@ -52,17 +52,19 @@
 
 inline unsigned int ComputeTone(unsigned int color)
 {
-  return RED_WEIGHT * qRed(color) + GREEN_WEIGHT * qGreen(color) + BLUE_WEIGHT * qBlue(color);
+  return RED_WEIGHT * static_cast<unsigned int> (qRed(color)) +
+          GREEN_WEIGHT * static_cast<unsigned int> (qGreen(color)) +
+          BLUE_WEIGHT * static_cast<unsigned int> (qBlue(color));
 }
 
 //---------------------------------------------------------------------
 
 inline unsigned int AdjustTone(unsigned int color, unsigned int oldTone, unsigned int newTone, double amount)
 {
   return qRgba(
-      qMax(0, qMin(255, (int) (amount * qRed(color) * newTone / oldTone + (1.0 - amount) * qRed(color)))),
-      qMax(0, qMin(255, (int) (amount * qGreen(color) * newTone / oldTone + (1.0 - amount) * qGreen(color)))),
-      qMax(0, qMin(255, (int) (amount * qBlue(color) * newTone / oldTone + (1.0 - amount) * qBlue(color)))),
+      qMax(0, qMin(255, static_cast<int> (amount * qRed(color) * newTone / oldTone + (1.0 - amount) * qRed(color)))),
+      qMax(0, qMin(255, static_cast<int> (amount * qGreen(color) * newTone / oldTone + (1.0 - amount) * qGreen(color)))),
+      qMax(0, qMin(255, static_cast<int> (amount * qBlue(color) * newTone / oldTone + (1.0 - amount) * qBlue(color)))),
       qAlpha(color)
     );
 }
@@ -172,7 +174,7 @@
   unsigned int total = m_pHistogram[i - 1];
   unsigned int* pToneMap = new unsigned int[TONE_MAP_SIZE];
   for(i = 0; i < TONE_MAP_SIZE; i++)
-    pToneMap[i] = (uint)((unsigned long long int)m_pHistogram[i] * MAX_TONE_VALUE / total);
+    pToneMap[i] = static_cast<uint> (static_cast<unsigned long long int> (m_pHistogram[i] * MAX_TONE_VALUE / total));
 /*
   // Undo the forward sum and reverse sum the tone histogram
   m_pHistogram[TONE_MAP_SIZE - 1] -= m_pHistogram[TONE_MAP_SIZE - 2];
@@ -191,15 +193,16 @@
 // protected
 void kpEffectToneEnhanceApplier::ComputeToneMaps(QImage* pImage, int nGranularity)
 {
-  if(nGranularity == m_nToneMapGranularity && pImage->width() == (int) m_nComputedWid && pImage->height() == (int) m_nComputedHgt)
+  if(nGranularity == m_nToneMapGranularity && pImage->width() ==
+          static_cast<int> (m_nComputedWid) && pImage->height() == static_cast<int> (m_nComputedHgt))
   {
     return; // We've already computed tone maps for this granularity
   }
   DeleteToneMaps();
   m_pToneMaps = new unsigned int*[nGranularity * nGranularity];
   m_nToneMapGranularity = nGranularity;
-  m_nComputedWid = pImage->width();
-  m_nComputedHgt = pImage->height();
+  m_nComputedWid = static_cast<unsigned int> (pImage->width());
+  m_nComputedHgt = static_cast<unsigned int> (pImage->height());
   int u, v;
   for(v = 0; v < nGranularity; v++)
   {
@@ -225,12 +228,17 @@
   int hFac = x - (u * (pImage->width() - 1) / (nGranularity - 1));
   if(hFac > m_areaWid)
     hFac = m_areaWid;
-  unsigned int y1 = (x1y1 * (m_areaWid - hFac) + x2y1 * hFac) / m_areaWid;
-  unsigned int y2 = (x1y2 * (m_areaWid - hFac) + x2y2 * hFac) / m_areaWid;
+  unsigned int y1 = (x1y1 * (static_cast<unsigned int> (m_areaWid) - static_cast<unsigned int> (hFac))
+                     + x2y1 * static_cast<unsigned int> (hFac)) / static_cast<unsigned int> (m_areaWid);
+
+  unsigned int y2 = (x1y2 * (static_cast<unsigned int> (m_areaWid) - static_cast<unsigned int> (hFac))
+                     + x2y2 * static_cast<unsigned int> (hFac)) / static_cast<unsigned int> (m_areaWid);
+
   int vFac = y - (v * (pImage->height() - 1) / (nGranularity - 1));
   if(vFac > m_areaHgt)
     vFac = m_areaHgt;
-  return (y1 * (m_areaHgt - vFac) + y2 * vFac) / m_areaHgt;
+  return (y1 * (static_cast<unsigned int> (m_areaHgt) - static_cast<unsigned int> (vFac))
+          + y2 * static_cast<unsigned int> (vFac)) / static_cast<unsigned int> (m_areaHgt);
 }
 
 //---------------------------------------------------------------------
@@ -240,7 +248,7 @@
 {
   if(pImage->width() < MIN_IMAGE_DIM || pImage->height() < MIN_IMAGE_DIM)
       return; // the image is not big enough to perform this operation
-  int nGranularity = (int)(granularity * (MAX_GRANULARITY - 2)) + 1;
+  int nGranularity = static_cast<int> (granularity * (MAX_GRANULARITY - 2)) + 1;
   m_areaWid = pImage->width() / nGranularity;
   if(m_areaWid < MIN_IMAGE_DIM)
       m_areaWid = MIN_IMAGE_DIM;
@@ -268,7 +276,7 @@
 kpImage kpEffectToneEnhance::applyEffect (const kpImage &image,
                                           double granularity, double amount)
 {
-  if (amount == 0)
+  if (amount == 0.0)
       return image;
 
   QImage qimage(image);
diff --git a/imagelib/kpColor.cpp b/imagelib/kpColor.cpp
--- a/imagelib/kpColor.cpp
+++ b/imagelib/kpColor.cpp
@@ -113,7 +113,7 @@
     int a, b;
     stream >> a >> b;
     color.m_rgbaIsValid = a;
-    color.m_rgba = b;
+    color.m_rgba = static_cast<unsigned int> (b);
 
     color.m_colorCacheIsValid = false;
 
diff --git a/imagelib/kpFloodFill.cpp b/imagelib/kpFloodFill.cpp
--- a/imagelib/kpFloodFill.cpp
+++ b/imagelib/kpFloodFill.cpp
@@ -190,7 +190,7 @@
     if (beenHere)
         *beenHere = false;
 
-    Q_ASSERT (y >= 0 && y < (int) d->fillLinesCache.count ());
+    Q_ASSERT (y >= 0 && y < static_cast<int> (d->fillLinesCache.count ()));
 
     foreach (const kpFillLine &line, d->fillLinesCache [y])
     {
diff --git a/imagelib/transforms/kpTransformAutoCrop.cpp b/imagelib/transforms/kpTransformAutoCrop.cpp
--- a/imagelib/transforms/kpTransformAutoCrop.cpp
+++ b/imagelib/transforms/kpTransformAutoCrop.cpp
@@ -691,7 +691,7 @@
                    << " botBorder.rect=" << botBorder.rect ()
                    << endl;
     #endif
-        ::ShowNothingToAutocropMessage (mainWindow, (bool) doc->selection ());
+        ::ShowNothingToAutocropMessage (mainWindow, static_cast<bool> (doc->selection ()));
         return false;
     }
 
@@ -755,11 +755,8 @@
 
 
     mainWindow->addImageOrSelectionCommand (
-        new kpTransformAutoCropCommand (
-            (bool) doc->selection (),
-            leftBorder, rightBorder,
-            topBorder, botBorder,
-            mainWindow->commandEnvironment ()));
+        new kpTransformAutoCropCommand (static_cast<bool> (doc->selection ()),
+            leftBorder, rightBorder, topBorder, botBorder,  mainWindow->commandEnvironment ()));
 
 
     return true;
diff --git a/kpViewScrollableContainer.cpp b/kpViewScrollableContainer.cpp
--- a/kpViewScrollableContainer.cpp
+++ b/kpViewScrollableContainer.cpp
@@ -486,8 +486,8 @@
     if (!docResizingGrip ())
         return QSize ();
 
-    const int docX = (int) m_view->transformViewToDocX (m_view->width () + viewDX);
-    const int docY = (int) m_view->transformViewToDocY (m_view->height () + viewDY);
+    const int docX = static_cast<int> (m_view->transformViewToDocX (m_view->width () + viewDX));
+    const int docY = static_cast<int> (m_view->transformViewToDocY (m_view->height () + viewDY));
 
     return QSize (qMax (1, docX), qMax (1, docY));
 }
@@ -676,8 +676,11 @@
 
     if (viewX >= 0 && viewY >= 0)
     {
-        m_resizeRoundedLastViewX = (int) m_view->transformDocToViewX ((int) m_view->transformViewToDocX (viewX));
-        m_resizeRoundedLastViewY = (int) m_view->transformDocToViewY ((int) m_view->transformViewToDocY (viewY));
+        m_resizeRoundedLastViewX =
+                static_cast<int> (m_view->transformDocToViewX (m_view->transformViewToDocX (viewX)));
+
+        m_resizeRoundedLastViewY =
+                static_cast<int> (m_view->transformDocToViewY (m_view->transformViewToDocY (viewY)));
 
         m_resizeRoundedLastViewDX = viewDX;
         m_resizeRoundedLastViewDY = viewDY;
@@ -752,8 +755,8 @@
 
     m_haveMovedFromOriginalDocSize = true;
 
-    updateResizeLines (qMax (1, qMax (m_view->width () + viewDX, (int) m_view->transformDocToViewX (1))),
-                       qMax (1, qMax (m_view->height () + viewDY, (int) m_view->transformDocToViewY (1))),
+    updateResizeLines (qMax (1, qMax (m_view->width () + viewDX, static_cast<int> (m_view->transformDocToViewX (1)))),
+                       qMax (1, qMax (m_view->height () + viewDY, static_cast<int> (m_view->transformDocToViewY (1)))),
                        viewDX, viewDY);
 
     emit continuedDocResize (newDocSize ());
@@ -1157,7 +1160,7 @@
         QScrollArea::wheelEvent(e);
 }
 
-//---------------------------------------------------------------------
+//---------------------------------------------------------------------------------
 
 QRect kpViewScrollableContainer::noDragScrollRect () const
 {
diff --git a/layers/selections/text/kpTextSelection_Cursor.cpp b/layers/selections/text/kpTextSelection_Cursor.cpp
--- a/layers/selections/text/kpTextSelection_Cursor.cpp
+++ b/layers/selections/text/kpTextSelection_Cursor.cpp
@@ -53,7 +53,7 @@
 
     int row = (point.y () - textAreaRect ().y ()) /
                fontMetrics.lineSpacing ();
-    if (row >= (int) d->textLines.size ())
+    if (row >= static_cast<int> (d->textLines.size ()))
         row = d->textLines.size () - 1;
 
     return row;
@@ -63,7 +63,7 @@
 int kpTextSelection::closestTextColForPoint (const QPoint &point) const
 {
     int row = closestTextRowForPoint (point);
-    if (row < 0 || row >= (int) d->textLines.size ())
+    if (row < 0 || row >= static_cast<int> (d->textLines.size ()))
         return -1;
 
     const int localX = point.x () - textAreaRect ().x ();
@@ -74,7 +74,7 @@
     int charLocalLeft = fontMetrics.width (d->textLines [row], 0);
 
     // OPT: binary search or guess location then move
-    for (int col = 0; col < (int) d->textLines [row].length (); col++)
+    for (int col = 0; col < static_cast<int> (d->textLines [row].length ()); col++)
     {
         // OPT: fontMetrics::charWidth() might be faster
         const int nextCharLocalLeft = fontMetrics.width (d->textLines [row], col + 1);
@@ -95,7 +95,7 @@
     kpPreeditText preeditText = d->preeditText;
     if ((row < 0 || col < 0) ||
         (preeditText.isEmpty () &&
-            (row >= (int) d->textLines.size () || col > (int) d->textLines [row].length ())))
+            (row >= static_cast<int> (d->textLines.size ()) || col > static_cast<int> (d->textLines [row].length ()))))
     {
 #if DEBUG_KP_SELECTION && 1
     qCDebug(kpLogLayers) << "kpTextSelection::pointForTextRowCol("
diff --git a/layers/tempImage/kpTempImage.cpp b/layers/tempImage/kpTempImage.cpp
--- a/layers/tempImage/kpTempImage.cpp
+++ b/layers/tempImage/kpTempImage.cpp
@@ -148,7 +148,7 @@
 // public
 bool kpTempImage::isVisible (const kpViewManager *vm) const
 {
-    return m_isBrush ? (bool) vm->viewUnderCursor () : true;
+    return m_isBrush ? static_cast<bool> (vm->viewUnderCursor ()) : true;
 }
 
 //---------------------------------------------------------------------
diff --git a/mainWindow/kpMainWindow_Edit.cpp b/mainWindow/kpMainWindow_Edit.cpp
--- a/mainWindow/kpMainWindow_Edit.cpp
+++ b/mainWindow/kpMainWindow_Edit.cpp
@@ -455,7 +455,7 @@
             macroCmd->addCommand (giveContentCmd);
         }
 
-        for (int i = 0; i < (int) textLines.size (); i++)
+        for (int i = 0; i < static_cast<int> (textLines.size ()); i++)
         {
             if (i > 0)
             {
diff --git a/mainWindow/kpMainWindow_Image.cpp b/mainWindow/kpMainWindow_Image.cpp
--- a/mainWindow/kpMainWindow_Image.cpp
+++ b/mainWindow/kpMainWindow_Image.cpp
@@ -469,7 +469,7 @@
 {
     toolEndShape ();
 
-    kpTransformRotateDialog dialog ((bool) d->document->selection (),
+    kpTransformRotateDialog dialog (static_cast<bool> (d->document->selection ()),
         transformDialogEnvironment (), this);
 
     if (dialog.exec () && !dialog.isNoOp ())
@@ -513,7 +513,7 @@
 {
     toolEndShape ();
 
-    kpTransformSkewDialog dialog ((bool) d->document->selection (),
+    kpTransformSkewDialog dialog (static_cast<bool> (d->document->selection ()),
         transformDialogEnvironment (), this);
 
     if (dialog.exec () && !dialog.isNoOp ())
@@ -594,7 +594,7 @@
 {
     toolEndShape ();
 
-    kpEffectsDialog dialog ((bool) d->document->selection (),
+    kpEffectsDialog dialog (static_cast<bool> (d->document->selection ()),
         transformDialogEnvironment (), this,
         d->moreEffectsDialogLastEffect);
 
diff --git a/mainWindow/kpMainWindow_Tools.cpp b/mainWindow/kpMainWindow_Tools.cpp
--- a/mainWindow/kpMainWindow_Tools.cpp
+++ b/mainWindow/kpMainWindow_Tools.cpp
@@ -217,7 +217,7 @@
             d->toolToolBar->selectPreviousTool ();
         else
         {
-            if (d->lastToolNumber >= 0 && d->lastToolNumber < (int) d->tools.count ())
+            if (d->lastToolNumber >= 0 && d->lastToolNumber < d->tools.count ())
                 d->toolToolBar->selectTool (d->tools.at (d->lastToolNumber));
             else
                 d->toolToolBar->selectTool (d->toolPen);
@@ -520,7 +520,7 @@
 void kpMainWindow::saveLastTool ()
 {
     int number = toolNumber ();
-    if (number < 0 || number >= (int) d->tools.count ())
+    if (number < 0 || number >= d->tools.count ())
         return;
 
 
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,7 +203,7 @@
     int index = 0;
     QList <int>::Iterator it = d->zoomList.begin ();
 
-    while (index < (int) d->zoomList.count () && zoomLevel > *it)
+    while (index < d->zoomList.count () && zoomLevel > *it)
         it++, index++;
 
     if (zoomLevel != *it)
@@ -231,7 +231,7 @@
     {
         d->actionActualSize->setEnabled (zoomLevel != 100);
 
-        d->actionZoomIn->setEnabled (d->actionZoom->currentItem () < (int) d->zoomList.count () - 1);
+        d->actionZoomIn->setEnabled (d->actionZoom->currentItem () < d->zoomList.count () - 1);
         d->actionZoomOut->setEnabled (d->actionZoom->currentItem () > 0);
     }
 
@@ -392,7 +392,7 @@
             const double viewY = vuc->transformDocToViewY (targetDocY);
             // Rounding error from zooming in and out :(
             // TODO: do everything in terms of tool doc points in type "double".
-            const QPoint viewPoint ((int) viewX, (int) viewY);
+            const QPoint viewPoint (static_cast<int> (viewX), static_cast<int> (viewY));
         #if DEBUG_KP_MAIN_WINDOW
             qCDebug(kpLogMainWindow) << "\t\tdoc: (" << targetDocX << "," << targetDocY << ")"
                        << " viewUnderCursor: (" << viewX << "," << viewY << ")"
@@ -567,9 +567,9 @@
   {
     const QRect docRect (
         0/*x*/,
-        (int) d->mainView->transformViewToDocY (d->scrollView->verticalScrollBar()->value ())/*maintain y*/,
-        d->document->width (),
-        1/*don't care about height*/);
+        static_cast<int> (d->mainView->transformViewToDocY (d->scrollView->verticalScrollBar()->value ()))/*maintain y*/,
+                d->document->width (),
+                1/*don't care about height*/);
     zoomToRect (
         docRect,
         true/*account for grips*/,
@@ -585,10 +585,10 @@
   if ( d->document )
   {
     const QRect docRect (
-        (int) d->mainView->transformViewToDocX (d->scrollView->horizontalScrollBar()->value ())/*maintain x*/,
-        0/*y*/,
-        1/*don't care about width*/,
-        d->document->height ());
+        static_cast<int> (d->mainView->transformViewToDocX (d->scrollView->horizontalScrollBar()->value ()))/*maintain x*/,
+                0/*y*/,
+                1/*don't care about width*/,
+                d->document->height ());
     zoomToRect (
         docRect,
         true/*account for grips*/,
@@ -609,7 +609,7 @@
 #endif
     const int targetItem = d->actionZoom->currentItem () + 1;
 
-    if (targetItem >= (int) d->zoomList.count ())
+    if (targetItem >= static_cast<int> (d->zoomList.count ()))
         return;
 
     d->actionZoom->setCurrentItem (targetItem);
diff --git a/pixmapfx/kpPixmapFX_DrawShapes.cpp b/pixmapfx/kpPixmapFX_DrawShapes.cpp
--- a/pixmapfx/kpPixmapFX_DrawShapes.cpp
+++ b/pixmapfx/kpPixmapFX_DrawShapes.cpp
@@ -53,7 +53,7 @@
     if (points.count () == 0)
         return false;
 
-    for (int i = 1; i < (int) points.count (); i++)
+    for (int i = 1; i < static_cast<int> (points.count ()); i++)
     {
         if (points [i] != points [0])
             return false;
diff --git a/pixmapfx/kpPixmapFX_Transforms.cpp b/pixmapfx/kpPixmapFX_Transforms.cpp
--- a/pixmapfx/kpPixmapFX_Transforms.cpp
+++ b/pixmapfx/kpPixmapFX_Transforms.cpp
@@ -614,7 +614,7 @@
         angle = -angle;
 
     // Remove multiples of 90 to make sure 0 <= angle <= 90
-    angle -= ((int) angle) / 90 * 90;
+    angle -= (static_cast<int> (angle)) / 90 * 90;
 
     // "Impossible" situation?
     if (angle < 0 || angle > 90)
diff --git a/scan/sanedialog.cpp b/scan/sanedialog.cpp
--- a/scan/sanedialog.cpp
+++ b/scan/sanedialog.cpp
@@ -37,7 +37,7 @@
 SaneDialog::SaneDialog(QWidget *parent)
     : KPageDialog(parent)
 {
-    setFaceType((KPageDialog::FaceType)Plain);
+    setFaceType(static_cast<KPageDialog::FaceType> (Plain));
     setWindowTitle(i18nc("@title:window", "Acquire Image"));
 
     buttonBox()->setStandardButtons(QDialogButtonBox::Close);
@@ -108,7 +108,7 @@
 void SaneDialog::imageReady(QByteArray &data, int w, int h, int bpl, int f)
 {
     /* copy the image data into img */
-    QImage img = m_ksanew->toQImage(data, w, h, bpl, (KSaneIface::KSaneWidget::ImageFormat)f);
+    QImage img = m_ksanew->toQImage(data, w, h, bpl, static_cast<KSaneIface::KSaneWidget::ImageFormat> (f));
     emit finalImage(img, nextId());
 }
 
diff --git a/tools/kpTool.cpp b/tools/kpTool.cpp
--- a/tools/kpTool.cpp
+++ b/tools/kpTool.cpp
@@ -122,7 +122,7 @@
 static bool KeyIsText (int key)
 {
     // TODO: should work like !QKeyEvent::text().isEmpty()
-    return !(key & (Qt::KeyboardModifierMask ^ Qt::ShiftModifier));
+    return !(static_cast<unsigned int> (key) & (Qt::KeyboardModifierMask ^ Qt::ShiftModifier));
 }
 
 //---------------------------------------------------------------------
@@ -160,7 +160,7 @@
         shortcut.append (QKeySequence (key));
         // (CTRL+<key>, ALT+<key>, CTRL+ALT+<key>, CTRL+SHIFT+<key>
         //  all clash with global KDE shortcuts)
-        shortcut.append (QKeySequence (Qt::ALT + Qt::SHIFT + key));
+        shortcut.append (QKeySequence (static_cast<int>(Qt::ALT) + static_cast<int>(Qt::SHIFT) + key));
     }
 
     return shortcut;
diff --git a/tools/polygonal/kpToolPolygonalBase.cpp b/tools/polygonal/kpToolPolygonalBase.cpp
--- a/tools/polygonal/kpToolPolygonalBase.cpp
+++ b/tools/polygonal/kpToolPolygonalBase.cpp
@@ -270,7 +270,7 @@
         // diagonal (dist from start maintained)
         else
         {
-            const double dist = sqrt ((double)(diffx * diffx + diffy * diffy));
+            const double dist = sqrt (static_cast<double> (diffx * diffx + diffy * diffy));
 
             #define sgn(a) ((a)<0?-1:1)
             // Round distances _before_ adding to any coordinate
diff --git a/tools/selection/image/kpToolFreeFormSelection.cpp b/tools/selection/image/kpToolFreeFormSelection.cpp
--- a/tools/selection/image/kpToolFreeFormSelection.cpp
+++ b/tools/selection/image/kpToolFreeFormSelection.cpp
@@ -82,14 +82,14 @@
     }
 
     Q_ASSERT (accidentalDragAdjustedPoint == currentPoint ());
-    Q_ASSERT (dragAccepted == (bool) document ()->selection ());
+    Q_ASSERT (dragAccepted == static_cast<bool> (document ()->selection ()));
 
     const kpFreeFormImageSelection *oldPointsSel = nullptr;
     if (document ()->selection ())
     {
         kpAbstractSelection *sel = document ()->selection ();
         Q_ASSERT (dynamic_cast <kpFreeFormImageSelection *> (sel));
-        oldPointsSel = static_cast <kpFreeFormImageSelection *> (sel);
+        oldPointsSel = dynamic_cast <kpFreeFormImageSelection *> (sel);
     }
 
 
diff --git a/tools/selection/text/kpToolText_CursorCalc.cpp b/tools/selection/text/kpToolText_CursorCalc.cpp
--- a/tools/selection/text/kpToolText_CursorCalc.cpp
+++ b/tools/selection/text/kpToolText_CursorCalc.cpp
@@ -51,8 +51,8 @@
 bool kpToolText::CursorIsOnWordChar (const QList <QString> &textLines,
     int cursorRow, int cursorCol)
 {
-    return (cursorRow >= 0 && cursorRow < (int) textLines.size () &&
-            cursorCol >= 0 && cursorCol < (int) textLines [cursorRow].length () &&
+    return (cursorRow >= 0 && cursorRow < textLines.size () &&
+            cursorCol >= 0 && cursorCol < textLines [cursorRow].length () &&
             !textLines [cursorRow][cursorCol].isSpace ());
 }
 
@@ -71,8 +71,8 @@
     if (textLines.isEmpty ())
         return (cursorRow == 0 && cursorCol == 0);
         
-    return (cursorRow == (int) textLines.size () - 1 &&
-            cursorCol == (int) textLines [cursorRow].length ());
+    return (cursorRow == textLines.size () - 1 &&
+            cursorCol == textLines [cursorRow].length ());
 }
 
 
@@ -107,10 +107,10 @@
         
     (*cursorCol)++;
 
-    if (*cursorCol > (int) textLines [*cursorRow].length ())
+    if (*cursorCol > textLines [*cursorRow].length ())
     {
         (*cursorRow)++;
-        if (*cursorRow > (int) textLines.size () - 1)
+        if (*cursorRow > textLines.size () - 1)
         {
             *cursorRow = textLines.size () - 1;
             *cursorCol = textLines [*cursorRow].length ();
diff --git a/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp b/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
--- a/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents_HandleArrowKeys.cpp
@@ -63,7 +63,7 @@
     if (!textLines.isEmpty () && cursorRow > 0)
     {
         cursorRow--;
-        cursorCol = qMin (cursorCol, (int) textLines [cursorRow].length ());
+        cursorCol = qMin (cursorCol, textLines [cursorRow].length ());
         viewManager ()->setTextCursorPosition (cursorRow, cursorCol);
     }
 
@@ -81,10 +81,10 @@
     if (hasBegunShape ())
         endShape (currentPoint (), normalizedRect ());
 
-    if (!textLines.isEmpty () && cursorRow < (int) textLines.size () - 1)
+    if (!textLines.isEmpty () && cursorRow < textLines.size () - 1)
     {
         cursorRow++;
-        cursorCol = qMin (cursorCol, (int) textLines [cursorRow].length ());
+        cursorCol = qMin (cursorCol, textLines [cursorRow].length ());
         viewManager ()->setTextCursorPosition (cursorRow, cursorCol);
     }
 
diff --git a/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp b/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
--- a/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
+++ b/tools/selection/text/kpToolText_KeyboardEvents_HandleTypingKeys.cpp
@@ -166,7 +166,7 @@
     qCDebug(kpLogTools) << "\ttext=" << e->text();
 #endif
     QString usableText;
-    for (int i = 0; i < (int) e->text ().length (); i++)
+    for (int i = 0; i < e->text ().length (); i++)
     {
         if (e->text ().at (i).isPrint ())
             usableText += e->text ().at (i);
diff --git a/views/kpUnzoomedThumbnailView.cpp b/views/kpUnzoomedThumbnailView.cpp
--- a/views/kpUnzoomedThumbnailView.cpp
+++ b/views/kpUnzoomedThumbnailView.cpp
@@ -117,7 +117,7 @@
     int x;
     if (document ()->width () > width ())
     {
-        x = (int) buddyView ()->transformViewToDocX (scrollViewContentsX);
+        x = static_cast<int> (buddyView ()->transformViewToDocX (scrollViewContentsX));
         const int rightMostAllowedX = qMax (0, document ()->width () - width ());
     #if DEBUG_KP_UNZOOMED_THUMBNAIL_VIEW
         qCDebug(kpLogViews) << "\tdocX=" << x
@@ -140,7 +140,7 @@
     int y;
     if (document ()->height () > height ())
     {
-        y = (int) buddyView ()->transformViewToDocY (scrollViewContentsY);
+        y = static_cast<int> (buddyView ()->transformViewToDocY (scrollViewContentsY));
         const int bottomMostAllowedY = qMax (0, document ()->height () - height ());
     #if DEBUG_KP_UNZOOMED_THUMBNAIL_VIEW
         qCDebug(kpLogViews) << "\tdocY=" << y
diff --git a/views/kpView.cpp b/views/kpView.cpp
--- a/views/kpView.cpp
+++ b/views/kpView.cpp
@@ -426,8 +426,8 @@
 // public
 QPoint kpView::transformViewToDoc (const QPoint &viewPoint) const
 {
-    return QPoint ((int) transformViewToDocX (viewPoint.x ()),
-                   (int) transformViewToDocY (viewPoint.y ()));
+    return QPoint (static_cast<int> (transformViewToDocX (viewPoint.x ())),
+                   static_cast<int> (transformViewToDocY (viewPoint.y ())));
 }
 
 //---------------------------------------------------------------------
@@ -472,8 +472,8 @@
 // public
 QPoint kpView::transformDocToView (const QPoint &docPoint) const
 {
-    return QPoint ((int) transformDocToViewX (docPoint.x ()),
-                   (int) transformDocToViewY (docPoint.y ()));
+    return QPoint (static_cast<int> (transformDocToViewX (docPoint.x ())),
+                   static_cast<int> (transformDocToViewY (docPoint.y ())));
 }
 
 // public
@@ -513,7 +513,7 @@
     const double otherViewX = otherView->transformDocToViewX (docX);
     const double otherViewY = otherView->transformDocToViewY (docY);
 
-    return QPoint ((int) otherViewX, (int) otherViewY);
+    return QPoint (static_cast<int> (otherViewX), static_cast<int> (otherViewY));
 }
 
 
diff --git a/views/kpZoomedView.cpp b/views/kpZoomedView.cpp
--- a/views/kpZoomedView.cpp
+++ b/views/kpZoomedView.cpp
@@ -94,8 +94,8 @@
     if (document ())
     {
         // TODO: use zoomedDocWidth() & zoomedDocHeight()?
-        resize ((int) transformDocToViewX (document ()->width ()),
-                (int) transformDocToViewY (document ()->height ()));
+        resize (static_cast<int> (transformDocToViewX (document ()->width ())),
+                static_cast<int> (transformDocToViewY (document ()->height ())));
     }
 }
 
diff --git a/views/manager/kpViewManager_TextCursor.cpp b/views/manager/kpViewManager_TextCursor.cpp
--- a/views/manager/kpViewManager_TextCursor.cpp
+++ b/views/manager/kpViewManager_TextCursor.cpp
@@ -69,7 +69,7 @@
 // public
 bool kpViewManager::textCursorEnabled () const
 {
-    return (bool) d->textCursorBlinkTimer;
+    return static_cast<bool> (d->textCursorBlinkTimer);
 }
 
 // public
diff --git a/widgets/colorSimilarity/kpColorSimilarityHolder.cpp b/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
--- a/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
+++ b/widgets/colorSimilarity/kpColorSimilarityHolder.cpp
@@ -47,7 +47,7 @@
 
 // public static
 const double kpColorSimilarityHolder::ColorCubeDiagonalDistance =
-    sqrt ((double)255 * 255 * 3);
+    sqrt (255.0 * 255 * 3);
 
 // public static
 const double kpColorSimilarityHolder::MaxColorSimilarity = .30;
diff --git a/widgets/kpDefaultColorCollection.cpp b/widgets/kpDefaultColorCollection.cpp
--- a/widgets/kpDefaultColorCollection.cpp
+++ b/widgets/kpDefaultColorCollection.cpp
@@ -60,7 +60,7 @@
         kpColor::Tan
     };
 
-    for (int i = 0; i < (int) (sizeof (colors) / sizeof (colors [0])); i++)
+    for (int i = 0; i < static_cast<int> (sizeof (colors) / sizeof (colors [0])); i++)
     {
         addColor (colors [i].toQColor ());
     }
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
@@ -150,7 +150,7 @@
         retOffsets.append (0);
 
     int totalSize = 0;
-    for (int i = 0; i < (int) sizes.count (); i++)
+    for (int i = 0; i <  sizes.count (); i++)
         totalSize += sizes [i];
 
     int margin = 1;
@@ -160,7 +160,7 @@
     if (totalSize + margin * 2 > max)
     {
         retOffsets [0] = 0;
-        for (int i = 1; i < (int) sizes.count (); i++)
+        for (int i = 1; i < sizes.count (); i++)
             retOffsets [i] = retOffsets [i - 1] + sizes [i - 1];
 
         return retOffsets;
@@ -181,7 +181,7 @@
     }
 
     retOffsets [0] = margin;
-    for (int i = 1; i < (int) sizes.count (); i++)
+    for (int i = 1; i < sizes.count (); i++)
     {
         retOffsets [i] += retOffsets [i - 1] +
                           sizes [i - 1] +
@@ -287,9 +287,9 @@
     for (int r = 0; r < m_pixmaps.count (); r++)
         maxHeightOfRow.append (0);
 
-    for (int r = 0; r < (int) m_pixmaps.count (); r++)
+    for (int r = 0; r <  m_pixmaps.count (); r++)
     {
-        for (int c = 0; c < (int) m_pixmaps [r].count (); c++)
+        for (int c = 0; c <  m_pixmaps [r].count (); c++)
         {
             if (c == 0 || m_pixmaps [r][c].height () > maxHeightOfRow [r])
                 maxHeightOfRow [r] = m_pixmaps [r][c].height ();
@@ -306,35 +306,35 @@
         qCDebug(kpLogWidgets) << "\t\t" << r << ": " << rowYOffset [r];
 #endif
 
-    for (int r = 0; r < (int) m_pixmaps.count (); r++)
+    for (int r = 0; r < m_pixmaps.count (); r++)
     {
     #if DEBUG_KP_TOOL_WIDGET_BASE
         qCDebug(kpLogWidgets) << "\tlaying out row " << r << ":";
     #endif
 
         QList <int> widths;
-        for (int c = 0; c < (int) m_pixmaps [r].count (); c++)
+        for (int c = 0; c < m_pixmaps [r].count (); c++)
             widths.append (m_pixmaps [r][c].width ());
     #if DEBUG_KP_TOOL_WIDGET_BASE
         qCDebug(kpLogWidgets) << "\t\twidths of cols:";
-        for (int c = 0; c < (int) m_pixmaps [r].count (); c++)
+        for (int c = 0; c <  m_pixmaps [r].count (); c++)
             qCDebug(kpLogWidgets) << "\t\t\t" << c << ": " << widths [c];
     #endif
 
         QList <int> colXOffset = spreadOutElements (widths, width ());
     #if DEBUG_KP_TOOL_WIDGET_BASE
         qCDebug(kpLogWidgets) << "\t\tspread out offsets of cols:";
-        for (int c = 0; c < (int) colXOffset.count (); c++)
+        for (int c = 0; c < colXOffset.count (); c++)
             qCDebug(kpLogWidgets) << "\t\t\t" << c << ": " << colXOffset [c];
     #endif
 
-        for (int c = 0; c < (int) colXOffset.count (); c++)
+        for (int c = 0; c < colXOffset.count (); c++)
         {
             int x = colXOffset [c];
             int y = rowYOffset [r];
             int w, h;
 
-            if (c == (int) colXOffset.count () - 1)
+            if (c == colXOffset.count () - 1)
             {
                 if (x + m_pixmaps [r][c].width () >= width ())
                     w = m_pixmaps [r][c].width ();
@@ -344,7 +344,7 @@
             else
                 w = colXOffset [c + 1] - x;
 
-            if (r == (int) m_pixmaps.count () - 1)
+            if (r == m_pixmaps.count () - 1)
             {
                 if (y + m_pixmaps [r][c].height () >= height ())
                     h = m_pixmaps [r][c].height ();
@@ -384,7 +384,7 @@
 int kpToolWidgetBase::selected () const
 {
     if (m_selectedRow < 0 ||
-        m_selectedRow >= (int) m_pixmaps.count () ||
+        m_selectedRow >= m_pixmaps.count () ||
         m_selectedCol < 0)
     {
         return -1;
@@ -394,7 +394,7 @@
     for (int y = 0; y < m_selectedRow; y++)
         upto += m_pixmaps [y].count ();
 
-    if (m_selectedCol >= (int) m_pixmaps [m_selectedRow].count ())
+    if (m_selectedCol >= m_pixmaps [m_selectedRow].count ())
         return -1;
 
     upto += m_selectedCol;
@@ -472,14 +472,14 @@
         newCol = m_selectedCol;
 
     newCol++;
-    if (newCol >= (int) m_pixmaps [newRow].count ())
+    if (newCol >= m_pixmaps [newRow].count ())
     {
         newRow++;
-        if (newRow >= (int) m_pixmaps.count ())
+        if (newRow >= m_pixmaps.count ())
             return false;
 
         newCol = 0;
-        if (newCol >= (int) m_pixmaps [newRow].count ())
+        if (newCol >= m_pixmaps [newRow].count ())
             return false;
     }
 
@@ -507,7 +507,7 @@
 #endif
 
     if (row < 0 || col < 0 ||
-        row >= (int) m_pixmapRects.count () || col >= (int) m_pixmapRects [row].count ())
+        row >= m_pixmapRects.count () || col >= m_pixmapRects [row].count ())
     {
     #if DEBUG_KP_TOOL_WIDGET_BASE
         qCDebug(kpLogWidgets) << "\tout of range";
@@ -597,15 +597,15 @@
     //       its base which calls ignore() :)
     if (e->type () == QEvent::ToolTip)
     {
-        QHelpEvent *he = (QHelpEvent *) e;
+        QHelpEvent *he = dynamic_cast<QHelpEvent *> (e);
     #if DEBUG_KP_TOOL_WIDGET_BASE
         qCDebug(kpLogWidgets) << "kpToolWidgetBase::event() QHelpEvent pos=" << he->pos ();
     #endif
 
         bool showedText = false;
-        for (int r = 0; r < (int) m_pixmapRects.count (); r++)
+        for (int r = 0; r < m_pixmapRects.count (); r++)
         {
-            for (int c = 0; c < (int) m_pixmapRects [r].count (); c++)
+            for (int c = 0; c < m_pixmapRects [r].count (); c++)
             {
                 if (m_pixmapRects [r][c].contains (he->pos ()))
                 {
@@ -653,9 +653,9 @@
         return;
 
 
-    for (int i = 0; i < (int) m_pixmapRects.count (); i++)
+    for (int i = 0; i < m_pixmapRects.count (); i++)
     {
-        for (int j = 0; j < (int) m_pixmapRects [i].count (); j++)
+        for (int j = 0; j < m_pixmapRects [i].count (); j++)
         {
             if (m_pixmapRects [i][j].contains (e->pos ()))
             {
@@ -681,13 +681,13 @@
 
     QPainter painter (this);
 
-    for (int i = 0; i < (int) m_pixmaps.count (); i++)
+    for (int i = 0; i < m_pixmaps.count (); i++)
     {
         #if DEBUG_KP_TOOL_WIDGET_BASE && 1
             qCDebug(kpLogWidgets) << "\tRow: " << i;
         #endif
 
-        for (int j = 0; j < (int) m_pixmaps [i].count (); j++)
+        for (int j = 0; j < m_pixmaps [i].count (); j++)
         {
             QRect rect = m_pixmapRects [i][j];
             QPixmap pixmap = m_pixmaps [i][j];
diff --git a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
--- a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
+++ b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp
@@ -47,14 +47,14 @@
 kpToolWidgetFillStyle::kpToolWidgetFillStyle (QWidget *parent, const QString &name)
     : kpToolWidgetBase (parent, name)
 {
-    for (int i = 0; i < (int) FillStyleNum; i++)
+    for (int i = 0; i < FillStyleNum; i++)
     {
         QPixmap pixmap;
 
-        pixmap = fillStylePixmap ((FillStyle) i,
+        pixmap = fillStylePixmap (static_cast<FillStyle> (i),
                                   (width () - 2/*margin*/) * 3 / 4,
                                   (height () - 2/*margin*/ - 2/*spacing*/) * 3 / (3 * 4));
-        addOption (pixmap, fillStyleName ((FillStyle) i)/*tooltip*/);
+        addOption (pixmap, fillStyleName (static_cast<FillStyle> (i))/*tooltip*/);
 
         startNewOptionRow ();
     }
@@ -144,7 +144,7 @@
                << selectedRow ()
                << endl;
 #endif
-    return (FillStyle) selectedRow ();
+    return static_cast<FillStyle> (selectedRow ());
 }
 
 //---------------------------------------------------------------------