Fix compiler warnings.
Change-Id: I6b6d86097074a12c9c4e3d22fe61a6b962ffa21e Reviewed-on: http://codereview.qt-project.org/5627 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>bb10
parent
e918598e2d
commit
36850d5cec
|
|
@ -72,6 +72,7 @@ void QPlatformInputContext::update(Qt::InputMethodQueries)
|
|||
|
||||
void QPlatformInputContext::invokeAction(QInputPanel::Action action, int cursorPosition)
|
||||
{
|
||||
Q_UNUSED(cursorPosition)
|
||||
// Default behavior for simple ephemeral input contexts. Some
|
||||
// complex input contexts should not be reset here.
|
||||
if (action == QInputPanel::Click)
|
||||
|
|
@ -80,6 +81,7 @@ void QPlatformInputContext::invokeAction(QInputPanel::Action action, int cursorP
|
|||
|
||||
bool QPlatformInputContext::filterEvent(const QEvent *event)
|
||||
{
|
||||
Q_UNUSED(event)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ void * QPlatformNativeInterface::nativeResourceForBackingStore(const QByteArray
|
|||
*/
|
||||
QVariantMap QPlatformNativeInterface::windowProperties(QPlatformWindow *window) const
|
||||
{
|
||||
Q_UNUSED(window)
|
||||
return QVariantMap();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,9 +84,9 @@ const int QHttpNetworkConnectionPrivate::defaultRePipelineLength = 2;
|
|||
|
||||
QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &hostName, quint16 port, bool encrypt)
|
||||
: state(RunningState),
|
||||
networkLayerState(Unknown),
|
||||
hostName(hostName), port(port), encrypt(encrypt),
|
||||
channelCount(defaultChannelCount),
|
||||
networkLayerState(Unknown)
|
||||
channelCount(defaultChannelCount)
|
||||
#ifndef QT_NO_NETWORKPROXY
|
||||
, networkProxy(QNetworkProxy::NoProxy)
|
||||
#endif
|
||||
|
|
@ -95,10 +95,9 @@ QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(const QString &host
|
|||
}
|
||||
|
||||
QHttpNetworkConnectionPrivate::QHttpNetworkConnectionPrivate(quint16 channelCount, const QString &hostName, quint16 port, bool encrypt)
|
||||
: state(RunningState),
|
||||
: state(RunningState), networkLayerState(Unknown),
|
||||
hostName(hostName), port(port), encrypt(encrypt),
|
||||
channelCount(channelCount),
|
||||
networkLayerState(Unknown)
|
||||
channelCount(channelCount)
|
||||
#ifndef QT_NO_NETWORKPROXY
|
||||
, networkProxy(QNetworkProxy::NoProxy)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ public:
|
|||
|
||||
enum ConnectionState {
|
||||
RunningState = 0,
|
||||
PausedState = 1,
|
||||
PausedState = 1
|
||||
};
|
||||
|
||||
enum NetworkLayerPreferenceState {
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@ QHttpNetworkConnectionChannel::QHttpNetworkConnectionChannel()
|
|||
, ignoreAllSslErrors(false)
|
||||
#endif
|
||||
, pipeliningSupported(PipeliningSupportUnknown)
|
||||
, connection(0)
|
||||
, networkLayerPreference(QAbstractSocket::AnyIPProtocol)
|
||||
, connection(0)
|
||||
{
|
||||
// Inlining this function in the header leads to compiler error on
|
||||
// release-armv5, on at least timebox 9.2 and 10.1.
|
||||
|
|
|
|||
|
|
@ -1138,6 +1138,7 @@ QDataStream &operator<<(QDataStream &out, const QHostAddress &address)
|
|||
out << prot;
|
||||
switch (address.protocol()) {
|
||||
case QAbstractSocket::UnknownNetworkLayerProtocol:
|
||||
case QAbstractSocket::AnyIPProtocol:
|
||||
break;
|
||||
case QAbstractSocket::IPv4Protocol:
|
||||
out << address.toIPv4Address();
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ QAbstractSpinBox *QAccessibleAbstractSpinBox::abstractSpinBox() const
|
|||
/*! \reimp */
|
||||
QString QAccessibleAbstractSpinBox::text(Text t, int child) const
|
||||
{
|
||||
Q_UNUSED(child)
|
||||
if (t == QAccessible::Value)
|
||||
return abstractSpinBox()->text();
|
||||
return QAccessibleWidget::text(t, 0);
|
||||
|
|
@ -91,6 +92,7 @@ QString QAccessibleAbstractSpinBox::text(Text t, int child) const
|
|||
/*! \reimp */
|
||||
bool QAccessibleAbstractSpinBox::doAction(int action, int child, const QVariantList ¶ms)
|
||||
{
|
||||
Q_UNUSED(child)
|
||||
if (!widget()->isEnabled())
|
||||
return false;
|
||||
return QAccessibleWidget::doAction(action, 0, params);
|
||||
|
|
@ -180,6 +182,7 @@ QSpinBox *QAccessibleSpinBox::spinBox() const
|
|||
/*! \reimp */
|
||||
bool QAccessibleSpinBox::doAction(int action, int child, const QVariantList ¶ms)
|
||||
{
|
||||
Q_UNUSED(child)
|
||||
if (!widget()->isEnabled())
|
||||
return false;
|
||||
|
||||
|
|
@ -211,6 +214,7 @@ QVariant QAccessibleDoubleSpinBox::invokeMethod(QAccessible::Method, int, const
|
|||
/*! \reimp */
|
||||
QString QAccessibleDoubleSpinBox::text(Text textType, int child) const
|
||||
{
|
||||
Q_UNUSED(child)
|
||||
if (textType == Value)
|
||||
return doubleSpinBox()->textFromValue(doubleSpinBox()->value());
|
||||
return QAccessibleWidget::text(textType, 0);
|
||||
|
|
|
|||
|
|
@ -820,6 +820,7 @@ QSqlIndex QTDSDriver::primaryIndex(const QString& tablename) const
|
|||
|
||||
QString QTDSDriver::escapeIdentifier(const QString &identifier, IdentifierType type) const
|
||||
{
|
||||
Q_UNUSED(type)
|
||||
QString res = identifier;
|
||||
if(!identifier.isEmpty() && !identifier.startsWith(QLatin1Char('"')) && !identifier.endsWith(QLatin1Char('"')) ) {
|
||||
res.replace(QLatin1Char('"'), QLatin1String("\"\""));
|
||||
|
|
|
|||
Loading…
Reference in New Issue