5 files changed, 32 insertions, 25 deletions

diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
index 4eaf3a9..a75f9dc 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
@@ -1,22 +1,19 @@
 
 #include <qstring.h>
 #include <qlabel.h>
 #include <qheader.h>
 #include <qlayout.h>
 
 #include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
-
-#include "../osplitter.h"
 
+#include <opie2/oapplicationfactory.h>
 #include "osplitter_mail.h"
 
-
 OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
 
 class Folder {
     int dummy;
 };
 
 // -----------------------------------------------------------------
 
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h
index b7e7efe..1447a92 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.h
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.h
@@ -9,16 +9,20 @@
 
 #ifndef OPIE_SPLITTER_MAIL_EXAMPLE_H
 #define OPIE_SPLITTER_MAIL_EXAMPLE_H
 
 #include <qwidget.h>
 #include <qlist.h>
 #include <qlistview.h>
 
+#include <opie2/osplitter.h>
+
+using Opie::OSplitter;
+
 class Folder;
 class QLabel;
 
 class OSplitter;
 class ListViews : public QWidget {
     Q_OBJECT
 public:
     static QString appName() { return QString::fromLatin1("osplitter-mail"); }
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro
index ec6e626..dd1bef2 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.pro
@@ -3,10 +3,10 @@ TEMPLATE = app
 TARGET = osplitter-mail
 
 INCLUDEPATH +=  $(OPIEDIR)/include
 DEPENDSPATH +=  $(OPIEDIR)/include
 
 HEADERS = osplitter_mail.h
 SOURCES = osplitter_mail.cpp
 
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopieui2
 include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opieui/oversatileviewdemo/.cvsignore b/libopie2/examples/opieui/oversatileviewdemo/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/libopie2/examples/opieui/oversatileviewdemo/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+moc*
+*moc
+*.o
+~*
+
diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
index 197669c..f62729c 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
@@ -28,17 +28,17 @@
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 #endif
 
 // Opie
 
 #ifdef QWS
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 using namespace Opie;
 #endif
 
 #include <opie2/ocompletionbox.h>
 #include <opie2/olineedit.h>
 #include <opie2/ocombobox.h>
 #include <opie2/oeditlistbox.h>
 #include <opie2/oselector.h>
@@ -51,41 +51,41 @@ using namespace Opie;
 
 #include "opieuidemo.h"
 
 enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector };
 
 OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl )
     : QMainWindow( parent, name, fl )
 {
-    
+
     QMenuBar* mbar = this->menuBar();
     OPopupMenu* demo = new OPopupMenu( this );
     demo->setTitle( "Title" );
     demo->setItemParameter( demo->insertItem( "OCompletionBox", this, SLOT( demo(int) ) ), ocompletionbox );
     demo->setItemParameter( demo->insertItem( "OLineEdit", this, SLOT( demo(int) ) ), olineedit );
     demo->setItemParameter( demo->insertItem( "OComboBox", this, SLOT( demo(int) ) ), ocombobox );
     demo->setItemParameter( demo->insertItem( "OEditListBox", this, SLOT( demo(int) ) ), oeditlistbox );
     demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector );
     mbar->insertItem( "Demonstrate", demo );
-    
+
     build();
 
 }
 
 OpieUIDemo::~OpieUIDemo()
 {
 }
 
 void OpieUIDemo::build()
 {
     main = new QTabWidget( this, "tabwidget" );
     setCentralWidget( main );
     main->show();
-    
+
     main->addTab( new OVersatileViewDemo( main ), "VersatileView" );
 }
 
 
 void OpieUIDemo::demo( int d )
 {
     switch (d)
     {
@@ -97,108 +97,108 @@ void OpieUIDemo::demo( int d )
 
     }
 
 }
 
 void OpieUIDemo::demoOCompletionBox()
 {
     qDebug( "ocompletionbox" );
-    
+
     OCompletionBox* box = new OCompletionBox( 0 );
     box->insertItem( "This CompletionBox" );
     box->insertItem( "Says 'Hello World'" );
     box->insertItem( "Here are some" );
     box->insertItem( "Additional Items" );
     box->insertItem( "Complete Completion Box" );
-    
+
     connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) );
     box->popup();
-    
+
 }
 
 void OpieUIDemo::demoOLineEdit()
 {
     qDebug( "olineedit" );
-    
+
     OLineEdit *edit = new OLineEdit( 0, "lineedit" );
-    
+
     edit->setCompletionMode( OGlobalSettings::CompletionPopup );
     OCompletion* comp = edit->completionObject();
 
     QStringList list;
     list << "mickeyl@handhelds.org";
     list << "mickey@tm.informatik.uni-frankfurt.de";
     list << "mickey@vanille.de";
-    
+
     comp->setItems( list );
-    
+
     edit->show();
 
 }
 
 void OpieUIDemo::demoOComboBox()
 {
     qDebug( "ocombobox" );
-    
+
     OComboBox *combo = new OComboBox( true, 0, "combobox" );
-    
+
     combo->setCompletionMode( OGlobalSettings::CompletionPopup );
     OCompletion* comp = combo->completionObject();
 
     QStringList ilist;
     ilist << "kergoth@handhelds.org";
     ilist << "harlekin@handhelds.org";
     ilist << "groucho@handhelds.org";
     combo->insertStringList( ilist );
-    
+
     QStringList clist;
     clist << "mickeyl@handhelds.org";
     clist << "mickey@tm.informatik.uni-frankfurt.de";
     clist << "mickey@vanille.de";
     comp->setItems( clist );
-    
+
     combo->show();
 
 }
 
 void OpieUIDemo::demoOEditListBox()
 {
     qDebug( "oeditlistbox" );
-    
+
     OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" );
-    
+
     edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup );
     OCompletion* comp = edit->lineEdit()->completionObject();
     QStringList clist;
     clist << "Completion everywhere";
     clist << "Cool Completion everywhere";
     clist << "History History History";
     comp->setItems( clist );
 
     QStringList list;
     list << "kergoth@handhelds.org";
     list << "harlekin@handhelds.org";
     list << "groucho@handhelds.org";
     list << "mickeyl@handhelds.org";
     edit->insertStringList( list );
-    
+
     edit->show();
 
 }
 
 void OpieUIDemo::demoOSelector()
 {
     qDebug( "oselector" );
-    
+
     OHSSelector* sel = new OHSSelector( 0, "gradientselector" );
     //#sel->resize( QSize( 200, 30 ) );
     //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) );
     //#sel->setText( "Dark", "Light" );
-   
+
     sel->show();
 }
 
 void OpieUIDemo::messageBox( const QString& text )
 {
     QString info;
     info = "You have selected '" + text + "'";
     QMessageBox::information( this, "OpieUIDemo", info );