| 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/todolist/todopluginconfig.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/todolist/todopluginconfig.h') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index e09251c..54d35cf 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h | |||
| @@ -19,3 +19,2 @@ | |||
| 19 | 19 | ||
| 20 | //#include <qwidget.h> | ||
| 21 | #include <qspinbox.h> | 20 | #include <qspinbox.h> |
| @@ -24,2 +23,4 @@ | |||
| 24 | 23 | ||
| 24 | #include "todopluginconfigbase.h" | ||
| 25 | |||
| 25 | class TodolistPluginConfig : public TodayConfigWidget { | 26 | class TodolistPluginConfig : public TodayConfigWidget { |
| @@ -41,4 +42,4 @@ private: | |||
| 41 | 42 | ||
| 42 | QSpinBox* SpinBox2; | 43 | TodoPluginConfigBase *m_gui; |
| 43 | QSpinBox* SpinBoxClip; | 44 | |
| 44 | 45 | ||