1 files changed, 13 insertions, 6 deletions

diff --git a/libopie2/opieui/otimepicker.h b/libopie2/opieui/otimepicker.h
index 2da7773..01bb557 100644
--- a/libopie2/opieui/otimepicker.h
+++ b/libopie2/opieui/otimepicker.h
@@ -34,3 +34,3 @@
 #include <opie2/oclickablelabel.h>
-#include "otimepickerbase.h"
+#include <opie2/otimepickerbase.h>
 
@@ -42,6 +42,5 @@
 
-using namespace Opie;
 
-// namespace Opie
-// {
+namespace Opie {
+namespace Ui   {
 
@@ -58,3 +57,3 @@ using namespace Opie;
  */
-class OTimePicker: public QWidget
+class OTimePicker : public QWidget
 {
@@ -116,2 +115,3 @@ public slots:
 private:
+    OTimePicker *m_timePicker;
     QTime m_time;
@@ -121,4 +121,11 @@ private:
 
-// };
+}
+}
 
+/* for Qt2  */
+#if ( QT_VERSION-0 >= 0x030000 )
+#error "Fix the UI File to use namespaces"
+#else
+typedef Opie::Ui::OTimePicker OUIOTimePicker;
+#endif
 #endif