summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/confedit/main.cpp15
-rw-r--r--noncore/games/tictac/main.cpp24
2 files changed, 11 insertions, 28 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 @@
1 1
2#include "mainwindow.h" 2#include "mainwindow.h"
3 3
4#include <opie2/oapplication.h> 4#include <qpe/qpeapplication.h>
5 5#include <opie/oapplicationfactory.h>
6int main( int argc, char ** argv ) 6
7{ 7OPIE_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}
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp
index 78fb3b7..0185b8c 100644
--- a/noncore/games/tictac/main.cpp
+++ b/noncore/games/tictac/main.cpp
@@ -1,5 +1,9 @@
1/**************************************************************************** 1/****************************************************************************
2<<<<<<< main.cpp
2** $Id$ 3** $Id$
4=======
5** $Id$
6>>>>>>> 1.1.8.1.2.1
3** 7**
4** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. 8** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
5** 9**
@@ -9,23 +13,7 @@
9*****************************************************************************/ 13*****************************************************************************/
10 14
11#include <qpe/qpeapplication.h> 15#include <qpe/qpeapplication.h>
12#include <stdlib.h> 16#include <opie/oapplicationfactory.h>
13#include "tictac.h" 17#include "tictac.h"
14 18
15 19OPIE_EXPORT_APP( OApplicationFactory<TicTacToe> )
16int main( int argc, char **argv )
17{
18 QPEApplication a( argc, argv );
19 int n = 3;
20 if ( argc == 2 ) // get board size n
21 n = atoi(argv[1]);
22 if ( n < 3 || n > 10 ) { // out of range
23 qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] );
24 return 1;
25 }
26 TicTacToe ttt( n ); // create game
27 a.setMainWidget( &ttt );
28 ttt.setCaption( QObject::tr("TicTac") );
29 ttt.show(); // show widget
30 return a.exec(); // go
31}