author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (unidiff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/pim/today/plugins/datebook/datebookpluginconfig.h | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
Diffstat (limited to 'core/pim/today/plugins/datebook/datebookpluginconfig.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginconfig.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index bc412dd..2d303fc 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h | |||
@@ -24,8 +24,11 @@ | |||
24 | #include <opie/todayconfigwidget.h> | 24 | #include <opie/todayconfigwidget.h> |
25 | 25 | ||
26 | class DatebookPluginConfig : public TodayConfigWidget { | 26 | #include "datebookpluginconfigbase.h" |
27 | |||
28 | class DatebookPluginConfig : public TodayConfigWidget { | ||
27 | 29 | ||
28 | Q_OBJECT | 30 | Q_OBJECT |
29 | 31 | ||
32 | |||
30 | public: | 33 | public: |
31 | DatebookPluginConfig( QWidget *parent, const char *name ); | 34 | DatebookPluginConfig( QWidget *parent, const char *name ); |
@@ -40,11 +43,6 @@ private: | |||
40 | void readConfig(); | 43 | void readConfig(); |
41 | 44 | ||
42 | QCheckBox* CheckBox2; | ||
43 | QCheckBox* CheckBox1; | ||
44 | QCheckBox* CheckBox3; | ||
45 | QSpinBox* SpinBox1; | ||
46 | QSpinBox* SpinBox2; | ||
47 | |||
48 | 45 | ||
46 | DatebookPluginConfigBase *m_gui; | ||
49 | // how many lines should be showed in the datebook section | 47 | // how many lines should be showed in the datebook section |
50 | int m_max_lines_meet; | 48 | int m_max_lines_meet; |