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

Remove dead code 

This code has been deprecated in Qt 5.

Change-Id: Ia8e0bc791ac1f43df7124b4f30db3d0bb9966015
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
bb10
Lars Knoll 2020-10-06 16:00:14 +02:00
parent feab484b8d
commit 92b7122eda
14 changed files with 4 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dbus/qdbusextratypes.h
View File

@ -45,9 +45,6 @@
#include <QtDBus/qtdbusglobal.h>
#include <QtCore/qvariant.h>
#include <QtCore/qstring.h>
#if QT_DEPRECATED_SINCE(5, 6)
#include <QtCore/qhash.h>
#endif
#include <QtCore/qhashfunctions.h>
#ifndef QT_NO_DBUS

3
src/dbus/qtdbusglobal.h
View File

@ -51,9 +51,6 @@
#ifdef Q_CC_MSVC
#include <QtCore/qlist.h>
#include <QtCore/qset.h>
#if QT_DEPRECATED_SINCE(5, 5)
#include <QtCore/qhash.h>
#endif
#endif
QT_BEGIN_NAMESPACE

10
src/gui/kernel/qpalette.h
View File

@ -92,10 +92,6 @@ public:
ToolTipBase, ToolTipText,
PlaceholderText,
NColorRoles = PlaceholderText + 1,
#if QT_DEPRECATED_SINCE(5, 13)
Foreground Q_DECL_ENUMERATOR_DEPRECATED_X("Use QPalette::WindowText instead") = WindowText,
Background Q_DECL_ENUMERATOR_DEPRECATED_X("Use QPalette::Window instead") = Window
#endif
};
Q_ENUM(ColorRole)
@ -138,12 +134,6 @@ public:
inline const QBrush &link() const { return brush(Link); }
inline const QBrush &linkVisited() const { return brush(LinkVisited); }
inline const QBrush &placeholderText() const { return brush(PlaceholderText); }
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use QPalette::windowText() instead")
inline const QBrush &foreground() const { return windowText(); }
QT_DEPRECATED_X("Use QPalette::window() instead")
inline const QBrush &background() const { return window(); }
#endif
bool operator==(const QPalette &p) const;
inline bool operator!=(const QPalette &p) const { return !(operator==(p)); }

3
src/gui/kernel/qplatformdialoghelper.h
View File

@ -319,9 +319,6 @@ public:
ShowDirsOnly = 0x00000001,
DontResolveSymlinks = 0x00000002,
DontConfirmOverwrite = 0x00000004,
#if QT_DEPRECATED_SINCE(5, 14)
DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x00000008,
#endif
DontUseNativeDialog = 0x00000010,
ReadOnly = 0x00000020,
HideNameFilterDetails = 0x00000040,

3
src/gui/text/qplatformfontdatabase.h
View File

@ -54,9 +54,6 @@
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QList>
#if QT_DEPRECATED_SINCE(5, 5)
#include <QtCore/QHash>
#endif
#include <QtGui/QFontDatabase>
#include <QtGui/private/qfontengine_p.h>
#include <QtGui/private/qfont_p.h>

3
src/gui/text/qtextformat.h
View File

@ -141,9 +141,6 @@ public:
BlockFormat = 1,
CharFormat = 2,
ListFormat = 3,
#if QT_DEPRECATED_SINCE(5, 3)
TableFormat = 4,
#endif
FrameFormat = 5,
UserFormat = 100

6
src/gui/text/qtextodfwriter.cpp
View File

@ -547,12 +547,6 @@ void QTextOdfWriter::writeFormats(QXmlStreamWriter &writer, const QSet<int> &for
else
writeFrameFormat(writer, textFormat.toFrameFormat(), formatIndex);
break;
#if QT_DEPRECATED_SINCE(5, 3)
case QTextFormat::TableFormat:
// this case never happens, because TableFormat is a FrameFormat
Q_UNREACHABLE();
break;
#endif
}
}

19
src/network/ssl/qsslcertificate.cpp
View File

@ -247,25 +247,6 @@ QSslCertificate &QSslCertificate::operator=(const QSslCertificate &other)
\sa clear()
*/
#if QT_DEPRECATED_SINCE(5,0)
/*!
\fn bool QSslCertificate::isValid() const
\obsolete
To verify a certificate, use verify().
To check if a certificate is blacklisted, use isBlacklisted().
To check if a certificate has expired or is not yet valid, compare
expiryDate() and effectiveDate() with QDateTime::currentDateTime()
This function checks that the current
date-time is within the date-time range during which the
certificate is considered valid, and checks that the
certificate is not in a blacklist of fraudulent certificates.
\sa isNull(), verify(), isBlacklisted(), expiryDate(), effectiveDate()
*/
#endif
/*!
Returns \c true if this certificate is blacklisted; otherwise
returns \c false.

8
src/network/ssl/qsslcertificate.h
View File

@ -103,14 +103,6 @@ public:
inline bool operator!=(const QSslCertificate &other) const { return !operator==(other); }
bool isNull() const;
#if QT_DEPRECATED_SINCE(5,0)
QT_DEPRECATED inline bool isValid() const {
const QDateTime currentTime = QDateTime::currentDateTimeUtc();
return currentTime >= effectiveDate() &&
currentTime <= expiryDate() &&
!isBlacklisted();
}
#endif
bool isBlacklisted() const;
bool isSelfSigned() const;
void clear();

3
src/network/ssl/qsslellipticcurve.h
View File

@ -43,9 +43,6 @@
#include <QtNetwork/qtnetworkglobal.h>
#include <QtCore/QString>
#include <QtCore/QMetaType>
#if QT_DEPRECATED_SINCE(5, 6)
#include <QtCore/QHash>
#endif
#include <QtCore/qhashfunctions.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/android/qandroidplatformtheme.cpp
View File

@ -304,7 +304,7 @@ static std::shared_ptr<AndroidStyle> loadAndroidStyle(QPalette *defaultPalette)
attributeIterator = item.find(QLatin1String("defaultBackgroundColor"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::Background, QRgb(int(attributeIterator.value().toDouble())));
palette.setColor(QPalette::Window, QRgb(int(attributeIterator.value().toDouble())));
attributeIterator = item.find(QLatin1String("TextAppearance_textColor"));
if (attributeIterator != item.constEnd())

6
src/plugins/styles/android/qandroidstyle.cpp
View File

@ -1407,7 +1407,7 @@ void QAndroidStyle::AndroidControl::drawControl(const QStyleOption *opt, QPainte
qDrawShadePanel(p, frame->rect, frame->palette, frame->state & State_Sunken,
frame->lineWidth);
} else {
qDrawPlainRect(p, frame->rect, frame->palette.foreground().color(), frame->lineWidth);
qDrawPlainRect(p, frame->rect, frame->palette.windowText().color(), frame->lineWidth);
}
} else {
if (const QStyleOptionFocusRect *fropt = qstyleoption_cast<const QStyleOptionFocusRect *>(opt)) {
@ -1421,13 +1421,13 @@ void QAndroidStyle::AndroidControl::drawControl(const QStyleOption *opt, QPainte
else
p->setPen(Qt::white);
} else {
p->setPen(opt->palette.foreground().color());
p->setPen(opt->palette.windowText().color());
}
QRect focusRect = opt->rect.adjusted(1, 1, -1, -1);
p->drawRect(focusRect.adjusted(0, 0, -1, -1)); //draw pen inclusive
p->setPen(oldPen);
} else {
p->fillRect(opt->rect, opt->palette.brush(QPalette::Background));
p->fillRect(opt->rect, opt->palette.window());
}
}
}

19
src/xml/dom/qdom.cpp
View File

@ -6125,18 +6125,9 @@ bool QDomDocument::setContent(const QString& text, bool namespaceProcessing, QSt
if (!impl)
impl = new QDomDocumentPrivate();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_DEPRECATED_SINCE(5, 15)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QXmlInputSource source;
source.setData(text);
return IMPL->setContent(&source, namespaceProcessing, errorMsg, errorLine, errorColumn);
QT_WARNING_POP
#else
QXmlStreamReader streamReader(text);
streamReader.setNamespaceProcessing(namespaceProcessing);
return IMPL->setContent(&streamReader, namespaceProcessing, errorMsg, errorLine, errorColumn);
#endif
}
/*!
@ -6197,19 +6188,9 @@ bool QDomDocument::setContent(const QByteArray &data, bool namespaceProcessing,
if (!impl)
impl = new QDomDocumentPrivate();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && QT_DEPRECATED_SINCE(5, 15)
QBuffer buf;
buf.setData(data);
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QXmlInputSource source(&buf);
QT_WARNING_POP
return IMPL->setContent(&source, namespaceProcessing, errorMsg, errorLine, errorColumn);
#else
QXmlStreamReader streamReader(data);
streamReader.setNamespaceProcessing(namespaceProcessing);
return IMPL->setContent(&streamReader, namespaceProcessing, errorMsg, errorLine, errorColumn);
#endif
}
/*!

14
src/xml/dom/qdom.h
View File

@ -339,23 +339,9 @@ public:
bool setContent(const QByteArray& text, bool namespaceProcessing, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
bool setContent(const QString& text, bool namespaceProcessing, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
bool setContent(QIODevice* dev, bool namespaceProcessing, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
#if QT_DEPRECATED_SINCE(5, 15)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QT_DEPRECATED_X("Use other overloads instead")
bool setContent(QXmlInputSource *source, bool namespaceProcessing, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
QT_WARNING_POP
#endif
bool setContent(const QByteArray& text, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
bool setContent(const QString& text, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
bool setContent(QIODevice* dev, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
#if QT_DEPRECATED_SINCE(5, 15)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QT_DEPRECATED_X("Use other overloads instead")
bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg=nullptr, int *errorLine=nullptr, int *errorColumn=nullptr );
QT_WARNING_POP
#endif
bool setContent(QXmlStreamReader *reader, bool namespaceProcessing, QString *errorMsg = nullptr,
int *errorLine = nullptr, int *errorColumn = nullptr);