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) (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
@@ -1,38 +1,38 @@
CONFIG += qt warn_on release quick-app
HEADERS = datebookday.h \
datebook.h \
dateentryimpl.h \
datebookdayheaderimpl.h \
datebooksettings.h \
datebookweek.h \
datebookweeklst.h \
datebookweekheaderimpl.h \
repeatentry.h \
noteentryimpl.h \
onoteedit.h \
- datebookdayallday.h
+ datebookdayallday.h
SOURCES = main.cpp \
datebookday.cpp \
datebook.cpp \
dateentryimpl.cpp \
datebookdayheaderimpl.cpp \
datebooksettings.cpp \
datebookweek.cpp \
datebookweeklst.cpp \
datebookweekheaderimpl.cpp \
repeatentry.cpp \
noteentryimpl.cpp \
onoteedit.cpp \
- datebookdayallday.cpp
+ datebookdayallday.cpp
INTERFACES = dateentry.ui \
datebookdayheader.ui \
datebookweekheader.ui \
datebookweeklstheader.ui \
datebookweeklstdayhdr.ui \
repeatentrybase.ui \
datebooksettingsbase.ui \
noteentry.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopieui2
TARGET = datebook
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,12 +1,13 @@
+#include "namespace_hack.h"
#include "datebookweeklst.h"
#include "datebook.h"
#include <qpe/datebookmonth.h>
#include <qpe/config.h>
#include <qpe/resource.h>
#include <qlayout.h>
#include <qtoolbutton.h>
#include <qtl.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
@@ -51,25 +51,25 @@
<name>maximumSize</name>
<size>
<width>32767</width>
<height>32767</height>
</size>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
</widget>
<widget>
- <class>OClickableLabel</class>
+ <class>ClickableLabel</class>
<property stdset="1">
<name>name</name>
<cstring>label</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
@@ -96,43 +96,43 @@
<name>maximumSize</name>
<size>
<width>32767</width>
<height>32767</height>
</size>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
</widget>
<widget>
- <class>OClickableLabel</class>
+ <class>ClickableLabel</class>
<property stdset="1">
<name>name</name>
<cstring>add</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
</widget>
</hbox>
</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>
</sizehint>
<container>0</container>
<sizepolicy>
<hordata>5</hordata>
<verdata>5</verdata>
</sizepolicy>
<pixmap>image0</pixmap>
</customwidget>
</customwidgets>
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
@@ -292,25 +292,25 @@
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</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>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
</widget>
@@ -565,26 +565,26 @@
<sizehint>
<width>-1</width>
<height>-1</height>
</sizehint>
<container>0</container>
<sizepolicy>
<hordata>7</hordata>
<verdata>1</verdata>
</sizepolicy>
<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>
</sizehint>
<container>0</container>
<sizepolicy>
<hordata>7</hordata>
<verdata>1</verdata>
</sizepolicy>
<pixmap>image1</pixmap>
</customwidget>
</customwidgets>
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
@@ -9,24 +9,25 @@
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
+#include "namespace_hack.h"
#include "dateentryimpl.h"
#include "repeatentry.h"
#include <qpe/qpeapplication.h>
#include <qpe/categoryselect.h>
#include <qpe/datebookmonth.h>
#include <qpe/tzselect.h>
#include <qlineedit.h>
#include <qspinbox.h>
#include <opie2/otimepicker.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