author | waspe <waspe> | 2003-11-03 17:56:32 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 17:56:32 (UTC) |
commit | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (patch) (unidiff) | |
tree | a87bc5fa9890457809f457d82c6811835cdebe91 /core/apps | |
parent | 6d7e3e8b04b63d92c61d1109c35163690f2c9948 (diff) | |
download | opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.zip opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.gz opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.bz2 |
resolved merge conflict
-rw-r--r-- | core/apps/helpbrowser/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp index b1bea56..dc82e93 100644 --- a/core/apps/helpbrowser/main.cpp +++ b/core/apps/helpbrowser/main.cpp | |||
@@ -12,22 +12,15 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "helpbrowser.h" | 21 | #include "helpbrowser.h" |
22 | 22 | ||
23 | #include <qtopia/qpeapplication.h> | 23 | #include <qtopia/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | int main( int argc, char ** argv ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> ) |
26 | { | ||
27 | QPEApplication a( argc, argv ); | ||
28 | |||
29 | HelpBrowser mw; | ||
30 | a.showMainWidget( &mw ); | ||
31 | |||
32 | return a.exec(); | ||
33 | } | ||