summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 22:31:41 (UTC)
committer zecke <zecke>2004-03-14 22:31:41 (UTC)
commitf616ebe85abd6dc279a3f4f91c51d535be0b6f69 (patch) (side-by-side diff)
tree9936067903a91dad7ffb3878d770a35cb080847d
parent594e12002884f0e105eea3cea75504acca5730a2 (diff)
downloadopie-f616ebe85abd6dc279a3f4f91c51d535be0b6f69.zip
opie-f616ebe85abd6dc279a3f4f91c51d535be0b6f69.tar.gz
opie-f616ebe85abd6dc279a3f4f91c51d535be0b6f69.tar.bz2
Take that designer...
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/datebook.pro0
-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, 29 insertions, 7 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
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