Subversion Repositories svn1

Rev

Rev 91 | Rev 112 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 91 Rev 94
Line 25... Line 25...
25 
*
 25 
*
26 
*   00.0    6-Nov-92    DDP     Ansified existing code
 26 
*   00.0    6-Nov-92    DDP     Ansified existing code
27 
*   00.0    27/01/95    DDP     Tidies up the program and formatted the file
 27 
*   00.0    27/01/95    DDP     Tidies up the program and formatted the file
28 
*
 28 
*
29 
**************************************************************************/
 29 
**************************************************************************/
- 
 
 30 
#include    <QtGui/QApplication>
30 
 
 31 
 
31 
#include    <time.h>
 32 
#include    <time.h>
32 
#include    "consts.h"
 33 
#include    "consts.h"
33 
#include    "structs.h"
 34 
#include    "structs.h"
34 
#include    "proto.h"
 35 
#include    "proto.h"
- 
 
 36 
 
- 
 
 37 
#include    "qmconfigure.h"
- 
 
 38 
#include    "mainwindow.h"
- 
 
 39 
 
35 
#undef      DISPLAY_STRUCTURES
 40 
#undef      DISPLAY_STRUCTURES
36 
 
 41 
 
37 
char        invalid_copy;                        /* Quick nasty test of copy */
 42 
char        invalid_copy;                        /* Quick nasty test of copy */
38 
 
 43 
 
39 
 
 44 
 
Line 138... Line 143...
138 
            file_name = argv[0];
 143 
            file_name = argv[0];
139 
        }
 144 
        }
140 
    }
 145 
    }
141 
 
 146 
 
142 
    /*
 147 
    /*
- 
 
 148 
    **  Process the configuration file
- 
 
 149 
    */
- 
 
 150 
    if( !configure( file_name, do_config ) )
- 
 
 151 
    {
- 
 
 152 
        printf( "Program aborted.\n" );
- 
 
 153 
        exit (1);
- 
 
 154 
    }
- 
 
 155 
 
- 
 
 156 
 
- 
 
 157 
    QApplication a(argc, argv);
- 
 
 158 
    MainWindow w;
- 
 
 159 
    w.show();
- 
 
 160 
 
- 
 
 161 
 
- 
 
 162 
    /*
143 
    **  Parse the command line arguments
 163 
    **  Parse the command line arguments
144 
    */
 164 
    */
145 
    if ( do_splash )
 165 
    if ( do_splash )
146 
    {
 166 
    {
147 
        printf( "Mara   Copyright David Purdie 1995-2008.\n" );
 167 
        printf( "Mara   Copyright David Purdie 1995-2008.\n" );
Line 180... Line 200...
180 
    **  Validate parameters
 200 
    **  Validate parameters
181 
    **  Filename must be supplied
 201 
    **  Filename must be supplied
182 
    */
 202 
    */
183 
    if ( file_name == NULL )
 203 
    if ( file_name == NULL )
184 
        usage();
 204 
        usage();
185 
 
 - 
 
- 
 
 205 
    return a.exec();
186 
    /*
 206 
    /*
187 
    **  Wait for the user to read the copyright notice
 207 
    **  Wait for the user to read the copyright notice
188 
    */
 208 
    */
189 
    if ( do_splash )
 209 
//    if ( do_splash )
190 
    {
 210 
//    {
191 
        while( getinp() >= ' ' );
 211 
//        while( getinp() >= ' ' );
192 
    }
 212 
//    }
193 
 
 213 
 
194 
    /*
 214 
    /*
195 
    **  Init the screen subsystem
 215 
    **  Init the screen subsystem
196 
    */
 216 
    */
197 
    init_screen();
 217 
    init_screen();