author | drw <drw> | 2004-02-22 17:54:40 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-22 17:54:40 (UTC) |
commit | 8705083d6a267450c71b0276833db5c7238f260e (patch) (unidiff) | |
tree | 12cfeab08d8a05808650acb4bc48848633fda63e | |
parent | 5b27ef38d45ae4aa751c6e364cb62ed428808e3f (diff) | |
download | opie-8705083d6a267450c71b0276833db5c7238f260e.zip opie-8705083d6a267450c71b0276833db5c7238f260e.tar.gz opie-8705083d6a267450c71b0276833db5c7238f260e.tar.bz2 |
libopie2: libopie->libopie2
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 | |||
@@ -1,26 +1,23 @@ | |||
1 | 1 | ||
2 | #include <qstring.h> | 2 | #include <qstring.h> |
3 | #include <qlabel.h> | 3 | #include <qlabel.h> |
4 | #include <qheader.h> | 4 | #include <qheader.h> |
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 | |||
15 | OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) | 12 | OPIE_EXPORT_APP( OApplicationFactory<ListViews> ) |
16 | 13 | ||
17 | class Folder { | 14 | class Folder { |
18 | int dummy; | 15 | int dummy; |
19 | }; | 16 | }; |
20 | 17 | ||
21 | // ----------------------------------------------------------------- | 18 | // ----------------------------------------------------------------- |
22 | 19 | ||
23 | ListViews::ListViews( QWidget* p, const char* name, WFlags fl ) | 20 | ListViews::ListViews( QWidget* p, const char* name, WFlags fl ) |
24 | : QWidget( p, name, fl ) { | 21 | : QWidget( p, name, fl ) { |
25 | qApp->installEventFilter( this ); | 22 | qApp->installEventFilter( this ); |
26 | m_lstFolders.setAutoDelete( true ); | 23 | m_lstFolders.setAutoDelete( true ); |
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 | |||
@@ -5,24 +5,28 @@ | |||
5 | /* | 5 | /* |
6 | * Header file for a more complete email client like | 6 | * Header file for a more complete email client like |
7 | * layout | 7 | * layout |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #ifndef OPIE_SPLITTER_MAIL_EXAMPLE_H | 10 | #ifndef OPIE_SPLITTER_MAIL_EXAMPLE_H |
11 | #define OPIE_SPLITTER_MAIL_EXAMPLE_H | 11 | #define OPIE_SPLITTER_MAIL_EXAMPLE_H |
12 | 12 | ||
13 | #include <qwidget.h> | 13 | #include <qwidget.h> |
14 | #include <qlist.h> | 14 | #include <qlist.h> |
15 | #include <qlistview.h> | 15 | #include <qlistview.h> |
16 | 16 | ||
17 | #include <opie2/osplitter.h> | ||
18 | |||
19 | using Opie::OSplitter; | ||
20 | |||
17 | class Folder; | 21 | class Folder; |
18 | class QLabel; | 22 | class QLabel; |
19 | 23 | ||
20 | class OSplitter; | 24 | class OSplitter; |
21 | class ListViews : public QWidget { | 25 | class ListViews : public QWidget { |
22 | Q_OBJECT | 26 | Q_OBJECT |
23 | public: | 27 | public: |
24 | static QString appName() { return QString::fromLatin1("osplitter-mail"); } | 28 | static QString appName() { return QString::fromLatin1("osplitter-mail"); } |
25 | ListViews( QWidget* parent, const char * name, WFlags fl ); | 29 | ListViews( QWidget* parent, const char * name, WFlags fl ); |
26 | ~ListViews(); | 30 | ~ListViews(); |
27 | 31 | ||
28 | bool eventFilter( QObject* , QEvent* ); | 32 | bool eventFilter( QObject* , QEvent* ); |
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 @@ | |||
1 | CONFIG += qt warn_on | 1 | CONFIG += qt warn_on |
2 | TEMPLATE = app | 2 | TEMPLATE = app |
3 | TARGET = osplitter-mail | 3 | TARGET = osplitter-mail |
4 | 4 | ||
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDSPATH += $(OPIEDIR)/include | 6 | DEPENDSPATH += $(OPIEDIR)/include |
7 | 7 | ||
8 | HEADERS = osplitter_mail.h | 8 | HEADERS = osplitter_mail.h |
9 | SOURCES = osplitter_mail.cpp | 9 | 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 | |||
@@ -24,182 +24,182 @@ | |||
24 | #include <qstringlist.h> | 24 | #include <qstringlist.h> |
25 | 25 | ||
26 | // Qtopia | 26 | // Qtopia |
27 | 27 | ||
28 | #ifdef QWS | 28 | #ifdef QWS |
29 | #include <qpe/qpeapplication.h> | 29 | #include <qpe/qpeapplication.h> |
30 | #include <qpe/global.h> | 30 | #include <qpe/global.h> |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | // Opie | 33 | // Opie |
34 | 34 | ||
35 | #ifdef QWS | 35 | #ifdef QWS |
36 | #include <opie/odevice.h> | 36 | #include <opie2/odevice.h> |
37 | using namespace Opie; | 37 | using namespace Opie; |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | #include <opie2/ocompletionbox.h> | 40 | #include <opie2/ocompletionbox.h> |
41 | #include <opie2/olineedit.h> | 41 | #include <opie2/olineedit.h> |
42 | #include <opie2/ocombobox.h> | 42 | #include <opie2/ocombobox.h> |
43 | #include <opie2/oeditlistbox.h> | 43 | #include <opie2/oeditlistbox.h> |
44 | #include <opie2/oselector.h> | 44 | #include <opie2/oselector.h> |
45 | #include <opie2/opopupmenu.h> | 45 | #include <opie2/opopupmenu.h> |
46 | 46 | ||
47 | #include <qtabwidget.h> | 47 | #include <qtabwidget.h> |
48 | #include "oversatileviewdemo.h" | 48 | #include "oversatileviewdemo.h" |
49 | 49 | ||
50 | // Local | 50 | // Local |
51 | 51 | ||
52 | #include "opieuidemo.h" | 52 | #include "opieuidemo.h" |
53 | 53 | ||
54 | enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector }; | 54 | enum Demos { ocompletionbox, olineedit, ocombobox, oeditlistbox, oselector }; |
55 | 55 | ||
56 | OpieUIDemo::OpieUIDemo( QWidget* parent, const char* name, WFlags fl ) | 56 | OpieUIDemo::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" ); |
63 | demo->setItemParameter( demo->insertItem( "OCompletionBox", this, SLOT( demo(int) ) ), ocompletionbox ); | 63 | demo->setItemParameter( demo->insertItem( "OCompletionBox", this, SLOT( demo(int) ) ), ocompletionbox ); |
64 | demo->setItemParameter( demo->insertItem( "OLineEdit", this, SLOT( demo(int) ) ), olineedit ); | 64 | demo->setItemParameter( demo->insertItem( "OLineEdit", this, SLOT( demo(int) ) ), olineedit ); |
65 | demo->setItemParameter( demo->insertItem( "OComboBox", this, SLOT( demo(int) ) ), ocombobox ); | 65 | demo->setItemParameter( demo->insertItem( "OComboBox", this, SLOT( demo(int) ) ), ocombobox ); |
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 | } |
73 | 73 | ||
74 | OpieUIDemo::~OpieUIDemo() | 74 | OpieUIDemo::~OpieUIDemo() |
75 | { | 75 | { |
76 | } | 76 | } |
77 | 77 | ||
78 | void OpieUIDemo::build() | 78 | void OpieUIDemo::build() |
79 | { | 79 | { |
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 | ||
87 | 87 | ||
88 | void OpieUIDemo::demo( int d ) | 88 | void OpieUIDemo::demo( int d ) |
89 | { | 89 | { |
90 | switch (d) | 90 | switch (d) |
91 | { | 91 | { |
92 | case ocompletionbox: demoOCompletionBox(); break; | 92 | case ocompletionbox: demoOCompletionBox(); break; |
93 | case olineedit: demoOLineEdit(); break; | 93 | case olineedit: demoOLineEdit(); break; |
94 | case ocombobox: demoOComboBox(); break; | 94 | case ocombobox: demoOComboBox(); break; |
95 | case oeditlistbox: demoOEditListBox(); break; | 95 | case oeditlistbox: demoOEditListBox(); break; |
96 | case oselector: demoOSelector(); break; | 96 | case oselector: demoOSelector(); break; |
97 | 97 | ||
98 | } | 98 | } |
99 | 99 | ||
100 | } | 100 | } |
101 | 101 | ||
102 | void OpieUIDemo::demoOCompletionBox() | 102 | void 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 | ||
118 | void OpieUIDemo::demoOLineEdit() | 118 | void 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 | ||
127 | QStringList list; | 127 | QStringList list; |
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 | } |
137 | 137 | ||
138 | void OpieUIDemo::demoOComboBox() | 138 | void 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 | ||
147 | QStringList ilist; | 147 | QStringList ilist; |
148 | ilist << "kergoth@handhelds.org"; | 148 | ilist << "kergoth@handhelds.org"; |
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 | } |
162 | 162 | ||
163 | void OpieUIDemo::demoOEditListBox() | 163 | void 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; |
172 | clist << "Completion everywhere"; | 172 | clist << "Completion everywhere"; |
173 | clist << "Cool Completion everywhere"; | 173 | clist << "Cool Completion everywhere"; |
174 | clist << "History History History"; | 174 | clist << "History History History"; |
175 | comp->setItems( clist ); | 175 | comp->setItems( clist ); |
176 | 176 | ||
177 | QStringList list; | 177 | QStringList list; |
178 | list << "kergoth@handhelds.org"; | 178 | list << "kergoth@handhelds.org"; |
179 | list << "harlekin@handhelds.org"; | 179 | list << "harlekin@handhelds.org"; |
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 | } |
187 | 187 | ||
188 | void OpieUIDemo::demoOSelector() | 188 | void 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 | ||
200 | void OpieUIDemo::messageBox( const QString& text ) | 200 | void OpieUIDemo::messageBox( const QString& text ) |
201 | { | 201 | { |
202 | QString info; | 202 | QString info; |
203 | info = "You have selected '" + text + "'"; | 203 | info = "You have selected '" + text + "'"; |
204 | QMessageBox::information( this, "OpieUIDemo", info ); | 204 | QMessageBox::information( this, "OpieUIDemo", info ); |
205 | } | 205 | } |
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 | |||
@@ -8,26 +8,27 @@ | |||
8 | 8 | ||
9 | This library is distributed in the hope that it will be useful, | 9 | This library is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Library General Public License for more details. | 12 | Library General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
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 | ||
25 | #include <assert.h> | 26 | #include <assert.h> |
26 | 27 | ||
27 | using namespace Opie; | 28 | using namespace Opie; |
28 | 29 | ||
29 | XMLElement::XMLElement() | 30 | XMLElement::XMLElement() |
30 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) | 31 | : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) |
31 | { | 32 | { |
32 | } | 33 | } |
33 | 34 | ||
@@ -77,58 +78,58 @@ void XMLElement::insertAfter( XMLElement *newChild, XMLElement *refChild ) | |||
77 | 78 | ||
78 | if ( newChild->m_parent && newChild != refChild ) | 79 | if ( newChild->m_parent && newChild != refChild ) |
79 | newChild->m_parent->removeChild( newChild ); | 80 | newChild->m_parent->removeChild( newChild ); |
80 | 81 | ||
81 | newChild->m_parent = this; | 82 | newChild->m_parent = this; |
82 | 83 | ||
83 | XMLElement *next = refChild->m_next; | 84 | XMLElement *next = refChild->m_next; |
84 | 85 | ||
85 | refChild->m_next = newChild; | 86 | refChild->m_next = newChild; |
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 | } |
93 | 94 | ||
94 | QString XMLElement::attribute( const QString &attr ) const | 95 | 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 | ||
102 | void XMLElement::setAttribute( const QString &attr, const QString &value ) | 103 | void XMLElement::setAttribute( const QString &attr, const QString &value ) |
103 | { | 104 | { |
104 | m_attributes.replace( attr, value ); | 105 | m_attributes.replace( attr, value ); |
105 | } | 106 | } |
106 | 107 | ||
107 | void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild ) | 108 | void XMLElement::insertBefore( XMLElement *newChild, XMLElement *refChild ) |
108 | { | 109 | { |
109 | assert( refChild ); | 110 | assert( refChild ); |
110 | assert( refChild->m_parent ); | 111 | assert( refChild->m_parent ); |
111 | assert( refChild->m_parent == this ); | 112 | assert( refChild->m_parent == this ); |
112 | assert( newChild != refChild ); | 113 | assert( newChild != refChild ); |
113 | 114 | ||
114 | if ( newChild->m_parent && newChild != refChild ) | 115 | if ( newChild->m_parent && newChild != refChild ) |
115 | newChild->m_parent->removeChild( newChild ); | 116 | newChild->m_parent->removeChild( newChild ); |
116 | 117 | ||
117 | newChild->m_parent = this; | 118 | newChild->m_parent = this; |
118 | 119 | ||
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 | ||
126 | if ( prev ) | 127 | if ( prev ) |
127 | prev->m_next = newChild; | 128 | prev->m_next = newChild; |
128 | 129 | ||
129 | if ( refChild == m_first ) | 130 | if ( refChild == m_first ) |
130 | m_first = newChild; | 131 | m_first = newChild; |
131 | } | 132 | } |
132 | 133 | ||
133 | void XMLElement::removeChild( XMLElement *child ) | 134 | void XMLElement::removeChild( XMLElement *child ) |
134 | { | 135 | { |
@@ -272,25 +273,25 @@ bool Handler::characters( const QString &ch ) | |||
272 | m_node->appendChild( textNode ); | 273 | m_node->appendChild( textNode ); |
273 | return true; | 274 | return true; |
274 | } | 275 | } |
275 | 276 | ||
276 | XMLElement *XMLElement::namedItem( const QString &name ) | 277 | XMLElement *XMLElement::namedItem( const QString &name ) |
277 | { | 278 | { |
278 | XMLElement *e = m_first; | 279 | XMLElement *e = m_first; |
279 | 280 | ||
280 | for (; e; e = e->nextChild() ) | 281 | for (; e; e = e->nextChild() ) |
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 | ||
287 | XMLElement *XMLElement::clone() const | 288 | XMLElement *XMLElement::clone() const |
288 | { | 289 | { |
289 | XMLElement *res = new XMLElement; | 290 | XMLElement *res = new XMLElement; |
290 | 291 | ||
291 | res->setTagName( m_tag ); | 292 | res->setTagName( m_tag ); |
292 | res->setValue( m_value ); | 293 | res->setValue( m_value ); |
293 | res->setAttributes( m_attributes ); | 294 | res->setAttributes( m_attributes ); |
294 | 295 | ||
295 | XMLElement *e = m_first; | 296 | XMLElement *e = m_first; |
296 | for (; e; e = e->m_next ) | 297 | for (; e; e = e->m_next ) |
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 | |||
@@ -18,25 +18,25 @@ | |||
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
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 */ |
33 | opie (and for now, qpe) includes here | 33 | opie (and for now, qpe) includes here |
34 | 34 | ||
35 | /* QT */ | 35 | /* QT */ |
36 | qte includes here | 36 | qte includes here |
37 | 37 | ||
38 | /* STD */ | 38 | /* STD */ |
39 | standard includes here | 39 | standard includes here |
40 | 40 | ||
41 | using namespace Opie; | 41 | using namespace Opie; |
42 | 42 | ||