7 files changed, 39 insertions, 31 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
@@ -5,13 +5,10 @@
 #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 {
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
@@ -14,6 +14,10 @@
 #include <qlist.h>
 #include <qlistview.h>
 
+#include <opie2/osplitter.h>
+
+using Opie::OSplitter;
+
 class Folder;
 class QLabel;
 
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
@@ -8,5 +8,5 @@ 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
@@ -33,7 +33,7 @@
 // Opie
 
 #ifdef QWS
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 using namespace Opie;
 #endif
 
@@ -56,7 +56,7 @@ 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" );
@@ -66,7 +66,7 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl )
     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();
 
 }
@@ -80,7 +80,7 @@ void OpieUIDemo::build()
     main = new QTabWidget( this, "tabwidget" );
     setCentralWidget( main );
     main->show();
-    
+
     main->addTab( new OVersatileViewDemo( main ), "VersatileView" );
 }
 
@@ -102,25 +102,25 @@ 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();
 
@@ -128,9 +128,9 @@ void OpieUIDemo::demoOLineEdit()
     list << "mickeyl@handhelds.org";
     list << "mickey@tm.informatik.uni-frankfurt.de";
     list << "mickey@vanille.de";
-    
+
     comp->setItems( list );
-    
+
     edit->show();
 
 }
@@ -138,9 +138,9 @@ void OpieUIDemo::demoOLineEdit()
 void OpieUIDemo::demoOComboBox()
 {
     qDebug( "ocombobox" );
-    
+
     OComboBox *combo = new OComboBox( true, 0, "combobox" );
-    
+
     combo->setCompletionMode( OGlobalSettings::CompletionPopup );
     OCompletion* comp = combo->completionObject();
 
@@ -149,13 +149,13 @@ void OpieUIDemo::demoOComboBox()
     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();
 
 }
@@ -163,9 +163,9 @@ void OpieUIDemo::demoOComboBox()
 void OpieUIDemo::demoOEditListBox()
 {
     qDebug( "oeditlistbox" );
-    
+
     OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" );
-    
+
     edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup );
     OCompletion* comp = edit->lineEdit()->completionObject();
     QStringList clist;
@@ -180,7 +180,7 @@ void OpieUIDemo::demoOEditListBox()
     list << "groucho@handhelds.org";
     list << "mickeyl@handhelds.org";
     edit->insertStringList( list );
-    
+
     edit->show();
 
 }
@@ -188,12 +188,12 @@ void OpieUIDemo::demoOEditListBox()
 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();
 }
 
diff --git a/libopie2/opiecore/xmltree.cc b/libopie2/opiecore/xmltree.cc
index 27db5b3..059791b 100644
--- a/libopie2/opiecore/xmltree.cc
+++ b/libopie2/opiecore/xmltree.cc
@@ -17,8 +17,9 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <opie2/xmltree.h>
+
 #include <qpe/stringutil.h>
-#include <opie/xmltree.h>
 
 #include <qxml.h>
 
@@ -86,7 +87,7 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
 
     newChild->m_prev = refChild;
     newChild->m_next = next;
-   
+
     if ( next )
         next->m_prev = newChild;
 }
@@ -95,7 +96,7 @@ QString XMLElement::attribute( const QString &attr ) const
 {
     AttributeMap::ConstIterator it = m_attributes.find( attr );
     if ( it == m_attributes.end() )
-        return QString::null;
+    return QString::null;
     return it.data();
 }
 
@@ -119,7 +120,7 @@ void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild )
     XMLElement *prev = refChild->m_prev;
 
     refChild->m_prev = newChild;
-    
+
     newChild->m_prev = prev;
     newChild->m_next = refChild;
 
@@ -281,7 +282,7 @@ XMLElement *XMLElement::namedItem( const QString &name )
         if ( e->tagName() == name )
             return e;
 
-    return 0; 
+    return 0;
 }
 
 XMLElement *XMLElement::clone() const
diff --git a/libopie2/templates/cpp.cpp b/libopie2/templates/cpp.cpp
index da5bcf0..cb1642f 100644
--- a/libopie2/templates/cpp.cpp
+++ b/libopie2/templates/cpp.cpp
@@ -27,7 +27,7 @@
                              Boston, MA 02111-1307, USA.
 */
 
-#include <opie/h.h>
+#include <opie2/h.h>
 
 /* OPIE */
 opie (and for now, qpe) includes here