summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.pro4
-rw-r--r--core/pim/datebook/datebookweeklst.cpp1
-rw-r--r--core/pim/datebook/datebookweeklstdayhdr.ui8
-rw-r--r--core/pim/datebook/dateentry.ui6
-rw-r--r--core/pim/datebook/dateentryimpl.cpp1
-rw-r--r--core/pim/datebook/namespace_hack.h20
6 files changed, 31 insertions, 9 deletions
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 2b2efaa..dbdd31b 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -11,5 +11,5 @@ HEADERS = datebookday.h \
11 noteentryimpl.h \ 11 noteentryimpl.h \
12 onoteedit.h \ 12 onoteedit.h \
13 datebookdayallday.h 13 datebookdayallday.h
14 SOURCES= main.cpp \ 14 SOURCES= main.cpp \
15 datebookday.cpp \ 15 datebookday.cpp \
@@ -24,5 +24,5 @@ SOURCES = main.cpp \
24 noteentryimpl.cpp \ 24 noteentryimpl.cpp \
25 onoteedit.cpp \ 25 onoteedit.cpp \
26 datebookdayallday.cpp 26 datebookdayallday.cpp
27 INTERFACES= dateentry.ui \ 27 INTERFACES= dateentry.ui \
28 datebookdayheader.ui \ 28 datebookdayheader.ui \
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 30c925d..abaf3ea 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -1,2 +1,3 @@
1#include "namespace_hack.h"
1#include "datebookweeklst.h" 2#include "datebookweeklst.h"
2 3
diff --git a/core/pim/datebook/datebookweeklstdayhdr.ui b/core/pim/datebook/datebookweeklstdayhdr.ui
index 9499726..74ea584 100644
--- a/core/pim/datebook/datebookweeklstdayhdr.ui
+++ b/core/pim/datebook/datebookweeklstdayhdr.ui
@@ -61,5 +61,5 @@
61 </widget> 61 </widget>
62 <widget> 62 <widget>
63 <class>OClickableLabel</class> 63 <class>ClickableLabel</class>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>name</name> 65 <name>name</name>
@@ -106,5 +106,5 @@
106 </widget> 106 </widget>
107 <widget> 107 <widget>
108 <class>OClickableLabel</class> 108 <class>ClickableLabel</class>
109 <property stdset="1"> 109 <property stdset="1">
110 <name>name</name> 110 <name>name</name>
@@ -123,6 +123,6 @@
123<customwidgets> 123<customwidgets>
124 <customwidget> 124 <customwidget>
125 <class>OClickableLabel</class> 125 <class>ClickableLabel</class>
126 <header location="global">opie/oclickablelabel.h</header> 126 <header location="local">namespace_hack.h</header>
127 <sizehint> 127 <sizehint>
128 <width>-1</width> 128 <width>-1</width>
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index acc607c..f776911 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -302,5 +302,5 @@
302 </spacer> 302 </spacer>
303 <widget row="5" column="1" rowspan="1" colspan="3" > 303 <widget row="5" column="1" rowspan="1" colspan="3" >
304 <class>OTimePicker</class> 304 <class>TimePicker</class>
305 <property stdset="1"> 305 <property stdset="1">
306 <name>name</name> 306 <name>name</name>
@@ -575,6 +575,6 @@
575 </customwidget> 575 </customwidget>
576 <customwidget> 576 <customwidget>
577 <class>OTimePicker</class> 577 <class>TimePicker</class>
578 <header location="local">opie/otimepicker.h</header> 578 <header location="local">namespace_hack.h</header>
579 <sizehint> 579 <sizehint>
580 <width>-1</width> 580 <width>-1</width>
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index dbff18f..7b4716f 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -19,4 +19,5 @@
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "namespace_hack.h"
21#include "dateentryimpl.h" 22#include "dateentryimpl.h"
22#include "repeatentry.h" 23#include "repeatentry.h"
diff --git a/core/pim/datebook/namespace_hack.h b/core/pim/datebook/namespace_hack.h
new file mode 100644
index 0000000..c15b5ed
--- a/dev/null
+++ b/core/pim/datebook/namespace_hack.h
@@ -0,0 +1,20 @@
1#ifndef NAME_SPACE_HACK_H
2#define NAME_SPACE_HACK_H
3
4#include <opie2/otimepicker.h>
5#include <opie2/oclickablelabel.h>
6
7class TimePicker : public Opie::Ui::OTimePicker {
8public:
9 TimePicker( QWidget* p = 0, const char* name = 0, WFlags fl = 0 )
10 : Opie::Ui::OTimePicker(p,name,fl){}
11
12};
13class ClickableLabel : public Opie::Ui::OClickableLabel {
14public:
15 ClickableLabel(QWidget *p=0,const char* name=0, WFlags fl = 0 )
16 : Opie::Ui::OClickableLabel(p,name,fl){}
17};
18
19
20#endif