summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-03 17:56:32 (UTC)
committer waspe <waspe>2003-11-03 17:56:32 (UTC)
commit9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (patch) (side-by-side diff)
treea87bc5fa9890457809f457d82c6811835cdebe91
parent6d7e3e8b04b63d92c61d1109c35163690f2c9948 (diff)
downloadopie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.zip
opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.gz
opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.bz2
resolved merge conflict
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/helpbrowser/main.cpp11
-rw-r--r--core/opie-login/main.cpp1
2 files changed, 2 insertions, 10 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
@@ -23,11 +23,4 @@
#include <qtopia/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
-int main( int argc, char ** argv )
-{
- QPEApplication a( argc, argv );
-
- HelpBrowser mw;
- a.showMainWidget( &mw );
-
- return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> )
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 2103216..5ecde1e 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -202,3 +202,2 @@ int main ( int argc, char **argv )
-
if ( LoginApplication::changeIdentity ( ))