| author | mickeyl <mickeyl> | 2003-10-27 20:26:56 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-10-27 20:26:56 (UTC) |
| commit | 1fed961e25a6afd4070d8873b431aba8342406c3 (patch) (unidiff) | |
| tree | 8ef9a1b3ad5cf50406ac500ccfb77cff60b77796 /noncore/multimedia/showimg/main.cpp | |
| parent | 651d29249946e7221fc85580453750d9e4be4fb0 (diff) | |
| download | opie-1fed961e25a6afd4070d8873b431aba8342406c3.zip opie-1fed961e25a6afd4070d8873b431aba8342406c3.tar.gz opie-1fed961e25a6afd4070d8873b431aba8342406c3.tar.bz2 | |
merge noncore/multimedia/showimg
- opieplayer2 and opierec generate lots of conflicts in merge
I'll gladly leave that to the experts ljp and Harlekin ;)
Diffstat (limited to 'noncore/multimedia/showimg/main.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/multimedia/showimg/main.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/noncore/multimedia/showimg/main.cpp b/noncore/multimedia/showimg/main.cpp index c28cc85..efb1c68 100644 --- a/noncore/multimedia/showimg/main.cpp +++ b/noncore/multimedia/showimg/main.cpp | |||
| @@ -24,10 +24,4 @@ | |||
| 24 | 24 | ||
| 25 | int main( int argc, char **argv ) | 25 | #include <opie/oapplicationfactory.h> |
| 26 | { | ||
| 27 | QPEApplication a( argc, argv ); | ||
| 28 | |||
| 29 | ImageViewer w(0, "new window", Qt::WResizeNoErase ); | ||
| 30 | a.showMainDocumentWidget(&w); | ||
| 31 | 26 | ||
| 32 | return a.exec(); | 27 | OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> ) \ No newline at end of file |
| 33 | } | ||