[dasher] iPhone: remove C{DasherInterfaceBridge, OSXSettingsStore}::GetParamName
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] iPhone: remove C{DasherInterfaceBridge, OSXSettingsStore}::GetParamName
- Date: Tue, 18 Jan 2011 17:17:40 +0000 (UTC)
commit eb590e6af27cf33a31498f5de57fe2c3d828871c
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date: Thu Dec 2 15:31:03 2010 +0000
iPhone: remove C{DasherInterfaceBridge,OSXSettingsStore}::GetParamName
...as now available in DasherCore versions
Src/iPhone/Classes/CDasherInterfaceBridge.h | 1 -
Src/iPhone/Classes/CDasherInterfaceBridge.mm | 4 ----
Src/iPhone/Classes/COSXSettingsStore.mm | 10 ----------
Src/iPhone/Classes/ParametersController.mm | 4 ++--
4 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/Src/iPhone/Classes/CDasherInterfaceBridge.h b/Src/iPhone/Classes/CDasherInterfaceBridge.h
index edf77c9..52f6f32 100644
--- a/Src/iPhone/Classes/CDasherInterfaceBridge.h
+++ b/Src/iPhone/Classes/CDasherInterfaceBridge.h
@@ -40,7 +40,6 @@ public:
~CDasherInterfaceBridge();
void ChangeScreen(CDasherScreen *NewScreen);
- std::string GetParamName(int iParameter);
//redefinitions to make public....
void OnUIRealised();
void NewFrame(unsigned long iTime, bool bForceRedraw);
diff --git a/Src/iPhone/Classes/CDasherInterfaceBridge.mm b/Src/iPhone/Classes/CDasherInterfaceBridge.mm
index e96451f..378a779 100644
--- a/Src/iPhone/Classes/CDasherInterfaceBridge.mm
+++ b/Src/iPhone/Classes/CDasherInterfaceBridge.mm
@@ -84,10 +84,6 @@ void CDasherInterfaceBridge::ChangeScreen(CDasherScreen *pScreen) {
m_pMouseDevice->SetScreenBounds(pScreen->GetWidth(), pScreen->GetHeight());
}
-string CDasherInterfaceBridge::GetParamName(int iParameter) {
- return static_cast<COSXSettingsStore *>(m_pSettingsStore)->GetParamName(iParameter);
-}
-
void CDasherInterfaceBridge::SetupPaths() {
NSString *systemDir = [NSString stringWithFormat:@"%@/", [[NSBundle mainBundle] bundlePath]];
NSString *userDir = [NSString stringWithFormat:@"%@/", [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]];
diff --git a/Src/iPhone/Classes/COSXSettingsStore.mm b/Src/iPhone/Classes/COSXSettingsStore.mm
index ef870ab..7724039 100644
--- a/Src/iPhone/Classes/COSXSettingsStore.mm
+++ b/Src/iPhone/Classes/COSXSettingsStore.mm
@@ -19,16 +19,6 @@ COSXSettingsStore::COSXSettingsStore(Dasher::CEventHandler *pEventHandler):CSett
COSXSettingsStore::~COSXSettingsStore() {
};
-std::string COSXSettingsStore::GetParamName(int iParameter) {
- if (iParameter < END_OF_BPS)
- return s_oParamTables.BoolParamTable[iParameter - FIRST_BP].regName;
- if (iParameter < END_OF_LPS)
- return s_oParamTables.LongParamTable[iParameter - FIRST_LP].regName;
- if (iParameter < END_OF_SPS)
- return s_oParamTables.StringParamTable[iParameter - FIRST_SP].regName;
- throw "Illegal Parameter Index";
-}
-
/*NSDictionary *COSXSettingsStore::ParameterDictionary() {
static NSMutableDictionary *parameterDictionary = nil;
diff --git a/Src/iPhone/Classes/ParametersController.mm b/Src/iPhone/Classes/ParametersController.mm
index 52a2ac3..fce10d9 100644
--- a/Src/iPhone/Classes/ParametersController.mm
+++ b/Src/iPhone/Classes/ParametersController.mm
@@ -47,7 +47,7 @@ using namespace Dasher;
for (int i=0; i<count; i++) {
if (settings[i].iType == T_BOOL) {
UILabel *label = [[[UILabel alloc] initWithFrame:CGRectMake(10.0, y, 190.0, 20.0)] autorelease];
- label.text = NSStringFromStdString(intf->GetParamName(settings[i].iParameter));
+ label.text = NSStringFromStdString(intf->GetSettingsStore()->GetParameterName(settings[i].iParameter));
UISwitch *sw = [[[UISwitch alloc] initWithFrame:CGRectMake(210.0, y, 100.0, 20.0)] autorelease];
[view addSubview:label];
[view addSubview:sw];
@@ -88,7 +88,7 @@ using namespace Dasher;
iDivisor/=10;
}
NSString *format =[@"%@: %." stringByAppendingFormat:@"%df",iPlaces];
- label.text = [NSString stringWithFormat:format,NSStringFromStdString(intf->GetParamName(setting->iParameter)),(val / (float)setting->iDivisor)];
+ label.text = [NSString stringWithFormat:format,NSStringFromStdString(intf->GetSettingsStore()->GetParameterName(setting->iParameter)),(val / (float)setting->iDivisor)];
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]