whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows code: Fix clang-tidy warnings about (private) class definitions 

Add override, disable copies where appropriate and use = default
for trivial functions.

Change-Id: Ia5bc7419b1aa053c5503ea7dfaf11cb6dfafd2e2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Friedemann Kleint 2018-08-29 09:40:06 +02:00
parent 4c4a5f8c86
commit 9a15ac356c
12 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/io/qsettings_win.cpp
View File

@ -377,11 +377,12 @@ typedef QVector<RegistryKey> RegistryKeyList;
class QWinSettingsPrivate : public QSettingsPrivate
{
Q_DISABLE_COPY(QWinSettingsPrivate)
public:
QWinSettingsPrivate(QSettings::Scope scope, const QString &organization,
const QString &application, REGSAM access = 0);
QWinSettingsPrivate(QString rKey, REGSAM access = 0);
~QWinSettingsPrivate();
~QWinSettingsPrivate() override;
void remove(const QString &uKey) override;
void set(const QString &uKey, const QVariant &value) override;

4
src/network/kernel/qnetworkproxy_win.cpp
View File

@ -370,7 +370,10 @@ static QList<QNetworkProxy> parseServerList(const QNetworkProxyQuery &query, con
#if !defined(Q_OS_WINRT)
namespace {
class QRegistryWatcher {
Q_DISABLE_COPY(QRegistryWatcher)
public:
QRegistryWatcher() = default;
void addLocation(HKEY hive, const QString& path)
{
HKEY openedKey;
@ -422,6 +425,7 @@ private:
class QWindowsSystemProxy
{
Q_DISABLE_COPY(QWindowsSystemProxy)
public:
QWindowsSystemProxy();
~QWindowsSystemProxy();

1
src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
View File

@ -368,6 +368,7 @@ namespace {
class DirectWriteFontFileStream: public IDWriteFontFileStream
{
Q_DISABLE_COPY(DirectWriteFontFileStream)
public:
DirectWriteFontFileStream(const QByteArray &fontData)
: m_fontData(fontData)

3
src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
View File

@ -85,6 +85,7 @@ public:
class QWindowsFontDatabase : public QPlatformFontDatabase
{
Q_DISABLE_COPY(QWindowsFontDatabase)
public:
enum FontOptions {
// Relevant bits from QWindowsIntegration::Options
@ -93,7 +94,7 @@ public:
};
QWindowsFontDatabase();
~QWindowsFontDatabase();
~QWindowsFontDatabase() override;
void populateFontDatabase() override;
void populateFamily(const QString &familyName) override;

5
src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
View File

@ -66,13 +66,14 @@ class QWindowsFontEngineData;
class QWindowsFontEngine : public QFontEngine
{
Q_DISABLE_COPY(QWindowsFontEngine)
friend class QWindowsMultiFontEngine;
public:
QWindowsFontEngine(const QString &name, LOGFONT lf,
const QSharedPointer<QWindowsFontEngineData> &fontEngineData);
~QWindowsFontEngine();
~QWindowsFontEngine() override;
void initFontInfo(const QFontDef &request,
int dpi);
@ -89,7 +90,7 @@ public:
void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const override;
void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) override;
virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
QPainterPath *path, QTextItem::RenderFlags flags) override;
HGDIOBJ selectDesignFont() const;

5
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
View File

@ -69,15 +69,14 @@ namespace {
class GeometrySink: public IDWriteGeometrySink
{
Q_DISABLE_COPY(GeometrySink)
public:
GeometrySink(QPainterPath *path)
: m_refCount(0), m_path(path)
{
Q_ASSERT(m_path != 0);
}
virtual ~GeometrySink()
{
}
virtual ~GeometrySink() = default;
IFACEMETHOD_(void, AddBeziers)(const D2D1_BEZIER_SEGMENT *beziers, UINT bezierCount);
IFACEMETHOD_(void, AddLines)(const D2D1_POINT_2F *points, UINT pointCount);

3
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h
View File

@ -72,11 +72,12 @@ class QWindowsFontEngineData;
class QWindowsFontEngineDirectWrite : public QFontEngine
{
Q_DISABLE_COPY(QWindowsFontEngineDirectWrite)
public:
explicit QWindowsFontEngineDirectWrite(IDWriteFontFace *directWriteFontFace,
qreal pixelSize,
const QSharedPointer<QWindowsFontEngineData> &d);
~QWindowsFontEngineDirectWrite();
~QWindowsFontEngineDirectWrite() override;
void initFontInfo(const QFontDef &request, int dpi);

3
src/plugins/printsupport/windows/qwindowsprintersupport.h
View File

@ -46,9 +46,10 @@ QT_BEGIN_NAMESPACE
class QWindowsPrinterSupport : public QPlatformPrinterSupport
{
Q_DISABLE_COPY(QWindowsPrinterSupport)
public:
QWindowsPrinterSupport();
~QWindowsPrinterSupport();
~QWindowsPrinterSupport() override;
QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) override;
QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) override;

4
src/plugins/styles/windowsvista/qwindowsvistastyle.cpp
View File

@ -179,9 +179,7 @@ QWindowsVistaStyle::QWindowsVistaStyle()
/*!
Destructor.
*/
QWindowsVistaStyle::~QWindowsVistaStyle()
{
}
QWindowsVistaStyle::~QWindowsVistaStyle() = default;
//convert Qt state flags to uxtheme button states
static int buttonStateId(int flags, int partId)

43
src/plugins/styles/windowsvista/qwindowsvistastyle_p.h
View File

@ -62,38 +62,41 @@ class QWindowsVistaStyle : public QWindowsXPStyle
Q_OBJECT
public:
QWindowsVistaStyle();
~QWindowsVistaStyle();
~QWindowsVistaStyle() override;
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget = 0) const;
QPainter *painter,
const QWidget *widget = nullptr) const override;
void drawControl(ControlElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget) const;
QPainter *painter, const QWidget *widget) const override;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
QPainter *painter, const QWidget *widget) const;
QPainter *painter, const QWidget *widget) const override;
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
const QSize &size, const QWidget *widget) const;
const QSize &size, const QWidget *widget) const override;
QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const;
QRect subElementRect(SubElement element, const QStyleOption *option,
const QWidget *widget) const override;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget) const;
SubControl sc, const QWidget *widget) const override;
SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
const QPoint &pos, const QWidget *widget = 0) const;
const QPoint &pos, const QWidget *widget = nullptr) const override;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr,
const QWidget *widget = nullptr) const override;
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
const QWidget *widget = nullptr) const override;
int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr,
const QWidget *widget = nullptr) const override;
int styleHint(StyleHint hint, const QStyleOption *opt = nullptr,
const QWidget *widget = nullptr, QStyleHintReturn *returnData = nullptr) const override;
void polish(QWidget *widget);
void unpolish(QWidget *widget);
void polish(QPalette &pal);
void polish(QApplication *app);
void unpolish(QApplication *app);
QPalette standardPalette() const;
void polish(QWidget *widget) override;
void unpolish(QWidget *widget) override;
void polish(QPalette &pal) override;
void polish(QApplication *app) override;
void unpolish(QApplication *app) override;
QPalette standardPalette() const override;
private:
Q_DISABLE_COPY(QWindowsVistaStyle)

42
src/plugins/styles/windowsvista/qwindowsxpstyle_p.h
View File

@ -63,35 +63,37 @@ class QWindowsXPStyle : public QWindowsStyle
public:
QWindowsXPStyle();
QWindowsXPStyle(QWindowsXPStylePrivate &dd);
~QWindowsXPStyle();
~QWindowsXPStyle() override;
void unpolish(QApplication*);
void polish(QApplication*);
void polish(QWidget*);
void polish(QPalette&);
void unpolish(QWidget*);
void unpolish(QApplication*) override;
void polish(QApplication*) override;
void polish(QWidget*) override;
void polish(QPalette&) override;
void unpolish(QWidget*) override;
void drawPrimitive(PrimitiveElement pe, const QStyleOption *option, QPainter *p,
const QWidget *widget = 0) const;
const QWidget *widget = nullptr) const override;
void drawControl(ControlElement element, const QStyleOption *option, QPainter *p,
const QWidget *wwidget = 0) const;
QRect subElementRect(SubElement r, const QStyleOption *option, const QWidget *widget = 0) const;
const QWidget *wwidget = nullptr) const override;
QRect subElementRect(SubElement r, const QStyleOption *option,
const QWidget *widget = nullptr) const override;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *option, SubControl sc,
const QWidget *widget = 0) const;
const QWidget *widget = nullptr) const override;
void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *option, QPainter *p,
const QWidget *widget = 0) const;
const QWidget *widget = nullptr) const override;
QSize sizeFromContents(ContentsType ct, const QStyleOption *option, const QSize &contentsSize,
const QWidget *widget = 0) const;
int pixelMetric(PixelMetric pm, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
const QWidget *widget = nullptr) const override;
int pixelMetric(PixelMetric pm, const QStyleOption *option = nullptr,
const QWidget *widget = nullptr) const override;
int styleHint(StyleHint hint, const QStyleOption *option = nullptr,
const QWidget *widget = nullptr,
QStyleHintReturn *returnData = nullptr) const override;
QPalette standardPalette() const;
QPalette standardPalette() const override;
QPixmap standardPixmap(StandardPixmap standardIcon, const QStyleOption *option,
const QWidget *widget = 0) const;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
const QWidget *widget = 0) const;
const QWidget *widget = nullptr) const override;
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = nullptr,
const QWidget *widget = nullptr) const override;
private:
Q_DISABLE_COPY(QWindowsXPStyle)

15
src/widgets/dialogs/qwizard_win_p.h
View File

@ -71,22 +71,23 @@ class QVistaBackButton : public QAbstractButton
public:
QVistaBackButton(QWidget *widget);
QSize sizeHint() const;
inline QSize minimumSizeHint() const
QSize sizeHint() const override;
inline QSize minimumSizeHint() const override
{ return sizeHint(); }
void enterEvent(QEvent *event);
void leaveEvent(QEvent *event);
void paintEvent(QPaintEvent *event);
void enterEvent(QEvent *event) override;
void leaveEvent(QEvent *event) override;
void paintEvent(QPaintEvent *event) override;
};
class QWizard;
class QVistaHelper : public QObject
{
Q_DISABLE_COPY(QVistaHelper)
public:
QVistaHelper(QWizard *wizard);
~QVistaHelper();
~QVistaHelper() override;
enum TitleBarChangeType { NormalTitleBar, ExtendedTitleBar };
void updateCustomMargins(bool vistaMargins);
bool setDWMTitleBar(TitleBarChangeType type);
@ -133,7 +134,7 @@ private:
void mouseMoveEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
bool eventFilter(QObject *obj, QEvent *event);
bool eventFilter(QObject *obj, QEvent *event) override;
static int instanceCount;
static VistaState cachedVistaState;