summaryrefslogtreecommitdiff
path: root/examples/simple-pim
Side-by-side diff
Diffstat (limited to 'examples/simple-pim') (more/less context) (ignore whitespace changes)
-rw-r--r--examples/simple-pim/config.in2
-rw-r--r--examples/simple-pim/example.pro2
-rw-r--r--examples/simple-pim/simple.cpp39
-rw-r--r--examples/simple-pim/simple.h26
4 files changed, 37 insertions, 32 deletions
diff --git a/examples/simple-pim/config.in b/examples/simple-pim/config.in
index 5d80f21..aa1a426 100644
--- a/examples/simple-pim/config.in
+++ b/examples/simple-pim/config.in
@@ -3,2 +3,2 @@
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIEPIM2
diff --git a/examples/simple-pim/example.pro b/examples/simple-pim/example.pro
index c3aab53..ebcdb2b 100644
--- a/examples/simple-pim/example.pro
+++ b/examples/simple-pim/example.pro
@@ -14,3 +14,3 @@ DEPENDPATH += $(OPIEDIR)/include
# we now also include opie
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiepim2 -lopieui2
diff --git a/examples/simple-pim/simple.cpp b/examples/simple-pim/simple.cpp
index 029e71b..50905bf 100644
--- a/examples/simple-pim/simple.cpp
+++ b/examples/simple-pim/simple.cpp
@@ -19,5 +19,5 @@
-#include <opie/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
-#include <opie/otabwidget.h>
-#include <opie/owait.h>
+#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching
+#include <opie2/otabwidget.h>
+#include <opie2/owait.h>
@@ -37,2 +37,3 @@
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
@@ -52,3 +53,3 @@ MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl )
*/
- m_tab = new OTabWidget(this);
+ m_tab = new Opie::Ui::OTabWidget(this);
@@ -213,3 +214,3 @@ void MainWindow::slotLoad() {
/* we will provide a wait scrren */
- m_loading = new OWait(this, "wait screen" );
+ m_loading = new Opie::Ui::OWait(this, "wait screen" );
}
@@ -278,3 +279,3 @@ void MainWindow::slotShow() {
/* as answer this slot will be called */
-void MainWindow::slotShowRecord( const OPimRecord& rec) {
+void MainWindow::slotShowRecord( const Opie::OPimRecord& rec) {
/* got a parent but still is a toplevel MODAL dialog */
@@ -346,3 +347,3 @@ namespace {
*/
- PIMListViewItem( QListView*, OPimRecord* record );
+ PIMListViewItem( QListView*, Opie::OPimRecord* record );
~PIMListViewItem();
@@ -352,9 +353,9 @@ namespace {
int rtti()const;
- OPimRecord* record()const;
+ Opie::OPimRecord* record()const;
private:
- OPimRecord* m_record;
+ Opie::OPimRecord* m_record;
};
- PIMListViewItem::PIMListViewItem( QListView *p, OPimRecord* rec )
+ PIMListViewItem::PIMListViewItem( QListView *p, Opie::OPimRecord* rec )
: QListViewItem(p), m_record( rec ) {
@@ -367,3 +368,3 @@ namespace {
- OPimRecord* PIMListViewItem::record()const {
+ Opie::OPimRecord* PIMListViewItem::record()const {
return m_record;
@@ -384,3 +385,3 @@ PIMListView::~PIMListView() {
-void PIMListView::set( OTodoAccess::List list ) {
+void PIMListView::set( Opie::OPimTodoAccess::List list ) {
/* clear first and then add new items */
@@ -388,3 +389,3 @@ void PIMListView::set( OTodoAccess::List list ) {
- OTodoAccess::List::Iterator it;
+ Opie::OPimTodoAccess::List::Iterator it;
for (it = list.begin(); it != list.end(); ++it ) {
@@ -392,5 +393,5 @@ void PIMListView::set( OTodoAccess::List list ) {
* make a new item which automatically gets added to the listview
- * and call the copy c'tor to create a new OTodo
+ * and call the copy c'tor to create a new OPimTodo
*/
- PIMListViewItem *i = new PIMListViewItem(this, new OTodo( *it ) );
+ PIMListViewItem *i = new PIMListViewItem(this, new Opie::OPimTodo( *it ) );
i->setText(0, (*it).summary() );
@@ -399,3 +400,3 @@ void PIMListView::set( OTodoAccess::List list ) {
-void PIMListView::set( const OEffectiveEvent::ValueList& lst ) {
+void PIMListView::set( const Opie::OEffectiveEvent::ValueList& lst ) {
/* clear first and then add items */
@@ -403,5 +404,5 @@ void PIMListView::set( const OEffectiveEvent::ValueList& lst ) {
- OEffectiveEvent::ValueList::ConstIterator it;
+ Opie::OEffectiveEvent::ValueList::ConstIterator it;
for ( it = lst.begin(); it != lst.end(); ++it ) {
- PIMListViewItem *i = new PIMListViewItem(this, new OEvent( (*it).event() ) );
+ PIMListViewItem *i = new PIMListViewItem(this, new Opie::OPimEvent( (*it).event() ) );
i->setText( 0, PIMListView::makeString( (*it) ) );
@@ -427,3 +428,3 @@ void PIMListView::showCurrentRecord() {
-QString PIMListView::makeString( const OEffectiveEvent& ev ) {
+QString PIMListView::makeString( const Opie::OEffectiveEvent& ev ) {
QString str;
diff --git a/examples/simple-pim/simple.h b/examples/simple-pim/simple.h
index bf9ede7..2a6e8ce 100644
--- a/examples/simple-pim/simple.h
+++ b/examples/simple-pim/simple.h
@@ -20,4 +20,4 @@
-#include <opie/otodoaccess.h>
-#include <opie/odatebookaccess.h>
+#include <opie2/otodoaccess.h>
+#include <opie2/odatebookaccess.h>
@@ -28,4 +28,8 @@ class QDate;
class QCopChannel;
+namespace Opie{
+namespace Ui {
class OWait;
class OTabWidget;
+}
+}
@@ -52,3 +56,3 @@ private slots:
void slotDate();
- void slotShowRecord( const OPimRecord& );
+ void slotShowRecord( const Opie::OPimRecord& );
@@ -58,6 +62,6 @@ private:
QAction *m_dateAction;
- OTabWidget* m_tab;
+ Opie::Ui::OTabWidget* m_tab;
- OTodoAccess m_tb;
- ODateBookAccess m_db;
+ Opie::OPimTodoAccess m_tb;
+ Opie::ODateBookAccess m_db;
PIMListView *m_todoView;
@@ -67,3 +71,3 @@ private:
QCopChannel *m_desktopChannel;
- OWait *m_loading;
+ Opie::Ui::OWait *m_loading;
};
@@ -82,4 +86,4 @@ public:
- void set( OTodoAccess::List );
- void set( const OEffectiveEvent::ValueList& );
+ void set( Opie::OPimTodoAccess::List );
+ void set( const Opie::OEffectiveEvent::ValueList& );
void showCurrentRecord();
@@ -87,6 +91,6 @@ public:
signals:
- void showRecord( const OPimRecord& );
+ void showRecord( const Opie::OPimRecord& );
private:
- static QString makeString( const OEffectiveEvent& ev );
+ static QString makeString( const Opie::OEffectiveEvent& ev );