Minor changes such as parameter warnings, added metatype registration for voice

refs #81
This commit is contained in:
Klaus Basan
2013-12-08 17:05:25 +01:00
committed by Mathew Sutcliffe
parent db4a3c5de4
commit 0c01da4c8e
9 changed files with 48 additions and 13 deletions

View File

@@ -21,7 +21,8 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
translations/blackmisc_i18n_en.ts
HEADERS += *.h \
vaudiodevice.h
vaudiodevice.h \
voiceallclasses.h
SOURCES += *.cpp
DESTDIR = ../../lib
OTHER_FILES += $$TRANSLATIONS readme.txt

View File

@@ -14,5 +14,6 @@
#include "blackmisc/networkallclasses.h"
#include "blackmisc/statusmessages.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/voiceallclasses.h"
#endif // guard

View File

@@ -11,6 +11,8 @@
#include "networkallclasses.h"
#include "settingsallclasses.h"
#include "valuemap.h"
#include "statusmessages.h"
#include "voiceallclasses.h"
/*
* Metadata for PQs
@@ -94,6 +96,16 @@ void BlackMisc::Settings::registerMetadata()
CSettingsNetwork::registerMetadata();
}
/*
* Metadata for Voice
*/
void BlackMisc::Voice::registerMetadata()
{
COutputAudioDevice::registerMetadata();
CInputAudioDevice::registerMetadata();
CVoiceRoom::registerMetadata();
}
/*
* Metadata for Blackmisc
*/
@@ -110,6 +122,7 @@ void BlackMisc::registerMetadata()
Geo::registerMetadata();
Network::registerMetadata();
Settings::registerMetadata();
Voice::registerMetadata();
}
/*

View File

@@ -89,6 +89,14 @@ namespace BlackMisc
void registerMetadata();
}
namespace Voice
{
/*!
* \brief Registe metadata for settings
*/
void registerMetadata();
}
/*!
* \brief Register all relevant metadata in BlackMisc
*/

View File

@@ -52,7 +52,7 @@ namespace BlackMisc
qDBusRegisterMetaType<CAudioDevice>();
}
QString CAudioDevice::convertToQString(bool i18n) const
QString CAudioDevice::convertToQString(bool /* i18n */) const
{
return m_deviceName;
}

View File

@@ -0,0 +1,12 @@
/* Copyright (C) 2013 VATSIM Community / contributors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef BLACKMISC_VOICEALLCLASSES_H
#define BLACKMISC_VOICEALLCLASSES_H
#include "blackmisc/vaudiodevice.h"
#include "blackmisc/vvoiceroom.h"
#endif // guard

View File

@@ -68,7 +68,7 @@ namespace BlackMisc
qDBusRegisterMetaType<CVoiceRoom>();
}
QString CVoiceRoom::convertToQString(bool i18n) const
QString CVoiceRoom::convertToQString(bool /* i18n */ ) const
{
if (m_hostname.isEmpty() || m_channel.isEmpty()) return "Unknown";
QString s = m_hostname;