remove redundant QSystemTrayIconSys::updateIcon()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/util/qsystemtrayicon_p.h b/src/gui/util/qsystemtrayicon_p.h
index 5b8053d..faafe33 100644 (file)
--- a/src/gui/util/qsystemtrayicon_p.h
+++ b/src/gui/util/qsystemtrayicon_p.h
@@ -131,7 +131,6 @@ public:
     };
 
     void addToTray();
-    void updateIcon();
     XVisualInfo* getSysTrayVisualInfo();
 
     // QObject::event is public but QWidget's ::event() re-implementation

diff --git a/src/gui/util/qsystemtrayicon_x11.cpp b/src/gui/util/qsystemtrayicon_x11.cpp
index 0980ad1..30c959f 100644 (file)
--- a/src/gui/util/qsystemtrayicon_x11.cpp
+++ b/src/gui/util/qsystemtrayicon_x11.cpp
@@ -244,15 +244,10 @@ void QSystemTrayIconSys::addToTray()
     setMinimumSize(22, 22); // required at least on GNOME
 }
 
-void QSystemTrayIconSys::updateIcon()
-{
-    update();
-}
-
 void QSystemTrayIconSys::resizeEvent(QResizeEvent *re)
 {
      QWidget::resizeEvent(re);
-     updateIcon();
+     QWidget::update();
 }
 
 void QSystemTrayIconSys::paintEvent(QPaintEvent*)
@@ -351,7 +346,7 @@ void QSystemTrayIconPrivate::updateIcon_sys()
 {
     if (!sys)
         return;
-    sys->updateIcon();
+    sys->update();
 }
 
 void QSystemTrayIconPrivate::updateMenu_sys()