Cleaned up the API of the Symbian event hooks.

The two major points were:
- Replacing "s60" with "symbian" in all event handling functions,
  since there is nothing S60-specific about them.
- Replace the Symbian event types with the encapsulating
  QSymbianEvent container. This allows us to cope with more types of
  events in the future without having to add new virtual functions.

AutoTest: QWidget passed
Task:     QT-1156
RevBy:    Jason Barron
RevBy:    Shane Kearns
RevBy:    Sami Merila

2 files changed, 8 insertions, 2 deletions

diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index d757f98..94c4177 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -243,11 +243,14 @@ void qt_symbian_show_submenu( CEikMenuPane* menuPane, int id)
 }
 #endif // Q_WS_S60
 
-void QMenuBarPrivate::symbianCommands(int command)
+int QMenuBarPrivate::symbianCommands(int command)
 {
+    int ret = 0;
+
     if (command == contexMenuCommand && !widgetWithContextMenu.isNull()) {
         QContextMenuEvent* event = new QContextMenuEvent(QContextMenuEvent::Keyboard, QPoint(0,0));
         QCoreApplication::postEvent(widgetWithContextMenu, event);
+        ret = 1;
     }
 
     int size = nativeMenuBars.size();
@@ -258,8 +261,11 @@ void QMenuBarPrivate::symbianCommands(int command)
 
         emit nativeMenuBars.at(i)->triggered(menu->action);
         menu->action->activate(QAction::Trigger);
+        ret = 1;
         break;
     }
+
+    return ret;
 }
 
 void QMenuBarPrivate::symbianCreateMenuBar(QWidget *parent)
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index 7815969..da2b8d7 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -266,7 +266,7 @@ public:
         void insertNativeMenuItems(const QList<QAction*> &actions);
 
     } *symbian_menubar;
-    static void symbianCommands(int command);
+    static int symbianCommands(int command);
 
 #endif
 };