summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp5
-rw-r--r--libopie2/examples/opieui/osplitter_example/osplitter_mail.h4
-rw-r--r--libopie2/examples/opieui/osplitter_example/osplitter_mail.pro2
-rw-r--r--libopie2/examples/opieui/oversatileviewdemo/.cvsignore6
-rw-r--r--libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp40
-rw-r--r--libopie2/opiecore/xmltree.cc11
-rw-r--r--libopie2/templates/cpp.cpp2
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 @@
5#include <qlayout.h> 5#include <qlayout.h>
6 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
15OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) 12OPIE_EXPORT_APP( OApplicationFactory<ListViews> )
16 13
17class Folder { 14class 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 @@
14#include <qlist.h> 14#include <qlist.h>
15#include <qlistview.h> 15#include <qlistview.h>
16 16
17#include <opie2/osplitter.h>
18
19using Opie::OSplitter;
20
17class Folder; 21class Folder;
18class QLabel; 22class QLabel;
19 23
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
8HEADERS = osplitter_mail.h 8HEADERS = osplitter_mail.h
9SOURCES = osplitter_mail.cpp 9SOURCES = osplitter_mail.cpp
10 10
11LIBS += -lqpe -lopie 11LIBS += -lqpe -lopieui2
12include ( $(OPIEDIR)/include.pro ) 12include ( $(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 @@
1Makefile*
2moc*
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
@@ -33,7 +33,7 @@
33// Opie 33// Opie
34 34
35#ifdef QWS 35#ifdef QWS
36#include <opie/odevice.h> 36#include <opie2/odevice.h>
37using namespace Opie; 37using namespace Opie;
38#endif 38#endif
39 39
@@ -56,7 +56,7 @@ enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector };
56OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) 56OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl )
57 : QMainWindow( parent, name, fl ) 57 : QMainWindow( parent, name, fl )
58{ 58{
59 59
60 QMenuBar* mbar = this->menuBar(); 60 QMenuBar* mbar = this->menuBar();
61 OPopupMenu* demo = new OPopupMenu( this ); 61 OPopupMenu* demo = new OPopupMenu( this );
62 demo->setTitle( "Title" ); 62 demo->setTitle( "Title" );
@@ -66,7 +66,7 @@ OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl )
66 demo->setItemParameter( demo->insertItem( "OEditListBox", this, SLOT( demo(int) ) ), oeditlistbox ); 66 demo->setItemParameter( demo->insertItem( "OEditListBox", this, SLOT( demo(int) ) ), oeditlistbox );
67 demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector ); 67 demo->setItemParameter( demo->insertItem( "OSelector", this, SLOT( demo(int) ) ), oselector );
68 mbar->insertItem( "Demonstrate", demo ); 68 mbar->insertItem( "Demonstrate", demo );
69 69
70 build(); 70 build();
71 71
72} 72}
@@ -80,7 +80,7 @@ void OpieUIDemo::build()
80 main = new QTabWidget( this, "tabwidget" ); 80 main = new QTabWidget( this, "tabwidget" );
81 setCentralWidget( main ); 81 setCentralWidget( main );
82 main->show(); 82 main->show();
83 83
84 main->addTab( new OVersatileViewDemo( main ), "VersatileView" ); 84 main->addTab( new OVersatileViewDemo( main ), "VersatileView" );
85} 85}
86 86
@@ -102,25 +102,25 @@ void OpieUIDemo::demo( int d )
102void OpieUIDemo::demoOCompletionBox() 102void OpieUIDemo::demoOCompletionBox()
103{ 103{
104 qDebug( "ocompletionbox" ); 104 qDebug( "ocompletionbox" );
105 105
106 OCompletionBox* box = new OCompletionBox( 0 ); 106 OCompletionBox* box = new OCompletionBox( 0 );
107 box->insertItem( "This CompletionBox" ); 107 box->insertItem( "This CompletionBox" );
108 box->insertItem( "Says 'Hello World'" ); 108 box->insertItem( "Says 'Hello World'" );
109 box->insertItem( "Here are some" ); 109 box->insertItem( "Here are some" );
110 box->insertItem( "Additional Items" ); 110 box->insertItem( "Additional Items" );
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}
117 117
118void OpieUIDemo::demoOLineEdit() 118void OpieUIDemo::demoOLineEdit()
119{ 119{
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 );
125 OCompletion* comp = edit->completionObject(); 125 OCompletion* comp = edit->completionObject();
126 126
@@ -128,9 +128,9 @@ void OpieUIDemo::demoOLineEdit()
128 list << "mickeyl@handhelds.org"; 128 list << "mickeyl@handhelds.org";
129 list << "mickey@tm.informatik.uni-frankfurt.de"; 129 list << "mickey@tm.informatik.uni-frankfurt.de";
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();
135 135
136} 136}
@@ -138,9 +138,9 @@ void OpieUIDemo::demoOLineEdit()
138void OpieUIDemo::demoOComboBox() 138void OpieUIDemo::demoOComboBox()
139{ 139{
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 );
145 OCompletion* comp = combo->completionObject(); 145 OCompletion* comp = combo->completionObject();
146 146
@@ -149,13 +149,13 @@ void OpieUIDemo::demoOComboBox()
149 ilist << "harlekin@handhelds.org"; 149 ilist << "harlekin@handhelds.org";
150 ilist << "groucho@handhelds.org"; 150 ilist << "groucho@handhelds.org";
151 combo->insertStringList( ilist ); 151 combo->insertStringList( ilist );
152 152
153 QStringList clist; 153 QStringList clist;
154 clist << "mickeyl@handhelds.org"; 154 clist << "mickeyl@handhelds.org";
155 clist << "mickey@tm.informatik.uni-frankfurt.de"; 155 clist << "mickey@tm.informatik.uni-frankfurt.de";
156 clist << "mickey@vanille.de"; 156 clist << "mickey@vanille.de";
157 comp->setItems( clist ); 157 comp->setItems( clist );
158 158
159 combo->show(); 159 combo->show();
160 160
161} 161}
@@ -163,9 +163,9 @@ void OpieUIDemo::demoOComboBox()
163void OpieUIDemo::demoOEditListBox() 163void OpieUIDemo::demoOEditListBox()
164{ 164{
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 );
170 OCompletion* comp = edit->lineEdit()->completionObject(); 170 OCompletion* comp = edit->lineEdit()->completionObject();
171 QStringList clist; 171 QStringList clist;
@@ -180,7 +180,7 @@ void OpieUIDemo::demoOEditListBox()
180 list << "groucho@handhelds.org"; 180 list << "groucho@handhelds.org";
181 list << "mickeyl@handhelds.org"; 181 list << "mickeyl@handhelds.org";
182 edit->insertStringList( list ); 182 edit->insertStringList( list );
183 183
184 edit->show(); 184 edit->show();
185 185
186} 186}
@@ -188,12 +188,12 @@ void OpieUIDemo::demoOEditListBox()
188void OpieUIDemo::demoOSelector() 188void OpieUIDemo::demoOSelector()
189{ 189{
190 qDebug( "oselector" ); 190 qDebug( "oselector" );
191 191
192 OHSSelector* sel = new OHSSelector( 0, "gradientselector" ); 192 OHSSelector* sel = new OHSSelector( 0, "gradientselector" );
193 //#sel->resize( QSize( 200, 30 ) ); 193 //#sel->resize( QSize( 200, 30 ) );
194 //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) ); 194 //#sel->setColors( QColor( 90, 190, 60 ), QColor( 200, 55, 255 ) );
195 //#sel->setText( "Dark", "Light" ); 195 //#sel->setText( "Dark", "Light" );
196 196
197 sel->show(); 197 sel->show();
198} 198}
199 199
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 @@
17 Boston, MA 02111-1307, USA. 17 Boston, MA 02111-1307, USA.
18*/ 18*/
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
23#include <qxml.h> 24#include <qxml.h>
24 25
@@ -86,7 +87,7 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild )
86 87
87 newChild->m_prev = refChild; 88 newChild->m_prev = refChild;
88 newChild->m_next = next; 89 newChild->m_next = next;
89 90
90 if ( next ) 91 if ( next )
91 next->m_prev = newChild; 92 next->m_prev = newChild;
92} 93}
@@ -95,7 +96,7 @@ QString XMLElement::attribute( const QString &attr ) const
95{ 96{
96 AttributeMap::ConstIterator it = m_attributes.find( attr ); 97 AttributeMap::ConstIterator it = m_attributes.find( attr );
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();
100} 101}
101 102
@@ -119,7 +120,7 @@ void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild )
119 XMLElement *prev = refChild->m_prev; 120 XMLElement *prev = refChild->m_prev;
120 121
121 refChild->m_prev = newChild; 122 refChild->m_prev = newChild;
122 123
123 newChild->m_prev = prev; 124 newChild->m_prev = prev;
124 newChild->m_next = refChild; 125 newChild->m_next = refChild;
125 126
@@ -281,7 +282,7 @@ XMLElement *XMLElement::namedItem( const QString &name )
281 if ( e->tagName() == name ) 282 if ( e->tagName() == name )
282 return e; 283 return e;
283 284
284 return 0; 285 return 0;
285} 286}
286 287
287XMLElement *XMLElement::clone() const 288XMLElement *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 @@
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#include <opie/h.h> 30#include <opie2/h.h>
31 31
32/* OPIE */ 32/* OPIE */
33opie (and for now, qpe) includes here 33opie (and for now, qpe) includes here