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/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) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginconfig.h | 9 |
1 files changed, 5 insertions, 4 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 @@ -//#include <qwidget.h> #include <qspinbox.h> @@ -24,5 +23,7 @@ +#include "todopluginconfigbase.h" + class TodolistPluginConfig : public TodayConfigWidget { -Q_OBJECT + Q_OBJECT @@ -40,5 +41,5 @@ private: void writeConfig(); + + TodoPluginConfigBase *m_gui; - QSpinBox* SpinBox2; - QSpinBox* SpinBoxClip; |