From a85d343a39577cdf953d0759e356c59a77ae743f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 27 Sep 2011 14:48:51 +0200
Subject: Widgets: Remove QT3_SUPPPORT.

Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/widgets/widgets/qmenubar.cpp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/widgets/widgets/qmenubar.cpp')

diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 385df52adf..2f424b0893 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -59,10 +59,6 @@
 
 #ifndef QT_NO_MENUBAR
 
-#ifdef QT3_SUPPORT
-#include <private/qaction_p.h>
-#include <qmenudata.h>
-#endif
 
 #include "qmenu_p.h"
 #include "qmenubar_p.h"
@@ -259,12 +255,6 @@ void QMenuBarPrivate::updateGeometries()
         extension->hide();
     }
     q->updateGeometry();
-#ifdef QT3_SUPPORT
-    if (parent) {
-        QMenubarUpdatedEvent menubarUpdated(q);
-        QApplication::sendEvent(parent, &menubarUpdated);
-    }
-#endif
 }
 
 QRect QMenuBarPrivate::actionRect(QAction *act) const
@@ -529,9 +519,6 @@ void QMenuBarPrivate::_q_actionTriggered()
     Q_Q(QMenuBar);
     if (QAction *action = qobject_cast<QAction *>(q->sender())) {
         emit q->triggered(action);
-#ifdef QT3_SUPPORT
-        emit q->activated(q->findIdForAction(action));
-#endif
     }
 }
 
-- 
cgit v1.2.3