summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 20:15:38 (UTC)
committer zecke <zecke>2004-03-14 20:15:38 (UTC)
commit5064995ccd7a57edd2e41a2908b6402ff25995c4 (patch) (side-by-side diff)
tree156685fc97a3fe2002b6f4250c7217b9c250f390
parent0d79c003839718ae70b3b997162044abd5c26bf6 (diff)
downloadopie-5064995ccd7a57edd2e41a2908b6402ff25995c4.zip
opie-5064995ccd7a57edd2e41a2908b6402ff25995c4.tar.gz
opie-5064995ccd7a57edd2e41a2908b6402ff25995c4.tar.bz2
More stuff cvs did not commit the first time
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
@@ -1,4 +1,4 @@
config TODAY
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
@@ -21,4 +21,5 @@
#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
@@ -28,6 +28,7 @@
#include <qtimer.h>
#include <qwhatsthis.h>
+using namespace Opie::Ui;
struct TodayPlugin {
TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
QLibrary *library;
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
@@ -28,7 +28,6 @@
#include <qscrollview.h>
#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
@@ -21,6 +21,7 @@
#include <qvbox.h>
#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
@@ -29,7 +29,6 @@ class QPushButton;
class QBoxLayout;
-using namespace Opie;
class TodayBase : public QWidget
@@ -43,13 +42,13 @@ public:
QFrame* Frame4;
QPushButton* DatesButton;
QVBoxLayout* layout;
- Opie::OClickableLabel* OwnerField;
+ Opie::Ui::OClickableLabel* OwnerField;
QLabel* Frame;
QLabel* DateLabel;
QFrame* Frame15;
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
@@ -30,6 +30,7 @@
#include <qtoolbutton.h>
#include <qwhatsthis.h>
+using namespace Opie::Ui;
class ToolButton : public QToolButton {
public:
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
@@ -38,7 +38,7 @@ public:
TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE );
~TodayConfig();
- OTabWidget* TabWidget3;
+ Opie::Ui::OTabWidget* TabWidget3;
void writeConfig();
void pluginManagement( QString libName, QString name, QPixmap icon );