diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-02-22 18:17:12 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-27 07:09:24 +0100 |
| commit | 7b2d98d90642ce7ac4ab0800bd7930f97ba6b10c (patch) | |
| tree | 13063801c2a3810bbee98162e8fc4db7a2678460 /src | |
| parent | cafb02911a29b98ac2652fde64e95870e70fd547 (diff) | |
Fix some warnings that have crept up since I last fixed warnings
qgtkstyle.cpp:3177:103: error: suggest parentheses around ‘&&’ within ‘||’ [-Werror=parentheses]
qcups.cpp:517:66: error: ‘QString::QString(const char*)’ is deprecated
itemviews.cpp:795:13: error: unused parameter ‘actionName’ [-Werror=unused-parameter]
qeglconvenience.cpp:268:9: error: ‘cfg’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
Change-Id: I9b8a175ff1c2ddc443363e08b92e09cf7c2f91cf
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/eglconvenience/qeglconvenience.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/itemviews.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/kernel/qcups.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qgtkstyle.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp index 3119356330..b711a2aebd 100644 --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp @@ -245,7 +245,7 @@ EGLConfig QEglConfigChooser::chooseConfig() configureAttributes.append(EGL_NONE); - EGLConfig cfg; + EGLConfig cfg = 0; do { // Get the number of matching configurations for this set of properties. EGLint matching = 0; diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp index 17764a3c2e..092278f7fb 100644 --- a/src/plugins/accessible/widgets/itemviews.cpp +++ b/src/plugins/accessible/widgets/itemviews.cpp @@ -792,7 +792,7 @@ void QAccessibleTableCell::doAction(const QString& actionName) } } -QStringList QAccessibleTableCell::keyBindingsForAction(const QString& actionName) const +QStringList QAccessibleTableCell::keyBindingsForAction(const QString &) const { return QStringList(); } diff --git a/src/printsupport/kernel/qcups.cpp b/src/printsupport/kernel/qcups.cpp index 47447b21a1..d2deee1db3 100644 --- a/src/printsupport/kernel/qcups.cpp +++ b/src/printsupport/kernel/qcups.cpp @@ -514,7 +514,7 @@ QList<QPair<QString, QSizeF> > QCUPSSupport::getCupsPrinterPaperSizesWithNames(i for (int j = 0; j < size->num_choices; ++j) { double multiplier = qt_multiplierForUnit(QPrinter::Millimeter, 0); // resolution is not needed here QSize sz = cups.paperRect(size->choices[j].choice).size(); - result.append(qMakePair(QString(size->choices[j].text), QSizeF(sz.width() / multiplier, sz.height() / multiplier))); + result.append(qMakePair(QString::fromUtf8(size->choices[j].text), QSizeF(sz.width() / multiplier, sz.height() / multiplier))); } } return result; diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index caa41db451..6d2c88bfea 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -3174,7 +3174,7 @@ void QGtkStyle::drawControl(ControlElement element, #ifndef QT_NO_COMBOBOX if (qobject_cast<const QComboBox*>(widget) || - option->styleObject && option->styleObject->property("_q_isComboBoxPopupItem").toBool()) + (option->styleObject && option->styleObject->property("_q_isComboBoxPopupItem").toBool())) ignoreCheckMark = true; // Ignore the checkmarks provided by the QComboMenuDelegate #endif |