author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (side-by-side diff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /noncore/apps | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
-rw-r--r-- | noncore/apps/confedit/main.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp index 7e7f064..74923c8 100644 --- a/noncore/apps/confedit/main.cpp +++ b/noncore/apps/confedit/main.cpp @@ -1,13 +1,8 @@ #include "mainwindow.h" -#include <opie2/oapplication.h> - -int main( int argc, char ** argv ) -{ - OApplication a( argc, argv, "confedit" ); - MainWindow mw; - mw.showMaximized(); - a.showMainDocumentWidget( &mw ); - return a.exec(); -} +#include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> + +OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) + |