resolved merge conflict

4 files changed, 19 insertions, 10 deletions

diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index b79c679..8863192 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -79,4 +79,10 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
 
+//     QHBox *box4 = new QHBox( this );
+
+//     QLabel* colorLabel = new QLabel( box4, "" );
+//     colorLabel->setText( tr( "To activate settings: Restart application !" ) );
+
+
     QHBox *box5 = new QHBox( this );
     QLabel* colorLabel2 = new QLabel( box5, "" );
@@ -105,5 +111,5 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
 
-    layout->addWidget( b_group );
+    //layout->addWidget( box4 );
     layout->addWidget( box1 );
     //    layout->addWidget( box2 );
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index dad09db..d47bc0b 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -117,4 +117,8 @@ void AddressBookPluginWidget::getAddress() {
 			 QDate::currentDate().toString().latin1(), 
 			 lookAheadDate.toString().latin1() );
+    }
+
+    if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+
 
 		OContact querybirthdays;
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 @@
 #include <opie/todayconfigwidget.h>
 
+#include "datebookpluginconfigbase.h"
+
 class DatebookPluginConfig : public TodayConfigWidget {
 
     Q_OBJECT
 
+
 public:
     DatebookPluginConfig( QWidget *parent,  const char *name );
@@ -40,11 +43,6 @@ private:
     void readConfig();
 
-    QCheckBox* CheckBox2;
-    QCheckBox* CheckBox1;
-    QCheckBox* CheckBox3;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-
 
+    DatebookPluginConfigBase *m_gui;
     // how many lines should be showed in the datebook section
     int m_max_lines_meet;
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
@@ -18,9 +18,10 @@
 #define TODOLIST_PLUGIN_CONFIG_H
 
-//#include <qwidget.h>
 #include <qspinbox.h>
 
 #include <opie/todayconfigwidget.h>
 
+#include "todopluginconfigbase.h"
+
 class TodolistPluginConfig : public TodayConfigWidget {
 
@@ -40,6 +41,6 @@ private:
     void writeConfig();
 
-    QSpinBox* SpinBox2;
-    QSpinBox* SpinBoxClip;
+    TodoPluginConfigBase *m_gui;
+
 
     // how many lines should be showed in the todolist section