Update to latest tqt3 automated conversion

3 files changed, 31 insertions, 31 deletions

diff --git a/src/workspace/qworkspace.h b/src/workspace/ntqworkspace.h
index 96cc83ff..7a29e975 100644
--- a/src/workspace/qworkspace.h
+++ b/src/workspace/ntqworkspace.h
@@ -42,8 +42,8 @@
 #define TQWORKSPACE_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qwidgetlist.h"
+#include "ntqwidget.h"
+#include "ntqwidgetlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_WORKSPACE
diff --git a/src/workspace/qt_workspace.pri b/src/workspace/qt_workspace.pri
index d5d4288d..629d27ae 100644
--- a/src/workspace/qt_workspace.pri
+++ b/src/workspace/qt_workspace.pri
@@ -1,6 +1,6 @@
 # Qt workspace module
 
 workspace {
-	HEADERS += $$WORKSPACE_H/qworkspace.h
+	HEADERS += $$WORKSPACE_H/ntqworkspace.h
 	SOURCES += $$WORKSPACE_CPP/qworkspace.cpp
 }
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index e11d5cc3..d37f2573 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -38,44 +38,44 @@
 **
 **********************************************************************/
 
-#include "qworkspace.h"
+#include "ntqworkspace.h"
 #ifndef QT_NO_WORKSPACE
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "../widgets/qtitlebar_p.h"
-#include "qobjectlist.h"
-#include "qlayout.h"
-#include "qtoolbutton.h"
-#include "qlabel.h"
-#include "qvbox.h"
-#include "qaccel.h"
-#include "qcursor.h"
-#include "qpopupmenu.h"
-#include "qmenubar.h"
-#include "qguardedptr.h"
-#include "qiconset.h"
+#include "ntqobjectlist.h"
+#include "ntqlayout.h"
+#include "ntqtoolbutton.h"
+#include "ntqlabel.h"
+#include "ntqvbox.h"
+#include "ntqaccel.h"
+#include "ntqcursor.h"
+#include "ntqpopupmenu.h"
+#include "ntqmenubar.h"
+#include "ntqguardedptr.h"
+#include "ntqiconset.h"
 #include "../widgets/qwidgetresizehandler_p.h"
-#include "qfocusdata.h"
-#include "qdatetime.h"
-#include "qtooltip.h"
-#include "qwmatrix.h"
-#include "qimage.h"
-#include "qscrollbar.h"
-#include "qstyle.h"
-#include "qbitmap.h"
+#include "ntqfocusdata.h"
+#include "ntqdatetime.h"
+#include "ntqtooltip.h"
+#include "ntqwmatrix.h"
+#include "ntqimage.h"
+#include "ntqscrollbar.h"
+#include "ntqstyle.h"
+#include "ntqbitmap.h"
 
 // magic non-mdi things
-#include "qtimer.h"
-#include "qdockarea.h"
-#include "qstatusbar.h"
-#include "qmainwindow.h"
-#include "qdockwindow.h"
-#include "qtoolbar.h"
+#include "ntqtimer.h"
+#include "ntqdockarea.h"
+#include "ntqstatusbar.h"
+#include "ntqmainwindow.h"
+#include "ntqdockwindow.h"
+#include "ntqtoolbar.h"
 
 #define BUTTON_WIDTH	16
 #define BUTTON_HEIGHT	14
 
 /*!
-    \class TQWorkspace qworkspace.h
+    \class TQWorkspace ntqworkspace.h
     \brief The TQWorkspace widget provides a workspace window that can
     contain decorated windows, e.g. for MDI.