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 @@ | |||
7 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
8 | #include <opie/oapplicationfactory.h> | ||
9 | |||
10 | #include "../osplitter.h" | ||
11 | 8 | ||
9 | #include <opie2/oapplicationfactory.h> | ||
12 | #include "osplitter_mail.h" | 10 | #include "osplitter_mail.h" |
13 | 11 | ||
14 | |||
15 | OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) | 12 | 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 @@ | |||
16 | 16 | ||
17 | #include <opie2/osplitter.h> | ||
18 | |||
19 | using Opie::OSplitter; | ||
20 | |||
17 | class Folder; | 21 | 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 | |||
10 | 10 | ||
11 | LIBS += -lqpe -lopie | 11 | LIBS += -lqpe -lopieui2 |
12 | include ( $(OPIEDIR)/include.pro ) | 12 | 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 @@ | |||
1 | Makefile* | ||
2 | moc* | ||
3 | *moc | ||
4 | *.o | ||
5 | ~* | ||
6 | |||
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 @@ | |||
35 | #ifdef QWS | 35 | #ifdef QWS |
36 | #include <opie/odevice.h> | 36 | #include <opie2/odevice.h> |
37 | using namespace Opie; | 37 | using namespace Opie; |
@@ -58,3 +58,3 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) | |||
58 | { | 58 | { |
59 | 59 | ||
60 | QMenuBar* mbar = this->menuBar(); | 60 | QMenuBar* mbar = this->menuBar(); |
@@ -68,3 +68,3 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) | |||
68 | mbar->insertItem( "Demonstrate", demo ); | 68 | mbar->insertItem( "Demonstrate", demo ); |
69 | 69 | ||
70 | build(); | 70 | build(); |
@@ -82,3 +82,3 @@ void OpieUIDemo::build() | |||
82 | main->show(); | 82 | main->show(); |
83 | 83 | ||
84 | main->addTab( new OVersatileViewDemo( main ), "VersatileView" ); | 84 | main->addTab( new OVersatileViewDemo( main ), "VersatileView" ); |
@@ -104,3 +104,3 @@ void OpieUIDemo::demoOCompletionBox() | |||
104 | qDebug( "ocompletionbox" ); | 104 | qDebug( "ocompletionbox" ); |
105 | 105 | ||
106 | OCompletionBox* box = new OCompletionBox( 0 ); | 106 | OCompletionBox* box = new OCompletionBox( 0 ); |
@@ -111,6 +111,6 @@ void OpieUIDemo::demoOCompletionBox() | |||
111 | box->insertItem( "Complete Completion Box" ); | 111 | box->insertItem( "Complete Completion Box" ); |
112 | 112 | ||
113 | connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) ); | 113 | connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) ); |
114 | box->popup(); | 114 | box->popup(); |
115 | 115 | ||
116 | } | 116 | } |
@@ -120,5 +120,5 @@ void OpieUIDemo::demoOLineEdit() | |||
120 | qDebug( "olineedit" ); | 120 | qDebug( "olineedit" ); |
121 | 121 | ||
122 | OLineEdit *edit = new OLineEdit( 0, "lineedit" ); | 122 | OLineEdit *edit = new OLineEdit( 0, "lineedit" ); |
123 | 123 | ||
124 | edit->setCompletionMode( OGlobalSettings::CompletionPopup ); | 124 | edit->setCompletionMode( OGlobalSettings::CompletionPopup ); |
@@ -130,5 +130,5 @@ void OpieUIDemo::demoOLineEdit() | |||
130 | list << "mickey@vanille.de"; | 130 | list << "mickey@vanille.de"; |
131 | 131 | ||
132 | comp->setItems( list ); | 132 | comp->setItems( list ); |
133 | 133 | ||
134 | edit->show(); | 134 | edit->show(); |
@@ -140,5 +140,5 @@ void OpieUIDemo::demoOComboBox() | |||
140 | qDebug( "ocombobox" ); | 140 | qDebug( "ocombobox" ); |
141 | 141 | ||
142 | OComboBox *combo = new OComboBox( true, 0, "combobox" ); | 142 | OComboBox *combo = new OComboBox( true, 0, "combobox" ); |
143 | 143 | ||
144 | combo->setCompletionMode( OGlobalSettings::CompletionPopup ); | 144 | combo->setCompletionMode( OGlobalSettings::CompletionPopup ); |
@@ -151,3 +151,3 @@ void OpieUIDemo::demoOComboBox() | |||
151 | combo->insertStringList( ilist ); | 151 | combo->insertStringList( ilist ); |
152 | 152 | ||
153 | QStringList clist; | 153 | QStringList clist; |
@@ -157,3 +157,3 @@ void OpieUIDemo::demoOComboBox() | |||
157 | comp->setItems( clist ); | 157 | comp->setItems( clist ); |
158 | 158 | ||
159 | combo->show(); | 159 | combo->show(); |
@@ -165,5 +165,5 @@ void OpieUIDemo::demoOEditListBox() | |||
165 | qDebug( "oeditlistbox" ); | 165 | qDebug( "oeditlistbox" ); |
166 | 166 | ||
167 | OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" ); | 167 | OEditListBox* edit = new OEditListBox( "OEditListBox", 0, "editlistbox" ); |
168 | 168 | ||
169 | edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup ); | 169 | edit->lineEdit()->setCompletionMode( OGlobalSettings::CompletionPopup ); |
@@ -182,3 +182,3 @@ void OpieUIDemo::demoOEditListBox() | |||
182 | edit->insertStringList( list ); | 182 | edit->insertStringList( list ); |
183 | 183 | ||
184 | edit->show(); | 184 | edit->show(); |
@@ -190,3 +190,3 @@ void OpieUIDemo::demoOSelector() | |||
190 | qDebug( "oselector" ); | 190 | qDebug( "oselector" ); |
191 | 191 | ||
192 | OHSSelector* sel = new OHSSelector( 0, "gradientselector" ); | 192 | OHSSelector* sel = new OHSSelector( 0, "gradientselector" ); |
@@ -195,3 +195,3 @@ void OpieUIDemo::demoOSelector() | |||
195 | //#sel->setText( "Dark", "Light" ); | 195 | //#sel->setText( "Dark", "Light" ); |
196 | 196 | ||
197 | sel->show(); | 197 | 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 @@ | |||
19 | 19 | ||
20 | #include <opie2/xmltree.h> | ||
21 | |||
20 | #include <qpe/stringutil.h> | 22 | #include <qpe/stringutil.h> |
21 | #include <opie/xmltree.h> | ||
22 | 23 | ||
@@ -88,3 +89,3 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) | |||
88 | newChild->m_next = next; | 89 | newChild->m_next = next; |
89 | 90 | ||
90 | if ( next ) | 91 | if ( next ) |
@@ -97,3 +98,3 @@ QString XMLElement::attribute( const QString &attr ) const | |||
97 | if ( it == m_attributes.end() ) | 98 | if ( it == m_attributes.end() ) |
98 | return QString::null; | 99 | return QString::null; |
99 | return it.data(); | 100 | return it.data(); |
@@ -121,3 +122,3 @@ void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild ) | |||
121 | refChild->m_prev = newChild; | 122 | refChild->m_prev = newChild; |
122 | 123 | ||
123 | newChild->m_prev = prev; | 124 | newChild->m_prev = prev; |
@@ -283,3 +284,3 @@ XMLElement *XMLElement::namedItem( const QString &name ) | |||
283 | 284 | ||
284 | return 0; | 285 | return 0; |
285 | } | 286 | } |
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 @@ | |||
29 | 29 | ||
30 | #include <opie/h.h> | 30 | #include <opie2/h.h> |
31 | 31 | ||