libopie2: libopie->libopie2

7 files changed, 16 insertions, 8 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,62 +1,59 @@
 
 #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;
 };
 
 // -----------------------------------------------------------------
 
 ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
     : QWidget( p, name, fl ) {
     qApp->installEventFilter( this );
     m_lstFolders.setAutoDelete( true );
     QHBoxLayout *lay = new QHBoxLayout(this);
 
     m_splitter = new OSplitter( Horizontal, this, "SPlitter 1" );
     lay->addWidget( m_splitter );
     connect(m_splitter, SIGNAL(sizeChange(bool, const QSize& ) ),
             this, SLOT(slotSizeChange(bool, const QSize& ) ) );
 
     m_overview = new QListView( m_splitter );
     m_overview->header()->setClickEnabled( FALSE );
     m_overview->addColumn( tr("Folder") );
     m_overview->setMaximumWidth( 200 );
     m_splitter->addWidget( m_overview, "zoom", tr("Folder Overview") );
     m_splitter->setSizeChange( 300 );
 
     /* OSplitter starts with the small mode */
     m_messages = 0;
     m_message = m_attach  = 0;
 
     splitti = new OSplitter( Vertical, m_splitter, "Splitti2" );
     splitti->setSizeChange( 300 );
     splitti->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ) );
 
     QLabel *lbl = new QLabel(splitti);
     lbl->setTextFormat ( Qt::RichText );
     lbl->setText("<br><br><b>Test Test  Test</b><br><br><p>Fooooo hjhh</p>");
 
     m_messages = new QListView( splitti );
     m_messages->addColumn(" Messages ");
 
     folder1 = new QListView( splitti );
     folder1->addColumn( "Messages 2 " );
 
     splitti->addWidget(m_messages, "mail", tr("Mails") );
     splitti->addWidget(folder1, "folder", tr("Folder") );
     splitti->addWidget( lbl, "logo", tr("Label") );
     m_message = lbl;
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
@@ -1,49 +1,53 @@
 /*
  * You may use, modify and distribute this code without any limitation
  */
 
 /*
  * Header file for a more complete email client like
  * layout
  */
 
 #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"); }
     ListViews( QWidget* parent, const char * name, WFlags fl );
     ~ListViews();
 
     bool eventFilter( QObject* , QEvent* );
 private:
     void initFolders();
     void initFolder( Folder *folder, unsigned int &count );
 
     QListView *m_messages, *m_overview;
     QLabel *m_message, *m_attach;
     QList<QListView> m_folders; // used in tab mode
     QList<Folder> m_lstFolders;
     bool m_mode : 1; // bitfield
     OSplitter *m_splitter;
     OSplitter *splitti;
     QListView *folder1;
 #if 0
 //private slots:
 //    void slotFolderChanged( QListViewItem* );
 //    void slotMessageChanged();
 //    void slotSizeChange( bool, const QSize& );
 #endif
 };
 
 #endif
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
@@ -1,12 +1,12 @@
 CONFIG += qt warn_on
 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
@@ -1,84 +1,84 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
 // Qt
 
 #include <qcolor.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qvbox.h>
 #include <qstring.h>
 #include <qstringlist.h>
 
 // Qtopia
 
 #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>
 #include <opie2/opopupmenu.h>
 
 #include <qtabwidget.h>
 #include "oversatileviewdemo.h"
 
 // Local
 
 #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" );
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
@@ -1,69 +1,70 @@
 /*  This file is part of the KDE project
     Copyright (C) 2001 Simon Hausmann <hausmann@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
+#include <opie2/xmltree.h>
+
 #include <qpe/stringutil.h>
-#include <opie/xmltree.h>
 
 #include <qxml.h>
 
 #include <assert.h>
 
 using namespace Opie;
 
 XMLElement::XMLElement()
     : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 )
 {
 }
 
 XMLElement::~XMLElement()
 {
     XMLElement *n = m_first;
 
     while ( n )
     {
         XMLElement *tmp = n;
         n = n->m_next;
         delete tmp;
     }
 }
 
 void XMLElement::appendChild( XMLElement *child )
 {
     if ( child->m_parent )
         child->m_parent->removeChild( child );
 
     child->m_parent = this;
 
     if ( m_last )
         m_last->m_next = child;
 
     child->m_prev = m_last;
 
     if ( !m_first )
         m_first = child;
 
     m_last = child;
 }
 
 void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
 {
     assert( newChild != refChild );
 
     if ( refChild == m_last )
     {
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
@@ -1,42 +1,42 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) The Main Author <main-author@whereever.org>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
-#include <opie/h.h>
+#include <opie2/h.h>
 
 /* OPIE */
 opie (and for now, qpe) includes here
 
 /* QT */
 qte includes here
 
 /* STD */
 standard includes here
 
 using namespace Opie;