author | alwin <alwin> | 2004-03-02 22:54:05 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-02 22:54:05 (UTC) |
commit | 3f5ca7734d2534ca90c13228504b6218f18f5afe (patch) (unidiff) | |
tree | 088184edbeaf3891960428c4107f8b064001af5d | |
parent | 13348f11ba1cfa4787b973d65bfba8fc08299867 (diff) | |
download | opie-3f5ca7734d2534ca90c13228504b6218f18f5afe.zip opie-3f5ca7734d2534ca90c13228504b6218f18f5afe.tar.gz opie-3f5ca7734d2534ca90c13228504b6218f18f5afe.tar.bz2 |
prefix correction for secondary namespace
-rw-r--r-- | libopie2/templates/lib_cpp.cpp | 14 | ||||
-rw-r--r-- | libopie2/templates/lib_h.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libopie2/templates/lib_cpp.cpp b/libopie2/templates/lib_cpp.cpp index b3e25bd..e87d0f2 100644 --- a/libopie2/templates/lib_cpp.cpp +++ b/libopie2/templates/lib_cpp.cpp | |||
@@ -1,63 +1,63 @@ | |||
1 | /* | 1 | /* |
2 | * this file describes how the usage in namespaces in libopie2 should be done | 2 | * this file describes how the usage in namespaces in libopie2 should be done |
3 | * ODP is the namespace for whole opie2 stuff | 3 | * ODP is the namespace for whole opie2 stuff |
4 | * the parts are separated as follow: | 4 | * the parts are separated as follow: |
5 | * ONet: opienet2 | 5 | * Net: opienet2 |
6 | * OPim: opiepim2 | 6 | * Pim: opiepim2 |
7 | * ODb: opiedb2 | 7 | * Db: opiedb2 |
8 | * OCore: opiecore2 | 8 | * Core: opiecore2 |
9 | * OMm: opiemm2 | 9 | * Mm: opiemm2 |
10 | * OUi: opieui2 | 10 | * Ui: opieui2 |
11 | * a class MUST start with O - so we make sure that it does not | 11 | * a class MUST start with O - so we make sure that it does not |
12 | * conflict with other stuff. | 12 | * conflict with other stuff. |
13 | * don't use "using namespace .." in implementations. | 13 | * don't use "using namespace .." in implementations. |
14 | */ | 14 | */ |
15 | /* | 15 | /* |
16 | This file is part of the Opie Project | 16 | This file is part of the Opie Project |
17 | Copyright (C) The Main Author <main-author@whereever.org> | 17 | Copyright (C) The Main Author <main-author@whereever.org> |
18 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> | 18 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> |
19 | .=l. | 19 | .=l. |
20 | .>+-= | 20 | .>+-= |
21 | _;:, .> :=|. This program is free software; you can | 21 | _;:, .> :=|. This program is free software; you can |
22 | .> <`_, > . <= redistribute it and/or modify it under | 22 | .> <`_, > . <= redistribute it and/or modify it under |
23 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 23 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
24 | .="- .-=="i, .._ License as published by the Free Software | 24 | .="- .-=="i, .._ License as published by the Free Software |
25 | - . .-<_> .<> Foundation; either version 2 of the License, | 25 | - . .-<_> .<> Foundation; either version 2 of the License, |
26 | ._= =} : or (at your option) any later version. | 26 | ._= =} : or (at your option) any later version. |
27 | .%`+i> _;_. | 27 | .%`+i> _;_. |
28 | .i_,=:_. -<s. This program is distributed in the hope that | 28 | .i_,=:_. -<s. This program is distributed in the hope that |
29 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 29 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
30 | : .. .:, . . . without even the implied warranty of | 30 | : .. .:, . . . without even the implied warranty of |
31 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 31 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
32 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 32 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
33 | ..}^=.= = ; Library General Public License for more | 33 | ..}^=.= = ; Library General Public License for more |
34 | ++= -. .` .: details. | 34 | ++= -. .` .: details. |
35 | : = ...= . :.=- | 35 | : = ...= . :.=- |
36 | -. .:....=;==+<; You should have received a copy of the GNU | 36 | -. .:....=;==+<; You should have received a copy of the GNU |
37 | -_. . . )=. = Library General Public License along with | 37 | -_. . . )=. = Library General Public License along with |
38 | -- :-=` this library; see the file COPYING.LIB. | 38 | -- :-=` this library; see the file COPYING.LIB. |
39 | If not, write to the Free Software Foundation, | 39 | If not, write to the Free Software Foundation, |
40 | Inc., 59 Temple Place - Suite 330, | 40 | Inc., 59 Temple Place - Suite 330, |
41 | Boston, MA 02111-1307, USA. | 41 | Boston, MA 02111-1307, USA. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <opie2/h.h> | 44 | #include <opie2/h.h> |
45 | 45 | ||
46 | /* OPIE */ | 46 | /* OPIE */ |
47 | opie (and for now, qpe) includes here | 47 | opie (and for now, qpe) includes here |
48 | 48 | ||
49 | /* QT */ | 49 | /* QT */ |
50 | qte includes here | 50 | qte includes here |
51 | 51 | ||
52 | /* STD */ | 52 | /* STD */ |
53 | standard includes here | 53 | standard includes here |
54 | 54 | ||
55 | namespace ODP { | 55 | namespace ODP { |
56 | namespace ONet { | 56 | namespace Net { |
57 | OFtpNetwork::OFtpNetwork() { | 57 | OFtpNetwork::OFtpNetwork() { |
58 | 58 | ||
59 | } | 59 | } |
60 | and so on. | 60 | and so on. |
61 | } | 61 | } |
62 | } | 62 | } |
63 | 63 | ||
diff --git a/libopie2/templates/lib_h.h b/libopie2/templates/lib_h.h index aec635f..f6eeb08 100644 --- a/libopie2/templates/lib_h.h +++ b/libopie2/templates/lib_h.h | |||
@@ -1,63 +1,63 @@ | |||
1 | /* | 1 | /* |
2 | * this file describes how the usage in namespaces in libopie2 should be done | 2 | * this file describes how the usage in namespaces in libopie2 should be done |
3 | * ODP is the namespace for whole opie2 stuff | 3 | * ODP is the namespace for whole opie2 stuff |
4 | * the parts are separated as follow: | 4 | * the parts are separated as follow: |
5 | * ONet: opienet2 | 5 | * Net: opienet2 |
6 | * OPim: opiepim2 | 6 | * Pim: opiepim2 |
7 | * ODb: opiedb2 | 7 | * Db: opiedb2 |
8 | * OCore: opiecore2 | 8 | * Core: opiecore2 |
9 | * OMm: opiemm2 | 9 | * Mm: opiemm2 |
10 | * OUi: opieui2 | 10 | * Ui: opieui2 |
11 | * a class MUST start with O - so we make sure that it does not | 11 | * a class MUST start with O - so we make sure that it does not |
12 | * conflict with other stuff. | 12 | * conflict with other stuff. |
13 | * don't use "using namespace .." in implementations. | 13 | * don't use "using namespace .." in implementations. |
14 | */ | 14 | */ |
15 | /* | 15 | /* |
16 | This file is part of the Opie Project | 16 | This file is part of the Opie Project |
17 | Copyright (C) The Main Author <main-author@whereever.org> | 17 | Copyright (C) The Main Author <main-author@whereever.org> |
18 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> | 18 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> |
19 | .=l. | 19 | .=l. |
20 | .>+-= | 20 | .>+-= |
21 | _;:, .> :=|. This program is free software; you can | 21 | _;:, .> :=|. This program is free software; you can |
22 | .> <`_, > . <= redistribute it and/or modify it under | 22 | .> <`_, > . <= redistribute it and/or modify it under |
23 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 23 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
24 | .="- .-=="i, .._ License as published by the Free Software | 24 | .="- .-=="i, .._ License as published by the Free Software |
25 | - . .-<_> .<> Foundation; either version 2 of the License, | 25 | - . .-<_> .<> Foundation; either version 2 of the License, |
26 | ._= =} : or (at your option) any later version. | 26 | ._= =} : or (at your option) any later version. |
27 | .%`+i> _;_. | 27 | .%`+i> _;_. |
28 | .i_,=:_. -<s. This program is distributed in the hope that | 28 | .i_,=:_. -<s. This program is distributed in the hope that |
29 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 29 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
30 | : .. .:, . . . without even the implied warranty of | 30 | : .. .:, . . . without even the implied warranty of |
31 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 31 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
32 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 32 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
33 | ..}^=.= = ; Library General Public License for more | 33 | ..}^=.= = ; Library General Public License for more |
34 | ++= -. .` .: details. | 34 | ++= -. .` .: details. |
35 | : = ...= . :.=- | 35 | : = ...= . :.=- |
36 | -. .:....=;==+<; You should have received a copy of the GNU | 36 | -. .:....=;==+<; You should have received a copy of the GNU |
37 | -_. . . )=. = Library General Public License along with | 37 | -_. . . )=. = Library General Public License along with |
38 | -- :-=` this library; see the file COPYING.LIB. | 38 | -- :-=` this library; see the file COPYING.LIB. |
39 | If not, write to the Free Software Foundation, | 39 | If not, write to the Free Software Foundation, |
40 | Inc., 59 Temple Place - Suite 330, | 40 | Inc., 59 Temple Place - Suite 330, |
41 | Boston, MA 02111-1307, USA. | 41 | Boston, MA 02111-1307, USA. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #ifndef THISFILE_H | 44 | #ifndef THISFILE_H |
45 | #define THISFILE_H | 45 | #define THISFILE_H |
46 | 46 | ||
47 | /* OPIE */ | 47 | /* OPIE */ |
48 | opie (and for now, qpe) includes here | 48 | opie (and for now, qpe) includes here |
49 | 49 | ||
50 | /* QT */ | 50 | /* QT */ |
51 | qte includes here | 51 | qte includes here |
52 | 52 | ||
53 | /* STD */ | 53 | /* STD */ |
54 | 54 | ||
55 | namespace ODP | 55 | namespace ODP |
56 | { | 56 | { |
57 | namspace ONet { | 57 | namspace Net { |
58 | classes here | 58 | classes here |
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
62 | #endif | 62 | #endif |
63 | 63 | ||