| author | zecke <zecke> | 2004-03-14 18:58:59 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-14 18:58:59 (UTC) |
| commit | d91c046d1faaf9fb039bda5cc186c96d4ff2c227 (patch) (side-by-side diff) | |
| tree | c196f20c933d46cc913c9460f02ce3274bd21fc9 /core | |
| parent | ddfee0836adbd62be48888fbe05e7a79481e81c9 (diff) | |
| download | opie-d91c046d1faaf9fb039bda5cc186c96d4ff2c227.zip opie-d91c046d1faaf9fb039bda5cc186c96d4ff2c227.tar.gz opie-d91c046d1faaf9fb039bda5cc186c96d4ff2c227.tar.bz2 | |
Opie DP changes
| -rw-r--r-- | core/pim/datebook/config.in | 2 | ||||
| -rw-r--r-- | core/pim/datebook/datebook.pro | 2 | ||||
| -rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 1 | ||||
| -rw-r--r-- | core/pim/datebook/datebookweeklst.h | 4 | ||||
| -rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 2 | ||||
| -rw-r--r-- | core/pim/datebook/main.cpp | 3 |
6 files changed, 8 insertions, 6 deletions
diff --git a/core/pim/datebook/config.in b/core/pim/datebook/config.in index aa3e8fc..dd9c798 100644 --- a/core/pim/datebook/config.in +++ b/core/pim/datebook/config.in @@ -2,3 +2,3 @@ boolean "opie-datebook (a datebook/appointment manager)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro index f3b5a59..2b2efaa 100644 --- a/core/pim/datebook/datebook.pro +++ b/core/pim/datebook/datebook.pro @@ -35,5 +35,5 @@ INTERFACES = dateentry.ui \ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopieui2 TARGET = datebook diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index af40143..30c925d 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp @@ -14,4 +14,5 @@ bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false); +using namespace Opie::Ui; DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl) : DateBookWeekLstHeaderBase(parent, name, fl) diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h index f683ce7..32fa23f 100644 --- a/core/pim/datebook/datebookweeklst.h +++ b/core/pim/datebook/datebookweeklst.h @@ -11,5 +11,5 @@ #include "datebookweeklstdayhdr.h" -#include <opie/oclickablelabel.h> +#include <opie2/oclickablelabel.h> class QDateTime; @@ -59,5 +59,5 @@ private: }; -class DateBookWeekLstEvent: public OClickableLabel +class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel { Q_OBJECT diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index 57bcd89..dbff18f 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp @@ -30,5 +30,5 @@ #include <qspinbox.h> -#include <opie/otimepicker.h> +#include <opie2/otimepicker.h> #include "onoteedit.h" diff --git a/core/pim/datebook/main.cpp b/core/pim/datebook/main.cpp index 421e457..3cb60af 100644 --- a/core/pim/datebook/main.cpp +++ b/core/pim/datebook/main.cpp @@ -20,5 +20,6 @@ #include "datebook.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<DateBook> ) |