summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -8,24 +8,25 @@
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "adresssearch.h"
#include "contactitem.h"
#include <qpe/resource.h>
//#include <qwhatsthis.h>
+using namespace Opie;
AdressSearch::AdressSearch(QListView* parent, QString name):
SearchGroup(parent, name)
{
_contacts = 0;
QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
// QWhatsThis::add( this, QObject::tr("Search the addressbook") );
/* QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
QImage img = pix.convertToImage();
img.smoothScale( 14, 14 );
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
@@ -5,34 +5,33 @@
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef ADRESSSEARCH_H
#define ADRESSSEARCH_H
#include "searchgroup.h"
#include <opie2/ocontactaccess.h>
-using namespace Opie;
/**
@author Patrick S. Vogt
*/
class AdressSearch : public SearchGroup
{
public:
AdressSearch(QListView* parent, QString name);
~AdressSearch();
protected:
virtual void load();
virtual int search();
virtual void insertItem( void* );
private:
- OPimContactAccess *_contacts;
+ Opie::OPimContactAccess *_contacts;
};
#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
@@ -7,25 +7,25 @@
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "contactitem.h"
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
-
+using namespace Opie;
ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
: ResultItem(parent)
{
_contact = contact;
setText(0, _contact->toShortText());
setIcon();
}
void ContactItem::setIcon()
{
QPixmap icon;
switch ( _contact->lastHitField() ) {
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
@@ -9,36 +9,35 @@
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef CONTACTITEM_H
#define CONTACTITEM_H
#include <opie2/opimrecord.h>
#include <opie2/opimcontact.h>
#include "resultitem.h"
-using namespace Opie;
/**
@author Patrick S. Vogt
*/
class ContactItem : public ResultItem
{
public:
- ContactItem(OListViewItem* parent, OPimContact *contact);
+ ContactItem(OListViewItem* parent, Opie::OPimContact *contact);
~ContactItem();
virtual QString toRichText();
virtual void action( int );
virtual QIntDict<QString> actions();
private:
void setIcon();
- OPimContact *_contact;
+ Opie::OPimContact *_contact;
};
#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
@@ -8,24 +8,25 @@
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "eventitem.h"
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
+using namespace Opie;
EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
: ResultItem(parent)
{
_event = event;
setText(0, _event->toShortText() );
setIcon();
}
EventItem::~EventItem()
{
}
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
@@ -8,35 +8,34 @@
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef EVENTITEM_H
#define EVENTITEM_H
#include "resultitem.h"
#include <opie2/opimevent.h>
-using namespace Opie;
/**
@author Patrick S. Vogt
*/
class EventItem : public ResultItem
{
public:
- EventItem(OListViewItem* parent, OPimEvent *event);
+ EventItem(OListViewItem* parent, Opie::OPimEvent *event);
~EventItem();
virtual QString toRichText();
virtual void action( int );
virtual QIntDict<QString> actions();
private:
void setIcon();
- OPimEvent *_event;
+ Opie::OPimEvent *_event;
};
#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
@@ -8,34 +8,33 @@
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef TODOITEM_H
#define TODOITEM_H
#include <opie2/opimtodo.h>
#include "resultitem.h"
-using namespace Opie;
/**
@author Patrick S. Vogt
*/
class TodoItem : public ResultItem
{
public:
- TodoItem(OListViewItem* parent, OPimTodo *todo);
+ TodoItem(OListViewItem* parent, Opie::OPimTodo *todo);
~TodoItem();
virtual QString toRichText();
virtual void action( int );
virtual QIntDict<QString> actions();
private:
void setIcon();
- OPimTodo *_todo;
+ Opie::OPimTodo *_todo;
};
#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
@@ -10,25 +10,25 @@
// Copyright: See COPYING file that comes with this distribution
//
//
#include "todosearch.h"
#include "todoitem.h"
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qaction.h>
#include <qpopupmenu.h>
-
+using namespace Opie;
TodoSearch::TodoSearch(QListView* parent, QString name)
: SearchGroup(parent, name), _todos(0), _popupMenu(0)
{
// AppLnkSet als(QPEApplication::qpeDir());
// setPixmap( 0, als.findExec("todolist")->pixmap() );
QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true );
Config cfg( "osearch", Config::User );
cfg.setGroup( "todo_settings" );
actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) );
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
@@ -11,37 +11,36 @@
//
//
#ifndef TODOSEARCH_H
#define TODOSEARCH_H
#include "searchgroup.h"
#include <opie2/otodoaccess.h>
#include <opie2/opimtodo.h>
class QAction;
-using namespace Opie;
/**
@author Patrick S. Vogt
*/
class TodoSearch : public SearchGroup
{
public:
TodoSearch(QListView* parent, QString name);
~TodoSearch();
virtual QPopupMenu* popupMenu();
protected:
virtual void load();
virtual int search();
virtual void insertItem( void* );
private:
- OPimTodoAccess *_todos;
+ Opie::OPimTodoAccess *_todos;
QAction *actionShowCompleted;
QPopupMenu *_popupMenu;
};
#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
@@ -18,44 +18,43 @@
#define DATEBOOK_PLUGIN_WIDGET_H
#include "datebookevent.h"
#include <opie2/oclickablelabel.h>
#include <qpe/datebookdb.h>
#include <qlayout.h>
#include <qguardedptr.h>
#include <qlist.h>
-using namespace Opie;
class DatebookPluginWidget : public QWidget {
Q_OBJECT
public:
DatebookPluginWidget( QWidget *parent, const char *name );
~DatebookPluginWidget();
void refresh();
void reinitialize();
private:
DateBookDB* db;
QGuardedPtr<QVBoxLayout> m_layoutDates;
QList<QWidget> m_eventsList;
void readConfig();
void getDates();
-
+
// how many lines should be showed in the datebook section
int m_max_lines_meet;
// If location is to be showed too, 1 to activate it.
bool m_show_location;
// if notes should be shown
bool m_show_notes;
// should only later appointments be shown or all for the current day.
bool m_onlyLater;
int m_moreDays;
// true if time of an appointment should be an extra line
bool m_timeExtraLine;
};
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
@@ -9,24 +9,25 @@
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "mailpluginwidget.h"
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Ui;
MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
: QWidget(parent, name ) {
m_mailLabel = 0l;
m_layout = 0l;
if ( m_mailLabel ) {
delete m_mailLabel;
}
m_mailLabel = new OClickableLabel( this );
connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
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
@@ -12,41 +12,40 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef MAIL_PLUGIN_WIDGET_H
#define MAIL_PLUGIN_WIDGET_H
#include <qlayout.h>
#include <opie2/oclickablelabel.h>
-using namespace Opie;
class MailPluginWidget : public QWidget {
Q_OBJECT
public:
MailPluginWidget( QWidget *parent, const char *name );
~MailPluginWidget();
-
+
void refresh();
protected slots:
void startMail();
private:
- OClickableLabel* m_mailLabel;
+ Opie::Ui::OClickableLabel* m_mailLabel;
QHBoxLayout* m_layout;
void readConfig();
void getInfo();
int m_newMails;
int m_outgoing;
private slots:
void channelReceived(const QCString &msg, const QByteArray & data);
};
#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
@@ -18,32 +18,31 @@
#define TODOLIST_PLUGIN_H
#include "todopluginwidget.h"
#include <opie2/oclickablelabel.h>
#include <opie2/todayplugininterface.h>
#include <qstring.h>
#include <qguardedptr.h>
#include <qwidget.h>
-using namespace Opie;
class TodolistPlugin : public TodayPluginObject {
public:
TodolistPlugin();
~TodolistPlugin();
-
+
QString pluginName() const;
double versionNumber() const;
QString pixmapNameWidget() const;
QWidget* widget(QWidget *);
QString pixmapNameConfig() const;
TodayConfigWidget* configWidget(QWidget *);
QString appName() const;
bool excludeFromRefresh() const;
void refresh();
void reinitialize();
private: