summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/AlphIO.cpp8
-rw-r--r--inputmethods/dasher/Alphabet.cpp4
-rw-r--r--inputmethods/dasher/AlphabetMap.cpp2
-rw-r--r--inputmethods/dasher/AlphabetMap.h2
-rw-r--r--inputmethods/dasher/DashEdit.h14
-rw-r--r--inputmethods/dasher/DasherInterface.cpp27
-rw-r--r--inputmethods/dasher/DasherInterface.h2
-rw-r--r--inputmethods/dasher/DasherModel.cpp8
-rw-r--r--inputmethods/dasher/DasherNode.cpp2
-rw-r--r--inputmethods/dasher/DasherNode.h20
-rw-r--r--inputmethods/dasher/DasherSettingsInterface.h48
-rw-r--r--inputmethods/dasher/DasherView.cpp4
-rw-r--r--inputmethods/dasher/DasherView.h2
-rw-r--r--inputmethods/dasher/PPMLanguageModel.cpp8
-rw-r--r--inputmethods/dasher/PPMLanguageModel.h7
-rw-r--r--inputmethods/dasher/QtDasherImpl.cc2
-rw-r--r--inputmethods/dasher/QtDasherPlugin.cc2
-rw-r--r--inputmethods/dasher/QtDasherPlugin.h2
-rw-r--r--inputmethods/dasher/QtDasherScreen.cc17
-rw-r--r--inputmethods/dasher/QtDasherScreen.h4
-rw-r--r--inputmethods/dasher/SettingsStore.cpp12
21 files changed, 118 insertions, 79 deletions
diff --git a/inputmethods/dasher/AlphIO.cpp b/inputmethods/dasher/AlphIO.cpp
index 41b1b23..96ca14a 100644
--- a/inputmethods/dasher/AlphIO.cpp
+++ b/inputmethods/dasher/AlphIO.cpp
@@ -14,8 +14,10 @@ using namespace Dasher;
using namespace std;
CAlphIO::CAlphIO(string SystemLocation, string UserLocation)
- : SystemLocation(SystemLocation), UserLocation(UserLocation),
- BlankInfo(), CData("")
+ : BlankInfo(),
+ SystemLocation(SystemLocation),
+ UserLocation(UserLocation),
+ CData("")
{
CreateDefault();
}
@@ -38,7 +40,7 @@ const CAlphIO::AlphInfo& CAlphIO::GetInfo(const std::string& AlphID)
if (AlphID=="")
return Alphabets["Default"];
else {
- AlphInfo& CurInfo = Alphabets[AlphID];
+ // AlphInfo& CurInfo = Alphabets[AlphID];
Alphabets[AlphID].AlphID = AlphID; // Ensure consistency
return Alphabets[AlphID];
}
diff --git a/inputmethods/dasher/Alphabet.cpp b/inputmethods/dasher/Alphabet.cpp
index dc58b35..6327d8a 100644
--- a/inputmethods/dasher/Alphabet.cpp
+++ b/inputmethods/dasher/Alphabet.cpp
@@ -16,7 +16,7 @@ using namespace Dasher;
using namespace std;
-CAlphabet::CAlphabet() : m_Groups(0), m_DefaultEncoding(Opts::Western), m_Orientation(Opts::LeftToRight)
+CAlphabet::CAlphabet() : m_DefaultEncoding(Opts::Western), m_Orientation(Opts::LeftToRight), m_Groups(0)
{
m_Characters.push_back("");
m_Display.push_back("");
@@ -31,7 +31,7 @@ void CAlphabet::GetSymbols(vector<symbol>* Symbols, string* Input, bool IsMore)
string Tmp;
symbol CurSymbol=0, TmpSymbol=0;
bool KeyIsPrefix;
- int z= Input->size();
+ // int z= Input->size();
int extras;
unsigned int bit;
diff --git a/inputmethods/dasher/AlphabetMap.cpp b/inputmethods/dasher/AlphabetMap.cpp
index 09e2c72..c687e45 100644
--- a/inputmethods/dasher/AlphabetMap.cpp
+++ b/inputmethods/dasher/AlphabetMap.cpp
@@ -12,7 +12,7 @@ using namespace Dasher;
using namespace std;
alphabet_map::alphabet_map(unsigned int InitialTableSize)
- : Undefined(0), HashTable(InitialTableSize<<1)
+ : HashTable(InitialTableSize<<1), Undefined(0)
{
Entries.reserve(InitialTableSize);
}
diff --git a/inputmethods/dasher/AlphabetMap.h b/inputmethods/dasher/AlphabetMap.h
index 3aac1f5..62f20d9 100644
--- a/inputmethods/dasher/AlphabetMap.h
+++ b/inputmethods/dasher/AlphabetMap.h
@@ -68,7 +68,7 @@ private:
{
public:
Entry(std::string Key, symbol Symbol, Entry* Next)
- : Key(Key), Symbol(Symbol), Next(Next), KeyIsPrefix(false) {}
+ : Key(Key), KeyIsPrefix(false), Symbol(Symbol), Next(Next) {}
std::string Key;
bool KeyIsPrefix;
diff --git a/inputmethods/dasher/DashEdit.h b/inputmethods/dasher/DashEdit.h
index dc14d15..0baeec9 100644
--- a/inputmethods/dasher/DashEdit.h
+++ b/inputmethods/dasher/DashEdit.h
@@ -23,7 +23,7 @@ namespace Dasher {class CDashEditbox;}
class Dasher::CDashEditbox
{
public:
- CDashEditbox() : m_iFlushed(0), m_DasherInterface(0), m_dirty(false) {}
+ CDashEditbox() : m_dirty(false),m_iFlushed(0), m_DasherInterface(0) {}
//! Provide the Editbox with a widget interface
virtual void SetInterface(CDasherWidgetInterface* DasherInterface) {m_DasherInterface = DasherInterface;}
@@ -45,7 +45,7 @@ public:
virtual void get_new_context(std::string& str, int max)=0;
//! Delete flushed text from the editbox
- virtual inline void unflush()=0;
+ virtual void unflush()=0;
//! Enter a the character Symbol into the text box
virtual void output(symbol Symbol)=0;
@@ -65,7 +65,7 @@ public:
//
//! If switched on, all new files should be timestamped, either in the
//! filename or in file metadata
- virtual void TimeStampNewFiles(bool Value) {}
+ virtual void TimeStampNewFiles(bool ) {}
//! Return true if any text has been modified since the last save (optional)
bool IsDirty() {return m_dirty;}
@@ -75,14 +75,14 @@ public:
//! New file - provide a file save dialogue and return the filename in
//! filename, or provide a blank filename and present a file
//! save dialogue when Save() is called
- virtual void New(const std::string& filename) {}; // filename can be "", but you cannot call Save() without having set a filename.
+ virtual void New(const std::string& ) {}; // filename can be "", but you cannot call Save() without having set a filename.
//! Open a file (optional)
//
//! Provide a file open dialogue and set filename to the
//! filename. Return true if a file is chosen and opened successfully,
//! false otherwise
- virtual bool Open(const std::string& filename) {return false;};
+ virtual bool Open(const std::string& ) {return false;};
//! Open a file and append to it (optional)
//
@@ -90,13 +90,13 @@ public:
//! filename. The file will then have any new text appended to it.
//! Return true if a file is chosen and opened successfully, false
//! otherwise
- virtual bool OpenAppendMode(const std::string& filename) {return false;};
+ virtual bool OpenAppendMode(const std::string& ) {return false;};
//! Save a file as a provided filename (optional)
//
//! Provide a file save dialogue and set filename to the
//! filename. Return true if a file is chosen and saved successfully,
//! false otherwise
- virtual bool SaveAs(const std::string& filename) {return false;};
+ virtual bool SaveAs(const std::string& ) {return false;};
//! Save the current file (optional)
//
diff --git a/inputmethods/dasher/DasherInterface.cpp b/inputmethods/dasher/DasherInterface.cpp
index bb5b85e..4699687 100644
--- a/inputmethods/dasher/DasherInterface.cpp
+++ b/inputmethods/dasher/DasherInterface.cpp
@@ -25,11 +25,28 @@ const string CDasherInterface::EmptyString = "";
CDasherInterface::CDasherInterface()
- : m_DashEditbox(0), m_DasherScreen(0), m_LanguageModel(0), TrainContext(0), m_Alphabet(0),
- m_DasherModel(0), m_DasherView(0), AlphabetID(""), LanguageModelID(-1), ViewID(-1),
- m_MaxBitRate(-1), m_Orientation(Opts::LeftToRight), m_SettingsStore(0), m_SettingsUI(0),
- m_UserLocation("usr_"), m_SystemLocation("sys_"), m_AlphIO(0), m_TrainFile(""),
- m_DasherFont(""), m_EditFont(""), m_EditFontSize(0), m_DrawKeyboard(false)
+ : m_Alphabet(0),
+ m_LanguageModel(0),
+ m_DasherModel(0),
+ m_DashEditbox(0),
+ m_DasherScreen(0),
+ m_DasherView(0),
+ m_SettingsStore(0),
+ m_SettingsUI(0),
+ m_AlphIO(0),
+ TrainContext(0),
+ AlphabetID(""),
+ LanguageModelID(-1),
+ ViewID(-1),
+ m_MaxBitRate(-1),
+ m_DrawKeyboard(false),
+ m_Orientation(Opts::LeftToRight),
+ m_UserLocation("usr_"),
+ m_SystemLocation("sys_"),
+ m_TrainFile(""),
+ m_DasherFont(""),
+ m_EditFont(""),
+ m_EditFontSize(0)
{
}
diff --git a/inputmethods/dasher/DasherInterface.h b/inputmethods/dasher/DasherInterface.h
index 6338801..7c4496f 100644
--- a/inputmethods/dasher/DasherInterface.h
+++ b/inputmethods/dasher/DasherInterface.h
@@ -38,7 +38,7 @@ class Dasher::CDasherInterface : private NoClones,
{
public:
CDasherInterface();
- ~CDasherInterface();
+ virtual ~CDasherInterface();
//! Tell the core which CSettingsStore should be used
void SetSettingsStore(CSettingsStore* SettingsStore);
diff --git a/inputmethods/dasher/DasherModel.cpp b/inputmethods/dasher/DasherModel.cpp
index 0450d66..f15fa49 100644
--- a/inputmethods/dasher/DasherModel.cpp
+++ b/inputmethods/dasher/DasherModel.cpp
@@ -17,7 +17,7 @@ using namespace std;
//////////////////////////////////////////////////////////////////////
CDasherModel::CDasherModel(CDashEditbox* Editbox, CLanguageModel* LanguageModel, bool Dimensions)
- : m_editbox(Editbox), m_languagemodel(LanguageModel), m_Root(0), m_Dimensions(Dimensions)
+ : m_Dimensions(Dimensions), m_editbox(Editbox), m_languagemodel(LanguageModel), m_Root(0)
{
LearnContext = m_languagemodel->GetRootNodeContext();
@@ -105,7 +105,7 @@ void CDasherModel::Get_string_under_mouse(const myint Mousex,const myint Mousey,
/////////////////////////////////////////////////////////////////////////////
-void CDasherModel::Flush(const myint Mousex,const myint Mousey)
+void CDasherModel::Flush(const myint ,const myint )
{
vector<symbol> vtUnder;
Get_string_under_mouse(m_DasherOX,m_DasherOY,vtUnder);
@@ -184,7 +184,7 @@ void CDasherModel::Start()
void CDasherModel::Get_new_root_coords(myint Mousex,myint Mousey)
{
- int cappedrate=0;
+ // int cappedrate=0;
double dRx=1.0,dRxnew=1.0;
double dRxnew2;
@@ -243,7 +243,7 @@ void CDasherModel::Get_new_root_coords(myint Mousex,myint Mousey)
/////////////////////////////////////////////////////////////////////////////
-void CDasherModel::Tap_on_display(myint miMousex,myint miMousey, unsigned long Time)
+void CDasherModel::Tap_on_display(myint miMousex,myint miMousey, unsigned long )
// work out the next viewpoint, opens some new nodes
{
// works out next viewpoint
diff --git a/inputmethods/dasher/DasherNode.cpp b/inputmethods/dasher/DasherNode.cpp
index 26af10f..3a984ef 100644
--- a/inputmethods/dasher/DasherNode.cpp
+++ b/inputmethods/dasher/DasherNode.cpp
@@ -32,7 +32,7 @@ void CDasherNode::Dump_node () const
*/
}
-void CDasherNode::Generic_Push_Node(CLanguageModel::CNodeContext *context) {
+void CDasherNode::Generic_Push_Node(CLanguageModel::CNodeContext *) {
m_iAge=0;
m_bAlive=true;
diff --git a/inputmethods/dasher/DasherNode.h b/inputmethods/dasher/DasherNode.h
index 705a9d4..fb00d47 100644
--- a/inputmethods/dasher/DasherNode.h
+++ b/inputmethods/dasher/DasherNode.h
@@ -74,9 +74,23 @@ using namespace Opts;
/////////////////////////////////////////////////////////////////////////////
-inline CDasherNode::CDasherNode(CDasherNode *parent,symbol Symbol, unsigned int igroup, int iphase, ColorSchemes ColorScheme,int ilbnd,int ihbnd,CLanguageModel *lm, int Colour=0)
- : m_parent(parent),m_Symbol(Symbol),m_iGroup(igroup),m_iLbnd(ilbnd),m_iHbnd(ihbnd),m_languagemodel(lm),m_iPhase(iphase),
- m_context(0), m_iAge(0), m_bAlive(1), m_Children(0), m_bForce(false), m_iChars(0), m_ColorScheme(ColorScheme), m_bControlChild(false), m_iColour(Colour)
+inline CDasherNode::CDasherNode(CDasherNode *parent,symbol Symbol, unsigned int igroup, int iphase, ColorSchemes ColorScheme,int ilbnd,int ihbnd,CLanguageModel *lm, int Colour=0) :
+ m_iLbnd(ilbnd),
+ m_iHbnd(ihbnd),
+ m_iGroup(igroup),
+ m_iChars(0),
+ m_iAge(0),
+ m_bAlive(1),
+ m_bControlChild(false),
+ m_ColorScheme(ColorScheme),
+ m_iPhase(iphase),
+ m_iColour(Colour),
+ m_Symbol(Symbol),
+ m_languagemodel(lm),
+ m_Children(0),
+ m_parent(parent),
+ m_context(0),
+ m_bForce(false)
{
/*
switch (ColorScheme) {
diff --git a/inputmethods/dasher/DasherSettingsInterface.h b/inputmethods/dasher/DasherSettingsInterface.h
index 9d03eba..34b55d4 100644
--- a/inputmethods/dasher/DasherSettingsInterface.h
+++ b/inputmethods/dasher/DasherSettingsInterface.h
@@ -21,31 +21,31 @@ public:
// These actually affect the way Dasher works
//! Change the alphabet in use to NewAlphabetID
- virtual void ChangeAlphabet(const std::string& NewAlphabetID) {};
+ virtual void ChangeAlphabet(const std::string& ) {};
//! Change the maximum bitrate (effectively the speed) of Dasher
- virtual void ChangeMaxBitRate(double NewMaxBitRate) {};
+ virtual void ChangeMaxBitRate(double ) {};
//! Generate a new langage model. Not usually needed
- virtual void ChangeLanguageModel(unsigned int NewLanguageModelID) {};
+ virtual void ChangeLanguageModel(unsigned int ) {};
//! Generate a new view of the model. Call it with 0 when starting up
- virtual void ChangeView(unsigned int NewViewID) {};
+ virtual void ChangeView(unsigned int ) {};
//! Change the orientation (l->r, r->l, so on) of the model
- virtual void ChangeOrientation(Opts::ScreenOrientations Orientation) {};
+ virtual void ChangeOrientation(Opts::ScreenOrientations ) {};
//! Set the file encoding of output files to Encoding
- virtual void SetFileEncoding(Opts::FileEncodingFormats Encoding) {};
+ virtual void SetFileEncoding(Opts::FileEncodingFormats ) {};
//! Inform the core that the screen has this size
- virtual void SetScreenSize(long Width, long Height) {};
+ virtual void SetScreenSize(long , long ) {};
//! Set the size of the font used in the Dasher canvas
- virtual void SetDasherFontSize(Dasher::Opts::FontSize fontsize) {};
+ virtual void SetDasherFontSize(Dasher::Opts::FontSize ) {};
//! Set the number of dimensions of input (either 1 or 2)
- virtual void SetDasherDimensions(bool Value) {};
+ virtual void SetDasherDimensions(bool ) {};
// These are recommended options for the Dasher GUI. {{{ They don't actually
// change the way Dasher works. They are part of the Dasher interface
@@ -53,49 +53,49 @@ public:
// easy for the Dasher engine to control the GUI later on. }}}
//! True if toolbar should be shown, false otherwise
- virtual void ShowToolbar(bool Value) {};
+ virtual void ShowToolbar(bool ) {};
//! True if toolbar should show text, false otherwse
- virtual void ShowToolbarText(bool Value) {};
+ virtual void ShowToolbarText(bool ) {};
//! True if toolbar should have large icons, false otherwise
- virtual void ShowToolbarLargeIcons(bool Value) {};
+ virtual void ShowToolbarLargeIcons(bool ) {};
//! True if the speed slider should be shown, false otherwise
- virtual void ShowSpeedSlider(bool Value) {};
+ virtual void ShowSpeedSlider(bool ) {};
//! True if the window layout should be fixed, false otherwise
- virtual void FixLayout(bool Value) {};
+ virtual void FixLayout(bool ) {};
//! True if new files should be timestamped, false otherwise
- virtual void TimeStampNewFiles(bool Value) {};
+ virtual void TimeStampNewFiles(bool ) {};
//! True if all text should be copied to clipboard when Dasher is stopped, false otherwise
- virtual void CopyAllOnStop(bool Value) {};
+ virtual void CopyAllOnStop(bool ) {};
//! True if a box should be drawn to represent the logical position of the mouse
- virtual void DrawMouse(bool Value) {};
+ virtual void DrawMouse(bool ) {};
//! Set the editbox font
- virtual void SetEditFont(std::string Name, long Size) {};
+ virtual void SetEditFont(std::string , long ) {};
//! Set the canvas font
- virtual void SetDasherFont(std::string Name) {};
+ virtual void SetDasherFont(std::string ) {};
//! Set the height of the edit box
- virtual void SetEditHeight(long Value) {};
+ virtual void SetEditHeight(long ) {};
//! Should Dasher start and stop on space bar?
- virtual void StartOnSpace(bool Value) {};
+ virtual void StartOnSpace(bool ) {};
//! Should Dasher start and stop on left mouse button?
- virtual void StartOnLeft(bool Value) {};
+ virtual void StartOnLeft(bool ) {};
//! Should Dasher be keyboard controlled?
- virtual void KeyControl(bool Value) {};
+ virtual void KeyControl(bool ) {};
//! Should Dasher pause when the pointer leaves the window?
- virtual void WindowPause(bool Value) {};
+ virtual void WindowPause(bool ) {};
};
diff --git a/inputmethods/dasher/DasherView.cpp b/inputmethods/dasher/DasherView.cpp
index 3b8cb64..8e32cf1 100644
--- a/inputmethods/dasher/DasherView.cpp
+++ b/inputmethods/dasher/DasherView.cpp
@@ -24,14 +24,14 @@ void CDasherView::ChangeOrientation(Dasher::Opts::ScreenOrientations Orientation
}
-void CDasherView::FlushAt(int mousex,int mousey)
+void CDasherView::FlushAt(int ,int )
{
m_DasherModel.Flush(0,0);
}
int CDasherView::RecursiveRender(CDasherNode* Render, myint y1,myint y2,int mostleft, bool text)
{
- symbol CurChar = Render->Symbol();
+ // symbol CurChar = Render->Symbol();
int Color;
if (ColourMode==true) {
diff --git a/inputmethods/dasher/DasherView.h b/inputmethods/dasher/DasherView.h
index 81cc24e..6257c03 100644
--- a/inputmethods/dasher/DasherView.h
+++ b/inputmethods/dasher/DasherView.h
@@ -28,7 +28,7 @@ class Dasher::CDasherView
{
public:
CDasherView(CDasherScreen* DasherScreen, CDasherModel& DasherModel, Dasher::Opts::ScreenOrientations Orientation=Dasher::Opts::LeftToRight);
- ~CDasherView() {}
+ virtual ~CDasherView() {}
void ChangeOrientation(Dasher::Opts::ScreenOrientations Orientation);
diff --git a/inputmethods/dasher/PPMLanguageModel.cpp b/inputmethods/dasher/PPMLanguageModel.cpp
index b725a2b..137b07f 100644
--- a/inputmethods/dasher/PPMLanguageModel.cpp
+++ b/inputmethods/dasher/PPMLanguageModel.cpp
@@ -72,7 +72,7 @@ CPPMLanguageModel::~CPPMLanguageModel()
}
-bool CPPMLanguageModel::GetProbs(CContext *context,vector<unsigned int> &probs,double addprob)
+bool CPPMLanguageModel::GetProbs(CContext *context,vector<unsigned int> &probs,double )
// get the probability distribution at the context
{
// seems like we have to have this hack for VC++
@@ -85,7 +85,7 @@ bool CPPMLanguageModel::GetProbs(CContext *context,vector<unsigned int> &probs,d
CPPMnode *temp,*s;
int loop,total;
int sym;
- ulong spent=0;
+ // ulong spent=0;
ulong size_of_slice;
bool *exclusions=new bool [modelchars];
ulong uniform=modelchars;
@@ -192,7 +192,7 @@ void CPPMLanguageModel::EnterSymbol(CContext* Context, modelchar Symbol)
CPPMLanguageModel::CPPMContext& context = * static_cast<CPPMContext *> (Context);
CPPMnode *find;
- CPPMnode *temp=context.head;
+ // CPPMnode *temp=context.head;
while (context.head) {
find =context.head->find_symbol(Symbol);
@@ -246,7 +246,7 @@ void CPPMLanguageModel::dumpString( char *str, int pos, int len )
}
-void CPPMLanguageModel::dumpTrie( CPPMLanguageModel::CPPMnode *t, int d )
+void CPPMLanguageModel::dumpTrie( CPPMLanguageModel::CPPMnode *, int )
// diagnostic display of the PPM trie from node t and deeper
{
//TODO
diff --git a/inputmethods/dasher/PPMLanguageModel.h b/inputmethods/dasher/PPMLanguageModel.h
index bd860b8..7025a0a 100644
--- a/inputmethods/dasher/PPMLanguageModel.h
+++ b/inputmethods/dasher/PPMLanguageModel.h
@@ -16,7 +16,7 @@
#include "LanguageModel.h"
-static char dumpTrieStr[40000];
+// static char dumpTrieStr[40000];
const int MAX_ORDER = 5;
const int maxcont =200;
@@ -25,7 +25,7 @@ class Dasher::CPPMLanguageModel : public Dasher::CLanguageModel, private NoClone
{
public:
CPPMLanguageModel(CAlphabet *_alphabet, int _normalization);
- ~CPPMLanguageModel();
+ virtual ~CPPMLanguageModel();
class CPPMnode {
public:
@@ -41,7 +41,8 @@ public:
class CPPMContext : public CContext {
public:
- CPPMContext(CPPMContext const &input) {head = input.head; order= input.order;}
+ CPPMContext(CPPMContext const &input) : CContext(input)
+ { head = input.head;order= input.order;}
CPPMContext(CPPMnode* _head=0, int _order=0) : head(_head),order(_order) {};
~CPPMContext() {};
void dump();
diff --git a/inputmethods/dasher/QtDasherImpl.cc b/inputmethods/dasher/QtDasherImpl.cc
index d72f6d9..f4a70dd 100644
--- a/inputmethods/dasher/QtDasherImpl.cc
+++ b/inputmethods/dasher/QtDasherImpl.cc
@@ -21,7 +21,7 @@ static const char * qtdasher_xpm[]={
QtDasherImpl::QtDasherImpl()
- : qtdasherwidget(0), icn(0), qtdasherinterface(0)
+ : qtdasherinterface(0), qtdasherwidget(0), icn(0)
{
}
diff --git a/inputmethods/dasher/QtDasherPlugin.cc b/inputmethods/dasher/QtDasherPlugin.cc
index cf4fc2c..f491769 100644
--- a/inputmethods/dasher/QtDasherPlugin.cc
+++ b/inputmethods/dasher/QtDasherPlugin.cc
@@ -49,7 +49,7 @@ void QtDasherPlugin::unflush()
{
if (flushcount==0)
return;
- for (flushcount; flushcount>0; flushcount--) {
+ for (; flushcount>0; flushcount--) {
deletetext();
}
}
diff --git a/inputmethods/dasher/QtDasherPlugin.h b/inputmethods/dasher/QtDasherPlugin.h
index 5f70acf..c979a2f 100644
--- a/inputmethods/dasher/QtDasherPlugin.h
+++ b/inputmethods/dasher/QtDasherPlugin.h
@@ -22,7 +22,7 @@ public:
void flush(int);
void Clear() {};
void SetEncoding(Dasher::Opts::FileEncodingFormats) {};
- void SetFont(std::string Name, long Size) {};
+ void SetFont(std::string , long ) {};
signals:
void key( ushort, ushort, ushort, bool, bool);
diff --git a/inputmethods/dasher/QtDasherScreen.cc b/inputmethods/dasher/QtDasherScreen.cc
index 747b705..2179cfb 100644
--- a/inputmethods/dasher/QtDasherScreen.cc
+++ b/inputmethods/dasher/QtDasherScreen.cc
@@ -18,10 +18,13 @@
QtDasherScreen::QtDasherScreen (int _width, int _height,
CDasherInterface *_interface,
- QWidget * _parent, Dasher::CDashEditbox *edit):
- QWidget(_parent), interface( _interface ),
- fontname( "fixed" ), fontsize(12),
- Dasher::CDasherScreen(_width, _height)
+ QWidget * _parent,
+ Dasher::CDashEditbox *_edit):
+ QWidget(_parent),
+ Dasher::CDasherScreen(_width, _height),
+ fontsize(12),
+ interface( _interface ),
+ fontname( "fixed" )
{
font = QFont (fontname.c_str(), fontsize);
painter = new QPainter ();
@@ -32,7 +35,9 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
interface->ChangeLanguageModel(0);
interface->ChangeView(0);
- interface->ChangeEdit(edit);
+ interface->ChangeEdit(_edit);
+ edit = _edit;
+
/* interface->GetFontSizes(&FontSizes);
@@ -143,7 +148,7 @@ void QtDasherScreen::DrawPolygon(point* Points, int Number, int Color,
painter->drawPolygon (qpa);
}
-void QtDasherScreen::mousePressEvent (QMouseEvent *e)
+void QtDasherScreen::mousePressEvent (QMouseEvent *)
{
paused=false;
interface->Unpause(get_time());
diff --git a/inputmethods/dasher/QtDasherScreen.h b/inputmethods/dasher/QtDasherScreen.h
index 06689d6..d3d67cb 100644
--- a/inputmethods/dasher/QtDasherScreen.h
+++ b/inputmethods/dasher/QtDasherScreen.h
@@ -36,7 +36,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
void SetFont(std::string Name)
{ fontname = Name; /* set_the_font(); */ }
- void SetFontSize(Dasher::Opts::FontSize fontsize)
+ void SetFontSize(Dasher::Opts::FontSize )
{
#warning QtDasherScreen::SetFontSize() not implemented
}
@@ -46,7 +46,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
return (Dasher::Opts::Normal);
}
- void TextSize(symbol Character, int* Width, int* Height, int Size) const
+ void TextSize(symbol , int* Width, int* Height, int ) const
{
// should probably use QPainter::boundingRect()
*Width = *Height = font.pixelSize();
diff --git a/inputmethods/dasher/SettingsStore.cpp b/inputmethods/dasher/SettingsStore.cpp
index c5bbfea..f7661bd 100644
--- a/inputmethods/dasher/SettingsStore.cpp
+++ b/inputmethods/dasher/SettingsStore.cpp
@@ -102,34 +102,34 @@ functions are over-ridden.
--------------------------------------------------------------------------*/
-bool CSettingsStore::LoadSetting(const string& Key, bool* Value)
+bool CSettingsStore::LoadSetting(const string& , bool* )
{
return false;
}
-bool CSettingsStore::LoadSetting(const string& Key, long* Value)
+bool CSettingsStore::LoadSetting(const string& , long* )
{
return false;
}
-bool CSettingsStore::LoadSetting(const string& Key, string* Value)
+bool CSettingsStore::LoadSetting(const string& , string* )
{
return false;
}
-void CSettingsStore::SaveSetting(const string& Key, bool Value)
+void CSettingsStore::SaveSetting(const string& , bool )
{
}
-void CSettingsStore::SaveSetting(const string& Key, long Value)
+void CSettingsStore::SaveSetting(const string& , long )
{
}
-void CSettingsStore::SaveSetting(const string& Key, const string& Value)
+void CSettingsStore::SaveSetting(const string& , const string& )
{
}