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 /libopie2 | |
parent | 5b27ef38d45ae4aa751c6e364cb62ed428808e3f (diff) | |
download | opie-8705083d6a267450c71b0276833db5c7238f260e.zip opie-8705083d6a267450c71b0276833db5c7238f260e.tar.gz opie-8705083d6a267450c71b0276833db5c7238f260e.tar.bz2 |
libopie2: libopie->libopie2
7 files changed, 16 insertions, 8 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 | |||
@@ -2,19 +2,16 @@ | |||
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 | ||
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 | |||
@@ -11,12 +11,16 @@ | |||
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 |
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 | |||
@@ -5,8 +5,8 @@ TARGET = osplitter-mail | |||
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 | |||
@@ -30,13 +30,13 @@ | |||
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> |
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 | |||
@@ -14,14 +14,15 @@ | |||
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; |
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 | |||
@@ -24,13 +24,13 @@ | |||
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 |