summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 20:37:48 (UTC)
committer zecke <zecke>2004-03-14 20:37:48 (UTC)
commitfb19e9dc49a8ed0f1b85fa88ed97d357000955e1 (patch) (unidiff)
tree9fb860c6fdda787351cabb5e57a4ef1661bdb60c
parentc4784ed159d96c6ba69dcf53eed9fe791e732e52 (diff)
downloadopie-fb19e9dc49a8ed0f1b85fa88ed97d357000955e1.zip
opie-fb19e9dc49a8ed0f1b85fa88ed97d357000955e1.tar.gz
opie-fb19e9dc49a8ed0f1b85fa88ed97d357000955e1.tar.bz2
no using namespace in a header
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp1
-rw-r--r--core/pim/osearch/adresssearch.h3
-rw-r--r--core/pim/osearch/contactitem.cpp2
-rw-r--r--core/pim/osearch/contactitem.h5
-rw-r--r--core/pim/osearch/eventitem.cpp1
-rw-r--r--core/pim/osearch/eventitem.h5
-rw-r--r--core/pim/osearch/todoitem.h5
-rw-r--r--core/pim/osearch/todosearch.cpp2
-rw-r--r--core/pim/osearch/todosearch.h3
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.h3
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.cpp1
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.h5
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.h3
13 files changed, 17 insertions, 22 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index 6891f03..f0495c6 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -4,32 +4,33 @@
4// 4//
5// Description: 5// Description:
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#include "adresssearch.h" 13#include "adresssearch.h"
14#include "contactitem.h" 14#include "contactitem.h"
15 15
16#include <qpe/resource.h> 16#include <qpe/resource.h>
17 17
18//#include <qwhatsthis.h> 18//#include <qwhatsthis.h>
19 19
20using namespace Opie;
20AdressSearch::AdressSearch(QListView* parent, QString name): 21AdressSearch::AdressSearch(QListView* parent, QString name):
21 SearchGroup(parent, name) 22 SearchGroup(parent, name)
22{ 23{
23 _contacts = 0; 24 _contacts = 0;
24 QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); 25 QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
25 setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); 26 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
26 27
27 28
28 //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); 29 //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
29 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); 30 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
30 QImage img = pix.convertToImage(); 31 QImage img = pix.convertToImage();
31 img.smoothScale( 14, 14 ); 32 img.smoothScale( 14, 14 );
32 pix.convertFromImage( img ); 33 pix.convertFromImage( img );
33 setPixmap( 0, pix );*/ 34 setPixmap( 0, pix );*/
34} 35}
35 36
diff --git a/core/pim/osearch/adresssearch.h b/core/pim/osearch/adresssearch.h
index 028521a..34c4f11 100644
--- a/core/pim/osearch/adresssearch.h
+++ b/core/pim/osearch/adresssearch.h
@@ -1,38 +1,37 @@
1// C++ Interface: $MODULE$ 1// C++ Interface: $MODULE$
2// 2//
3// Description: 3// Description:
4// 4//
5// 5//
6// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 6// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
7// 7//
8// Copyright: See COPYING file that comes with this distribution 8// Copyright: See COPYING file that comes with this distribution
9// 9//
10// 10//
11#ifndef ADRESSSEARCH_H 11#ifndef ADRESSSEARCH_H
12#define ADRESSSEARCH_H 12#define ADRESSSEARCH_H
13 13
14#include "searchgroup.h" 14#include "searchgroup.h"
15#include <opie2/ocontactaccess.h> 15#include <opie2/ocontactaccess.h>
16 16
17using namespace Opie;
18 17
19 18
20/** 19/**
21@author Patrick S. Vogt 20@author Patrick S. Vogt
22*/ 21*/
23class AdressSearch : public SearchGroup 22class AdressSearch : public SearchGroup
24{ 23{
25public: 24public:
26 AdressSearch(QListView* parent, QString name); 25 AdressSearch(QListView* parent, QString name);
27 ~AdressSearch(); 26 ~AdressSearch();
28 27
29protected: 28protected:
30 virtual void load(); 29 virtual void load();
31 virtual int search(); 30 virtual int search();
32 virtual void insertItem( void* ); 31 virtual void insertItem( void* );
33 32
34private: 33private:
35 OPimContactAccess *_contacts; 34 Opie::OPimContactAccess *_contacts;
36}; 35};
37 36
38#endif 37#endif
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index 639af46..c89c6e2 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -3,33 +3,33 @@
3// C++ Implementation: $MODULE$ 3// C++ Implementation: $MODULE$
4// 4//
5// Description: 5// Description:
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#include "contactitem.h" 13#include "contactitem.h"
14 14
15#include <qpe/resource.h> 15#include <qpe/resource.h>
16#include <qpe/qcopenvelope_qws.h> 16#include <qpe/qcopenvelope_qws.h>
17 17
18 18
19 19using namespace Opie;
20ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) 20ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
21: ResultItem(parent) 21: ResultItem(parent)
22{ 22{
23 _contact = contact; 23 _contact = contact;
24 setText(0, _contact->toShortText()); 24 setText(0, _contact->toShortText());
25 setIcon(); 25 setIcon();
26} 26}
27 27
28void ContactItem::setIcon() 28void ContactItem::setIcon()
29{ 29{
30 QPixmap icon; 30 QPixmap icon;
31 switch ( _contact->lastHitField() ) { 31 switch ( _contact->lastHitField() ) {
32 case -1: 32 case -1:
33 icon = Resource::loadPixmap( "reset" ); 33 icon = Resource::loadPixmap( "reset" );
34 break; 34 break;
35 case Qtopia::BusinessPhone: 35 case Qtopia::BusinessPhone:
diff --git a/core/pim/osearch/contactitem.h b/core/pim/osearch/contactitem.h
index 3c553fc..c038082 100644
--- a/core/pim/osearch/contactitem.h
+++ b/core/pim/osearch/contactitem.h
@@ -5,40 +5,39 @@
5// Description: 5// Description:
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#ifndef CONTACTITEM_H 13#ifndef CONTACTITEM_H
14#define CONTACTITEM_H 14#define CONTACTITEM_H
15 15
16#include <opie2/opimrecord.h> 16#include <opie2/opimrecord.h>
17#include <opie2/opimcontact.h> 17#include <opie2/opimcontact.h>
18 18
19#include "resultitem.h" 19#include "resultitem.h"
20 20
21using namespace Opie;
22 21
23/** 22/**
24@author Patrick S. Vogt 23@author Patrick S. Vogt
25*/ 24*/
26class ContactItem : public ResultItem 25class ContactItem : public ResultItem
27{ 26{
28public: 27public:
29 ContactItem(OListViewItem* parent, OPimContact *contact); 28 ContactItem(OListViewItem* parent, Opie::OPimContact *contact);
30 29
31 ~ContactItem(); 30 ~ContactItem();
32 31
33 virtual QString toRichText(); 32 virtual QString toRichText();
34 virtual void action( int ); 33 virtual void action( int );
35 virtual QIntDict<QString> actions(); 34 virtual QIntDict<QString> actions();
36 35
37 36
38private: 37private:
39 void setIcon(); 38 void setIcon();
40 OPimContact *_contact; 39 Opie::OPimContact *_contact;
41 40
42}; 41};
43 42
44#endif 43#endif
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp
index 8dcfc70..7bcf340 100644
--- a/core/pim/osearch/eventitem.cpp
+++ b/core/pim/osearch/eventitem.cpp
@@ -4,32 +4,33 @@
4// 4//
5// Description: 5// Description:
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#include "eventitem.h" 13#include "eventitem.h"
14 14
15 15
16#include <qpe/resource.h> 16#include <qpe/resource.h>
17#include <qpe/qcopenvelope_qws.h> 17#include <qpe/qcopenvelope_qws.h>
18 18
19 19
20using namespace Opie;
20EventItem::EventItem(OListViewItem* parent, OPimEvent *event) 21EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
21 : ResultItem(parent) 22 : ResultItem(parent)
22{ 23{
23 _event = event; 24 _event = event;
24 setText(0, _event->toShortText() ); 25 setText(0, _event->toShortText() );
25 setIcon(); 26 setIcon();
26} 27}
27 28
28 29
29EventItem::~EventItem() 30EventItem::~EventItem()
30{ 31{
31} 32}
32 33
33 34
34QString EventItem::toRichText() 35QString EventItem::toRichText()
35{ 36{
diff --git a/core/pim/osearch/eventitem.h b/core/pim/osearch/eventitem.h
index 68923f1..d121020 100644
--- a/core/pim/osearch/eventitem.h
+++ b/core/pim/osearch/eventitem.h
@@ -4,39 +4,38 @@
4// 4//
5// Description: 5// Description:
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#ifndef EVENTITEM_H 13#ifndef EVENTITEM_H
14#define EVENTITEM_H 14#define EVENTITEM_H
15 15
16#include "resultitem.h" 16#include "resultitem.h"
17 17
18#include <opie2/opimevent.h> 18#include <opie2/opimevent.h>
19 19
20using namespace Opie;
21 20
22/** 21/**
23@author Patrick S. Vogt 22@author Patrick S. Vogt
24*/ 23*/
25class EventItem : public ResultItem 24class EventItem : public ResultItem
26{ 25{
27public: 26public:
28 EventItem(OListViewItem* parent, OPimEvent *event); 27 EventItem(OListViewItem* parent, Opie::OPimEvent *event);
29 28
30 ~EventItem(); 29 ~EventItem();
31 30
32 virtual QString toRichText(); 31 virtual QString toRichText();
33 virtual void action( int ); 32 virtual void action( int );
34 virtual QIntDict<QString> actions(); 33 virtual QIntDict<QString> actions();
35 34
36private: 35private:
37 void setIcon(); 36 void setIcon();
38 OPimEvent *_event; 37 Opie::OPimEvent *_event;
39 38
40}; 39};
41 40
42#endif 41#endif
diff --git a/core/pim/osearch/todoitem.h b/core/pim/osearch/todoitem.h
index 7c8537b..031369a 100644
--- a/core/pim/osearch/todoitem.h
+++ b/core/pim/osearch/todoitem.h
@@ -4,38 +4,37 @@
4// 4//
5// Description: 5// Description:
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#ifndef TODOITEM_H 13#ifndef TODOITEM_H
14#define TODOITEM_H 14#define TODOITEM_H
15 15
16 16
17#include <opie2/opimtodo.h> 17#include <opie2/opimtodo.h>
18#include "resultitem.h" 18#include "resultitem.h"
19 19
20using namespace Opie;
21 20
22/** 21/**
23@author Patrick S. Vogt 22@author Patrick S. Vogt
24*/ 23*/
25class TodoItem : public ResultItem 24class TodoItem : public ResultItem
26{ 25{
27public: 26public:
28 TodoItem(OListViewItem* parent, OPimTodo *todo); 27 TodoItem(OListViewItem* parent, Opie::OPimTodo *todo);
29 ~TodoItem(); 28 ~TodoItem();
30 29
31 virtual QString toRichText(); 30 virtual QString toRichText();
32 virtual void action( int ); 31 virtual void action( int );
33 virtual QIntDict<QString> actions(); 32 virtual QIntDict<QString> actions();
34 33
35private: 34private:
36 void setIcon(); 35 void setIcon();
37 OPimTodo *_todo; 36 Opie::OPimTodo *_todo;
38 37
39}; 38};
40 39
41#endif 40#endif
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index cdf3a1c..1839566 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -6,33 +6,33 @@
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#include "todosearch.h" 13#include "todosearch.h"
14#include "todoitem.h" 14#include "todoitem.h"
15 15
16#include <qpe/resource.h> 16#include <qpe/resource.h>
17#include <qpe/config.h> 17#include <qpe/config.h>
18 18
19#include <qaction.h> 19#include <qaction.h>
20#include <qpopupmenu.h> 20#include <qpopupmenu.h>
21 21
22 22using namespace Opie;
23TodoSearch::TodoSearch(QListView* parent, QString name) 23TodoSearch::TodoSearch(QListView* parent, QString name)
24: SearchGroup(parent, name), _todos(0), _popupMenu(0) 24: SearchGroup(parent, name), _todos(0), _popupMenu(0)
25{ 25{
26 //AppLnkSet als(QPEApplication::qpeDir()); 26 //AppLnkSet als(QPEApplication::qpeDir());
27 //setPixmap( 0, als.findExec("todolist")->pixmap() ); 27 //setPixmap( 0, als.findExec("todolist")->pixmap() );
28 QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" ); 28 QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
29 setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); 29 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
30 actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); 30 actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true );
31 Config cfg( "osearch", Config::User ); 31 Config cfg( "osearch", Config::User );
32 cfg.setGroup( "todo_settings" ); 32 cfg.setGroup( "todo_settings" );
33 actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); 33 actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) );
34 34
35} 35}
36 36
37 37
38TodoSearch::~TodoSearch() 38TodoSearch::~TodoSearch()
diff --git a/core/pim/osearch/todosearch.h b/core/pim/osearch/todosearch.h
index 740e483..c047348 100644
--- a/core/pim/osearch/todosearch.h
+++ b/core/pim/osearch/todosearch.h
@@ -7,41 +7,40 @@
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
9// 9//
10// Copyright: See COPYING file that comes with this distribution 10// Copyright: See COPYING file that comes with this distribution
11// 11//
12// 12//
13#ifndef TODOSEARCH_H 13#ifndef TODOSEARCH_H
14#define TODOSEARCH_H 14#define TODOSEARCH_H
15 15
16#include "searchgroup.h" 16#include "searchgroup.h"
17 17
18#include <opie2/otodoaccess.h> 18#include <opie2/otodoaccess.h>
19#include <opie2/opimtodo.h> 19#include <opie2/opimtodo.h>
20 20
21class QAction; 21class QAction;
22 22
23using namespace Opie;
24 23
25/** 24/**
26@author Patrick S. Vogt 25@author Patrick S. Vogt
27*/ 26*/
28class TodoSearch : public SearchGroup 27class TodoSearch : public SearchGroup
29{ 28{
30public: 29public:
31 TodoSearch(QListView* parent, QString name); 30 TodoSearch(QListView* parent, QString name);
32 ~TodoSearch(); 31 ~TodoSearch();
33 32
34 virtual QPopupMenu* popupMenu(); 33 virtual QPopupMenu* popupMenu();
35 34
36protected: 35protected:
37 virtual void load(); 36 virtual void load();
38 virtual int search(); 37 virtual int search();
39 virtual void insertItem( void* ); 38 virtual void insertItem( void* );
40 39
41private: 40private:
42 OPimTodoAccess *_todos; 41 Opie::OPimTodoAccess *_todos;
43 QAction *actionShowCompleted; 42 QAction *actionShowCompleted;
44 QPopupMenu *_popupMenu; 43 QPopupMenu *_popupMenu;
45}; 44};
46 45
47#endif 46#endif
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h
index 68af323..f8ed89e 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.h
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h
@@ -14,50 +14,49 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef DATEBOOK_PLUGIN_WIDGET_H 17#ifndef DATEBOOK_PLUGIN_WIDGET_H
18#define DATEBOOK_PLUGIN_WIDGET_H 18#define DATEBOOK_PLUGIN_WIDGET_H
19 19
20#include "datebookevent.h" 20#include "datebookevent.h"
21 21
22#include <opie2/oclickablelabel.h> 22#include <opie2/oclickablelabel.h>
23 23
24#include <qpe/datebookdb.h> 24#include <qpe/datebookdb.h>
25 25
26#include <qlayout.h> 26#include <qlayout.h>
27#include <qguardedptr.h> 27#include <qguardedptr.h>
28#include <qlist.h> 28#include <qlist.h>
29 29
30using namespace Opie;
31 30
32class DatebookPluginWidget : public QWidget { 31class DatebookPluginWidget : public QWidget {
33 32
34 Q_OBJECT 33 Q_OBJECT
35 34
36public: 35public:
37 DatebookPluginWidget( QWidget *parent, const char *name ); 36 DatebookPluginWidget( QWidget *parent, const char *name );
38 ~DatebookPluginWidget(); 37 ~DatebookPluginWidget();
39 void refresh(); 38 void refresh();
40 void reinitialize(); 39 void reinitialize();
41 40
42private: 41private:
43 DateBookDB* db; 42 DateBookDB* db;
44 QGuardedPtr<QVBoxLayout> m_layoutDates; 43 QGuardedPtr<QVBoxLayout> m_layoutDates;
45 QList<QWidget> m_eventsList; 44 QList<QWidget> m_eventsList;
46 void readConfig(); 45 void readConfig();
47 void getDates(); 46 void getDates();
48 47
49 48
50 // how many lines should be showed in the datebook section 49 // how many lines should be showed in the datebook section
51 int m_max_lines_meet; 50 int m_max_lines_meet;
52 // If location is to be showed too, 1 to activate it. 51 // If location is to be showed too, 1 to activate it.
53 bool m_show_location; 52 bool m_show_location;
54 // if notes should be shown 53 // if notes should be shown
55 bool m_show_notes; 54 bool m_show_notes;
56 // should only later appointments be shown or all for the current day. 55 // should only later appointments be shown or all for the current day.
57 bool m_onlyLater; 56 bool m_onlyLater;
58 int m_moreDays; 57 int m_moreDays;
59 // true if time of an appointment should be an extra line 58 // true if time of an appointment should be an extra line
60 bool m_timeExtraLine; 59 bool m_timeExtraLine;
61}; 60};
62 61
63#endif 62#endif
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp
index a8e4c41..a71c477 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.cpp
+++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp
@@ -5,32 +5,33 @@
5 * email : harlekin@handhelds.org 5 * email : harlekin@handhelds.org
6 * 6 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16#include "mailpluginwidget.h" 16#include "mailpluginwidget.h"
17 17
18#include <qpe/config.h> 18#include <qpe/config.h>
19#include <qpe/qcopenvelope_qws.h> 19#include <qpe/qcopenvelope_qws.h>
20 20
21using namespace Opie::Ui;
21MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) 22MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
22 : QWidget(parent, name ) { 23 : QWidget(parent, name ) {
23 24
24 m_mailLabel = 0l; 25 m_mailLabel = 0l;
25 m_layout = 0l; 26 m_layout = 0l;
26 27
27 if ( m_mailLabel ) { 28 if ( m_mailLabel ) {
28 delete m_mailLabel; 29 delete m_mailLabel;
29 } 30 }
30 m_mailLabel = new OClickableLabel( this ); 31 m_mailLabel = new OClickableLabel( this );
31 connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); 32 connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
32 33
33 if ( m_layout ) { 34 if ( m_layout ) {
34 delete m_layout; 35 delete m_layout;
35 } 36 }
36 m_layout = new QHBoxLayout( this ); 37 m_layout = new QHBoxLayout( this );
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h
index 0ad8738..2c6104f 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.h
+++ b/core/pim/today/plugins/mail/mailpluginwidget.h
@@ -8,45 +8,44 @@
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef MAIL_PLUGIN_WIDGET_H 17#ifndef MAIL_PLUGIN_WIDGET_H
18#define MAIL_PLUGIN_WIDGET_H 18#define MAIL_PLUGIN_WIDGET_H
19 19
20#include <qlayout.h> 20#include <qlayout.h>
21 21
22#include <opie2/oclickablelabel.h> 22#include <opie2/oclickablelabel.h>
23 23
24using namespace Opie;
25 24
26class MailPluginWidget : public QWidget { 25class MailPluginWidget : public QWidget {
27 26
28 Q_OBJECT 27 Q_OBJECT
29 28
30public: 29public:
31 MailPluginWidget( QWidget *parent, const char *name ); 30 MailPluginWidget( QWidget *parent, const char *name );
32 ~MailPluginWidget(); 31 ~MailPluginWidget();
33 32
34 void refresh(); 33 void refresh();
35 34
36protected slots: 35protected slots:
37 void startMail(); 36 void startMail();
38 37
39private: 38private:
40 OClickableLabel* m_mailLabel; 39 Opie::Ui::OClickableLabel* m_mailLabel;
41 QHBoxLayout* m_layout; 40 QHBoxLayout* m_layout;
42 void readConfig(); 41 void readConfig();
43 void getInfo(); 42 void getInfo();
44 43
45 int m_newMails; 44 int m_newMails;
46 int m_outgoing; 45 int m_outgoing;
47 46
48private slots: 47private slots:
49 void channelReceived(const QCString &msg, const QByteArray & data); 48 void channelReceived(const QCString &msg, const QByteArray & data);
50}; 49};
51 50
52#endif 51#endif
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index bea15d5..976dbf7 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -14,40 +14,39 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef TODOLIST_PLUGIN_H 17#ifndef TODOLIST_PLUGIN_H
18#define TODOLIST_PLUGIN_H 18#define TODOLIST_PLUGIN_H
19 19
20 20
21#include "todopluginwidget.h" 21#include "todopluginwidget.h"
22 22
23#include <opie2/oclickablelabel.h> 23#include <opie2/oclickablelabel.h>
24#include <opie2/todayplugininterface.h> 24#include <opie2/todayplugininterface.h>
25 25
26#include <qstring.h> 26#include <qstring.h>
27#include <qguardedptr.h> 27#include <qguardedptr.h>
28#include <qwidget.h> 28#include <qwidget.h>
29 29
30using namespace Opie;
31 30
32class TodolistPlugin : public TodayPluginObject { 31class TodolistPlugin : public TodayPluginObject {
33 32
34public: 33public:
35 TodolistPlugin(); 34 TodolistPlugin();
36 ~TodolistPlugin(); 35 ~TodolistPlugin();
37 36
38 QString pluginName() const; 37 QString pluginName() const;
39 double versionNumber() const; 38 double versionNumber() const;
40 QString pixmapNameWidget() const; 39 QString pixmapNameWidget() const;
41 QWidget* widget(QWidget *); 40 QWidget* widget(QWidget *);
42 QString pixmapNameConfig() const; 41 QString pixmapNameConfig() const;
43 TodayConfigWidget* configWidget(QWidget *); 42 TodayConfigWidget* configWidget(QWidget *);
44 QString appName() const; 43 QString appName() const;
45 bool excludeFromRefresh() const; 44 bool excludeFromRefresh() const;
46 void refresh(); 45 void refresh();
47 void reinitialize(); 46 void reinitialize();
48 47
49 private: 48 private:
50 QGuardedPtr<TodolistPluginWidget> m_widget; 49 QGuardedPtr<TodolistPluginWidget> m_widget;
51}; 50};
52 51
53#endif 52#endif