| -rw-r--r-- | core/pim/datebook/datebook.pro | 4 | ||||
| -rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 1 | ||||
| -rw-r--r-- | core/pim/datebook/datebookweeklstdayhdr.ui | 8 | ||||
| -rw-r--r-- | core/pim/datebook/dateentry.ui | 6 | ||||
| -rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 1 | ||||
| -rw-r--r-- | core/pim/datebook/namespace_hack.h | 20 |
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 @@ -10,7 +10,7 @@ HEADERS = datebookday.h \ repeatentry.h \ noteentryimpl.h \ onoteedit.h \ - datebookdayallday.h + datebookdayallday.h SOURCES = main.cpp \ datebookday.cpp \ datebook.cpp \ @@ -23,7 +23,7 @@ SOURCES = main.cpp \ repeatentry.cpp \ noteentryimpl.cpp \ onoteedit.cpp \ - datebookdayallday.cpp + datebookdayallday.cpp INTERFACES = dateentry.ui \ datebookdayheader.ui \ datebookweekheader.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,3 +1,4 @@ +#include "namespace_hack.h" #include "datebookweeklst.h" 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 @@ -60,7 +60,7 @@ </property> </widget> <widget> - <class>OClickableLabel</class> + <class>ClickableLabel</class> <property stdset="1"> <name>name</name> <cstring>label</cstring> @@ -105,7 +105,7 @@ </property> </widget> <widget> - <class>OClickableLabel</class> + <class>ClickableLabel</class> <property stdset="1"> <name>name</name> <cstring>add</cstring> @@ -122,8 +122,8 @@ </widget> <customwidgets> <customwidget> - <class>OClickableLabel</class> - <header location="global">opie/oclickablelabel.h</header> + <class>ClickableLabel</class> + <header location="local">namespace_hack.h</header> <sizehint> <width>-1</width> <height>-1</height> 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 @@ -301,7 +301,7 @@ </property> </spacer> <widget row="5" column="1" rowspan="1" colspan="3" > - <class>OTimePicker</class> + <class>TimePicker</class> <property stdset="1"> <name>name</name> <cstring>timePickerStart</cstring> @@ -574,8 +574,8 @@ <pixmap>image1</pixmap> </customwidget> <customwidget> - <class>OTimePicker</class> - <header location="local">opie/otimepicker.h</header> + <class>TimePicker</class> + <header location="local">namespace_hack.h</header> <sizehint> <width>-1</width> <height>-1</height> 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 @@ -18,6 +18,7 @@ ** **********************************************************************/ +#include "namespace_hack.h" #include "dateentryimpl.h" #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 @@ +#ifndef NAME_SPACE_HACK_H +#define NAME_SPACE_HACK_H + +#include <opie2/otimepicker.h> +#include <opie2/oclickablelabel.h> + +class TimePicker : public Opie::Ui::OTimePicker { +public: + TimePicker( QWidget* p = 0, const char* name = 0, WFlags fl = 0 ) + : Opie::Ui::OTimePicker(p,name,fl){} + +}; +class ClickableLabel : public Opie::Ui::OClickableLabel { +public: + ClickableLabel(QWidget *p=0,const char* name=0, WFlags fl = 0 ) + : Opie::Ui::OClickableLabel(p,name,fl){} +}; + + +#endif |