[cmake-commits] hoffman committed CMakeSetup.cxx 1.3 1.4 CMakeSetupDialog.h 1.3 1.4 QCMake.h 1.3 1.4 QCMakeCacheView.h 1.4 1.5

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv22379

Modified Files:
	CMakeSetup.cxx CMakeSetupDialog.h QCMake.h QCMakeCacheView.h 
Log Message:
ENH: remove qt warnings from qt with MS compiler


Index: QCMake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMake.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- QCMake.h	3 Nov 2007 14:30:52 -0000	1.3
+++ QCMake.h	3 Nov 2007 16:50:02 -0000	1.4
@@ -17,6 +17,10 @@
 
 #ifndef __QCMake_h
 #define __QCMake_h
+#ifdef _MSC_VER
+#pragma warning ( disable : 4127 )
+#pragma warning ( disable : 4512 )
+#endif
 
 #include <QObject>
 #include <QString>

Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMakeSetup.cxx	3 Nov 2007 14:30:52 -0000	1.3
+++ CMakeSetup.cxx	3 Nov 2007 16:50:02 -0000	1.4
@@ -14,7 +14,7 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-
+#include "QCMake.h"  // include to disable MS warnings
 #include <QApplication>
 
 #include "cmSystemTools.h"

Index: QCMakeCacheView.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- QCMakeCacheView.h	3 Nov 2007 16:07:38 -0000	1.4
+++ QCMakeCacheView.h	3 Nov 2007 16:50:02 -0000	1.5
@@ -18,13 +18,13 @@
 #ifndef QCMakeCacheView_h
 #define QCMakeCacheView_h
 
+#include "QCMake.h"
 #include <QTableView>
 #include <QAbstractTableModel>
 #include <QCheckBox>
 #include <QLineEdit>
 #include <QItemDelegate>
 
-#include "QCMake.h"
 class QCMakeCacheModel;
 
 

Index: CMakeSetupDialog.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMakeSetupDialog.h	3 Nov 2007 14:30:52 -0000	1.3
+++ CMakeSetupDialog.h	3 Nov 2007 16:50:02 -0000	1.4
@@ -15,9 +15,9 @@
 
 =========================================================================*/
 
+#include "QCMake.h"
 #include <QMainWindow>
 #include "ui_CMakeSetupDialog.h"
-#include "QCMake.h"
 
 class QCMakeThread;
 class CMakeCacheModel;