2009-07-01 08:30 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

* harbour/contrib/hbqt/hbqt.h * harbour/contrib/hbqt/hbqt_base.cpp * harbour/contrib/hbqt/hbqt_qtextblockgroup.cpp * harbour/contrib/hbqt/hbqt_qtextcursor.cpp * harbour/contrib/hbqt/hbqt_qtextdocument.cpp * harbour/contrib/hbqt/hbqt_qtextdocumentfragment.cpp * harbour/contrib/hbqt/hbqt_qtextdocumentwriter.cpp * harbour/contrib/hbqt/hbqt_qtextframe.cpp * harbour/contrib/hbqt/hbqt_qtextobject.cpp * harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp * harbour/contrib/hbqt/moc_slots.cpp * harbour/contrib/hbqt/qth/QTextBlockGroup.qth * harbour/contrib/hbqt/qth/QTextCursor.qth * harbour/contrib/hbqt/qth/QTextDocument.qth * harbour/contrib/hbqt/qth/QTextDocumentFragment.qth * harbour/contrib/hbqt/qth/QTextDocumentWriter.qth * harbour/contrib/hbqt/qth/QTextFrame.qth * harbour/contrib/hbqt/qth/QTextObject.qth * harbour/contrib/hbqt/qth/QWebHistoryItem.qth ! Shifted headers to respective .qth ! Removed unnecessary additional headers and defines in hbqt.h /* Now HBQT compiles in 42 seconds on my machine. */
2009-07-01 15:48:47 +00:00
parent 0a708f0a34
commit ac72b2cdca
20 changed files with 65 additions and 29 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,31 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-07-01 08:30 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * harbour/contrib/hbqt/hbqt.h
+  * harbour/contrib/hbqt/hbqt_base.cpp
+  * harbour/contrib/hbqt/hbqt_qtextblockgroup.cpp
+  * harbour/contrib/hbqt/hbqt_qtextcursor.cpp
+  * harbour/contrib/hbqt/hbqt_qtextdocument.cpp
+  * harbour/contrib/hbqt/hbqt_qtextdocumentfragment.cpp
+  * harbour/contrib/hbqt/hbqt_qtextdocumentwriter.cpp
+  * harbour/contrib/hbqt/hbqt_qtextframe.cpp
+  * harbour/contrib/hbqt/hbqt_qtextobject.cpp
+  * harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp
+  * harbour/contrib/hbqt/moc_slots.cpp
+  * harbour/contrib/hbqt/qth/QTextBlockGroup.qth
+  * harbour/contrib/hbqt/qth/QTextCursor.qth
+  * harbour/contrib/hbqt/qth/QTextDocument.qth
+  * harbour/contrib/hbqt/qth/QTextDocumentFragment.qth
+  * harbour/contrib/hbqt/qth/QTextDocumentWriter.qth
+  * harbour/contrib/hbqt/qth/QTextFrame.qth
+  * harbour/contrib/hbqt/qth/QTextObject.qth
+  * harbour/contrib/hbqt/qth/QWebHistoryItem.qth
+    ! Shifted headers to respective .qth
+    ! Removed unnecessary additional headers and defines in hbqt.h
+
+    /*  Now HBQT compiles in 42 seconds on my machine. */
+
 2009-07-01 17:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * contrib/hbqt/qth/QWebHistoryItem.qth
  * contrib/hbqt/qth/QTextCursor.qth
--- a/harbour/contrib/hbqt/hbqt.h
+++ b/harbour/contrib/hbqt/hbqt.h
@@ -56,8 +56,6 @@
 #ifndef __HBQT_H
 #define __HBQT_H

-#include <qglobal.h>
-
 #if QT_VERSION >= 0x040500

 #define hbqt_par_QTranslator( n )            ( ( QTranslator* ) hb_parptr( n ) )
@@ -348,24 +346,8 @@
 #define hbqt_ret_QAbstractItemModel( p )     ( hb_retptr( ( QAbstractItemModel* ) p ) )
 #define hbqt_ret_QPrinter( p )               ( hb_retptr( ( QPrinter* ) p ) )

-#include <QtGui/QWidget>
-
-void    hbqt_ret_QRect( QRect );
-void    hbqt_ret_QSize( QSize );
-void    hbqt_ret_QPoint( QPoint );
-
-QRect   hbqt_const_QRect( int );
-QSize   hbqt_const_QSize( int );
-QPoint  hbqt_const_QPoint( int );
-
-void    hbqt_ret_QRectF( QRectF );
-void    hbqt_ret_QSizeF( QSizeF );
-void    hbqt_ret_QPointF( QPointF );
-
-QRectF  hbqt_const_QRectF( int );
-QSizeF  hbqt_const_QSizeF( int );
-QPointF hbqt_const_QPointF( int );
-
 #endif

 #endif /* __HBQT_H */
+
+
--- a/harbour/contrib/hbqt/hbqt_base.cpp
+++ b/harbour/contrib/hbqt/hbqt_base.cpp
@@ -52,6 +52,8 @@
 */
 /*----------------------------------------------------------------------*/

+#include <qglobal.h>
+
 #include "hbapi.h"

 #include "hbqt.h"
--- a/harbour/contrib/hbqt/hbqt_qtextblockgroup.cpp
+++ b/harbour/contrib/hbqt/hbqt_qtextblockgroup.cpp
@@ -61,7 +61,7 @@


 #include <QtGui/QTextBlockGroup>
-
+#include <QtGui/QTextDocument>

 /*
 * QTextBlockGroup ( QTextDocument * document )
--- a/harbour/contrib/hbqt/hbqt_qtextcursor.cpp
+++ b/harbour/contrib/hbqt/hbqt_qtextcursor.cpp
@@ -62,6 +62,8 @@

 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>
+#include <QtGui/QTextBlock>


 /*
@@ -571,3 +573,4 @@ HB_FUNC( QT_QTEXTCURSOR_VISUALNAVIGATION )
 /*----------------------------------------------------------------------*/
 #endif             /* #if QT_VERSION >= 0x040500 */
 /*----------------------------------------------------------------------*/
+
--- a/harbour/contrib/hbqt/hbqt_qtextdocument.cpp
+++ b/harbour/contrib/hbqt/hbqt_qtextdocument.cpp
@@ -70,10 +70,10 @@


 #include <QtGui/QTextDocument>
+#include <QtGui/QTextDocumentFragment>
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextCursor>

-
 /*
 * QTextDocument ( QObject * parent = 0 )
 * QTextDocument ( const QString & text, QObject * parent = 0 )
@@ -616,3 +616,4 @@ HB_FUNC( QT_QTEXTDOCUMENT_UNDO_1 )
 /*----------------------------------------------------------------------*/
 #endif             /* #if QT_VERSION >= 0x040500 */
 /*----------------------------------------------------------------------*/
+
--- a/harbour/contrib/hbqt/hbqt_qtextdocumentfragment.cpp
+++ b/harbour/contrib/hbqt/hbqt_qtextdocumentfragment.cpp
@@ -61,6 +61,9 @@


 #include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>


 /*
--- a/harbour/contrib/hbqt/hbqt_qtextdocumentwriter.cpp
+++ b/harbour/contrib/hbqt/hbqt_qtextdocumentwriter.cpp
@@ -61,7 +61,8 @@


 #include <QtGui/QTextDocumentWriter>
-
+#include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>

 /*
 * QTextDocumentWriter ()
--- a/harbour/contrib/hbqt/hbqt_qtextframe.cpp
+++ b/harbour/contrib/hbqt/hbqt_qtextframe.cpp
@@ -70,6 +70,7 @@


 #include <QtGui/QTextFrame>
+#include <QtGui/QTextDocument>
 #include <QtGui/QTextCursor>


@@ -142,3 +143,4 @@ HB_FUNC( QT_QTEXTFRAME_SETFRAMEFORMAT )
 /*----------------------------------------------------------------------*/
 #endif             /* #if QT_VERSION >= 0x040500 */
 /*----------------------------------------------------------------------*/
+
--- a/harbour/contrib/hbqt/hbqt_qtextobject.cpp
+++ b/harbour/contrib/hbqt/hbqt_qtextobject.cpp
@@ -61,7 +61,10 @@


 #include <QtGui/QTextObject>
-
+#include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>

 /*
 *
--- a/harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp
+++ b/harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp
@@ -59,9 +59,11 @@
 #if QT_VERSION >= 0x040500
 /*----------------------------------------------------------------------*/

+
 #include <qvariant.h>

 #include <QtWebKit/QWebHistoryItem>
+#include <QtCore/QVariant>


 /*
@@ -141,3 +143,4 @@ HB_FUNC( QT_QWEBHISTORYITEM_USERDATA )
 /*----------------------------------------------------------------------*/
 #endif             /* #if QT_VERSION >= 0x040500 */
 /*----------------------------------------------------------------------*/
+
--- a/harbour/contrib/hbqt/moc_slots.cpp
+++ b/harbour/contrib/hbqt/moc_slots.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** Meta object code from reading C++ file 'hbqt_slots.h'
 **
-** Created: Wed Jul 1 01:16:08 2009
+** Created: Wed Jul 1 08:25:04 2009
 **      by: The Qt Meta Object Compiler version 61 (Qt 4.5.0)
 **
 ** WARNING! All changes made in this file will be lost!
--- a/harbour/contrib/hbqt/qth/QTextBlockGroup.qth
+++ b/harbour/contrib/hbqt/qth/QTextBlockGroup.qth
@@ -62,7 +62,7 @@ New      =

 <CODE>
 #include <QtGui/QTextBlockGroup>
-
+#include <QtGui/QTextDocument>

 /*
 * QTextBlockGroup ( QTextDocument * document )
--- a/harbour/contrib/hbqt/qth/QTextCursor.qth
+++ b/harbour/contrib/hbqt/qth/QTextCursor.qth
@@ -63,6 +63,8 @@ New      =
 <CODE>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>
+#include <QtGui/QTextBlock>


 /*
--- a/harbour/contrib/hbqt/qth/QTextDocument.qth
+++ b/harbour/contrib/hbqt/qth/QTextDocument.qth
@@ -62,10 +62,10 @@ New      =

 <CODE>
 #include <QtGui/QTextDocument>
+#include <QtGui/QTextDocumentFragment>
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextCursor>

-
 /*
 * QTextDocument ( QObject * parent = 0 )
 * QTextDocument ( const QString & text, QObject * parent = 0 )
--- a/harbour/contrib/hbqt/qth/QTextDocumentFragment.qth
+++ b/harbour/contrib/hbqt/qth/QTextDocumentFragment.qth
@@ -62,6 +62,9 @@ New      =

 <CODE>
 #include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>


 /*
--- a/harbour/contrib/hbqt/qth/QTextDocumentWriter.qth
+++ b/harbour/contrib/hbqt/qth/QTextDocumentWriter.qth
@@ -62,7 +62,8 @@ New      =

 <CODE>
 #include <QtGui/QTextDocumentWriter>
-
+#include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>

 /*
 * QTextDocumentWriter ()
--- a/harbour/contrib/hbqt/qth/QTextFrame.qth
+++ b/harbour/contrib/hbqt/qth/QTextFrame.qth
@@ -62,6 +62,7 @@ New      = pDocument

 <CODE>
 #include <QtGui/QTextFrame>
+#include <QtGui/QTextDocument>
 #include <QtGui/QTextCursor>


--- a/harbour/contrib/hbqt/qth/QTextObject.qth
+++ b/harbour/contrib/hbqt/qth/QTextObject.qth
@@ -62,7 +62,10 @@ New      =

 <CODE>
 #include <QtGui/QTextObject>
-
+#include <QtGui/QTextDocumentFragment>
+#include <QtGui/QTextDocument>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>

 /*
 *
--- a/harbour/contrib/hbqt/qth/QWebHistoryItem.qth
+++ b/harbour/contrib/hbqt/qth/QWebHistoryItem.qth
@@ -64,6 +64,7 @@ New      =
 #include <qvariant.h>

 #include <QtWebKit/QWebHistoryItem>
+#include <QtCore/QVariant>


 /*