diff options
author | Aurélien Gâteau <agateau@kde.org> | 2011-04-14 10:00:36 +0200 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:47 +0200 |
commit | 0241d63994c12fe0d0592b4a5eb9b6f29343280e (patch) | |
tree | 1b219cfd88ee8d4f0add2d6908bb42eb562064b7 | |
parent | 5d6d23f118cfe4c7f48a4dedb1156c4ca1bfc33c (diff) |
Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterface
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit 3d188ffae259584c4351c5fa766a49da9b189112)
-rw-r--r-- | src/gui/widgets/qabstractmenubarinterface_p.h (renamed from src/gui/widgets/qabstractmenubarimpl_p.h) | 16 | ||||
-rw-r--r-- | src/gui/widgets/qmenubar_p.h | 4 | ||||
-rw-r--r-- | src/gui/widgets/qmenubarimpl.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/qmenubarimpl_p.h | 4 | ||||
-rw-r--r-- | src/gui/widgets/widgets.pri | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/widgets/qabstractmenubarimpl_p.h b/src/gui/widgets/qabstractmenubarinterface_p.h index 156ee6ab72..a014bc121e 100644 --- a/src/gui/widgets/qabstractmenubarimpl_p.h +++ b/src/gui/widgets/qabstractmenubarinterface_p.h @@ -38,8 +38,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef QABSTRACTMENUBARIMPL_P_H -#define QABSTRACTMENUBARIMPL_P_H +#ifndef QABSTRACTMENUBARINTERFACE_P_H +#define QABSTRACTMENUBARINTERFACE_P_H #include <qfactoryinterface.h> #include <qglobal.h> @@ -56,11 +56,11 @@ class QMenuBar; class QObject; class QWidget; -class QAbstractMenuBarImpl; +class QAbstractMenuBarInterface; struct QMenuBarImplFactoryInterface : public QFactoryInterface { - virtual QAbstractMenuBarImpl* createImpl() = 0; + virtual QAbstractMenuBarInterface* createImpl() = 0; }; #define QMenuBarImplFactoryInterface_iid "com.nokia.qt.QMenuBarImplFactoryInterface" @@ -69,11 +69,11 @@ Q_DECLARE_INTERFACE(QMenuBarImplFactoryInterface, QMenuBarImplFactoryInterface_i /** * The platform-specific implementation of a menubar */ -class QAbstractMenuBarImpl +class QAbstractMenuBarInterface { public: - QAbstractMenuBarImpl() {} - virtual ~QAbstractMenuBarImpl() {} + QAbstractMenuBarInterface() {} + virtual ~QAbstractMenuBarInterface() {} // QMenuBarPrivate::init() virtual void init(QMenuBar *) = 0; @@ -113,4 +113,4 @@ QT_END_NAMESPACE #endif // QT_NO_MENUBAR -#endif // QABSTRACTMENUBARIMPL_P_H +#endif // QABSTRACTMENUBARINTERFACE_P_H diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h index b49e03931d..427cd30908 100644 --- a/src/gui/widgets/qmenubar_p.h +++ b/src/gui/widgets/qmenubar_p.h @@ -61,7 +61,7 @@ #include "qguifunctions_wince.h" #endif -#include "qabstractmenubarimpl_p.h" +#include "qabstractmenubarinterface_p.h" #ifndef QT_NO_MENUBAR #ifdef Q_WS_S60 @@ -160,7 +160,7 @@ public: #ifdef QT3_SUPPORT bool doAutoResize; #endif - QAbstractMenuBarImpl *impl; + QAbstractMenuBarInterface *impl; #ifdef QT_SOFTKEYS_ENABLED QAction *menuBarAction; #endif diff --git a/src/gui/widgets/qmenubarimpl.cpp b/src/gui/widgets/qmenubarimpl.cpp index 1ca2e11966..4f2ad72474 100644 --- a/src/gui/widgets/qmenubarimpl.cpp +++ b/src/gui/widgets/qmenubarimpl.cpp @@ -239,7 +239,7 @@ bool QMenuBarImpl::menuBarEventFilter(QObject *, QEvent *) struct QMenuBarImplFactory : public QMenuBarImplFactoryInterface { - QAbstractMenuBarImpl* createImpl() { return new QMenuBarImpl; } + QAbstractMenuBarInterface* createImpl() { return new QMenuBarImpl; } virtual QStringList keys() const { return QStringList(); } }; diff --git a/src/gui/widgets/qmenubarimpl_p.h b/src/gui/widgets/qmenubarimpl_p.h index e7a3bdeae7..08ac6a0c00 100644 --- a/src/gui/widgets/qmenubarimpl_p.h +++ b/src/gui/widgets/qmenubarimpl_p.h @@ -43,13 +43,13 @@ #ifndef QT_NO_MENUBAR -#include "qabstractmenubarimpl_p.h" +#include "qabstractmenubarinterface_p.h" QT_BEGIN_NAMESPACE class QMenuBar; -class QMenuBarImpl : public QAbstractMenuBarImpl +class QMenuBarImpl : public QAbstractMenuBarInterface { public: ~QMenuBarImpl(); diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri index f39b941f86..97d23f7f00 100644 --- a/src/gui/widgets/widgets.pri +++ b/src/gui/widgets/widgets.pri @@ -4,7 +4,7 @@ HEADERS += \ widgets/qbuttongroup.h \ widgets/qabstractbutton.h \ widgets/qabstractbutton_p.h \ - widgets/qabstractmenubarimpl_p.h \ + widgets/qabstractmenubarinterface_p.h \ widgets/qabstractslider.h \ widgets/qabstractslider_p.h \ widgets/qabstractspinbox.h \ |