4 files changed, 18 insertions, 14 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
@@ -19,15 +19,14 @@
 #include <qpe/timestring.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 
 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) :
     OClickableLabel(parent,name,fl), event(ev) {
 
     setAlignment( AlignTop );
@@ -42,13 +41,13 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     msg += "<B>" + (ev).description() + "</B>";
     if ( (ev).event().hasAlarm() ) {
         msg += " <b>[with alarm]</b>";
     }
 
     // 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") ) {
         msg += "<br>All day";
@@ -57,22 +56,27 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
         msg += "<br>" + ampmTime(QTime( (ev).event().start().time() ) )
                // end time of event
                + "<b> - </b>" + ampmTime(QTime( (ev).event().end().time() ) );
     }
 
     // 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;
     if( ampm ) {
         int hour = tm.hour();
         if ( hour == 0 ) {
@@ -89,13 +93,13 @@ QString DateBookEvent::ampmTime( QTime tm ) {
         return s;
     }
 
 }
 
 
-/*
+/**
  * starts the edit dialog as known from datebook
  */
 void DateBookEvent::editEventSlot( const Event &e ) {
   startDatebook();
 
   while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents();
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
@@ -25,15 +25,14 @@ class DateBookEvent: public OClickableLabel {
 
      Q_OBJECT
 
 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);
 signals:
     void editEvent(const Event &e);
 private slots:
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,6 +1,7 @@
+
 /*
  * datebookplugin.cpp
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
@@ -30,13 +31,13 @@ DatebookPlugin::~DatebookPlugin() {
 
 QString DatebookPlugin::pluginName() const {
     return "Datebook plugin";
 }
 
 double DatebookPlugin::versionNumber() const {
-    return 0.1;
+    return 1.0;
 }
 
 QString DatebookPlugin::pixmapNameWidget() const {
     return "DateBook";
 }
 
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
@@ -38,15 +38,15 @@ private:
     void readConfig();
     void getDates();
 
     // 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;
 
 };
 
 #endif