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 @@ -7,9 +7,6 @@ #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 @@ -16,2 +16,6 @@ +#include <opie2/osplitter.h> + +using Opie::OSplitter; + class Folder; 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 @@ -10,3 +10,3 @@ 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 @@ -35,3 +35,3 @@ #ifdef QWS -#include <opie/odevice.h> +#include <opie2/odevice.h> using namespace Opie; @@ -58,3 +58,3 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) { - + QMenuBar* mbar = this->menuBar(); @@ -68,3 +68,3 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) mbar->insertItem( "Demonstrate", demo ); - + build(); @@ -82,3 +82,3 @@ void OpieUIDemo::build() main->show(); - + main->addTab( new OVersatileViewDemo( main ), "VersatileView" ); @@ -104,3 +104,3 @@ void OpieUIDemo::demoOCompletionBox() qDebug( "ocompletionbox" ); - + OCompletionBox* box = new OCompletionBox( 0 ); @@ -111,6 +111,6 @@ void OpieUIDemo::demoOCompletionBox() box->insertItem( "Complete Completion Box" ); - + connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) ); box->popup(); - + } @@ -120,5 +120,5 @@ void OpieUIDemo::demoOLineEdit() qDebug( "olineedit" ); - + OLineEdit *edit = new OLineEdit( 0, "lineedit" ); - + edit->setCompletionMode( OGlobalSettings::CompletionPopup ); @@ -130,5 +130,5 @@ void OpieUIDemo::demoOLineEdit() list << "mickey@vanille.de"; - + comp->setItems( list ); - + edit->show(); @@ -140,5 +140,5 @@ void OpieUIDemo::demoOComboBox() qDebug( "ocombobox" ); - + OComboBox *combo = new OComboBox( true, 0, "combobox" ); - + combo->setCompletionMode( OGlobalSettings::CompletionPopup ); @@ -151,3 +151,3 @@ void OpieUIDemo::demoOComboBox() combo->insertStringList( ilist ); - + QStringList clist; @@ -157,3 +157,3 @@ void OpieUIDemo::demoOComboBox() comp->setItems( clist ); - + combo->show(); @@ -165,5 +165,5 @@ void OpieUIDemo::demoOEditListBox() qDebug( "oeditlistbox" ); - + OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" ); - + edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup ); @@ -182,3 +182,3 @@ void OpieUIDemo::demoOEditListBox() edit->insertStringList( list ); - + edit->show(); @@ -190,3 +190,3 @@ void OpieUIDemo::demoOSelector() qDebug( "oselector" ); - + OHSSelector* sel = new OHSSelector( 0, "gradientselector" ); @@ -195,3 +195,3 @@ void OpieUIDemo::demoOSelector() //#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 @@ -19,4 +19,5 @@ +#include <opie2/xmltree.h> + #include <qpe/stringutil.h> -#include <opie/xmltree.h> @@ -88,3 +89,3 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) newChild->m_next = next; - + if ( next ) @@ -97,3 +98,3 @@ QString XMLElement::attribute( const QString &attr ) const if ( it == m_attributes.end() ) - return QString::null; + return QString::null; return it.data(); @@ -121,3 +122,3 @@ void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild ) refChild->m_prev = newChild; - + newChild->m_prev = prev; @@ -283,3 +284,3 @@ XMLElement *XMLElement::namedItem( const QString &name ) - 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 @@ -29,3 +29,3 @@ -#include <opie/h.h> +#include <opie2/h.h> |