Since now, S60 commands are handled by QApplication::s60HandleCommandL

inside QtGui, we do not need to export those QMenu[Bar]::symbianCommands
through our public API, anymore.
This commit moved the code of QMenuBar::symbianCommands to
QMenuBarPrivate::symbianCommands and made that one static.

QMenu[Private]::symbianCommands was apparently unused -> deleted.

RevBy: Jason Barron
RevvBy: Markku Luukkainen

1 files changed, 10 insertions, 3 deletions

diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 3d865d3..7b1817f 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -28,7 +28,7 @@
 #endif
 #include "private/qwindowsurface_s60_p.h"
 #include "qpaintengine.h"
-#include "qmenubar.h"
+#include "private/qmenubar_p.h"
 
 #include "apgwgnam.h" // For CApaWindowGroupName
 #include <MdaAudioTonePlayer.h>     // For CMdaAudioToneUtility
@@ -1038,7 +1038,14 @@ bool QApplication::s60EventFilter(TWsEvent *aEvent)
     return false;
 }
 
-void QApplication::s60HandleCommandL(int command)
+/*!
+    Handles commands which are typically handled by CAknAppUi::HandleCommandL()
+    Qts Ui integration into Symbian is partially achieved by deriving from CAknAppUi.
+    Currently, exit, menu and softkey commands are handled
+
+    \sa s60EventFilter(), s60ProcessEvent()
+*/
+void QApplication::symbianHandleCommand(int command)
 {
     switch (command) {
     case EEikCmdExit:
@@ -1048,7 +1055,7 @@ void QApplication::s60HandleCommandL(int command)
         break;
     default:
         // For now assume all unknown menu items are Qt menu items
-        QMenuBar::symbianCommands(command);
+        QMenuBarPrivate::symbianCommands(command);
         break;
     }
 }