From 5cac09f625c88bdc93ca108e1bfac8cebb792d1f Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Tue, 11 Mar 2014 22:24:25 +0100 Subject: [PATCH] Fixed issues arised after merge - wrong namespace in newly created headers - wrong includes - Fixed members in CKeyboardKey - Fixed CKeyboardKey unit test --- src/blackcore/context_audio_proxy.h | 20 ++++++++++---------- src/blackcore/context_network.h | 2 +- src/blackcore/context_simulator_proxy.cpp | 2 +- src/blackmisc/hwkeyboardkey.h | 2 +- tests/blackmisc/testhardware.cpp | 1 + 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index 6e10bcfb6..3316a073f 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -9,8 +9,8 @@ #include "context_audio.h" #include "blackmisc/genericdbusinterface.h" -#include "blackmisc/vaudiodevicelist.h" -#include "blackmisc/vvoiceroomlist.h" +#include "blackmisc/audiodevicelist.h" +#include "blackmisc/voiceroomlist.h" #include "blackmisc/nwuserlist.h" #include "blackmisc/avaircraft.h" @@ -74,19 +74,19 @@ namespace BlackCore virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &ownAircraft) override; //! \copydoc IContextAudio::getComVoiceRooms() - virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const override; + virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override; //! \copydoc IContextAudio::getComVoiceRoomsWithAudioStatus() - virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override; + virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override; //! \copydoc IContextAudio::getCom1VoiceRoom - virtual BlackMisc::Voice::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override; + virtual BlackMisc::Audio::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override; //! \copydoc IContextAudio::getCom2VoiceRoom - virtual BlackMisc::Voice::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override; + virtual BlackMisc::Audio::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override; //! \copydoc IContextAudio::setComVoiceRooms() - virtual void setComVoiceRooms(const BlackMisc::Voice::CVoiceRoom &voiceRoomCom1, const BlackMisc::Voice::CVoiceRoom &voiceRoomCom2) override; + virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoom &voiceRoomCom1, const BlackMisc::Audio::CVoiceRoom &voiceRoomCom2) override; //! \copydoc IContextAudio::getCom1RoomCallsigns() virtual BlackMisc::Aviation::CCallsignList getCom1RoomCallsigns() const override; @@ -104,13 +104,13 @@ namespace BlackCore virtual void leaveAllVoiceRooms() override; //! \copydoc IContextAudio::getAudioDevices() - virtual BlackMisc::Voice::CAudioDeviceList getAudioDevices() const override; + virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const override; //! \copydoc IContextAudio::getCurrentAudioDevices() - virtual BlackMisc::Voice::CAudioDeviceList getCurrentAudioDevices() const override; + virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const override; //! \copydoc IContextAudio::setCurrentAudioDevice() - virtual void setCurrentAudioDevice(const BlackMisc::Voice::CAudioDevice &audioDevice) override; + virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override; //! \copydoc IContextAudio::setVolumes() virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override; diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 6ef84dcc2..5c6595968 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -11,7 +11,7 @@ #include "blackmisc/statusmessagelist.h" #include "blackmisc/nwtextmessagelist.h" #include "blackmisc/nwuserlist.h" -#include "blackmisc/vvoiceroomlist.h" +#include "blackmisc/voiceroomlist.h" #include #define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "net.vatsim.PilotClient.BlackCore.ContextNetwork" diff --git a/src/blackcore/context_simulator_proxy.cpp b/src/blackcore/context_simulator_proxy.cpp index 2ac24230b..ccea7ed66 100644 --- a/src/blackcore/context_simulator_proxy.cpp +++ b/src/blackcore/context_simulator_proxy.cpp @@ -17,7 +17,7 @@ namespace BlackCore { // Constructor for DBus - CContextSimulatorProxy::CContextSimulatorProxy(const QString &serviceName, QDBusConnection &connection, QObject *parent) : IContextSimulator(parent), m_dBusInterface(0) + CContextSimulatorProxy::CContextSimulatorProxy(const QString &serviceName, QDBusConnection &connection, QObject *parent) : IContextSimulator(parent), m_dBusInterface(nullptr) { this->m_dBusInterface = new BlackMisc::CGenericDBusInterface( serviceName , IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(), diff --git a/src/blackmisc/hwkeyboardkey.h b/src/blackmisc/hwkeyboardkey.h index 5a214c068..9b1269f6b 100644 --- a/src/blackmisc/hwkeyboardkey.h +++ b/src/blackmisc/hwkeyboardkey.h @@ -285,7 +285,7 @@ namespace BlackMisc } // class } // BlackMisc -BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Hardware::CKeyboardKey, (o.m_qtKey, o.m_nativeVirtualKey, o.m_modifier1, o.m_modifier2, o.m_function, o.m_pressed)) +BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Hardware::CKeyboardKey, (o.m_qtKey, o.m_nativeVirtualKey, o.m_modifier1, o.m_modifier2, o.m_function)) Q_DECLARE_METATYPE(BlackMisc::Hardware::CKeyboardKey) #endif // guard diff --git a/tests/blackmisc/testhardware.cpp b/tests/blackmisc/testhardware.cpp index afa48b3d3..d1dc6ff53 100644 --- a/tests/blackmisc/testhardware.cpp +++ b/tests/blackmisc/testhardware.cpp @@ -29,6 +29,7 @@ namespace BlackMiscTest key2.setModifier1(CKeyboardKey::ModifierAltLeft); key2.setModifier2(CKeyboardKey::ModifierCtrlLeft); key2.setFunction(CKeyboardKey::HotkeyPtt); + key2.setNativeVirtualKey('5'); QVERIFY2(key == key2, "CKeyboardKey::operator== failed!"); key = CKeyboardKey();