author | zecke <zecke> | 2002-10-23 19:53:47 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-23 19:53:47 (UTC) |
commit | c4c50c8468b607da19ccee21c92837c2d4b39efc (patch) (unidiff) | |
tree | e09dada3b875dd3badc542877fa877c9c57b88fe /noncore | |
parent | 748f658f5102a50502cd060d50b35fded71356c3 (diff) | |
download | opie-c4c50c8468b607da19ccee21c92837c2d4b39efc.zip opie-c4c50c8468b607da19ccee21c92837c2d4b39efc.tar.gz opie-c4c50c8468b607da19ccee21c92837c2d4b39efc.tar.bz2 |
Fix stupid bug in function_keyboard
class Doo{
public:
Doo (){
Foo* m_foo = new Foo();
}
void do(){
m_foo->woot()
}
private
Foo* m_foo
};
what is wrong in the above code?
cvslastchange for the answer
-rw-r--r-- | noncore/apps/opie-console/BUGS | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/noncore/apps/opie-console/BUGS b/noncore/apps/opie-console/BUGS index 23a1026..2f66df1 100644 --- a/noncore/apps/opie-console/BUGS +++ b/noncore/apps/opie-console/BUGS | |||
@@ -1,24 +1,28 @@ | |||
1 | Ok we all know we write perfect code | 1 | Ok we all know we write perfect code |
2 | but sometimes the compiler produces bad code | 2 | but sometimes the compiler produces bad code |
3 | and we need to work around some compiler bugs!! -zecke | 3 | and we need to work around some compiler bugs!! -zecke |
4 | 4 | ||
5 | 5 | ||
6 | Send/receive: lrzsz behaves strange when trying to use | 6 | Send/receive: lrzsz behaves strange when trying to use |
7 | --overwrite or --rename. | 7 | --overwrite or --rename. |
8 | 8 | ||
9 | - console should autoconnect by default | 9 | - console should autoconnect by default |
10 | 10 | ||
11 | - keys and buttonbar merge | 11 | - keys and buttonbar merge |
12 | 12 | ||
13 | - keys really working | 13 | - keys really working |
14 | mc is working | ||
15 | but F11 on bar seems to be the F10 key and so on | ||
16 | F9 is F8... -zecke | ||
17 | Should be fixed -zecke | ||
14 | 18 | ||
15 | - scripting with "direct subpopup" | 19 | - scripting with "direct subpopup" |
16 | 20 | ||
17 | - kill more compiler warnings. | 21 | - kill more compiler warnings. |
18 | 22 | ||
19 | - more colorshemes ( "orange is ugly" ) | 23 | - more colorshemes ( "orange is ugly" ) |
20 | 24 | ||
21 | - irda and bluetooth out ( can be done with normal serial as long as the | 25 | - irda and bluetooth out ( can be done with normal serial as long as the |
22 | connection is allready up, and extended stuff is a lot of work; maybe later | 26 | connection is allready up, and extended stuff is a lot of work; maybe later |
23 | in again ). | 27 | in again ). |
24 | 28 | ||
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index c314949..b2f1c78 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -169,55 +169,56 @@ void FunctionKeyboard::loadDefaults() { | |||
169 | /* what keys should be default? */ | 169 | /* what keys should be default? */ |
170 | keys.insert( "r0c0", FKey ("F1", 4144, 0)); | 170 | keys.insert( "r0c0", FKey ("F1", 4144, 0)); |
171 | keys.insert( "r0c1", FKey ("F2", 4145, 0)); | 171 | keys.insert( "r0c1", FKey ("F2", 4145, 0)); |
172 | keys.insert( "r0c2", FKey ("F3", 4145, 0)); | 172 | keys.insert( "r0c2", FKey ("F3", 4145, 0)); |
173 | keys.insert( "r0c3", FKey ("F4", 4146, 0)); | 173 | keys.insert( "r0c3", FKey ("F4", 4146, 0)); |
174 | keys.insert( "r0c4", FKey ("F5", 4147, 0)); | 174 | keys.insert( "r0c4", FKey ("F5", 4147, 0)); |
175 | keys.insert( "r0c5", FKey ("F6", 4148, 0)); | 175 | keys.insert( "r0c5", FKey ("F6", 4148, 0)); |
176 | keys.insert( "r0c6", FKey ("F7", 4149, 0)); | 176 | keys.insert( "r0c6", FKey ("F7", 4149, 0)); |
177 | keys.insert( "r0c7", FKey ("F8", 4150, 0)); | 177 | keys.insert( "r0c7", FKey ("F8", 4150, 0)); |
178 | keys.insert( "r0c8", FKey ("F9", 4151, 0)); | 178 | keys.insert( "r0c8", FKey ("F9", 4151, 0)); |
179 | keys.insert( "r0c9", FKey ("F10", 4152, 0)); | 179 | keys.insert( "r0c9", FKey ("F10", 4152, 0)); |
180 | keys.insert( "r0c10", FKey ("F11", 4153, 0)); | 180 | keys.insert( "r0c10", FKey ("F11", 4153, 0)); |
181 | 181 | ||
182 | keys.insert( "r1c7", FKey ("Ho", 4112, 0)); | 182 | keys.insert( "r1c7", FKey ("Ho", 4112, 0)); |
183 | keys.insert( "r1c8", FKey ("End", 4113, 0)); | 183 | keys.insert( "r1c8", FKey ("End", 4113, 0)); |
184 | keys.insert( "r1c9", FKey ("PU", 4118, 0)); | 184 | keys.insert( "r1c9", FKey ("PU", 4118, 0)); |
185 | keys.insert( "r1c10", FKey ("PD", 4119, 0)); | 185 | keys.insert( "r1c10", FKey ("PD", 4119, 0)); |
186 | 186 | ||
187 | } | 187 | } |
188 | 188 | ||
189 | /* FunctionKeyboardConfig {{{1 */ | 189 | /* FunctionKeyboardConfig {{{1 */ |
190 | 190 | ||
191 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) | 191 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) |
192 | : ProfileDialogKeyWidget(name, parent, na) { | 192 | : ProfileDialogKeyWidget(name, parent, na) { |
193 | qWarning("FunctionKeyboardConfig"); | ||
193 | 194 | ||
194 | 195 | ||
195 | kb = new FunctionKeyboard(this); | 196 | kb = new FunctionKeyboard(this); |
196 | 197 | ||
197 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); | 198 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); |
198 | QLabel *l = new QLabel("Rows", dimentions); | 199 | QLabel *l = new QLabel("Rows", dimentions); |
199 | QSpinBox *m_rowBox = new QSpinBox(1, 15, 1, dimentions); | 200 | m_rowBox = new QSpinBox(1, 15, 1, dimentions); |
200 | connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int))); | 201 | connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int))); |
201 | l = new QLabel("Columns", dimentions); | 202 | l = new QLabel("Columns", dimentions); |
202 | m_colBox = new QSpinBox(1, 15, 1, dimentions); | 203 | m_colBox = new QSpinBox(1, 15, 1, dimentions); |
203 | connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int))); | 204 | connect (m_colBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeCols(int))); |
204 | 205 | ||
205 | QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this); | 206 | QGroupBox *editKey = new QGroupBox(2, Qt::Horizontal, tr("Edit Key"), this); |
206 | l = new QLabel("Label", editKey); | 207 | l = new QLabel("Label", editKey); |
207 | /* | 208 | /* |
208 | m_labels = new QComboBox(false, editKey); | 209 | m_labels = new QComboBox(false, editKey); |
209 | labels->insertItem("text"); | 210 | labels->insertItem("text"); |
210 | 211 | ||
211 | QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); | 212 | QStringList files = QDir(QPEApplication::qpeDir() + "pics/console/keys/", "*.png").entryList(); |
212 | 213 | ||
213 | for (uint i = 0; i < files.count(); i++) { | 214 | for (uint i = 0; i < files.count(); i++) { |
214 | 215 | ||
215 | m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i])); | 216 | m_labels->insertItem(Resource::loadPixmap("console/keys/" + files[i])); |
216 | } | 217 | } |
217 | connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); | 218 | connect (m_labels, SIGNAL(activated(int)), this, SLOT(slotChangeIcon(int))); |
218 | */ | 219 | */ |
219 | 220 | ||
220 | QVBoxLayout *root = new QVBoxLayout(this, 2); | 221 | QVBoxLayout *root = new QVBoxLayout(this, 2); |
221 | root->addWidget(kb); | 222 | root->addWidget(kb); |
222 | root->addWidget(dimentions); | 223 | root->addWidget(dimentions); |
223 | root->addWidget(editKey); | 224 | root->addWidget(editKey); |