From 53afe798d44a7ca349b3284e40afce51c57fdafc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 25 Mar 2015 00:59:33 +0100 Subject: [PATCH] Fixed warnings as mentioned in https://dev.vatsim-germany.org/boards/22/topics/2587?r=2598#message-2598 and found by +win32-msvc*:QMAKE_CXXFLAGS_WARN_ON *= /Wall /W3 /wd4640 /wd4619 /wd4350 /wd4351 --- samples/cli_client/client.cpp | 2 +- src/blackcore/simulator.h | 6 +++--- src/blackgui/components/settingsfsxcomponent.cpp | 4 ++-- src/blackgui/components/textmessagecomponent.cpp | 1 - src/blackmisc/aviation/aircraftengine.cpp | 2 +- src/blackmisc/aviation/aircraftparts.cpp | 8 ++++---- src/blackmisc/networkutils.cpp | 4 ++-- src/blackmisc/networkutils.h | 2 +- src/blackmisc/nwserver.h | 10 +++++----- src/blackmisc/nwvoicecapabilites.cpp | 2 -- src/blackmisc/simulation/simdirectaccessownaircraft.h | 3 +++ .../simulation/simdirectaccessremoteaircraft.h | 5 +++++ src/blacksim/fsx/simconnectutilities.cpp | 4 ++-- src/blacksim/fsx/simconnectutilities.h | 4 ++-- src/plugins/simulator/fsx/simconnect_datadefinition.h | 2 +- src/plugins/simulator/fsx/simulator_fsx.cpp | 1 - 16 files changed, 32 insertions(+), 28 deletions(-) diff --git a/samples/cli_client/client.cpp b/samples/cli_client/client.cpp index 86c288ea2..778978511 100644 --- a/samples/cli_client/client.cpp +++ b/samples/cli_client/client.cpp @@ -173,7 +173,7 @@ void Client::presetLoginModeCmd(QTextStream &args) { QString modeString; args >> modeString; - BlackCore::INetwork::LoginMode mode; + BlackCore::INetwork::LoginMode mode(BlackCore::INetwork::LoginNormal); if (modeString == "normal") { mode = BlackCore::INetwork::LoginNormal; } if (modeString == "observer") { mode = BlackCore::INetwork::LoginAsObserver; } if (modeString == "stealth") { mode = BlackCore::INetwork::LoginStealth; } diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 03cfa47e5..cc168fcb7 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -267,10 +267,10 @@ namespace BlackCore bool m_debugMessages = false; //!< Display debug messages bool m_blinkCycle = false; //!< use for highlighting IInterpolator *m_interpolator = nullptr; //!< interpolator instance - qint64 m_highlightEndTimeMsEpoch = 0; + qint64 m_highlightEndTimeMsEpoch = 0; //!< end highlighting BlackMisc::Simulation::CSimulatedAircraftList m_highlightedAircraft; //!< all other aircraft are to be ignored - BlackMisc::Aviation::CCallsignList m_callsignsToBeRendered; - QTimer *m_oneSecondTimer = nullptr; + BlackMisc::Aviation::CCallsignList m_callsignsToBeRendered; //!< callsigns which will be rendered + QTimer *m_oneSecondTimer = nullptr; //!< timer }; diff --git a/src/blackgui/components/settingsfsxcomponent.cpp b/src/blackgui/components/settingsfsxcomponent.cpp index 73a82cfc9..037ad3b46 100644 --- a/src/blackgui/components/settingsfsxcomponent.cpp +++ b/src/blackgui/components/settingsfsxcomponent.cpp @@ -69,7 +69,7 @@ namespace BlackGui CLogMessage(this).warning("invalid port"); return; } - quint16 p = port.toUInt(); + int p = port.toInt(); QString msg; if (!CNetworkUtils::canConnect(address, p, msg)) { @@ -108,7 +108,7 @@ namespace BlackGui CLogMessage(this).warning("invalid port"); return; } - quint16 p = port.toUInt(); + int p = port.toInt(); QString fileName = this->getIContextSimulator()->getSimulatorInfo().getSimulatorSetupValueAsString(CFsxSimulatorSetup::SetupSimConnectCfgFile); Q_ASSERT(!fileName.isEmpty()); // write either local or remote file diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index cba3b657a..1c9afeee4 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -421,7 +421,6 @@ namespace BlackGui cmd.append(" ").append(enteredLine); return cmd; } - return ""; } void CTextMessageComponent::onTextMessageReceived(const CTextMessageList &messages) diff --git a/src/blackmisc/aviation/aircraftengine.cpp b/src/blackmisc/aviation/aircraftengine.cpp index 5e1fbd186..342f85bce 100644 --- a/src/blackmisc/aviation/aircraftengine.cpp +++ b/src/blackmisc/aviation/aircraftengine.cpp @@ -28,7 +28,7 @@ namespace BlackMisc { Q_UNUSED(i18n); QString s(m_number); - s += m_on; + s += BlackMisc::boolToOnOff(m_on); return s; } } // namespace diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 8e2dc97e8..6f54f49a9 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -18,15 +18,15 @@ namespace BlackMisc QString s; s += m_lights.toQString(i18n); s += " gear down: "; - s += m_gearDown; + s += BlackMisc::boolToYesNo(m_gearDown); s += " flaps pct: "; - s += m_flapsPercentage; + s += QString::number(m_flapsPercentage); s += " spoilers out: "; - s += m_spoilersOut; + s += BlackMisc::boolToYesNo(m_spoilersOut); s += " engines on: "; s += m_engines.toQString(i18n); s += " on ground: "; - s += m_isOnGround; + s += BlackMisc::boolToYesNo(m_isOnGround); return s; } diff --git a/src/blackmisc/networkutils.cpp b/src/blackmisc/networkutils.cpp index 4d7b140a8..6ce1a2c04 100644 --- a/src/blackmisc/networkutils.cpp +++ b/src/blackmisc/networkutils.cpp @@ -69,7 +69,7 @@ namespace BlackMisc /* * Can connect to IP/port? */ - bool CNetworkUtils::canConnect(const QString &hostAddress, quint16 port, QString &message, int timeoutMs) + bool CNetworkUtils::canConnect(const QString &hostAddress, int port, QString &message, int timeoutMs) { if (!CNetworkUtils::hasConnectedInterface(false)) { @@ -80,7 +80,7 @@ namespace BlackMisc // http://qt-project.org/forums/viewthread/9346 QTcpSocket socket; bool connected = false; - socket.connectToHost(hostAddress, port); + socket.connectToHost(hostAddress, static_cast(port)); if (!socket.waitForConnected(timeoutMs)) { message = QObject::tr("Connection failed : %1", "BlackMisc").arg(socket.errorString()); diff --git a/src/blackmisc/networkutils.h b/src/blackmisc/networkutils.h index c3aaf3077..db4d047fa 100644 --- a/src/blackmisc/networkutils.h +++ b/src/blackmisc/networkutils.h @@ -38,7 +38,7 @@ namespace BlackMisc * \param message human readable message * \return */ - static bool canConnect(const QString &hostAddress, quint16 port, QString &message, int timeoutMs = 1500); + static bool canConnect(const QString &hostAddress, int port, QString &message, int timeoutMs = 1500); /*! * Can connect to server? diff --git a/src/blackmisc/nwserver.h b/src/blackmisc/nwserver.h index c64638bff..9233d3087 100644 --- a/src/blackmisc/nwserver.h +++ b/src/blackmisc/nwserver.h @@ -69,10 +69,10 @@ namespace BlackMisc void setDescription(const QString &description) { m_description = description.trimmed().simplified(); } //! Get port - qint32 getPort() const { return m_port; } + int getPort() const { return m_port; } //! Set port - void setPort(qint32 port) { m_port = port; } + void setPort(int port) { m_port = port; } //! Server is accepting connections bool isAcceptingConnections() const { return m_isAcceptingConnections; } @@ -101,9 +101,9 @@ namespace BlackMisc QString m_name; QString m_description; QString m_address; - qint32 m_port; - CUser m_user; - bool m_isAcceptingConnections; + int m_port; + CUser m_user; + bool m_isAcceptingConnections; }; } // namespace } // namespace diff --git a/src/blackmisc/nwvoicecapabilites.cpp b/src/blackmisc/nwvoicecapabilites.cpp index c7c7f55c2..7a442e494 100644 --- a/src/blackmisc/nwvoicecapabilites.cpp +++ b/src/blackmisc/nwvoicecapabilites.cpp @@ -57,8 +57,6 @@ namespace BlackMisc return u; } } - Q_ASSERT("Wrong index"); - return QString(""); // never reached } void CVoiceCapabilities::setFromFlightPlanRemarks(const QString &flightPlanRemarks) diff --git a/src/blackmisc/simulation/simdirectaccessownaircraft.h b/src/blackmisc/simulation/simdirectaccessownaircraft.h index 73ec7e011..d3baba33b 100644 --- a/src/blackmisc/simulation/simdirectaccessownaircraft.h +++ b/src/blackmisc/simulation/simdirectaccessownaircraft.h @@ -38,6 +38,9 @@ namespace BlackMisc class IOwnAircraftProvider : public IOwnAircraftProviderReadOnly { public: + + using IOwnAircraftProviderReadOnly::ownAircraft; + //! Own aircraft virtual CSimulatedAircraft &ownAircraft() = 0; diff --git a/src/blackmisc/simulation/simdirectaccessremoteaircraft.h b/src/blackmisc/simulation/simdirectaccessremoteaircraft.h index 1d12fd8a4..e8f9b2192 100644 --- a/src/blackmisc/simulation/simdirectaccessremoteaircraft.h +++ b/src/blackmisc/simulation/simdirectaccessremoteaircraft.h @@ -63,6 +63,11 @@ namespace BlackMisc class IRemoteAircraftProvider : public IRemoteAircraftProviderReadOnly { public: + + using IRemoteAircraftProviderReadOnly::remoteAircraft; + using IRemoteAircraftProviderReadOnly::remoteAircraftParts; + using IRemoteAircraftProviderReadOnly::remoteAircraftSituations; + //! All rendered aircraft //! \note in memory reference, not thread safe virtual CSimulatedAircraftList &remoteAircraft() = 0; diff --git a/src/blacksim/fsx/simconnectutilities.cpp b/src/blacksim/fsx/simconnectutilities.cpp index f38c048a2..0cd8271a3 100644 --- a/src/blacksim/fsx/simconnectutilities.cpp +++ b/src/blacksim/fsx/simconnectutilities.cpp @@ -29,7 +29,7 @@ namespace BlackSim // // Create a very simple SimConnect.cfg // - bool CSimConnectUtilities::writeSimConnectCfg(const QString &fileName, const QString &ip, quint16 port) + bool CSimConnectUtilities::writeSimConnectCfg(const QString &fileName, const QString &ip, int port) { QString sc = CSimConnectUtilities::simConnectCfg(ip, port); QFile file(fileName); @@ -46,7 +46,7 @@ namespace BlackSim // // simconnect.cfg file // - QString CSimConnectUtilities::simConnectCfg(const QString &ip, quint16 port) + QString CSimConnectUtilities::simConnectCfg(const QString &ip, int port) { QString sc = QString("[SimConnect]\nProtocol=Ipv4\nAddress=%1\nPort=%2\n" "MaxReceiveSize=4096\nDisableNagle=0").arg(ip).arg(port); diff --git a/src/blacksim/fsx/simconnectutilities.h b/src/blacksim/fsx/simconnectutilities.h index 77b02b5c5..ca2697f9b 100644 --- a/src/blacksim/fsx/simconnectutilities.h +++ b/src/blacksim/fsx/simconnectutilities.h @@ -48,7 +48,7 @@ namespace BlackSim * \param port Port of FSX (e.g. 500) * \return content for simconnect.cfg */ - static QString simConnectCfg(const QString &ip, quint16 port = 500); + static QString simConnectCfg(const QString &ip, int port = 500); /*! * Create a FSX simconnect.cfg file @@ -57,7 +57,7 @@ namespace BlackSim * \param port Port of FSX (e.g. 500) * \return success */ - static bool writeSimConnectCfg(const QString &fileName, const QString &ip, quint16 port = 500); + static bool writeSimConnectCfg(const QString &fileName, const QString &ip, int port = 500); /*! * Resolve SimConnect exception (based on Qt metadata). diff --git a/src/plugins/simulator/fsx/simconnect_datadefinition.h b/src/plugins/simulator/fsx/simconnect_datadefinition.h index 2a906a35d..46f45b32c 100644 --- a/src/plugins/simulator/fsx/simconnect_datadefinition.h +++ b/src/plugins/simulator/fsx/simconnect_datadefinition.h @@ -118,7 +118,7 @@ namespace BlackSimPlugin //! Set default values void setDefaultValues() { - std::fill(data, data + 128, 0); + std::fill(data, data + 128, static_cast(0)); data[17] = 1; // standby data[19] = 0; // no ident } diff --git a/src/plugins/simulator/fsx/simulator_fsx.cpp b/src/plugins/simulator/fsx/simulator_fsx.cpp index fcf409f6c..4b78dc0e7 100644 --- a/src/plugins/simulator/fsx/simulator_fsx.cpp +++ b/src/plugins/simulator/fsx/simulator_fsx.cpp @@ -185,7 +185,6 @@ namespace BlackSimPlugin CLogMessage(this).warning("FSX: Not connected, not added aircraft %1") << callsign.toQString(); return false; } - remoteAircraft().setRendered(callsign, false); } bool CSimulatorFsx::updateOwnSimulatorCockpit(const CAircraft &ownAircraft, const QString &originator)