summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorAurélien Gâteau <agateau@kde.org>2011-04-14 10:00:33 +0200
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-10 12:54:47 +0200
commit5d6d23f118cfe4c7f48a4dedb1156c4ca1bfc33c (patch)
tree147ede8f4f123b4cb40c6cd530b61069420605b0 /src/gui
parent9317fee1d9cb3a871cf0efdd357688e0c86c6f84 (diff)
Make ctor and dtor of QAbstractMenuBarImpl inline
This way the class does not need to be exported Merge-request: 916 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> (cherry picked from commit a624a4011adca00d7334462c4d33f574c465110a)
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/qabstractmenubarimpl_p.cpp44
-rw-r--r--src/gui/widgets/qabstractmenubarimpl_p.h5
-rw-r--r--src/gui/widgets/widgets.pri1
3 files changed, 3 insertions, 47 deletions
diff --git a/src/gui/widgets/qabstractmenubarimpl_p.cpp b/src/gui/widgets/qabstractmenubarimpl_p.cpp
deleted file mode 100644
index bc16030835..0000000000
--- a/src/gui/widgets/qabstractmenubarimpl_p.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <private/qabstractmenubarimpl_p.h>
-
-QAbstractMenuBarImpl::~QAbstractMenuBarImpl()
-{}
diff --git a/src/gui/widgets/qabstractmenubarimpl_p.h b/src/gui/widgets/qabstractmenubarimpl_p.h
index 25441dff4a..156ee6ab72 100644
--- a/src/gui/widgets/qabstractmenubarimpl_p.h
+++ b/src/gui/widgets/qabstractmenubarimpl_p.h
@@ -69,10 +69,11 @@ Q_DECLARE_INTERFACE(QMenuBarImplFactoryInterface, QMenuBarImplFactoryInterface_i
/**
* The platform-specific implementation of a menubar
*/
-class Q_GUI_EXPORT QAbstractMenuBarImpl
+class QAbstractMenuBarImpl
{
public:
- virtual ~QAbstractMenuBarImpl();
+ QAbstractMenuBarImpl() {}
+ virtual ~QAbstractMenuBarImpl() {}
// QMenuBarPrivate::init()
virtual void init(QMenuBar *) = 0;
diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri
index e5d6890495..f39b941f86 100644
--- a/src/gui/widgets/widgets.pri
+++ b/src/gui/widgets/widgets.pri
@@ -85,7 +85,6 @@ HEADERS += \
widgets/qprintpreviewwidget.h
SOURCES += \
widgets/qabstractbutton.cpp \
- widgets/qabstractmenubarimpl_p.cpp \
widgets/qabstractslider.cpp \
widgets/qabstractspinbox.cpp \
widgets/qcalendarwidget.cpp \