author | wimpie <wimpie> | 2004-04-09 18:04:30 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-04-09 18:04:30 (UTC) |
commit | 028717962deec0c2ff0e382221cbc2242393b79e (patch) (unidiff) | |
tree | a5f00a3b3d229f838b6e40e34ca12f248b317813 /inputmethods/dasher/DasherInterface.h | |
parent | d17b9f7b64e004dcc301866f8122171218553b42 (diff) | |
download | opie-028717962deec0c2ff0e382221cbc2242393b79e.zip opie-028717962deec0c2ff0e382221cbc2242393b79e.tar.gz opie-028717962deec0c2ff0e382221cbc2242393b79e.tar.bz2 |
Removed warnings about initialization sequence in constructores
and unused variables and arguments
Diffstat (limited to 'inputmethods/dasher/DasherInterface.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/dasher/DasherInterface.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
@@ -1,89 +1,89 @@ | |||
1 | // DasherInterface.h | 1 | // DasherInterface.h |
2 | // | 2 | // |
3 | ///////////////////////////////////////////////////////////////////////////// | 3 | ///////////////////////////////////////////////////////////////////////////// |
4 | // | 4 | // |
5 | // Copyright (c) 2002 Iain Murray | 5 | // Copyright (c) 2002 Iain Murray |
6 | // | 6 | // |
7 | ///////////////////////////////////////////////////////////////////////////// | 7 | ///////////////////////////////////////////////////////////////////////////// |
8 | 8 | ||
9 | 9 | ||
10 | 10 | ||
11 | #ifndef __DasherInterface_h__ | 11 | #ifndef __DasherInterface_h__ |
12 | #define __DasherInterface_h__ | 12 | #define __DasherInterface_h__ |
13 | 13 | ||
14 | // TODO - there is a list of things to be configurable in my notes | 14 | // TODO - there is a list of things to be configurable in my notes |
15 | // Check that everything that is not self-contained within the GUI is covered. | 15 | // Check that everything that is not self-contained within the GUI is covered. |
16 | 16 | ||
17 | #include "MSVC_Unannoy.h" | 17 | #include "MSVC_Unannoy.h" |
18 | #include "NoClones.h" | 18 | #include "NoClones.h" |
19 | 19 | ||
20 | #include "DasherWidgetInterface.h" | 20 | #include "DasherWidgetInterface.h" |
21 | #include "DasherAppInterface.h" | 21 | #include "DasherAppInterface.h" |
22 | #include "DasherSettingsInterface.h" | 22 | #include "DasherSettingsInterface.h" |
23 | 23 | ||
24 | #include "DasherScreen.h" | 24 | #include "DasherScreen.h" |
25 | #include "Alphabet.h" | 25 | #include "Alphabet.h" |
26 | #include "AlphIO.h" | 26 | #include "AlphIO.h" |
27 | #include "LanguageModel.h" | 27 | #include "LanguageModel.h" |
28 | #include "DasherModel.h" | 28 | #include "DasherModel.h" |
29 | #include "DashEdit.h" | 29 | #include "DashEdit.h" |
30 | #include "DasherView.h" | 30 | #include "DasherView.h" |
31 | 31 | ||
32 | #include "MSVC_Unannoy.h" | 32 | #include "MSVC_Unannoy.h" |
33 | #include <map> | 33 | #include <map> |
34 | 34 | ||
35 | namespace Dasher {class CDasherInterface;} | 35 | namespace Dasher {class CDasherInterface;} |
36 | class Dasher::CDasherInterface : private NoClones, | 36 | class Dasher::CDasherInterface : private NoClones, |
37 | public CDasherWidgetInterface, public CDasherAppInterface, public CDasherSettingsInterface | 37 | public CDasherWidgetInterface, public CDasherAppInterface, public CDasherSettingsInterface |
38 | { | 38 | { |
39 | public: | 39 | public: |
40 | CDasherInterface(); | 40 | CDasherInterface(); |
41 | ~CDasherInterface(); | 41 | virtual ~CDasherInterface(); |
42 | 42 | ||
43 | //! Tell the core which CSettingsStore should be used | 43 | //! Tell the core which CSettingsStore should be used |
44 | void SetSettingsStore(CSettingsStore* SettingsStore); | 44 | void SetSettingsStore(CSettingsStore* SettingsStore); |
45 | 45 | ||
46 | //! Tell the core which CDasherSettingsInterface should be used | 46 | //! Tell the core which CDasherSettingsInterface should be used |
47 | // | 47 | // |
48 | //! Provide a pointer to an instance of CDasherSettingsInterface in | 48 | //! Provide a pointer to an instance of CDasherSettingsInterface in |
49 | //! order to allow for platform dependent configuration of certain | 49 | //! order to allow for platform dependent configuration of certain |
50 | //! options | 50 | //! options |
51 | void SetSettingsUI(CDasherSettingsInterface* SettingsUI); | 51 | void SetSettingsUI(CDasherSettingsInterface* SettingsUI); |
52 | 52 | ||
53 | //! Set the path for user specific configuration and files | 53 | //! Set the path for user specific configuration and files |
54 | void SetUserLocation(std::string UserLocation); | 54 | void SetUserLocation(std::string UserLocation); |
55 | 55 | ||
56 | //! Set the path for system-wide configuration and files | 56 | //! Set the path for system-wide configuration and files |
57 | void SetSystemLocation(std::string SystemLocation); | 57 | void SetSystemLocation(std::string SystemLocation); |
58 | 58 | ||
59 | // Widget Interface | 59 | // Widget Interface |
60 | // ----------------------------------------------------- | 60 | // ----------------------------------------------------- |
61 | void Start(); | 61 | void Start(); |
62 | 62 | ||
63 | void TapOn(int MouseX, int MouseY, unsigned long Time); // Times in milliseconds | 63 | void TapOn(int MouseX, int MouseY, unsigned long Time); // Times in milliseconds |
64 | void PauseAt(int MouseX, int MouseY); // are required to make | 64 | void PauseAt(int MouseX, int MouseY); // are required to make |
65 | void Unpause(unsigned long Time); // Dasher run at the | 65 | void Unpause(unsigned long Time); // Dasher run at the |
66 | void Redraw(); // correct speed. | 66 | void Redraw(); // correct speed. |
67 | 67 | ||
68 | void ChangeScreen(); // The widgets need to tell the engine when they have been | 68 | void ChangeScreen(); // The widgets need to tell the engine when they have been |
69 | void ChangeEdit(); // affected by external interaction | 69 | void ChangeEdit(); // affected by external interaction |
70 | 70 | ||
71 | unsigned int GetNumberSymbols(); // These are needed so widgets know | 71 | unsigned int GetNumberSymbols(); // These are needed so widgets know |
72 | const std::string& GetDisplayText(symbol Symbol); // how to render the alphabet. All | 72 | const std::string& GetDisplayText(symbol Symbol); // how to render the alphabet. All |
73 | const std::string& GetEditText(symbol Symbol); // strings are encoded in UTF-8 | 73 | const std::string& GetEditText(symbol Symbol); // strings are encoded in UTF-8 |
74 | int GetTextColour(symbol Symbol); // the foreground colour of the text | 74 | int GetTextColour(symbol Symbol); // the foreground colour of the text |
75 | Opts::ScreenOrientations GetAlphabetOrientation(); | 75 | Opts::ScreenOrientations GetAlphabetOrientation(); |
76 | Opts::AlphabetTypes GetAlphabetType(); | 76 | Opts::AlphabetTypes GetAlphabetType(); |
77 | const std::string& GetTrainFile(); | 77 | const std::string& GetTrainFile(); |
78 | 78 | ||
79 | // App Interface | 79 | // App Interface |
80 | // ----------------------------------------------------- | 80 | // ----------------------------------------------------- |
81 | 81 | ||
82 | // std::map<int, std::string>& GetAlphabets(); // map<key, value> int is a UID string can change. Store UID in preferences. Display string to user. | 82 | // std::map<int, std::string>& GetAlphabets(); // map<key, value> int is a UID string can change. Store UID in preferences. Display string to user. |
83 | // std::vector<std::string>& GetAlphabets(); | 83 | // std::vector<std::string>& GetAlphabets(); |
84 | // std::vector<std::string>& GetLangModels(); | 84 | // std::vector<std::string>& GetLangModels(); |
85 | // std::vector<std::string>& GetViews(); | 85 | // std::vector<std::string>& GetViews(); |
86 | 86 | ||
87 | void ChangeScreen(CDasherScreen* NewScreen); // We may change the widgets Dasher uses | 87 | void ChangeScreen(CDasherScreen* NewScreen); // We may change the widgets Dasher uses |
88 | void ChangeEdit(CDashEditbox* NewEdit); // at run time. | 88 | void ChangeEdit(CDashEditbox* NewEdit); // at run time. |
89 | 89 | ||