am/pm support, ugly

1 files changed, 23 insertions, 19 deletions

diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 090e8f9..d265d67 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -24,27 +24,27 @@
 #include <qpe/datebookdb.h>
 #include <qpe/event.h>
 
 #include <opie/tododb.h>
 
 #include <qdatetime.h>
-#include <qlist.h> 
+#include <qlist.h>
 
 #include "todayconfig.h"
 #include "todaybase.h"
 #include "clickablelabel.h"
 
 class QVBoxLayout;
 
 class Today : public TodayBase {
-  Q_OBJECT
-    
-    public:
-  Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-  ~Today();
-  
+    Q_OBJECT
+
+  public:
+    Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    ~Today();
+
   private slots:
     void startConfig();
     void startTodo();
     void startDatebook();
     void startMail();
     void draw();
@@ -55,58 +55,62 @@ class Today : public TodayBase {
     void getTodo();
     void getMail();
     void autoStart();
     bool checkIfModified();
     void setOwnerField();
     void setOwnerField(QString &string);
-    private slots:
-      void channelReceived(const QCString &msg, const QByteArray & data);
-    
+  private slots:
+    void channelReceived(const QCString &msg, const QByteArray & data);
+
  private:
     DateBookDB *db;
     ToDoDB *todo;
     todayconfig *conf;
     QWidget* AllDateBookEvents;
     //Config cfg;
     int MAX_LINES_TASK;
     int MAX_CHAR_CLIP;
     int MAX_LINES_MEET;
-    int SHOW_LOCATION; 
+    int SHOW_LOCATION;
     int SHOW_NOTES;
 };
 
 class DateBookEvent: public ClickableLabel {
   Q_OBJECT
 public:
-    DateBookEvent(const EffectiveEvent &ev, 
-                  QWidget* parent = 0,
-                  int SHOW_LOCATION = 0,
-                  int SHOW_NOTES = 0,
-                  const char* name = 0, 
-                  WFlags fl = 0);
+  DateBookEvent(const EffectiveEvent &ev,
+                QWidget* parent = 0,
+                int SHOW_LOCATION = 0,
+                int SHOW_NOTES = 0,
+                const char* name = 0,
+                WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
 private slots:
     void editMe();
 private:
+    QString ampmTime(QTime);
     const EffectiveEvent event;
+    bool ampm;
 };
 
 class DateBookEventLater: public ClickableLabel {
   Q_OBJECT
 public:
-    DateBookEventLater(const EffectiveEvent &ev, 
+    DateBookEventLater(const EffectiveEvent &ev,
                        QWidget* parent = 0,
                        int SHOW_LOCATION = 0,
                        int SHOW_NOTES = 0,
-                       const char* name = 0, 
+                       const char* name = 0,
                        WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
 private slots:
     void editMe();
 private:
+    QString ampmTime(QTime);
     const EffectiveEvent event;
+    bool ampm;
 };
 
 #endif // TODAY_H