summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/config.in2
-rw-r--r--core/pim/today/main.cpp1
-rw-r--r--core/pim/today/today.cpp1
-rw-r--r--core/pim/today/today.h1
-rw-r--r--core/pim/today/todaybase.cpp1
-rw-r--r--core/pim/today/todaybase.h5
-rw-r--r--core/pim/today/todayconfig.cpp1
-rw-r--r--core/pim/today/todayconfig.h2
8 files changed, 8 insertions, 6 deletions
diff --git a/core/pim/today/config.in b/core/pim/today/config.in
index cdebdcb..5166d15 100644
--- a/core/pim/today/config.in
+++ b/core/pim/today/config.in
@@ -2,3 +2,3 @@
boolean "opie-today (today gives an overview of appointments and todos)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIEPIM2
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp
index 974c050..d63bc30 100644
--- a/core/pim/today/main.cpp
+++ b/core/pim/today/main.cpp
@@ -22,3 +22,4 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<Today> )
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 812f8b5..ebcd2dd 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -29,4 +29,5 @@
#include <qwhatsthis.h>
+using namespace Opie::Ui;
struct TodayPlugin {
TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 972731c..89170e1 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -29,5 +29,4 @@
#include <qvbox.h>
-using namespace Opie;
class QVBoxLayout;
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 7f1915c..cb809d3 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -22,4 +22,5 @@
#include <qwhatsthis.h>
+using namespace Opie::Ui;
TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
: QWidget( parent, name, WStyle_ContextHelp ) {
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index b737351..6ee9bb2 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -30,5 +30,4 @@ class QBoxLayout;
-using namespace Opie;
@@ -44,5 +43,5 @@ public:
QPushButton* DatesButton;
QVBoxLayout* layout;
- Opie::OClickableLabel* OwnerField;
+ Opie::Ui::OClickableLabel* OwnerField;
QLabel* Frame;
QLabel* DateLabel;
@@ -50,5 +49,5 @@ public:
QLabel* Opiezilla;
QLabel* TodayLabel;
- OClickableLabel* ConfigButton;
+ Opie::Ui::OClickableLabel* ConfigButton;
};
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index a6f53e1..4f0877c 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -31,4 +31,5 @@
#include <qwhatsthis.h>
+using namespace Opie::Ui;
class ToolButton : public QToolButton {
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 3b585c9..2b6c507 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -39,5 +39,5 @@ public:
~TodayConfig();
- OTabWidget* TabWidget3;
+ Opie::Ui::OTabWidget* TabWidget3;
void writeConfig();