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

Remove some unused, local variables

Browse Source 
Change-Id: I453162d2d396bb3427064d3b1593bb6c71376605
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Jędrzej Nowacki 2017-10-12 16:32:07 +02:00
parent 7809bba68f
commit 2d4fe257ca
6 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dbus/qdbusmetatype.cpp
View File

@ -216,7 +216,6 @@ Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
void QDBusMetaType::registerMarshallOperators(int id, MarshallFunction mf, void QDBusMetaType::registerMarshallOperators(int id, MarshallFunction mf,
DemarshallFunction df) DemarshallFunction df)
{ {
QByteArray var;
QVector<QDBusCustomTypeInfo> *ct = customTypes(); QVector<QDBusCustomTypeInfo> *ct = customTypes();
if (id < 0 || !mf || !df || !ct) if (id < 0 || !mf || !df || !ct)
return; // error! return; // error!

2
src/gui/painting/qstroker.cpp
View File

@ -1147,8 +1147,6 @@ void QDashStroker::processCurrentSubpath()
QLineF cline; QLineF cline;
QPainterPath dashPath;
QSubpathFlatIterator it(&m_elements, m_dashThreshold); QSubpathFlatIterator it(&m_elements, m_dashThreshold);
qfixed2d prev = it.next(); qfixed2d prev = it.next();

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

@ -381,7 +381,6 @@ void QTextOdfWriter::writeInlineCharacter(QXmlStreamWriter &writer, const QTextF
} }
if (image.isNull()) { if (image.isNull()) {
QString context;
if (image.isNull()) { // try direct loading if (image.isNull()) { // try direct loading
name = imageFormat.name(); // remove qrc:/ prefix again name = imageFormat.name(); // remove qrc:/ prefix again
image.load(name); image.load(name);

2
src/tools/uic/cpp/cppwritedeclaration.cpp
View File

@ -105,7 +105,7 @@ void WriteDeclaration::acceptUI(DomUI *node)
QString qualifiedClassName = node->elementClass() + m_option.postfix; QString qualifiedClassName = node->elementClass() + m_option.postfix;
QString className = qualifiedClassName; QString className = qualifiedClassName;
QString varName = m_driver->findOrInsertWidget(node->elementWidget()); m_driver->findOrInsertWidget(node->elementWidget());
QString widgetClassName = node->elementWidget()->attributeClass(); QString widgetClassName = node->elementWidget()->attributeClass();
QString exportMacro = node->elementExportMacro(); QString exportMacro = node->elementExportMacro();

1
src/widgets/effects/qpixmapfilter.cpp
View File

@ -925,7 +925,6 @@ void QPixmapBlurFilter::draw(QPainter *painter, const QPointF &p, const QPixmap
scaledRadius /= scale; scaledRadius /= scale;
QImage srcImage; QImage srcImage;
QImage destImage;
if (srcRect == src.rect()) { if (srcRect == src.rect()) {
srcImage = src.toImage(); srcImage = src.toImage();

1
src/widgets/styles/qstylehelper.cpp
View File

@ -278,7 +278,6 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter)
buttonColor.setHsv(buttonColor .hue(), buttonColor.setHsv(buttonColor .hue(),
qMin(140, buttonColor .saturation()), qMin(140, buttonColor .saturation()),
qMax(180, buttonColor.value())); qMax(180, buttonColor.value()));
QColor shadowColor(0, 0, 0, 20);
if (enabled) { if (enabled) {
// Drop shadow // Drop shadow