diff --git a/Gui/AnimatedCheckBox.cpp b/Gui/AnimatedCheckBox.cpp
index 778e881a60..0b024c63d1 100644
--- a/Gui/AnimatedCheckBox.cpp
+++ b/Gui/AnimatedCheckBox.cpp
@@ -51,28 +51,28 @@ void
 AnimatedCheckBox::setAnimation(int i)
 {
     animation = i;
-    repaint();
+    update();
 }
 
 void
 AnimatedCheckBox::setReadOnly(bool readOnly)
 {
     this->readOnly = readOnly;
-    repaint();
+    update();
 }
 
 void
 AnimatedCheckBox::setDirty(bool b)
 {
     dirty = b;
-    repaint();
+    update();
 }
 
 void
 AnimatedCheckBox::setChecked(bool c) {
     checked = c;
     Q_EMIT toggled(checked);
-    repaint();
+    update();
 }
 
 void
@@ -82,7 +82,7 @@ AnimatedCheckBox::keyPressEvent(QKeyEvent* e)
         checked = !checked;
         Q_EMIT toggled(checked);
         Q_EMIT clicked(checked);
-        repaint();
+        update();
     } else {
         QFrame::keyPressEvent(e);
     }
@@ -96,7 +96,7 @@ AnimatedCheckBox::mousePressEvent(QMouseEvent* e)
             return;
         }
         checked = !checked;
-        repaint();
+        update();
         Q_EMIT clicked(checked);
         Q_EMIT toggled(checked);
         
diff --git a/Gui/ComboBox.cpp b/Gui/ComboBox.cpp
index 83354e2276..5545b93f31 100644
--- a/Gui/ComboBox.cpp
+++ b/Gui/ComboBox.cpp
@@ -367,7 +367,7 @@ ComboBox::mousePressEvent(QMouseEvent* e)
     if ( buttonDownIsLeft(e) && !_readOnly && _enabled ) {
         _clicked = true;
         createMenu();
-        repaint();
+        update();
         QFrame::mousePressEvent(e);
     }
 }
@@ -376,7 +376,7 @@ void
 ComboBox::mouseReleaseEvent(QMouseEvent* e)
 {
     _clicked = false;
-    repaint();
+    update();
     QFrame::mouseReleaseEvent(e);
 }
 
@@ -451,7 +451,7 @@ ComboBox::createMenu()
     }
     _clicked = false;
     setFocus();
-    repaint();
+    update();
 }
 
 int
@@ -988,7 +988,7 @@ void
 ComboBox::setReadOnly(bool readOnly)
 {
     _readOnly = readOnly;
-    repaint();
+    update();
 }
 
 bool
@@ -1001,7 +1001,7 @@ void
 ComboBox::setEnabled_natron(bool enabled)
 {
     _enabled = enabled;
-    repaint();
+    update();
 }
 
 int
@@ -1014,21 +1014,21 @@ void
 ComboBox::setAnimation(int i)
 {
     _animation = i;
-    repaint();
+    update();
 }
 
 void
 ComboBox::setDirty(bool b)
 {
     _dirty = b;
-    repaint();
+    update();
 }
 
 void
 ComboBox::setAltered(bool b)
 {
     _altered = b;
-    repaint();
+    update();
 }
 
 bool
diff --git a/Gui/InfoViewerWidget.cpp b/Gui/InfoViewerWidget.cpp
index e15b834539..553f7f4cca 100644
--- a/Gui/InfoViewerWidget.cpp
+++ b/Gui/InfoViewerWidget.cpp
@@ -315,7 +315,7 @@ InfoViewerWidget::setColor(float r,
         values.prepend("<b> ~ </b>");
     }
     rgbaValues->setText(values);
-    rgbaValues->repaint();
+    rgbaValues->update();
     float h,s,v,l;
     // Nuke's HSV display is based on sRGB, an L is Rec.709.
     // see http://forums.thefoundry.co.uk/phpBB2/viewtopic.php?t=2283
@@ -327,7 +327,7 @@ InfoViewerWidget::setColor(float r,
     QPixmap pix(15,15);
     pix.fill(col);
     color->setPixmap(pix);
-    color->repaint();
+    color->update();
 
     const QFont &hsvFont = hvl_lastOption->font();
 
@@ -350,7 +350,7 @@ InfoViewerWidget::setColor(float r,
                  .arg(hsvFont.pixelSize());
 
     hvl_lastOption->setText(hsvlValues);
-    hvl_lastOption->repaint();
+    hvl_lastOption->update();
 } // setColor
 
 void
diff --git a/Gui/KnobGuiString.cpp b/Gui/KnobGuiString.cpp
index 8f4e9ed69c..27e3043a92 100644
--- a/Gui/KnobGuiString.cpp
+++ b/Gui/KnobGuiString.cpp
@@ -99,7 +99,7 @@ AnimatingTextEdit::setAnimation(int v)
     animation = v;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
@@ -109,7 +109,7 @@ AnimatingTextEdit::setReadOnlyNatron(bool ro)
     readOnlyNatron = ro;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
@@ -118,7 +118,7 @@ AnimatingTextEdit::setDirty(bool b)
     dirty = b;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
diff --git a/Gui/Label.cpp b/Gui/Label.cpp
index a04cb8fdb4..870a661f94 100644
--- a/Gui/Label.cpp
+++ b/Gui/Label.cpp
@@ -59,7 +59,7 @@ Label::refreshStyle()
 {
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
diff --git a/Gui/LineEdit.cpp b/Gui/LineEdit.cpp
index 456dd44f49..fd8e0ee914 100644
--- a/Gui/LineEdit.cpp
+++ b/Gui/LineEdit.cpp
@@ -119,7 +119,7 @@ LineEdit::setAnimation(int v)
     animation = v;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
@@ -128,7 +128,7 @@ LineEdit::setDirty(bool b)
     dirty = b;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
@@ -137,7 +137,7 @@ LineEdit::setAltered(bool b)
     altered = b;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
diff --git a/Gui/ScaleSliderQWidget.cpp b/Gui/ScaleSliderQWidget.cpp
index 73eb629496..fc4e4e1a9f 100644
--- a/Gui/ScaleSliderQWidget.cpp
+++ b/Gui/ScaleSliderQWidget.cpp
@@ -241,7 +241,7 @@ void
 ScaleSliderQWidget::setAltered(bool b)
 {
     _imp->altered = b;
-    repaint();
+    update();
 }
 
 bool
@@ -504,6 +504,6 @@ ScaleSliderQWidget::setUseLineColor(bool use, const QColor& color)
 {
     _imp->useLineColor = use;
     _imp->lineColor = color;
-    repaint();
+    update();
 }
 
diff --git a/Gui/ScriptTextEdit.cpp b/Gui/ScriptTextEdit.cpp
index 023f03834a..816a35be4c 100644
--- a/Gui/ScriptTextEdit.cpp
+++ b/Gui/ScriptTextEdit.cpp
@@ -55,7 +55,7 @@ ScriptTextEdit::setOutput(bool o)
     isOutput = o;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 bool
diff --git a/Gui/SpinBox.cpp b/Gui/SpinBox.cpp
index 077016801e..366997ff0a 100644
--- a/Gui/SpinBox.cpp
+++ b/Gui/SpinBox.cpp
@@ -789,7 +789,7 @@ SpinBox::setAnimation(int i)
     animation = i;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 void
@@ -798,7 +798,7 @@ SpinBox::setDirty(bool d)
     dirty = d;
     style()->unpolish(this);
     style()->polish(this);
-    repaint();
+    update();
 }
 
 QMenu*
@@ -827,5 +827,5 @@ SpinBox::setUseLineColor(bool use, const QColor& color)
 {
     _imp->useLineColor = use;
     _imp->lineColor = color;
-    repaint();
+    update();
 }
diff --git a/Gui/SplashScreen.cpp b/Gui/SplashScreen.cpp
index bed116c7bc..b89ec00314 100644
--- a/Gui/SplashScreen.cpp
+++ b/Gui/SplashScreen.cpp
@@ -75,7 +75,7 @@ void
 SplashScreen::updateText(const QString & text)
 {
     _text = text;
-    repaint();
+    update();
     QCoreApplication::processEvents();
 }
 
@@ -120,7 +120,7 @@ void
 LoadProjectSplashScreen::updateText(const QString & text)
 {
     _text = text;
-    repaint();
+    update();
     QCoreApplication::processEvents();
 }
 
diff --git a/Gui/TabWidget.cpp b/Gui/TabWidget.cpp
index 9926be5a83..080fc7c52e 100644
--- a/Gui/TabWidget.cpp
+++ b/Gui/TabWidget.cpp
@@ -113,7 +113,7 @@ class TransparantDropRect: public QWidget
     {
         _type = type;
         if (type != TabWidget::eDropRectNone) {
-            repaint();
+            update();
         }
     }
     
@@ -1266,7 +1266,7 @@ TabWidget::dropEvent(QDropEvent* e)
     }
     _imp->drawDropRect = false;
     setFrameShape(QFrame::NoFrame);
-    repaint();
+    update();
 }
 
 TabBar::TabBar(TabWidget* tabWidget,
diff --git a/Gui/TimeLineGui.cpp b/Gui/TimeLineGui.cpp
index 7d4e05ac3e..5b1c42a615 100644
--- a/Gui/TimeLineGui.cpp
+++ b/Gui/TimeLineGui.cpp
@@ -973,7 +973,7 @@ TimeLineGui::toWidgetCoordinates(double x,
 void
 TimeLineGui::onKeyframesIndicatorsChanged()
 {
-    repaint();
+    update();
 }
 
 void