4 files changed, 22 insertions, 18 deletions

diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index d4e8e1e..c37813b 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -22,9 +22,8 @@
 
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
                              QWidget* parent,
-                             int show_location,
-                             int show_notes,
-                             //  int onlyLater,
+                             bool show_location,
+                             bool show_notes,
                              int maxCharClip,
                              const char* name,
                              WFlags fl) :
@@ -45,12 +44,12 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     }
 
     // include location or not
-    if ( show_location == 1) {
+    if ( show_location ) {
         msg += "<BR><i>" + (ev).location() + "</i>";
     }
 
     if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" )
-         &&  ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59") ) {
+         &&  ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) {
         msg += "<br>All day";
     }  else {
         // start time of event
@@ -60,16 +59,21 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     }
 
     // include possible note or not
-    if ( show_notes == 1) {
+    if ( show_notes ) {
         msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip );
     }
 
     setText( msg );
     connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) );
-    setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
+    //  setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 
 
+/**
+ * AM/PM timestring conversion.
+ * @param tm the timestring
+ * @return formatted to am/pm is system is set to it
+ */
 QString DateBookEvent::ampmTime( QTime tm ) {
 
     QString s;
@@ -92,7 +96,7 @@ QString DateBookEvent::ampmTime( QTime tm ) {
 }
 
 
-/*
+/**
  * starts the edit dialog as known from datebook
  */
 void DateBookEvent::editEventSlot( const Event &e ) {
@@ -108,11 +112,11 @@ void DateBookEvent::editEventSlot( const Event &e ) {
  * launches datebook
  */
 void DateBookEvent::startDatebook() {
-    QCopEnvelope e("QPE/System", "execute(QString)");
-    e << QString("datebook");
+    QCopEnvelope e( "QPE/System", "execute(QString)" );
+    e << QString( "datebook" );
 }
 
 void DateBookEvent::editMe() {
-  emit editEvent(event.event());
+  emit editEvent( event.event() );
 }
 
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index 1168f7c..61c64f1 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -28,9 +28,8 @@ class DateBookEvent: public OClickableLabel {
 public:
   DateBookEvent(const EffectiveEvent &ev,
                 QWidget* parent = 0,
-                int show_location = 0,
-                int show_notes = 0,
-                //   int onlyLater = 0,
+                bool show_location = 0,
+                bool show_notes = 0,
                 int maxCharClip = 0,
                 const char* name = 0,
                 WFlags fl = 0);
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index 9800e61..07f5005 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -1,3 +1,4 @@
+
 /*
  * datebookplugin.cpp
  *
@@ -33,7 +34,7 @@ QString DatebookPlugin::pluginName() const {
 }
 
 double DatebookPlugin::versionNumber() const {
-    return 0.1;
+    return 1.0;
 }
 
 QString DatebookPlugin::pixmapNameWidget() const {
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h
index e0213ec..1720bb2 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.h
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h
@@ -41,11 +41,11 @@ private:
     // how many lines should be showed in the datebook section
     int m_max_lines_meet;
     // If location is to be showed too, 1 to activate it.
-    int m_show_location;
+    bool m_show_location;
     // if notes should be shown
-    int m_show_notes;
+    bool m_show_notes;
     // should only later appointments be shown or all for the current day.
-    int m_onlyLater;
+    bool m_onlyLater;
 
 };