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 @@ -6,11 +6,8 @@ #include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> - -#include "../osplitter.h" +#include <opie2/oapplicationfactory.h> #include "osplitter_mail.h" - OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) 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 @@ -15,4 +15,8 @@ #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 @@ -9,4 +9,4 @@ 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 @@ -34,5 +34,5 @@ #ifdef QWS -#include <opie/odevice.h> +#include <opie2/odevice.h> using namespace Opie; #endif @@ -57,5 +57,5 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) : QMainWindow( parent, name, fl ) { - + QMenuBar* mbar = this->menuBar(); OPopupMenu* demo = new OPopupMenu( this ); @@ -67,5 +67,5 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector ); mbar->insertItem( "Demonstrate", demo ); - + build(); @@ -81,5 +81,5 @@ void OpieUIDemo::build() setCentralWidget( main ); main->show(); - + main->addTab( new OVersatileViewDemo( main ), "VersatileView" ); } @@ -103,5 +103,5 @@ void OpieUIDemo::demoOCompletionBox() { qDebug( "ocompletionbox" ); - + OCompletionBox* box = new OCompletionBox( 0 ); box->insertItem( "This CompletionBox" ); @@ -110,8 +110,8 @@ void OpieUIDemo::demoOCompletionBox() box->insertItem( "Additional Items" ); box->insertItem( "Complete Completion Box" ); - + connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) ); box->popup(); - + } @@ -119,7 +119,7 @@ void OpieUIDemo::demoOLineEdit() { qDebug( "olineedit" ); - + OLineEdit *edit = new OLineEdit( 0, "lineedit" ); - + edit->setCompletionMode( OGlobalSettings::CompletionPopup ); OCompletion* comp = edit->completionObject(); @@ -129,7 +129,7 @@ void OpieUIDemo::demoOLineEdit() list << "mickey@tm.informatik.uni-frankfurt.de"; list << "mickey@vanille.de"; - + comp->setItems( list ); - + edit->show(); @@ -139,7 +139,7 @@ void OpieUIDemo::demoOComboBox() { qDebug( "ocombobox" ); - + OComboBox *combo = new OComboBox( true, 0, "combobox" ); - + combo->setCompletionMode( OGlobalSettings::CompletionPopup ); OCompletion* comp = combo->completionObject(); @@ -150,5 +150,5 @@ void OpieUIDemo::demoOComboBox() ilist << "groucho@handhelds.org"; combo->insertStringList( ilist ); - + QStringList clist; clist << "mickeyl@handhelds.org"; @@ -156,5 +156,5 @@ void OpieUIDemo::demoOComboBox() clist << "mickey@vanille.de"; comp->setItems( clist ); - + combo->show(); @@ -164,7 +164,7 @@ void OpieUIDemo::demoOEditListBox() { qDebug( "oeditlistbox" ); - + OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" ); - + edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup ); OCompletion* comp = edit->lineEdit()->completionObject(); @@ -181,5 +181,5 @@ void OpieUIDemo::demoOEditListBox() list << "mickeyl@handhelds.org"; edit->insertStringList( list ); - + edit->show(); @@ -189,10 +189,10 @@ 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 @@ -18,6 +18,7 @@ */ +#include <opie2/xmltree.h> + #include <qpe/stringutil.h> -#include <opie/xmltree.h> #include <qxml.h> @@ -87,5 +88,5 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) newChild->m_prev = refChild; newChild->m_next = next; - + if ( next ) next->m_prev = newChild; @@ -96,5 +97,5 @@ 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(); } @@ -120,5 +121,5 @@ void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild ) refChild->m_prev = newChild; - + newChild->m_prev = prev; newChild->m_next = refChild; @@ -282,5 +283,5 @@ XMLElement *XMLElement::namedItem( const QString &name ) return e; - return 0; + return 0; } 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 @@ -28,5 +28,5 @@ */ -#include <opie/h.h> +#include <opie2/h.h> /* OPIE */ |