diff --git a/kdecoration/breezesizegrip.cpp b/kdecoration/breezesizegrip.cpp
--- a/kdecoration/breezesizegrip.cpp
+++ b/kdecoration/breezesizegrip.cpp
@@ -185,8 +185,7 @@
 
         }
 
-        return;
-
+        
     }
 
     //_______________________________________________________________________________
diff --git a/kdecoration/config/breezedetectwidget.cpp b/kdecoration/config/breezedetectwidget.cpp
--- a/kdecoration/config/breezedetectwidget.cpp
+++ b/kdecoration/config/breezedetectwidget.cpp
@@ -99,8 +99,6 @@
         m_ui.windowTitle->setText( m_info->name() );
         emit detectionDone( exec() == QDialog::Accepted );
 
-        return;
-
     }
 
     //_________________________________________________________
diff --git a/kdecoration/config/breezeexceptionlistwidget.cpp b/kdecoration/config/breezeexceptionlistwidget.cpp
--- a/kdecoration/config/breezeexceptionlistwidget.cpp
+++ b/kdecoration/config/breezeexceptionlistwidget.cpp
@@ -142,7 +142,6 @@
         }
 
         resizeColumns();
-        return;
 
     }
 
@@ -181,8 +180,6 @@
 
         setChanged( true );
 
-        return;
-
     }
 
     //_______________________________________________________
@@ -204,8 +201,6 @@
 
         setChanged( true );
 
-        return;
-
     }
 
     //_______________________________________________________
@@ -219,7 +214,6 @@
         InternalSettingsPtr exception( model().get( index ) );
         exception->setEnabled( !exception->enabled() );
         setChanged( true );
-        return;
 
     }
 
@@ -265,8 +259,6 @@
 
         setChanged( true );
 
-        return;
-
     }
 
     //_______________________________________________________
@@ -317,8 +309,6 @@
 
         setChanged( true );
 
-        return;
-
     }
 
     //_______________________________________________________
diff --git a/kdecoration/config/breezelistmodel.h b/kdecoration/config/breezelistmodel.h
--- a/kdecoration/config/breezelistmodel.h
+++ b/kdecoration/config/breezelistmodel.h
@@ -207,7 +207,6 @@
             emit layoutAboutToBeChanged();
             _remove( value );
             emit layoutChanged();
-            return;
 
         }
 
@@ -223,7 +222,6 @@
             for( typename List::const_iterator iter = values.begin(); iter != values.end(); iter++ )
             { _remove( *iter ); }
             emit layoutChanged();
-            return;
 
         }
 
@@ -281,9 +279,7 @@
             _selection.clear();
             privateSort();
             emit layoutChanged();
-
-            return;
-        }
+       }
 
         //! return all values
         const List& get( void ) const
diff --git a/kstyle/animations/breezeanimations.cpp b/kstyle/animations/breezeanimations.cpp
--- a/kstyle/animations/breezeanimations.cpp
+++ b/kstyle/animations/breezeanimations.cpp
@@ -191,8 +191,7 @@
         if( QStackedWidget* stack = qobject_cast<QStackedWidget*>( widget ) )
         { _stackedWidgetEngine->registerWidget( stack ); }
 
-        return;
-
+        
     }
 
     //____________________________________________________________
diff --git a/kstyle/animations/breezebusyindicatorengine.cpp b/kstyle/animations/breezebusyindicatorengine.cpp
--- a/kstyle/animations/breezebusyindicatorengine.cpp
+++ b/kstyle/animations/breezebusyindicatorengine.cpp
@@ -110,8 +110,7 @@
 
         }
 
-        return;
-
+        
     }
 
 
diff --git a/kstyle/animations/breezetransitionwidget.cpp b/kstyle/animations/breezetransitionwidget.cpp
--- a/kstyle/animations/breezetransitionwidget.cpp
+++ b/kstyle/animations/breezetransitionwidget.cpp
@@ -303,7 +303,6 @@
         }
 
         p.end();
-        return;
-    }
+   }
 
 }
diff --git a/kstyle/breezeframeshadow.cpp b/kstyle/breezeframeshadow.cpp
--- a/kstyle/breezeframeshadow.cpp
+++ b/kstyle/breezeframeshadow.cpp
@@ -341,8 +341,6 @@
         painter.setCompositionMode( QPainter::CompositionMode_SourceOver );
         _helper.renderFrame( &painter, rect, QColor(), outline );
 
-        return;
-
     }
 
     //____________________________________________________________________________________
diff --git a/kstyle/breezehelper.cpp b/kstyle/breezehelper.cpp
--- a/kstyle/breezehelper.cpp
+++ b/kstyle/breezehelper.cpp
@@ -475,8 +475,7 @@
         }
 
         painter->restore();
-        return;
-    }
+   }
 
     //______________________________________________________________________________
     void Helper::renderFocusLine( QPainter* painter, const QRect& rect, const QColor& color ) const
@@ -762,8 +761,6 @@
         painter->translate( baseRect.topLeft() );
         painter->drawPath( path );
 
-        return;
-
     }
 
     //______________________________________________________________________________
@@ -835,8 +832,7 @@
 
         }
 
-        return;
-
+        
     }
 
     //______________________________________________________________________________
@@ -1054,8 +1050,7 @@
             painter->drawRoundedRect( baseRect, radius, radius );
         }
 
-        return;
-
+        
     }
 
     //______________________________________________________________________________
@@ -1080,8 +1075,7 @@
             painter->drawEllipse( grooveRect );
         }
 
-        return;
-
+        
     }
 
     //______________________________________________________________________________
@@ -1120,8 +1114,7 @@
 
         }
 
-        return;
-
+        
     }
 
     //______________________________________________________________________________
@@ -1188,8 +1181,7 @@
             painter->drawRoundedRect( baseRect, radius, radius );
         }
 
-        return;
-
+        
     }
 
 
@@ -1246,8 +1238,6 @@
         painter->setBrush( pixmap );
         painter->drawRoundedRect( baseRect, radius, radius );
 
-        return;
-
     }
 
     //______________________________________________________________________________
@@ -1270,8 +1260,7 @@
             painter->drawRoundedRect( baseRect, radius, radius );
         }
 
-        return;
-
+        
     }
 
     //______________________________________________________________________________
@@ -1327,9 +1316,7 @@
         painter->setPen( QPen( color, 1.1 ) );
         painter->drawPolyline( arrow );
         painter->restore();
-
-        return;
-    }
+   }
 
     //______________________________________________________________________________
     void Helper::renderDecorationButton( QPainter* painter, const QRect& rect, const QColor& color, ButtonType buttonType, bool inverted ) const
@@ -1413,7 +1400,6 @@
         }
 
         painter->restore();
-        return;
 
     }
 
diff --git a/kstyle/breezemdiwindowshadow.cpp b/kstyle/breezemdiwindowshadow.cpp
--- a/kstyle/breezemdiwindowshadow.cpp
+++ b/kstyle/breezemdiwindowshadow.cpp
@@ -229,7 +229,6 @@
         // create new shadow
         auto windowShadow( new MdiWindowShadow( widget->parentWidget(), _shadowTiles ) );
         windowShadow->setWidget( widget );
-        return;
 
     }
 
diff --git a/kstyle/breezemnemonics.cpp b/kstyle/breezemnemonics.cpp
--- a/kstyle/breezemnemonics.cpp
+++ b/kstyle/breezemnemonics.cpp
@@ -50,8 +50,7 @@
 
         }
 
-        return;
-
+        
     }
 
     //____________________________________________________
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -6678,8 +6678,6 @@
         // render
         _helper->renderArrow( painter, arrowRect, color, orientation );
 
-        return;
-
     }
 
     //______________________________________________________________________________
diff --git a/kstyle/breezewindowmanager.cpp b/kstyle/breezewindowmanager.cpp
--- a/kstyle/breezewindowmanager.cpp
+++ b/kstyle/breezewindowmanager.cpp
@@ -871,8 +871,6 @@
 
         _dragInProgress = true;
 
-        return;
-
     }
 
     //_______________________________________________________