|
Lines 63-73
Link Here
|
| 63 |
// This is so we can pass this stuff using signal/slot mechanism... |
63 |
// This is so we can pass this stuff using signal/slot mechanism... |
| 64 |
//ick int id = qRegisterMetaType<uint32>(); |
64 |
//ick int id = qRegisterMetaType<uint32>(); |
| 65 |
|
65 |
|
| 66 |
bool success = (bool)LogInit("virtualjaguar.log"); // Init logfile |
66 |
// bool success = (bool)LogInit("virtualjaguar.log"); // Init logfile |
| 67 |
int retVal = -1; // Default is failure |
67 |
int retVal = -1; // Default is failure |
| 68 |
|
68 |
|
| 69 |
if (!success) |
69 |
// if (!success) |
| 70 |
printf("Failed to open virtualjaguar.log for writing!\n"); |
70 |
// printf("Failed to open virtualjaguar.log for writing!\n"); |
| 71 |
|
71 |
|
| 72 |
// Set up SDL library |
72 |
// Set up SDL library |
| 73 |
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) |
73 |
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) |
|
Lines 85-97
Link Here
|
| 85 |
SDL_Quit(); |
85 |
SDL_Quit(); |
| 86 |
} |
86 |
} |
| 87 |
|
87 |
|
| 88 |
LogDone(); // Close logfile |
88 |
// LogDone(); // Close logfile |
| 89 |
return retVal; |
89 |
return retVal; |
| 90 |
} |
90 |
} |
| 91 |
|
91 |
|
| 92 |
// Main app constructor--we stick globally accessible stuff here... |
92 |
// Main app constructor--we stick globally accessible stuff here... |
| 93 |
|
93 |
|
| 94 |
App::App(int argc, char * argv[]): QApplication(argc, argv) |
94 |
App::App(int & argc, char * argv[]): QApplication(argc, argv) |
| 95 |
{ |
95 |
{ |
| 96 |
mainWindow = new MainWin(); |
96 |
mainWindow = new MainWin(); |
| 97 |
mainWindow->show(); |
97 |
mainWindow->show(); |
| 98 |
-- src/gui/app.h.old 2013-01-05 11:22:12.844470719 -0600 |
98 |
++ src/gui/app.h 2013-01-05 11:22:30.021255980 -0600 |
|
Lines 17-23
Link Here
|
| 17 |
class App: public QApplication |
17 |
class App: public QApplication |
| 18 |
{ |
18 |
{ |
| 19 |
public: |
19 |
public: |
| 20 |
App(int argc, char * argv[]); |
20 |
App(int & argc, char * argv[]); |
| 21 |
|
21 |
|
| 22 |
private: |
22 |
private: |
| 23 |
MainWin * mainWindow; |
23 |
MainWin * mainWindow; |
