author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (unidiff) | |
tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/button/buttonsettings.h | |
parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
Diffstat (limited to 'core/settings/button/buttonsettings.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/button/buttonsettings.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h index d41a209..67694d3 100644 --- a/core/settings/button/buttonsettings.h +++ b/core/settings/button/buttonsettings.h | |||
@@ -39,15 +39,16 @@ using namespace Opie; | |||
39 | class buttoninfo; | 39 | class buttoninfo; |
40 | 40 | ||
41 | class ButtonSettings : public QDialog { | 41 | class ButtonSettings : public QDialog { |
42 | Q_OBJECT | 42 | Q_OBJECT |
43 | 43 | ||
44 | public: | 44 | public: |
45 | ButtonSettings ( ); | 45 | ButtonSettings ( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0 ); |
46 | ~ButtonSettings ( ); | 46 | ~ButtonSettings ( ); |
47 | 47 | ||
48 | static QString appName() { return QString::fromLatin1("buttonsettings"); } | ||
48 | virtual void accept ( ); | 49 | virtual void accept ( ); |
49 | virtual void done ( int r ); | 50 | virtual void done ( int r ); |
50 | 51 | ||
51 | private slots: | 52 | private slots: |
52 | void keyTimeout ( ); | 53 | void keyTimeout ( ); |
53 | void updateLabels ( ); | 54 | void updateLabels ( ); |