1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterface

Browse Source 
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit 3d188ffae259584c4351c5fa766a49da9b189112)
This commit is contained in:
Aurélien Gâteau 2011-04-14 10:00:36 +02:00 committed by Olivier Goffart
parent 5d6d23f118
commit 0241d63994
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/widgets/qabstractmenubarimpl_p.h → src/gui/widgets/qabstractmenubarinterface_p.h
View File

@ -38,8 +38,8 @@
** $QT_END_LICENSE$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#ifndef QABSTRACTMENUBARIMPL_P_H #ifndef QABSTRACTMENUBARINTERFACE_P_H
#define QABSTRACTMENUBARIMPL_P_H #define QABSTRACTMENUBARINTERFACE_P_H
#include <qfactoryinterface.h> #include <qfactoryinterface.h>
#include <qglobal.h> #include <qglobal.h>
@ -56,11 +56,11 @@ class QMenuBar;
class QObject; class QObject;
class QWidget; class QWidget;
class QAbstractMenuBarImpl; class QAbstractMenuBarInterface;
struct QMenuBarImplFactoryInterface : public QFactoryInterface struct QMenuBarImplFactoryInterface : public QFactoryInterface
{ {
virtual QAbstractMenuBarImpl* createImpl() = 0; virtual QAbstractMenuBarInterface* createImpl() = 0;
}; };
#define QMenuBarImplFactoryInterface_iid "com.nokia.qt.QMenuBarImplFactoryInterface" #define QMenuBarImplFactoryInterface_iid "com.nokia.qt.QMenuBarImplFactoryInterface"
@ -69,11 +69,11 @@ Q_DECLARE_INTERFACE(QMenuBarImplFactoryInterface, QMenuBarImplFactoryInterface_i
/** /**
* The platform-specific implementation of a menubar * The platform-specific implementation of a menubar
*/ */
class QAbstractMenuBarImpl class QAbstractMenuBarInterface
{ {
public: public:
QAbstractMenuBarImpl() {} QAbstractMenuBarInterface() {}
virtual ~QAbstractMenuBarImpl() {} virtual ~QAbstractMenuBarInterface() {}
// QMenuBarPrivate::init() // QMenuBarPrivate::init()
virtual void init(QMenuBar *) = 0; virtual void init(QMenuBar *) = 0;
@ -113,4 +113,4 @@ QT_END_NAMESPACE
#endif // QT_NO_MENUBAR #endif // QT_NO_MENUBAR
#endif // QABSTRACTMENUBARIMPL_P_H #endif // QABSTRACTMENUBARINTERFACE_P_H

4
src/gui/widgets/qmenubar_p.h
View File

@ -61,7 +61,7 @@
#include "qguifunctions_wince.h" #include "qguifunctions_wince.h"
#endif #endif
#include "qabstractmenubarimpl_p.h" #include "qabstractmenubarinterface_p.h"
#ifndef QT_NO_MENUBAR #ifndef QT_NO_MENUBAR
#ifdef Q_WS_S60 #ifdef Q_WS_S60
@ -160,7 +160,7 @@ public:
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
bool doAutoResize; bool doAutoResize;
#endif #endif
QAbstractMenuBarImpl *impl; QAbstractMenuBarInterface *impl;
#ifdef QT_SOFTKEYS_ENABLED #ifdef QT_SOFTKEYS_ENABLED
QAction *menuBarAction; QAction *menuBarAction;
#endif #endif

2
src/gui/widgets/qmenubarimpl.cpp
View File

@ -239,7 +239,7 @@ bool QMenuBarImpl::menuBarEventFilter(QObject *, QEvent *)
struct QMenuBarImplFactory : public QMenuBarImplFactoryInterface struct QMenuBarImplFactory : public QMenuBarImplFactoryInterface
{ {
QAbstractMenuBarImpl* createImpl() { return new QMenuBarImpl; } QAbstractMenuBarInterface* createImpl() { return new QMenuBarImpl; }
virtual QStringList keys() const { return QStringList(); } virtual QStringList keys() const { return QStringList(); }
}; };

4
src/gui/widgets/qmenubarimpl_p.h
View File

@ -43,13 +43,13 @@
#ifndef QT_NO_MENUBAR #ifndef QT_NO_MENUBAR
#include "qabstractmenubarimpl_p.h" #include "qabstractmenubarinterface_p.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QMenuBar; class QMenuBar;
class QMenuBarImpl : public QAbstractMenuBarImpl class QMenuBarImpl : public QAbstractMenuBarInterface
{ {
public: public:
~QMenuBarImpl(); ~QMenuBarImpl();

2
src/gui/widgets/widgets.pri
View File

@ -4,7 +4,7 @@ HEADERS += \
widgets/qbuttongroup.h \ widgets/qbuttongroup.h \
widgets/qabstractbutton.h \ widgets/qabstractbutton.h \
widgets/qabstractbutton_p.h \ widgets/qabstractbutton_p.h \
widgets/qabstractmenubarimpl_p.h \ widgets/qabstractmenubarinterface_p.h \
widgets/qabstractslider.h \ widgets/qabstractslider.h \
widgets/qabstractslider_p.h \ widgets/qabstractslider_p.h \
widgets/qabstractspinbox.h \ widgets/qabstractspinbox.h \