projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sistema l'errore da me commesso in fase di conversione...
[bertos.git]
/
emul
/
emul.cpp
diff --git
a/emul/emul.cpp
b/emul/emul.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
77892ec
..
0603f85
--- a/
emul/emul.cpp
+++ b/
emul/emul.cpp
@@
-15,6
+15,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.6 2006/05/28 12:17:57 bernie
+ *#* Drop almost all the Qt3 cruft.
+ *#*
*#* Revision 1.5 2006/05/27 22:30:56 bernie
*#* Add some delay to slow things down.
*#*
*#* Revision 1.5 2006/05/27 22:30:56 bernie
*#* Add some delay to slow things down.
*#*
@@
-44,11
+47,7
@@
#include <cstdlib> // std::exit()
#include <cstdlib> // std::exit()
-#if _QT < 4
- #include <qapplication.h>
-#else
- #include <QtGui/qapplication.h>
-#endif
+#include <QtGui/qapplication.h>
/// The global emulator instance.
/// The global emulator instance.
@@
-69,9
+68,6
@@
Emulator::Emulator(int &argc, char **argv) :
emulApp(new QApplication(argc, argv)),
emulWin(new EmulWin(this))
{
emulApp(new QApplication(argc, argv)),
emulWin(new EmulWin(this))
{
- #if QT_VERSION < ((4 << 16) + (0 << 8) + 0)
- emulApp->setMainWidget(emulWin);
- #endif
emulWin->show();
}
emulWin->show();
}