author | erik <erik> | 2007-04-23 20:46:34 (UTC) |
---|---|---|
committer | erik <erik> | 2007-04-23 20:46:34 (UTC) |
commit | 34975323367e4a903886cd317b34192f1271a1f2 (patch) (unidiff) | |
tree | 8898d9010cdb89b371e0bccdbf717f87359d8513 /core/pim/datebook/modules/weeklst/datebookweeklstdblview.h | |
parent | d38e40fe9ee475230425fa83e924c49e5946b87c (diff) | |
download | opie-34975323367e4a903886cd317b34192f1271a1f2.zip opie-34975323367e4a903886cd317b34192f1271a1f2.tar.gz opie-34975323367e4a903886cd317b34192f1271a1f2.tar.bz2 |
Fix for bug 1844. The display of 12hour (AM/PM) time was broken. It was
because the views never bother to check.
This fix incorporates the patch submitted by harlekin. Thanks!
Diffstat (limited to 'core/pim/datebook/modules/weeklst/datebookweeklstdblview.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklstdblview.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h index 808556e..9eb17e0 100644 --- a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h +++ b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h | |||
@@ -16,11 +16,11 @@ class DateBookWeekLstDblView: public QWidget { | |||
16 | public: | 16 | public: |
17 | DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, | 17 | DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, |
18 | QValueList<EffectiveEvent> &ev2, | 18 | QValueList<EffectiveEvent> &ev2, |
19 | QDate &d, bool onM, | 19 | QDate &d, bool onM, bool showAmPm, |
20 | QWidget* parent = 0, const char* name = 0, | 20 | QWidget* parent = 0, const char* name = 0, |
21 | WFlags fl = 0 ); | 21 | WFlags fl = 0 ); |
22 | DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, | 22 | DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, |
23 | QDate &d, bool onM, | 23 | QDate &d, bool onM, bool showAmPm, |
24 | QWidget* parent = 0, const char* name = 0, | 24 | QWidget* parent = 0, const char* name = 0, |
25 | WFlags fl = 0 ); | 25 | WFlags fl = 0 ); |
26 | virtual ~DateBookWeekLstDblView(); | 26 | virtual ~DateBookWeekLstDblView(); |
@@ -43,6 +43,7 @@ signals: | |||
43 | protected: | 43 | protected: |
44 | QHBoxLayout*m_MainLayout; | 44 | QHBoxLayout*m_MainLayout; |
45 | DateBookWeekLstView *leftView,*rightView; | 45 | DateBookWeekLstView *leftView,*rightView; |
46 | bool ampm; | ||
46 | }; | 47 | }; |
47 | 48 | ||
48 | #endif | 49 | #endif |