summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-10-05 14:09:17 (GMT)
committeraxis <qt-info@nokia.com>2009-10-05 14:31:58 (GMT)
commitc6e0bf67795768954bc2ac129f20dbb7243b2975 (patch)
tree014e7010cb24313eb74170cbd0c48585d5904023
parenteda93b795b044542a4247a086e4c2eed454123e4 (diff)
downloadQt-c6e0bf67795768954bc2ac129f20dbb7243b2975.zip
Qt-c6e0bf67795768954bc2ac129f20dbb7243b2975.tar.gz
Qt-c6e0bf67795768954bc2ac129f20dbb7243b2975.tar.bz2
Moved non-public functions out of public header file.
RevBy: Trust me
-rw-r--r--src/gui/widgets/qmenu.h8
-rw-r--r--src/gui/widgets/qmenu_p.h5
2 files changed, 5 insertions, 8 deletions
diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h
index 3d41727..0346a55 100644
--- a/src/gui/widgets/qmenu.h
+++ b/src/gui/widgets/qmenu.h
@@ -52,19 +52,11 @@
#endif
QT_BEGIN_HEADER
-#ifdef Q_WS_S60
- class CEikMenuPane;
-#endif
QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
-#ifdef Q_WS_S60
-void qt_symbian_show_toplevel(CEikMenuPane* menuPane);
-void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id);
-#endif // Q_WS_S60
-
#ifndef QT_NO_MENU
class QMenuPrivate;
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index 2d5632e..ea1ab47 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -68,6 +68,11 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_MENU
+#ifdef Q_WS_S60
+void qt_symbian_show_toplevel(CEikMenuPane* menuPane);
+void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id);
+#endif // Q_WS_S60
+
class QTornOffMenu;
class QEventLoop;