summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 20:15:38 (UTC)
committer zecke <zecke>2004-03-14 20:15:38 (UTC)
commit5064995ccd7a57edd2e41a2908b6402ff25995c4 (patch) (unidiff)
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 @@
1 config TODAY 1 config TODAY
2 boolean "opie-today (today gives an overview of appointments and todos)" 2 boolean "opie-today (today gives an overview of appointments and todos)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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 @@
21 21
22#include <opie2/oapplicationfactory.h> 22#include <opie2/oapplicationfactory.h>
23 23
24using namespace Opie::Core;
24OPIE_EXPORT_APP( OApplicationFactory<Today> ) 25OPIE_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 @@
28#include <qtimer.h> 28#include <qtimer.h>
29#include <qwhatsthis.h> 29#include <qwhatsthis.h>
30 30
31using namespace Opie::Ui;
31struct TodayPlugin { 32struct TodayPlugin {
32 TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} 33 TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
33 QLibrary *library; 34 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 @@
28#include <qscrollview.h> 28#include <qscrollview.h>
29#include <qvbox.h> 29#include <qvbox.h>
30 30
31using namespace Opie;
32 31
33class QVBoxLayout; 32class QVBoxLayout;
34 33
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 @@
21#include <qvbox.h> 21#include <qvbox.h>
22#include <qwhatsthis.h> 22#include <qwhatsthis.h>
23 23
24using namespace Opie::Ui;
24TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) 25TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
25 : QWidget( parent, name, WStyle_ContextHelp ) { 26 : QWidget( parent, name, WStyle_ContextHelp ) {
26 27
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;
29class QBoxLayout; 29class QBoxLayout;
30 30
31 31
32using namespace Opie;
33 32
34 33
35class TodayBase : public QWidget 34class TodayBase : public QWidget
@@ -43,13 +42,13 @@ public:
43 QFrame* Frame4; 42 QFrame* Frame4;
44 QPushButton* DatesButton; 43 QPushButton* DatesButton;
45 QVBoxLayout* layout; 44 QVBoxLayout* layout;
46 Opie::OClickableLabel* OwnerField; 45 Opie::Ui::OClickableLabel* OwnerField;
47 QLabel* Frame; 46 QLabel* Frame;
48 QLabel* DateLabel; 47 QLabel* DateLabel;
49 QFrame* Frame15; 48 QFrame* Frame15;
50 QLabel* Opiezilla; 49 QLabel* Opiezilla;
51 QLabel* TodayLabel; 50 QLabel* TodayLabel;
52 OClickableLabel* ConfigButton; 51 Opie::Ui::OClickableLabel* ConfigButton;
53 52
54}; 53};
55 54
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 @@
30#include <qtoolbutton.h> 30#include <qtoolbutton.h>
31#include <qwhatsthis.h> 31#include <qwhatsthis.h>
32 32
33using namespace Opie::Ui;
33class ToolButton : public QToolButton { 34class ToolButton : public QToolButton {
34 35
35public: 36public:
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:
38 TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE ); 38 TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE );
39 ~TodayConfig(); 39 ~TodayConfig();
40 40
41 OTabWidget* TabWidget3; 41 Opie::Ui::OTabWidget* TabWidget3;
42 42
43 void writeConfig(); 43 void writeConfig();
44 void pluginManagement( QString libName, QString name, QPixmap icon ); 44 void pluginManagement( QString libName, QString name, QPixmap icon );