[dasher] Remove a few unused variables / signedness fixes. (27-Jul-2009)
- From: Patrick Welche <pwelche src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [dasher] Remove a few unused variables / signedness fixes. (27-Jul-2009)
- Date: Sat, 15 Aug 2009 14:23:33 +0000 (UTC)
commit f1af06f11877991593af86a01d704eb56e42ac29
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date: Mon Aug 10 10:52:38 2009 +0200
Remove a few unused variables / signedness fixes. (27-Jul-2009)
Src/DasherCore/ControlManager.cpp | 2 +-
Src/DasherCore/ConversionHelper.cpp | 2 +-
.../LanguageModelling/CTWLanguageModel.cpp | 2 +-
Src/DasherCore/PinYinConversionHelper.cpp | 1 -
Src/DasherCore/PinyinParser.cpp | 1 -
5 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/Src/DasherCore/ControlManager.cpp b/Src/DasherCore/ControlManager.cpp
index 85c9a6a..add3b3e 100644
--- a/Src/DasherCore/ControlManager.cpp
+++ b/Src/DasherCore/ControlManager.cpp
@@ -407,7 +407,7 @@ void CControlManager::Leave(CDasherNode *pNode) {
void CControlManager::XmlStartHandler(void *pUserData, const XML_Char *szName, const XML_Char **aszAttr) {
- int colour;
+ int colour=-1;
string str;
if(0==strcmp(szName, "label"))
{
diff --git a/Src/DasherCore/ConversionHelper.cpp b/Src/DasherCore/ConversionHelper.cpp
index 03bc161..9ad6324 100644
--- a/Src/DasherCore/ConversionHelper.cpp
+++ b/Src/DasherCore/ConversionHelper.cpp
@@ -362,7 +362,7 @@ void CConversionHelper::BuildTree(CDasherNode *pRoot) {
strCurrentString = m_pAlphabet->GetDisplayText(pRootAlphabetData->iSymbol);
SCENode *pStartTemp;
- bool ConversionSuccess = Convert(strCurrentString, &pStartTemp);
+ Convert(strCurrentString, &pStartTemp);
SConversionData *pRootConversionData = static_cast<CConversionHelper::SConversionData *>(pRoot->m_pUserData);
diff --git a/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp b/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
index 7b2677f..6d35ee0 100644
--- a/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
+++ b/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
@@ -371,7 +371,7 @@ void CCTWLanguageModel::GetProbs(Context context, std::vector<unsigned int> &Pro
uint64 IntervalB = 0; // 'base' interval
uint64 IntervalZ = 0; // divided interval for the 0-branch
uint64 IntervalO = 0; // divided interval for the 1-branch
- int MinInterval = 0;
+ unsigned int MinInterval = 0;
unsigned short int Pw0 = 0;
unsigned short int Pw1 = 0;
diff --git a/Src/DasherCore/PinYinConversionHelper.cpp b/Src/DasherCore/PinYinConversionHelper.cpp
index 494f21c..5f6114b 100644
--- a/Src/DasherCore/PinYinConversionHelper.cpp
+++ b/Src/DasherCore/PinYinConversionHelper.cpp
@@ -105,7 +105,6 @@ void CPinYinConversionHelper::AssignSizes(SCENode **pStart, Dasher::CLanguageMod
int uniform_add;
int nonuniform_norm;
- int control_space;
int iNorm = normalization;
//Kept normalization base from old code
diff --git a/Src/DasherCore/PinyinParser.cpp b/Src/DasherCore/PinyinParser.cpp
index 1b8e390..8c2a415 100644
--- a/Src/DasherCore/PinyinParser.cpp
+++ b/Src/DasherCore/PinyinParser.cpp
@@ -110,7 +110,6 @@ std::set<std::string> *CPinyinParser::ParseGroupName(const std::string &strName)
strSymbol += '9';
std::string strTone = strName.substr(i2-1,1);
- int iTone = atoi(strTone.c_str());
CTrieNode *pCurrentNode = m_pRoot;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]