X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=emul%2Femulwin.cpp;h=09b4687b58b361ab6821701957adba488bda20ef;hb=3b33848a29f6a9ba49a2913ba6b721e01d8b95f5;hp=b2bdc62fd3d012df577bbcf196db1ce68ba3833b;hpb=ccdd34ae9e26f226d77859be9c44c5b2b5d516ba;p=bertos.git

diff --git a/emul/emulwin.cpp b/emul/emulwin.cpp
index b2bdc62f..09b4687b 100755
--- a/emul/emulwin.cpp
+++ b/emul/emulwin.cpp
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/02/20 02:00:39  bernie
+ *#* Port to Qt 4.1.
+ *#*
  *#* Revision 1.3  2006/02/15 09:11:17  bernie
  *#* Add keyboard emulator.
  *#*
@@ -33,19 +36,48 @@
 #include <emul/emulkbd.h>
 
 #include <cassert>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qslider.h>
-#include <qcheckbox.h>
-#include <qpopupmenu.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <qdatetime.h>
-#include <qtimer.h>
-#include <qapplication.h>
-
-EmulWin::EmulWin(Emulator *e) : QMainWindow(0, "DevLibEmul", WDestructiveClose)
+
+#if _QT < 4
+	#include <qlayout.h>
+	#include <qlabel.h>
+	#include <qslider.h>
+	#include <qcheckbox.h>
+	#include <qmenubar.h>
+	#include <qmessagebox.h>
+	#include <qdatetime.h>
+	#include <qtimer.h>
+	#include <qapplication.h>
+	#include <qpopupmenu.h>
+	#include <qevent.h>
+#else
+	#include <QtGui/QLayout>
+	#include <QtGui/QLabel>
+	#include <QtGui/QSlider>
+	#include <QtGui/QCheckBox>
+	#include <QtGui/QMenuBar>
+	#include <QtGui/QMessageBox>
+	#include <QtCore/QDateTime>
+	#include <QtCore/QTimer>
+	#include <QtGui/QApplication>
+	#include <QtGui/QCloseEvent>
+	//#include <Qt3Support/q3popupmenu.h>
+	//#define QPopupMenu Q3PopupMenu
+	#define QPopupMenu QMenu
+	using namespace Qt;
+#endif
+
+EmulWin::EmulWin(Emulator *e) : QMainWindow(0, "DevLibEmul",
+	#if _QT < 4
+		Qt::WDestructiveClose
+	#else
+		0
+	#endif
+)
 {
+	#if _QT >= 4
+		setAttribute(Qt::WA_DeleteOnClose);
+	#endif
+
 	// "File" menu
 	QPopupMenu * file = new QPopupMenu(this);
 	file->insertItem("&Quit", static_cast<QObject *>(e->emulApp), SLOT(closeAllWindows()), CTRL+Key_Q);