| author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
| commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (side-by-side diff) | |
| 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 @@ -25,3 +25,5 @@ -class DatebookPluginConfig : public TodayConfigWidget { +#include "datebookpluginconfigbase.h" + +class DatebookPluginConfig : public TodayConfigWidget { @@ -29,2 +31,3 @@ class DatebookPluginConfig : public TodayConfigWidget { + public: @@ -41,9 +44,4 @@ private: - QCheckBox* CheckBox2; - QCheckBox* CheckBox1; - QCheckBox* CheckBox3; - QSpinBox* SpinBox1; - QSpinBox* SpinBox2; - + DatebookPluginConfigBase *m_gui; // how many lines should be showed in the datebook section |