author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (unidiff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /noncore/apps/confedit/main.cpp | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
Diffstat (limited to 'noncore/apps/confedit/main.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -3,11 +3,6 @@ | |||
3 | 3 | ||
4 | #include <opie2/oapplication.h> | 4 | #include <qpe/qpeapplication.h> |
5 | 5 | #include <opie/oapplicationfactory.h> | |
6 | int main( int argc, char ** argv ) | 6 | |
7 | { | 7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
8 | OApplication a( argc, argv, "confedit" ); | 8 | |
9 | MainWindow mw; | ||
10 | mw.showMaximized(); | ||
11 | a.showMainDocumentWidget( &mw ); | ||
12 | return a.exec(); | ||
13 | } | ||