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

* contrib/hbqt/qth/QTextBlockGroup.qth * contrib/hbqt/qth/QTextDocumentFragment.qth * contrib/hbqt/qth/QWebHistoryItem.qth * contrib/hbqt/qth/QTextCursor.qth * contrib/hbqt/qth/QTextDocument.qth * contrib/hbqt/qth/QTextFrame.qth * contrib/hbqt/qth/QTextDocumentWriter.qth * contrib/hbqt/qth/QTextObject.qth * contrib/hbqt/hbqt_qtextdocument.cpp * contrib/hbqt/hbqt_qtextblockgroup.cpp * contrib/hbqt/hbqt_qtextcursor.cpp * contrib/hbqt/hbqt_qwebhistoryitem.cpp * contrib/hbqt/moc_slots.cpp * contrib/hbqt/hbqt_qtextobject.cpp * contrib/hbqt/hbqt_qtextdocumentfragment.cpp * contrib/hbqt/hbqt.h * contrib/hbqt/hbqt_base.cpp * contrib/hbqt/hbqt_qtextdocumentwriter.cpp * contrib/hbqt/hbqt_qtextframe.cpp * Reverted previous two changes before applying fixes.
2009-07-01 18:50:00 +00:00
parent 088f476a62
commit b20a37cdb8
20 changed files with 49 additions and 41 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,28 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-07-01 20:48 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbqt/qth/QTextBlockGroup.qth
+  * contrib/hbqt/qth/QTextDocumentFragment.qth
+  * contrib/hbqt/qth/QWebHistoryItem.qth
+  * contrib/hbqt/qth/QTextCursor.qth
+  * contrib/hbqt/qth/QTextDocument.qth
+  * contrib/hbqt/qth/QTextFrame.qth
+  * contrib/hbqt/qth/QTextDocumentWriter.qth
+  * contrib/hbqt/qth/QTextObject.qth
+  * contrib/hbqt/hbqt_qtextdocument.cpp
+  * contrib/hbqt/hbqt_qtextblockgroup.cpp
+  * contrib/hbqt/hbqt_qtextcursor.cpp
+  * contrib/hbqt/hbqt_qwebhistoryitem.cpp
+  * contrib/hbqt/moc_slots.cpp
+  * contrib/hbqt/hbqt_qtextobject.cpp
+  * contrib/hbqt/hbqt_qtextdocumentfragment.cpp
+  * contrib/hbqt/hbqt.h
+  * contrib/hbqt/hbqt_base.cpp
+  * contrib/hbqt/hbqt_qtextdocumentwriter.cpp
+  * contrib/hbqt/hbqt_qtextframe.cpp
+    * Reverted previous two changes before applying fixes.
+
 2009-07-01 09:26 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
  * harbour/contrib/hbqt/hbqt.h
    ! Includes <QtGui/QWidget>
--- a/harbour/contrib/hbqt/hbqt.h
+++ b/harbour/contrib/hbqt/hbqt.h
@@ -57,7 +57,6 @@
 #define __HBQT_H

 #include <qglobal.h>
-#include <QtGui/QWidget>

 #if QT_VERSION >= 0x040500

@@ -349,8 +348,24 @@
 #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,8 +52,6 @@
 */
 /*----------------------------------------------------------------------*/

-#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,8 +62,6 @@

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


 /*
@@ -573,4 +571,3 @@ 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,4 +616,3 @@ 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,9 +61,6 @@


 #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,8 +61,7 @@


 #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,7 +70,6 @@


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


@@ -143,4 +142,3 @@ 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,10 +61,7 @@


 #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,11 +59,9 @@
 #if QT_VERSION >= 0x040500
 /*----------------------------------------------------------------------*/

-
 #include <qvariant.h>

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


 /*
@@ -143,4 +141,3 @@ 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 08:25:04 2009
+** Created: Wed Jul 1 01:16:08 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,8 +63,6 @@ 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,9 +62,6 @@ 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,8 +62,7 @@ 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,7 +62,6 @@ 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,10 +62,7 @@ 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,7 +64,6 @@ New      =
 #include <qvariant.h>

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


 /*