Skip to content

Commit 839b64f

Browse files
committed
Using less c-style API
1 parent 0dda0fa commit 839b64f

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Src/DasherCore/DasherInterfaceBase.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -773,25 +773,28 @@ void CDasherInterfaceBase::CreateModules() {
773773
//WIP Temporary as too many segfaults! //RegisterModule(new CDemoFilter(this, this, m_pFramerate));
774774
}
775775

776-
void CDasherInterfaceBase::GetPermittedValues(Parameter parameter, std::vector<std::string> &vList) {
777-
// TODO: Deprecate direct calls to these functions
776+
std::vector<std::string> CDasherInterfaceBase::GetPermittedValues(Parameter parameter) {
777+
std::vector<std::string> result;
778+
778779
switch (parameter) {
779780
case SP_ALPHABET_ID:
780781
DASHER_ASSERT(m_AlphIO != NULL);
781-
m_AlphIO->GetAlphabets(&vList);
782+
m_AlphIO->GetAlphabets(&result);
782783
break;
783784
case SP_COLOUR_ID:
784785
DASHER_ASSERT(m_ColourIO != NULL);
785-
m_ColorIO->GetKnownPalettes(&vList);
786+
m_ColorIO->GetKnownPalettes(&result);
786787
break;
787788
case SP_INPUT_FILTER:
788-
m_pModuleManager->ListInputMethodModules(vList);
789+
m_pModuleManager->ListInputMethodModules(result);
789790
break;
790791
case SP_INPUT_DEVICE:
791-
m_pModuleManager->ListInputDeviceModules(vList);
792+
m_pModuleManager->ListInputDeviceModules(result);
792793
break;
793794
default: break;
794795
}
796+
797+
return result;
795798
}
796799

797800
void CDasherInterfaceBase::SetOffset(int iOffset, bool bForce) {

Src/DasherCore/DasherInterfaceBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Dasher::CDasherInterfaceBase : public CMessageDisplay, private NoClones {
103103
/// geneate preferences dialogues etc.
104104
///
105105

106-
void GetPermittedValues(Parameter parameter, std::vector<std::string> &vList);
106+
std::vector<std::string> GetPermittedValues(Parameter parameter);
107107

108108
CColorIO* GetColorIO(){return m_ColorIO;}
109109

0 commit comments

Comments
 (0)