flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues arised after merge

Browse Source 
- wrong namespace in newly created headers
- wrong includes
- Fixed members in CKeyboardKey
- Fixed CKeyboardKey unit test
This commit is contained in:
Roland Winklmeier
2014-03-11 22:24:25 +01:00
parent 0349d8f212
commit 5cac09f625
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackcore/context_audio_proxy.h
View File

@@ -9,8 +9,8 @@
#include "context_audio.h" #include "context_audio.h"
#include "blackmisc/genericdbusinterface.h" #include "blackmisc/genericdbusinterface.h"
#include "blackmisc/vaudiodevicelist.h" #include "blackmisc/audiodevicelist.h"
#include "blackmisc/vvoiceroomlist.h" #include "blackmisc/voiceroomlist.h"
#include "blackmisc/nwuserlist.h" #include "blackmisc/nwuserlist.h"
#include "blackmisc/avaircraft.h" #include "blackmisc/avaircraft.h"
@@ -74,19 +74,19 @@ namespace BlackCore
virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &ownAircraft) override; virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &ownAircraft) override;
//! \copydoc IContextAudio::getComVoiceRooms() //! \copydoc IContextAudio::getComVoiceRooms()
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const override; virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override;
//! \copydoc IContextAudio::getComVoiceRoomsWithAudioStatus() //! \copydoc IContextAudio::getComVoiceRoomsWithAudioStatus()
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override; virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
//! \copydoc IContextAudio::getCom1VoiceRoom //! \copydoc IContextAudio::getCom1VoiceRoom
virtual BlackMisc::Voice::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override; virtual BlackMisc::Audio::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override;
//! \copydoc IContextAudio::getCom2VoiceRoom //! \copydoc IContextAudio::getCom2VoiceRoom
virtual BlackMisc::Voice::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override; virtual BlackMisc::Audio::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override;
//! \copydoc IContextAudio::setComVoiceRooms() //! \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() //! \copydoc IContextAudio::getCom1RoomCallsigns()
virtual BlackMisc::Aviation::CCallsignList getCom1RoomCallsigns() const override; virtual BlackMisc::Aviation::CCallsignList getCom1RoomCallsigns() const override;
@@ -104,13 +104,13 @@ namespace BlackCore
virtual void leaveAllVoiceRooms() override; virtual void leaveAllVoiceRooms() override;
//! \copydoc IContextAudio::getAudioDevices() //! \copydoc IContextAudio::getAudioDevices()
virtual BlackMisc::Voice::CAudioDeviceList getAudioDevices() const override; virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const override;
//! \copydoc IContextAudio::getCurrentAudioDevices() //! \copydoc IContextAudio::getCurrentAudioDevices()
virtual BlackMisc::Voice::CAudioDeviceList getCurrentAudioDevices() const override; virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const override;
//! \copydoc IContextAudio::setCurrentAudioDevice() //! \copydoc IContextAudio::setCurrentAudioDevice()
virtual void setCurrentAudioDevice(const BlackMisc::Voice::CAudioDevice &audioDevice) override; virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override;
//! \copydoc IContextAudio::setVolumes() //! \copydoc IContextAudio::setVolumes()
virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override; virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override;

2
src/blackcore/context_network.h
View File

@@ -11,7 +11,7 @@
#include "blackmisc/statusmessagelist.h" #include "blackmisc/statusmessagelist.h"
#include "blackmisc/nwtextmessagelist.h" #include "blackmisc/nwtextmessagelist.h"
#include "blackmisc/nwuserlist.h" #include "blackmisc/nwuserlist.h"
#include "blackmisc/vvoiceroomlist.h" #include "blackmisc/voiceroomlist.h"
#include <QObject> #include <QObject>
#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "net.vatsim.PilotClient.BlackCore.ContextNetwork" #define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "net.vatsim.PilotClient.BlackCore.ContextNetwork"

2
src/blackcore/context_simulator_proxy.cpp
View File

@@ -17,7 +17,7 @@ namespace BlackCore
{ {
// Constructor for DBus // 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( this->m_dBusInterface = new BlackMisc::CGenericDBusInterface(
serviceName , IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(), serviceName , IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),

2
src/blackmisc/hwkeyboardkey.h
View File

@@ -285,7 +285,7 @@ namespace BlackMisc
} // class } // class
} // BlackMisc } // 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) Q_DECLARE_METATYPE(BlackMisc::Hardware::CKeyboardKey)
#endif // guard #endif // guard

1
tests/blackmisc/testhardware.cpp
View File

@@ -29,6 +29,7 @@ namespace BlackMiscTest
key2.setModifier1(CKeyboardKey::ModifierAltLeft); key2.setModifier1(CKeyboardKey::ModifierAltLeft);
key2.setModifier2(CKeyboardKey::ModifierCtrlLeft); key2.setModifier2(CKeyboardKey::ModifierCtrlLeft);
key2.setFunction(CKeyboardKey::HotkeyPtt); key2.setFunction(CKeyboardKey::HotkeyPtt);
key2.setNativeVirtualKey('5');
QVERIFY2(key == key2, "CKeyboardKey::operator== failed!"); QVERIFY2(key == key2, "CKeyboardKey::operator== failed!");
key = CKeyboardKey(); key = CKeyboardKey();