fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-09-03 21:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/utils/hbqtgen.prg
    + Implemented: QIcon() as a parameter now can be supplied as 
      filename, resource name, or constructed QIcon() as pointer.
      Notified at HMG forums.

      Since begining QIcon is passed as a string only. I do not 
      remember why I did it like that but it was very limiting, 
      though it solved our purpose well.

  * contrib/hbqt/qtgui/g/QAbstractButton.cpp
  * contrib/hbqt/qtgui/g/QAction.cpp
  * contrib/hbqt/qtgui/g/QActionGroup.cpp
  * contrib/hbqt/qtgui/g/QApplication.cpp
  * contrib/hbqt/qtgui/g/QComboBox.cpp
  * contrib/hbqt/qtgui/g/QListWidgetItem.cpp
  * contrib/hbqt/qtgui/g/QMenu.cpp
  * contrib/hbqt/qtgui/g/QMenuBar.cpp
  * contrib/hbqt/qtgui/g/QStandardItem.cpp
  * contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
  * contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
  * contrib/hbqt/qtgui/g/QTabWidget.cpp
  * contrib/hbqt/qtgui/g/QToolBar.cpp
  * contrib/hbqt/qtgui/g/QToolBox.cpp
  * contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
  * contrib/hbqt/qtgui/g/QWidget.cpp
    * Regenerated.
This commit is contained in:
Pritpal Bedi
2010-09-04 04:25:21 +00:00
parent 0ae677b526
commit 50b29f78e2
18 changed files with 80 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
harbour/ChangeLog
View File

@@ -16,6 +16,34 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-09-03 21:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/utils/hbqtgen.prg
+ Implemented: QIcon() as a parameter now can be supplied as
filename, resource name, or constructed QIcon() as pointer.
Notified at HMG forums.
Since begining QIcon is passed as a string only. I do not
remember why I did it like that but it was very limiting,
though it solved our purpose well.
* contrib/hbqt/qtgui/g/QAbstractButton.cpp
* contrib/hbqt/qtgui/g/QAction.cpp
* contrib/hbqt/qtgui/g/QActionGroup.cpp
* contrib/hbqt/qtgui/g/QApplication.cpp
* contrib/hbqt/qtgui/g/QComboBox.cpp
* contrib/hbqt/qtgui/g/QListWidgetItem.cpp
* contrib/hbqt/qtgui/g/QMenu.cpp
* contrib/hbqt/qtgui/g/QMenuBar.cpp
* contrib/hbqt/qtgui/g/QStandardItem.cpp
* contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
* contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
* contrib/hbqt/qtgui/g/QTabWidget.cpp
* contrib/hbqt/qtgui/g/QToolBar.cpp
* contrib/hbqt/qtgui/g/QToolBox.cpp
* contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
* contrib/hbqt/qtgui/g/QWidget.cpp
* Regenerated.
2010-09-03 20:35 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtcore/hbqt_hbslots.cpp
* contrib/hbqt/qtcore/hbqt_hbslots.h

4
harbour/contrib/hbqt/qtgui/g/QAbstractButton.cpp
View File

@@ -351,10 +351,10 @@ HB_FUNC( QT_QABSTRACTBUTTON_SETICON )
{
QAbstractButton * p = hbqt_par_QAbstractButton( 1 );
if( p )
( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QABSTRACTBUTTON_SETICON FP=( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QABSTRACTBUTTON_SETICON FP=( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QAction.cpp
View File

@@ -490,10 +490,10 @@ HB_FUNC( QT_QACTION_SETICON )
{
QAction * p = hbqt_par_QAction( 1 );
if( p )
( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QACTION_SETICON FP=( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QACTION_SETICON FP=( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QActionGroup.cpp
View File

@@ -201,10 +201,10 @@ HB_FUNC( QT_QACTIONGROUP_ADDACTION_2 )
{
QActionGroup * p = hbqt_par_QActionGroup( 1 );
if( p )
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QActionGroup::tr( hb_parc( 3 ) ) ), false ) );
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QActionGroup::tr( hb_parc( 3 ) ) ), false ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QACTIONGROUP_ADDACTION_2 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QActionGroup::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QACTIONGROUP_ADDACTION_2 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QActionGroup::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QApplication.cpp
View File

@@ -1031,10 +1031,10 @@ HB_FUNC( QT_QAPPLICATION_SETWINDOWICON )
{
QApplication * p = hbqt_par_QApplication( 1 );
if( p )
( p )->setWindowIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setWindowIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QAPPLICATION_SETWINDOWICON FP=( p )->setWindowIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QAPPLICATION_SETWINDOWICON FP=( p )->setWindowIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

12
harbour/contrib/hbqt/qtgui/g/QComboBox.cpp
View File

@@ -176,10 +176,10 @@ HB_FUNC( QT_QCOMBOBOX_ADDITEM_1 )
{
QComboBox * p = hbqt_par_QComboBox( 1 );
if( p )
( p )->addItem( QIcon( hbqt_par_QString( 2 ) ), QComboBox::tr( hb_parc( 3 ) ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
( p )->addItem( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QComboBox::tr( hb_parc( 3 ) ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QCOMBOBOX_ADDITEM_1 FP=( p )->addItem( QIcon( hbqt_par_QString( 2 ) ), QComboBox::tr( hb_parc( 3 ) ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QCOMBOBOX_ADDITEM_1 FP=( p )->addItem( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QComboBox::tr( hb_parc( 3 ) ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QVariant( 4 ) : QVariant() ) ); p is NULL" ) );
}
}
@@ -358,10 +358,10 @@ HB_FUNC( QT_QCOMBOBOX_INSERTITEM_1 )
{
QComboBox * p = hbqt_par_QComboBox( 1 );
if( p )
( p )->insertItem( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ), QComboBox::tr( hb_parc( 4 ) ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) );
( p )->insertItem( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), QComboBox::tr( hb_parc( 4 ) ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QCOMBOBOX_INSERTITEM_1 FP=( p )->insertItem( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ), QComboBox::tr( hb_parc( 4 ) ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QCOMBOBOX_INSERTITEM_1 FP=( p )->insertItem( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), QComboBox::tr( hb_parc( 4 ) ), ( HB_ISPOINTER( 5 ) ? *hbqt_par_QVariant( 5 ) : QVariant() ) ); p is NULL" ) );
}
}
@@ -708,10 +708,10 @@ HB_FUNC( QT_QCOMBOBOX_SETITEMICON )
{
QComboBox * p = hbqt_par_QComboBox( 1 );
if( p )
( p )->setItemIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) );
( p )->setItemIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QCOMBOBOX_SETITEMICON FP=( p )->setItemIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QCOMBOBOX_SETITEMICON FP=( p )->setItemIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QListWidgetItem.cpp
View File

@@ -419,10 +419,10 @@ HB_FUNC( QT_QLISTWIDGETITEM_SETICON )
{
QListWidgetItem * p = hbqt_par_QListWidgetItem( 1 );
if( p )
( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLISTWIDGETITEM_SETICON FP=( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QLISTWIDGETITEM_SETICON FP=( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

16
harbour/contrib/hbqt/qtgui/g/QMenu.cpp
View File

@@ -235,10 +235,10 @@ HB_FUNC( QT_QMENU_ADDACTION_1 )
{
QMenu * p = hbqt_par_QMenu( 1 );
if( p )
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) );
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_ADDACTION_1 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_ADDACTION_1 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
}
}
@@ -263,10 +263,10 @@ HB_FUNC( QT_QMENU_ADDACTION_3 )
{
QMenu * p = hbqt_par_QMenu( 1 );
if( p )
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) );
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenu::tr( hb_parc( 3 ) ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_ADDACTION_3 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_ADDACTION_3 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenu::tr( hb_parc( 3 ) ), hbqt_par_QObject( 4 ), hbqt_par_char( 5 ), *hbqt_par_QKeySequence( 6 ) ), false ) ); p is NULL" ) );
}
}
@@ -322,10 +322,10 @@ HB_FUNC( QT_QMENU_ADDMENU_2 )
{
QMenu * p = hbqt_par_QMenu( 1 );
if( p )
hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) );
hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_ADDMENU_2 FP=hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( QIcon( hbqt_par_QString( 2 ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_ADDMENU_2 FP=hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenu::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
}
}
@@ -574,10 +574,10 @@ HB_FUNC( QT_QMENU_SETICON )
{
QMenu * p = hbqt_par_QMenu( 1 );
if( p )
( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_SETICON FP=( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENU_SETICON FP=( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QMenuBar.cpp
View File

@@ -241,10 +241,10 @@ HB_FUNC( QT_QMENUBAR_ADDMENU_2 )
{
QMenuBar * p = hbqt_par_QMenuBar( 1 );
if( p )
hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( QIcon( hbqt_par_QString( 2 ) ), QMenuBar::tr( hb_parc( 3 ) ) ), false ) );
hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenuBar::tr( hb_parc( 3 ) ) ), false ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENUBAR_ADDMENU_2 FP=hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( QIcon( hbqt_par_QString( 2 ) ), QMenuBar::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QMENUBAR_ADDMENU_2 FP=hb_retptrGC( hbqt_gcAllocate_QMenu( ( p )->addMenu( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QMenuBar::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QStandardItem.cpp
View File

@@ -881,10 +881,10 @@ HB_FUNC( QT_QSTANDARDITEM_SETICON )
{
QStandardItem * p = hbqt_par_QStandardItem( 1 );
if( p )
( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSTANDARDITEM_SETICON FP=( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSTANDARDITEM_SETICON FP=( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QSystemTrayIcon.cpp
View File

@@ -233,10 +233,10 @@ HB_FUNC( QT_QSYSTEMTRAYICON_SETICON )
{
QSystemTrayIcon * p = hbqt_par_QSystemTrayIcon( 1 );
if( p )
( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSYSTEMTRAYICON_SETICON FP=( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QSYSTEMTRAYICON_SETICON FP=( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

12
harbour/contrib/hbqt/qtgui/g/QTabWidget.cpp
View File

@@ -190,10 +190,10 @@ HB_FUNC( QT_QTABWIDGET_ADDTAB_1 )
{
QTabWidget * p = hbqt_par_QTabWidget( 1 );
if( p )
hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QTabWidget::tr( hb_parc( 4 ) ) ) );
hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), QTabWidget::tr( hb_parc( 4 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_ADDTAB_1 FP=hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QTabWidget::tr( hb_parc( 4 ) ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_ADDTAB_1 FP=hb_retni( ( p )->addTab( hbqt_par_QWidget( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), QTabWidget::tr( hb_parc( 4 ) ) ) ); p is NULL" ) );
}
}
@@ -344,10 +344,10 @@ HB_FUNC( QT_QTABWIDGET_INSERTTAB_1 )
{
QTabWidget * p = hbqt_par_QTabWidget( 1 );
if( p )
hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QTabWidget::tr( hb_parc( 5 ) ) ) );
hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QIcon( 4 ) : QIcon( hbqt_par_QString( 4 ) ) ), QTabWidget::tr( hb_parc( 5 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_INSERTTAB_1 FP=hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QTabWidget::tr( hb_parc( 5 ) ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_INSERTTAB_1 FP=hb_retni( ( p )->insertTab( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QIcon( 4 ) : QIcon( hbqt_par_QString( 4 ) ) ), QTabWidget::tr( hb_parc( 5 ) ) ) ); p is NULL" ) );
}
}
@@ -484,10 +484,10 @@ HB_FUNC( QT_QTABWIDGET_SETTABICON )
{
QTabWidget * p = hbqt_par_QTabWidget( 1 );
if( p )
( p )->setTabIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) );
( p )->setTabIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABICON FP=( p )->setTabIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABWIDGET_SETTABICON FP=( p )->setTabIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QTableWidgetItem.cpp
View File

@@ -420,10 +420,10 @@ HB_FUNC( QT_QTABLEWIDGETITEM_SETICON )
{
QTableWidgetItem * p = hbqt_par_QTableWidgetItem( 1 );
if( p )
( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABLEWIDGETITEM_SETICON FP=( p )->setIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTABLEWIDGETITEM_SETICON FP=( p )->setIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QToolBar.cpp
View File

@@ -230,10 +230,10 @@ HB_FUNC( QT_QTOOLBAR_ADDACTION_2 )
{
QToolBar * p = hbqt_par_QToolBar( 1 );
if( p )
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QToolBar::tr( hb_parc( 3 ) ) ), false ) );
hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QToolBar::tr( hb_parc( 3 ) ) ), false ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBAR_ADDACTION_2 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( QIcon( hbqt_par_QString( 2 ) ), QToolBar::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBAR_ADDACTION_2 FP=hb_retptrGC( hbqt_gcAllocate_QAction( ( p )->addAction( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ), QToolBar::tr( hb_parc( 3 ) ) ), false ) ); p is NULL" ) );
}
}

12
harbour/contrib/hbqt/qtgui/g/QToolBox.cpp
View File

@@ -157,10 +157,10 @@ HB_FUNC( QT_QTOOLBOX_ADDITEM )
{
QToolBox * p = hbqt_par_QToolBox( 1 );
if( p )
hb_retni( ( p )->addItem( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QToolBox::tr( hb_parc( 4 ) ) ) );
hb_retni( ( p )->addItem( hbqt_par_QWidget( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), QToolBox::tr( hb_parc( 4 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBOX_ADDITEM FP=hb_retni( ( p )->addItem( hbqt_par_QWidget( 2 ), QIcon( hbqt_par_QString( 3 ) ), QToolBox::tr( hb_parc( 4 ) ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBOX_ADDITEM FP=hb_retni( ( p )->addItem( hbqt_par_QWidget( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ), QToolBox::tr( hb_parc( 4 ) ) ) ); p is NULL" ) );
}
}
@@ -241,10 +241,10 @@ HB_FUNC( QT_QTOOLBOX_INSERTITEM )
{
QToolBox * p = hbqt_par_QToolBox( 1 );
if( p )
hb_retni( ( p )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QToolBox::tr( hb_parc( 5 ) ) ) );
hb_retni( ( p )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QIcon( 4 ) : QIcon( hbqt_par_QString( 4 ) ) ), QToolBox::tr( hb_parc( 5 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBOX_INSERTITEM FP=hb_retni( ( p )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), QIcon( hbqt_par_QString( 4 ) ), QToolBox::tr( hb_parc( 5 ) ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBOX_INSERTITEM FP=hb_retni( ( p )->insertItem( hb_parni( 2 ), hbqt_par_QWidget( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QIcon( 4 ) : QIcon( hbqt_par_QString( 4 ) ) ), QToolBox::tr( hb_parc( 5 ) ) ) ); p is NULL" ) );
}
}
@@ -353,10 +353,10 @@ HB_FUNC( QT_QTOOLBOX_SETITEMICON )
{
QToolBox * p = hbqt_par_QToolBox( 1 );
if( p )
( p )->setItemIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) );
( p )->setItemIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBOX_SETITEMICON FP=( p )->setItemIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTOOLBOX_SETITEMICON FP=( p )->setItemIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QTreeWidgetItem.cpp
View File

@@ -656,10 +656,10 @@ HB_FUNC( QT_QTREEWIDGETITEM_SETICON )
{
QTreeWidgetItem * p = hbqt_par_QTreeWidgetItem( 1 );
if( p )
( p )->setIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) );
( p )->setIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTREEWIDGETITEM_SETICON FP=( p )->setIcon( hb_parni( 2 ), QIcon( hbqt_par_QString( 3 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QTREEWIDGETITEM_SETICON FP=( p )->setIcon( hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QIcon( 3 ) : QIcon( hbqt_par_QString( 3 ) ) ) ); p is NULL" ) );
}
}

4
harbour/contrib/hbqt/qtgui/g/QWidget.cpp
View File

@@ -2216,10 +2216,10 @@ HB_FUNC( QT_QWIDGET_SETWINDOWICON )
{
QWidget * p = hbqt_par_QWidget( 1 );
if( p )
( p )->setWindowIcon( QIcon( hbqt_par_QString( 2 ) ) );
( p )->setWindowIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) );
else
{
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWIDGET_SETWINDOWICON FP=( p )->setWindowIcon( QIcon( hbqt_par_QString( 2 ) ) ); p is NULL" ) );
HB_TRACE( HB_TR_DEBUG, ( "............................... F=QT_QWIDGET_SETWINDOWICON FP=( p )->setWindowIcon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QIcon( 2 ) : QIcon( hbqt_par_QString( 2 ) ) ) ); p is NULL" ) );
}
}

3
harbour/contrib/hbqt/utils/hbqtgen.prg
View File

@@ -1022,7 +1022,8 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_, lList, fB
aA[ PRT_DOC ] := "c" + cDocNM
CASE aA[ PRT_CAST ] == "QIcon"
aA[ PRT_BODY ] := "QIcon( hbqt_par_QString( " + cHBIdx + " ) )"
s := "*hbqt_par_QIcon( " + cHBIdx + " )"
aA[ PRT_BODY ] := "( HB_ISPOINTER( " + cHBIdx + " ) ? " + s + " : " + "QIcon( hbqt_par_QString( " + cHBIdx + " ) ) )"
aA[ PRT_DOC ] := "c" + cDocNM
CASE aA[ PRT_L_FAR ]