diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 79e81957a4..7709b02de3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,452 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-07 07:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/generator/hbqtgen.prg
+    * Formatting.
+    * .cpp file rename.
+      This is to resolve short term problem msvc builds failing
+      due to too long command line length when assembling the library.
+    ; TOFIX: On the mide term which whould split this huge lib into smaller
+             pieces.
+    * Moved non-generated files to the top of the file list
+      to make them build first.
+
+  * contrib/hbqt/Makefile_gen
+  + contrib/hbqt/QAbstractButton.cpp
+  + contrib/hbqt/QAbstractItemModel.cpp
+  + contrib/hbqt/QAbstractItemView.cpp
+  + contrib/hbqt/QAbstractListModel.cpp
+  + contrib/hbqt/QAbstractPrintDialog.cpp
+  + contrib/hbqt/QAbstractScrollArea.cpp
+  + contrib/hbqt/QAbstractSlider.cpp
+  + contrib/hbqt/QAbstractSpinBox.cpp
+  + contrib/hbqt/QAbstractTableModel.cpp
+  + contrib/hbqt/QAction.cpp
+  + contrib/hbqt/QApplication.cpp
+  + contrib/hbqt/QBitmap.cpp
+  + contrib/hbqt/QBoxLayout.cpp
+  + contrib/hbqt/QBrush.cpp
+  + contrib/hbqt/QCalendarWidget.cpp
+  + contrib/hbqt/QCheckBox.cpp
+  + contrib/hbqt/QClipboard.cpp
+  + contrib/hbqt/QColor.cpp
+  + contrib/hbqt/QColorDialog.cpp
+  + contrib/hbqt/QComboBox.cpp
+  + contrib/hbqt/QCommandLinkButton.cpp
+  + contrib/hbqt/QCommonStyle.cpp
+  + contrib/hbqt/QConicalGradient.cpp
+  + contrib/hbqt/QCoreApplication.cpp
+  + contrib/hbqt/QCursor.cpp
+  + contrib/hbqt/QDateEdit.cpp
+  + contrib/hbqt/QDateTime.cpp
+  + contrib/hbqt/QDateTimeEdit.cpp
+  + contrib/hbqt/QDesktopWidget.cpp
+  + contrib/hbqt/QDial.cpp
+  + contrib/hbqt/QDialog.cpp
+  + contrib/hbqt/QDir.cpp
+  + contrib/hbqt/QDirModel.cpp
+  + contrib/hbqt/QDockWidget.cpp
+  + contrib/hbqt/QDoubleSpinBox.cpp
+  + contrib/hbqt/QDragEnterEvent.cpp
+  + contrib/hbqt/QDragLeaveEvent.cpp
+  + contrib/hbqt/QDragMoveEvent.cpp
+  + contrib/hbqt/QDropEvent.cpp
+  + contrib/hbqt/QErrorMessage.cpp
+  + contrib/hbqt/QEvent.cpp
+  + contrib/hbqt/QEventLoop.cpp
+  + contrib/hbqt/QFileDialog.cpp
+  + contrib/hbqt/QFileSystemModel.cpp
+  + contrib/hbqt/QFocusEvent.cpp
+  + contrib/hbqt/QFocusFrame.cpp
+  + contrib/hbqt/QFont.cpp
+  + contrib/hbqt/QFontComboBox.cpp
+  + contrib/hbqt/QFontDatabase.cpp
+  + contrib/hbqt/QFontDialog.cpp
+  + contrib/hbqt/QFontInfo.cpp
+  + contrib/hbqt/QFormLayout.cpp
+  + contrib/hbqt/QFrame.cpp
+  + contrib/hbqt/QFtp.cpp
+  + contrib/hbqt/QGradient.cpp
+  + contrib/hbqt/QGridLayout.cpp
+  + contrib/hbqt/QGroupBox.cpp
+  + contrib/hbqt/QHBoxLayout.cpp
+  + contrib/hbqt/QHeaderView.cpp
+  + contrib/hbqt/QHttp.cpp
+  + contrib/hbqt/QIcon.cpp
+  + contrib/hbqt/QImage.cpp
+  + contrib/hbqt/QImageReader.cpp
+  + contrib/hbqt/QImageWriter.cpp
+  + contrib/hbqt/QInputDialog.cpp
+  + contrib/hbqt/QInputEvent.cpp
+  + contrib/hbqt/QKeyEvent.cpp
+  + contrib/hbqt/QKeySequence.cpp
+  + contrib/hbqt/QLabel.cpp
+  + contrib/hbqt/QLatin1Char.cpp
+  + contrib/hbqt/QLatin1String.cpp
+  + contrib/hbqt/QLayout.cpp
+  + contrib/hbqt/QLayoutItem.cpp
+  + contrib/hbqt/QLCDNumber.cpp
+  + contrib/hbqt/QLine.cpp
+  + contrib/hbqt/QLinearGradient.cpp
+  + contrib/hbqt/QLineEdit.cpp
+  + contrib/hbqt/QList.cpp
+  + contrib/hbqt/QListView.cpp
+  + contrib/hbqt/QListWidget.cpp
+  + contrib/hbqt/QListWidgetItem.cpp
+  + contrib/hbqt/QMainWindow.cpp
+  + contrib/hbqt/QMenu.cpp
+  + contrib/hbqt/QMenuBar.cpp
+  + contrib/hbqt/QMessageBox.cpp
+  + contrib/hbqt/QModelIndex.cpp
+  + contrib/hbqt/QMouseEvent.cpp
+  + contrib/hbqt/QMoveEvent.cpp
+  + contrib/hbqt/QObject.cpp
+  + contrib/hbqt/QPageSetupDialog.cpp
+  + contrib/hbqt/QPaintDevice.cpp
+  + contrib/hbqt/QPainter.cpp
+  + contrib/hbqt/QPaintEvent.cpp
+  + contrib/hbqt/QPalette.cpp
+  + contrib/hbqt/QPen.cpp
+  + contrib/hbqt/QPicture.cpp
+  + contrib/hbqt/QPixmap.cpp
+  + contrib/hbqt/QPoint.cpp
+  + contrib/hbqt/QPointF.cpp
+  + contrib/hbqt/QPrintDialog.cpp
+  + contrib/hbqt/QPrintPreviewDialog.cpp
+  + contrib/hbqt/QProgressBar.cpp
+  + contrib/hbqt/QProgressDialog.cpp
+  + contrib/hbqt/QPushButton.cpp
+  + contrib/hbqt/QRadialGradient.cpp
+  + contrib/hbqt/QRadioButton.cpp
+  + contrib/hbqt/QRect.cpp
+  + contrib/hbqt/QRectF.cpp
+  + contrib/hbqt/QRegion.cpp
+  + contrib/hbqt/QResizeEvent.cpp
+  + contrib/hbqt/QResource.cpp
+  + contrib/hbqt/QScrollArea.cpp
+  + contrib/hbqt/QScrollBar.cpp
+  + contrib/hbqt/QSignalMapper.cpp
+  + contrib/hbqt/QSize.cpp
+  + contrib/hbqt/QSizeF.cpp
+  + contrib/hbqt/QSizeGrip.cpp
+  + contrib/hbqt/QSizePolicy.cpp
+  + contrib/hbqt/QSlider.cpp
+  + contrib/hbqt/QSound.cpp
+  + contrib/hbqt/QSpinBox.cpp
+  + contrib/hbqt/QSplashScreen.cpp
+  + contrib/hbqt/QSplitter.cpp
+  + contrib/hbqt/QStandardItem.cpp
+  + contrib/hbqt/QStandardItemModel.cpp
+  + contrib/hbqt/QStatusBar.cpp
+  + contrib/hbqt/QStringList.cpp
+  + contrib/hbqt/QStringListModel.cpp
+  + contrib/hbqt/QStyle.cpp
+  + contrib/hbqt/QStyledItemDelegate.cpp
+  + contrib/hbqt/QStyleHintReturn.cpp
+  + contrib/hbqt/QStyleHintReturnMask.cpp
+  + contrib/hbqt/QStyleHintReturnVariant.cpp
+  + contrib/hbqt/QStyleOption.cpp
+  + contrib/hbqt/QStyleOptionButton.cpp
+  + contrib/hbqt/QStyleOptionComboBox.cpp
+  + contrib/hbqt/QStyleOptionComplex.cpp
+  + contrib/hbqt/QStyleOptionDockWidget.cpp
+  + contrib/hbqt/QStyleOptionFocusRect.cpp
+  + contrib/hbqt/QStyleOptionFrame.cpp
+  + contrib/hbqt/QStyleOptionGroupBox.cpp
+  + contrib/hbqt/QStyleOptionHeader.cpp
+  + contrib/hbqt/QStyleOptionMenuItem.cpp
+  + contrib/hbqt/QStyleOptionProgressBar.cpp
+  + contrib/hbqt/QStyleOptionSizeGrip.cpp
+  + contrib/hbqt/QStyleOptionSlider.cpp
+  + contrib/hbqt/QStyleOptionSpinBox.cpp
+  + contrib/hbqt/QStyleOptionTab.cpp
+  + contrib/hbqt/QStyleOptionTabBarBase.cpp
+  + contrib/hbqt/QStyleOptionTabWidgetFrame.cpp
+  + contrib/hbqt/QStyleOptionTitleBar.cpp
+  + contrib/hbqt/QStyleOptionToolBar.cpp
+  + contrib/hbqt/QStyleOptionToolBox.cpp
+  + contrib/hbqt/QStyleOptionToolButton.cpp
+  + contrib/hbqt/QStyleOptionViewItem.cpp
+  + contrib/hbqt/QStylePainter.cpp
+  + contrib/hbqt/QSystemTrayIcon.cpp
+  + contrib/hbqt/QTabBar.cpp
+  + contrib/hbqt/QTableView.cpp
+  + contrib/hbqt/QTableWidget.cpp
+  + contrib/hbqt/QTableWidgetItem.cpp
+  + contrib/hbqt/QTabWidget.cpp
+  + contrib/hbqt/QTextBlock.cpp
+  + contrib/hbqt/QTextBlockFormat.cpp
+  + contrib/hbqt/QTextBlockGroup.cpp
+  + contrib/hbqt/QTextBoundaryFinder.cpp
+  + contrib/hbqt/QTextBrowser.cpp
+  + contrib/hbqt/QTextCharFormat.cpp
+  + contrib/hbqt/QTextCodec.cpp
+  + contrib/hbqt/QTextCursor.cpp
+  + contrib/hbqt/QTextDecoder.cpp
+  + contrib/hbqt/QTextDocument.cpp
+  + contrib/hbqt/QTextDocumentFragment.cpp
+  + contrib/hbqt/QTextDocumentWriter.cpp
+  + contrib/hbqt/QTextEdit.cpp
+  + contrib/hbqt/QTextEncoder.cpp
+  + contrib/hbqt/QTextFormat.cpp
+  + contrib/hbqt/QTextFragment.cpp
+  + contrib/hbqt/QTextFrame.cpp
+  + contrib/hbqt/QTextFrameFormat.cpp
+  + contrib/hbqt/QTextImageFormat.cpp
+  + contrib/hbqt/QTextInlineObject.cpp
+  + contrib/hbqt/QTextItem.cpp
+  + contrib/hbqt/QTextLayout.cpp
+  + contrib/hbqt/QTextLength.cpp
+  + contrib/hbqt/QTextLine.cpp
+  + contrib/hbqt/QTextObject.cpp
+  + contrib/hbqt/QTextStream.cpp
+  + contrib/hbqt/QTimeEdit.cpp
+  + contrib/hbqt/QTimer.cpp
+  + contrib/hbqt/QToolBar.cpp
+  + contrib/hbqt/QToolBox.cpp
+  + contrib/hbqt/QToolButton.cpp
+  + contrib/hbqt/QTreeView.cpp
+  + contrib/hbqt/QTreeWidget.cpp
+  + contrib/hbqt/QTreeWidgetItem.cpp
+  + contrib/hbqt/QUrl.cpp
+  + contrib/hbqt/QVariant.cpp
+  + contrib/hbqt/QVBoxLayout.cpp
+  + contrib/hbqt/QWebFrame.cpp
+  + contrib/hbqt/QWebHistory.cpp
+  + contrib/hbqt/QWebHistoryInterface.cpp
+  + contrib/hbqt/QWebHistoryItem.cpp
+  + contrib/hbqt/QWebHitTestResult.cpp
+  + contrib/hbqt/QWebPage.cpp
+  + contrib/hbqt/QWebPluginFactory.cpp
+  + contrib/hbqt/QWebSecurityOrigin.cpp
+  + contrib/hbqt/QWebSettings.cpp
+  + contrib/hbqt/QWebView.cpp
+  + contrib/hbqt/QWheelEvent.cpp
+  + contrib/hbqt/QWidget.cpp
+  + contrib/hbqt/QWidgetAction.cpp
+  + contrib/hbqt/QWidgetItem.cpp
+  + contrib/hbqt/QWindowsStyle.cpp
+  + contrib/hbqt/QWindowsXPStyle.cpp
+  + contrib/hbqt/QWizard.cpp
+  - contrib/hbqt/hbqt_qabstractbutton.cpp
+  - contrib/hbqt/hbqt_qabstractitemmodel.cpp
+  - contrib/hbqt/hbqt_qabstractitemview.cpp
+  - contrib/hbqt/hbqt_qabstractlistmodel.cpp
+  - contrib/hbqt/hbqt_qabstractprintdialog.cpp
+  - contrib/hbqt/hbqt_qabstractscrollarea.cpp
+  - contrib/hbqt/hbqt_qabstractslider.cpp
+  - contrib/hbqt/hbqt_qabstractspinbox.cpp
+  - contrib/hbqt/hbqt_qabstracttablemodel.cpp
+  - contrib/hbqt/hbqt_qaction.cpp
+  - contrib/hbqt/hbqt_qapplication.cpp
+  - contrib/hbqt/hbqt_qbitmap.cpp
+  - contrib/hbqt/hbqt_qboxlayout.cpp
+  - contrib/hbqt/hbqt_qbrush.cpp
+  - contrib/hbqt/hbqt_qcalendarwidget.cpp
+  - contrib/hbqt/hbqt_qcheckbox.cpp
+  - contrib/hbqt/hbqt_qclipboard.cpp
+  - contrib/hbqt/hbqt_qcolor.cpp
+  - contrib/hbqt/hbqt_qcolordialog.cpp
+  - contrib/hbqt/hbqt_qcombobox.cpp
+  - contrib/hbqt/hbqt_qcommandlinkbutton.cpp
+  - contrib/hbqt/hbqt_qcommonstyle.cpp
+  - contrib/hbqt/hbqt_qconicalgradient.cpp
+  - contrib/hbqt/hbqt_qcoreapplication.cpp
+  - contrib/hbqt/hbqt_qcursor.cpp
+  - contrib/hbqt/hbqt_qdateedit.cpp
+  - contrib/hbqt/hbqt_qdatetime.cpp
+  - contrib/hbqt/hbqt_qdatetimeedit.cpp
+  - contrib/hbqt/hbqt_qdesktopwidget.cpp
+  - contrib/hbqt/hbqt_qdial.cpp
+  - contrib/hbqt/hbqt_qdialog.cpp
+  - contrib/hbqt/hbqt_qdir.cpp
+  - contrib/hbqt/hbqt_qdirmodel.cpp
+  - contrib/hbqt/hbqt_qdockwidget.cpp
+  - contrib/hbqt/hbqt_qdoublespinbox.cpp
+  - contrib/hbqt/hbqt_qdragenterevent.cpp
+  - contrib/hbqt/hbqt_qdragleaveevent.cpp
+  - contrib/hbqt/hbqt_qdragmoveevent.cpp
+  - contrib/hbqt/hbqt_qdropevent.cpp
+  - contrib/hbqt/hbqt_qerrormessage.cpp
+  - contrib/hbqt/hbqt_qevent.cpp
+  - contrib/hbqt/hbqt_qeventloop.cpp
+  - contrib/hbqt/hbqt_qfiledialog.cpp
+  - contrib/hbqt/hbqt_qfilesystemmodel.cpp
+  - contrib/hbqt/hbqt_qfocusevent.cpp
+  - contrib/hbqt/hbqt_qfocusframe.cpp
+  - contrib/hbqt/hbqt_qfont.cpp
+  - contrib/hbqt/hbqt_qfontcombobox.cpp
+  - contrib/hbqt/hbqt_qfontdatabase.cpp
+  - contrib/hbqt/hbqt_qfontdialog.cpp
+  - contrib/hbqt/hbqt_qfontinfo.cpp
+  - contrib/hbqt/hbqt_qformlayout.cpp
+  - contrib/hbqt/hbqt_qframe.cpp
+  - contrib/hbqt/hbqt_qftp.cpp
+  - contrib/hbqt/hbqt_qgradient.cpp
+  - contrib/hbqt/hbqt_qgridlayout.cpp
+  - contrib/hbqt/hbqt_qgroupbox.cpp
+  - contrib/hbqt/hbqt_qhboxlayout.cpp
+  - contrib/hbqt/hbqt_qheaderview.cpp
+  - contrib/hbqt/hbqt_qhttp.cpp
+  - contrib/hbqt/hbqt_qicon.cpp
+  - contrib/hbqt/hbqt_qimage.cpp
+  - contrib/hbqt/hbqt_qimagereader.cpp
+  - contrib/hbqt/hbqt_qimagewriter.cpp
+  - contrib/hbqt/hbqt_qinputdialog.cpp
+  - contrib/hbqt/hbqt_qinputevent.cpp
+  - contrib/hbqt/hbqt_qkeyevent.cpp
+  - contrib/hbqt/hbqt_qkeysequence.cpp
+  - contrib/hbqt/hbqt_qlabel.cpp
+  - contrib/hbqt/hbqt_qlatin1char.cpp
+  - contrib/hbqt/hbqt_qlatin1string.cpp
+  - contrib/hbqt/hbqt_qlayout.cpp
+  - contrib/hbqt/hbqt_qlayoutitem.cpp
+  - contrib/hbqt/hbqt_qlcdnumber.cpp
+  - contrib/hbqt/hbqt_qline.cpp
+  - contrib/hbqt/hbqt_qlineargradient.cpp
+  - contrib/hbqt/hbqt_qlineedit.cpp
+  - contrib/hbqt/hbqt_qlist.cpp
+  - contrib/hbqt/hbqt_qlistview.cpp
+  - contrib/hbqt/hbqt_qlistwidget.cpp
+  - contrib/hbqt/hbqt_qlistwidgetitem.cpp
+  - contrib/hbqt/hbqt_qmainwindow.cpp
+  - contrib/hbqt/hbqt_qmenu.cpp
+  - contrib/hbqt/hbqt_qmenubar.cpp
+  - contrib/hbqt/hbqt_qmessagebox.cpp
+  - contrib/hbqt/hbqt_qmodelindex.cpp
+  - contrib/hbqt/hbqt_qmouseevent.cpp
+  - contrib/hbqt/hbqt_qmoveevent.cpp
+  - contrib/hbqt/hbqt_qobject.cpp
+  - contrib/hbqt/hbqt_qpagesetupdialog.cpp
+  - contrib/hbqt/hbqt_qpaintdevice.cpp
+  - contrib/hbqt/hbqt_qpainter.cpp
+  - contrib/hbqt/hbqt_qpaintevent.cpp
+  - contrib/hbqt/hbqt_qpalette.cpp
+  - contrib/hbqt/hbqt_qpen.cpp
+  - contrib/hbqt/hbqt_qpicture.cpp
+  - contrib/hbqt/hbqt_qpixmap.cpp
+  - contrib/hbqt/hbqt_qpoint.cpp
+  - contrib/hbqt/hbqt_qpointf.cpp
+  - contrib/hbqt/hbqt_qprintdialog.cpp
+  - contrib/hbqt/hbqt_qprintpreviewdialog.cpp
+  - contrib/hbqt/hbqt_qprogressbar.cpp
+  - contrib/hbqt/hbqt_qprogressdialog.cpp
+  - contrib/hbqt/hbqt_qpushbutton.cpp
+  - contrib/hbqt/hbqt_qradialgradient.cpp
+  - contrib/hbqt/hbqt_qradiobutton.cpp
+  - contrib/hbqt/hbqt_qrect.cpp
+  - contrib/hbqt/hbqt_qrectf.cpp
+  - contrib/hbqt/hbqt_qregion.cpp
+  - contrib/hbqt/hbqt_qresizeevent.cpp
+  - contrib/hbqt/hbqt_qresource.cpp
+  - contrib/hbqt/hbqt_qscrollarea.cpp
+  - contrib/hbqt/hbqt_qscrollbar.cpp
+  - contrib/hbqt/hbqt_qsignalmapper.cpp
+  - contrib/hbqt/hbqt_qsize.cpp
+  - contrib/hbqt/hbqt_qsizef.cpp
+  - contrib/hbqt/hbqt_qsizegrip.cpp
+  - contrib/hbqt/hbqt_qsizepolicy.cpp
+  - contrib/hbqt/hbqt_qslider.cpp
+  - contrib/hbqt/hbqt_qsound.cpp
+  - contrib/hbqt/hbqt_qspinbox.cpp
+  - contrib/hbqt/hbqt_qsplashscreen.cpp
+  - contrib/hbqt/hbqt_qsplitter.cpp
+  - contrib/hbqt/hbqt_qstandarditem.cpp
+  - contrib/hbqt/hbqt_qstandarditemmodel.cpp
+  - contrib/hbqt/hbqt_qstatusbar.cpp
+  - contrib/hbqt/hbqt_qstringlist.cpp
+  - contrib/hbqt/hbqt_qstringlistmodel.cpp
+  - contrib/hbqt/hbqt_qstyle.cpp
+  - contrib/hbqt/hbqt_qstyleditemdelegate.cpp
+  - contrib/hbqt/hbqt_qstylehintreturn.cpp
+  - contrib/hbqt/hbqt_qstylehintreturnmask.cpp
+  - contrib/hbqt/hbqt_qstylehintreturnvariant.cpp
+  - contrib/hbqt/hbqt_qstyleoption.cpp
+  - contrib/hbqt/hbqt_qstyleoptionbutton.cpp
+  - contrib/hbqt/hbqt_qstyleoptioncombobox.cpp
+  - contrib/hbqt/hbqt_qstyleoptioncomplex.cpp
+  - contrib/hbqt/hbqt_qstyleoptiondockwidget.cpp
+  - contrib/hbqt/hbqt_qstyleoptionfocusrect.cpp
+  - contrib/hbqt/hbqt_qstyleoptionframe.cpp
+  - contrib/hbqt/hbqt_qstyleoptiongroupbox.cpp
+  - contrib/hbqt/hbqt_qstyleoptionheader.cpp
+  - contrib/hbqt/hbqt_qstyleoptionmenuitem.cpp
+  - contrib/hbqt/hbqt_qstyleoptionprogressbar.cpp
+  - contrib/hbqt/hbqt_qstyleoptionsizegrip.cpp
+  - contrib/hbqt/hbqt_qstyleoptionslider.cpp
+  - contrib/hbqt/hbqt_qstyleoptionspinbox.cpp
+  - contrib/hbqt/hbqt_qstyleoptiontab.cpp
+  - contrib/hbqt/hbqt_qstyleoptiontabbarbase.cpp
+  - contrib/hbqt/hbqt_qstyleoptiontabwidgetframe.cpp
+  - contrib/hbqt/hbqt_qstyleoptiontitlebar.cpp
+  - contrib/hbqt/hbqt_qstyleoptiontoolbar.cpp
+  - contrib/hbqt/hbqt_qstyleoptiontoolbox.cpp
+  - contrib/hbqt/hbqt_qstyleoptiontoolbutton.cpp
+  - contrib/hbqt/hbqt_qstyleoptionviewitem.cpp
+  - contrib/hbqt/hbqt_qstylepainter.cpp
+  - contrib/hbqt/hbqt_qsystemtrayicon.cpp
+  - contrib/hbqt/hbqt_qtabbar.cpp
+  - contrib/hbqt/hbqt_qtableview.cpp
+  - contrib/hbqt/hbqt_qtablewidget.cpp
+  - contrib/hbqt/hbqt_qtablewidgetitem.cpp
+  - contrib/hbqt/hbqt_qtabwidget.cpp
+  - contrib/hbqt/hbqt_qtextblock.cpp
+  - contrib/hbqt/hbqt_qtextblockformat.cpp
+  - contrib/hbqt/hbqt_qtextblockgroup.cpp
+  - contrib/hbqt/hbqt_qtextboundaryfinder.cpp
+  - contrib/hbqt/hbqt_qtextbrowser.cpp
+  - contrib/hbqt/hbqt_qtextcharformat.cpp
+  - contrib/hbqt/hbqt_qtextcodec.cpp
+  - contrib/hbqt/hbqt_qtextcursor.cpp
+  - contrib/hbqt/hbqt_qtextdecoder.cpp
+  - contrib/hbqt/hbqt_qtextdocument.cpp
+  - contrib/hbqt/hbqt_qtextdocumentfragment.cpp
+  - contrib/hbqt/hbqt_qtextdocumentwriter.cpp
+  - contrib/hbqt/hbqt_qtextedit.cpp
+  - contrib/hbqt/hbqt_qtextencoder.cpp
+  - contrib/hbqt/hbqt_qtextformat.cpp
+  - contrib/hbqt/hbqt_qtextfragment.cpp
+  - contrib/hbqt/hbqt_qtextframe.cpp
+  - contrib/hbqt/hbqt_qtextframeformat.cpp
+  - contrib/hbqt/hbqt_qtextimageformat.cpp
+  - contrib/hbqt/hbqt_qtextinlineobject.cpp
+  - contrib/hbqt/hbqt_qtextitem.cpp
+  - contrib/hbqt/hbqt_qtextlayout.cpp
+  - contrib/hbqt/hbqt_qtextlength.cpp
+  - contrib/hbqt/hbqt_qtextline.cpp
+  - contrib/hbqt/hbqt_qtextobject.cpp
+  - contrib/hbqt/hbqt_qtextstream.cpp
+  - contrib/hbqt/hbqt_qtimeedit.cpp
+  - contrib/hbqt/hbqt_qtimer.cpp
+  - contrib/hbqt/hbqt_qtoolbar.cpp
+  - contrib/hbqt/hbqt_qtoolbox.cpp
+  - contrib/hbqt/hbqt_qtoolbutton.cpp
+  - contrib/hbqt/hbqt_qtreeview.cpp
+  - contrib/hbqt/hbqt_qtreewidget.cpp
+  - contrib/hbqt/hbqt_qtreewidgetitem.cpp
+  - contrib/hbqt/hbqt_qurl.cpp
+  - contrib/hbqt/hbqt_qvariant.cpp
+  - contrib/hbqt/hbqt_qvboxlayout.cpp
+  - contrib/hbqt/hbqt_qwebframe.cpp
+  - contrib/hbqt/hbqt_qwebhistory.cpp
+  - contrib/hbqt/hbqt_qwebhistoryinterface.cpp
+  - contrib/hbqt/hbqt_qwebhistoryitem.cpp
+  - contrib/hbqt/hbqt_qwebhittestresult.cpp
+  - contrib/hbqt/hbqt_qwebpage.cpp
+  - contrib/hbqt/hbqt_qwebpluginfactory.cpp
+  - contrib/hbqt/hbqt_qwebsecurityorigin.cpp
+  - contrib/hbqt/hbqt_qwebsettings.cpp
+  - contrib/hbqt/hbqt_qwebview.cpp
+  - contrib/hbqt/hbqt_qwheelevent.cpp
+  - contrib/hbqt/hbqt_qwidget.cpp
+  - contrib/hbqt/hbqt_qwidgetaction.cpp
+  - contrib/hbqt/hbqt_qwidgetitem.cpp
+  - contrib/hbqt/hbqt_qwindowsstyle.cpp
+  - contrib/hbqt/hbqt_qwindowsxpstyle.cpp
+  - contrib/hbqt/hbqt_qwizard.cpp
+    * .cpp file rename.
+
 2009-07-07 01:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * bin/postinst.bat
   * bin/hb-func.sh
diff --git a/harbour/contrib/hbqt/Makefile_gen b/harbour/contrib/hbqt/Makefile_gen
index 85930a7df7..d486cdb3bd 100644
--- a/harbour/contrib/hbqt/Makefile_gen
+++ b/harbour/contrib/hbqt/Makefile_gen
@@ -4,226 +4,226 @@
 
 
 CPP_SOURCES=\
-	hbqt_qabstractbutton.cpp \
-	hbqt_qabstractitemmodel.cpp \
-	hbqt_qabstractitemview.cpp \
-	hbqt_qabstractlistmodel.cpp \
-	hbqt_qabstractprintdialog.cpp \
-	hbqt_qabstractscrollarea.cpp \
-	hbqt_qabstractslider.cpp \
-	hbqt_qabstractspinbox.cpp \
-	hbqt_qabstracttablemodel.cpp \
-	hbqt_qaction.cpp \
-	hbqt_qapplication.cpp \
-	hbqt_qbitmap.cpp \
-	hbqt_qboxlayout.cpp \
-	hbqt_qbrush.cpp \
-	hbqt_qcalendarwidget.cpp \
-	hbqt_qcheckbox.cpp \
-	hbqt_qclipboard.cpp \
-	hbqt_qcolor.cpp \
-	hbqt_qcolordialog.cpp \
-	hbqt_qcombobox.cpp \
-	hbqt_qcommandlinkbutton.cpp \
-	hbqt_qcommonstyle.cpp \
-	hbqt_qconicalgradient.cpp \
-	hbqt_qcoreapplication.cpp \
-	hbqt_qcursor.cpp \
-	hbqt_qdateedit.cpp \
-	hbqt_qdatetime.cpp \
-	hbqt_qdatetimeedit.cpp \
-	hbqt_qdesktopwidget.cpp \
-	hbqt_qdial.cpp \
-	hbqt_qdialog.cpp \
-	hbqt_qdir.cpp \
-	hbqt_qdirmodel.cpp \
-	hbqt_qdockwidget.cpp \
-	hbqt_qdoublespinbox.cpp \
-	hbqt_qdropevent.cpp \
-	hbqt_qdragmoveevent.cpp \
-	hbqt_qdragenterevent.cpp \
-	hbqt_qdragleaveevent.cpp \
-	hbqt_qerrormessage.cpp \
-	hbqt_qevent.cpp \
-	hbqt_qeventloop.cpp \
-	hbqt_qfiledialog.cpp \
-	hbqt_qfilesystemmodel.cpp \
-	hbqt_qfocusevent.cpp \
-	hbqt_qfocusframe.cpp \
-	hbqt_qfont.cpp \
-	hbqt_qfontcombobox.cpp \
-	hbqt_qfontdatabase.cpp \
-	hbqt_qfontdialog.cpp \
-	hbqt_qfontinfo.cpp \
-	hbqt_qformlayout.cpp \
-	hbqt_qframe.cpp \
-	hbqt_qftp.cpp \
-	hbqt_qgradient.cpp \
-	hbqt_qgridlayout.cpp \
-	hbqt_qgroupbox.cpp \
-	hbqt_qhboxlayout.cpp \
-	hbqt_qheaderview.cpp \
-	hbqt_qhttp.cpp \
-	hbqt_qicon.cpp \
-	hbqt_qimage.cpp \
-	hbqt_qimagereader.cpp \
-	hbqt_qimagewriter.cpp \
-	hbqt_qinputdialog.cpp \
-	hbqt_qinputevent.cpp \
-	hbqt_qkeyevent.cpp \
-	hbqt_qkeysequence.cpp \
-	hbqt_qlabel.cpp \
-	hbqt_qlatin1char.cpp \
-	hbqt_qlatin1string.cpp \
-	hbqt_qlayout.cpp \
-	hbqt_qlayoutitem.cpp \
-	hbqt_qlcdnumber.cpp \
-	hbqt_qline.cpp \
-	hbqt_qlineargradient.cpp \
-	hbqt_qlineedit.cpp \
-	hbqt_qlist.cpp \
-	hbqt_qlistview.cpp \
-	hbqt_qlistwidget.cpp \
-	hbqt_qlistwidgetitem.cpp \
-	hbqt_qmainwindow.cpp \
-	hbqt_qmenu.cpp \
-	hbqt_qmenubar.cpp \
-	hbqt_qmessagebox.cpp \
-	hbqt_qmodelindex.cpp \
-	hbqt_qmouseevent.cpp \
-	hbqt_qmoveevent.cpp \
-	hbqt_qobject.cpp \
-	hbqt_qpaintdevice.cpp \
-	hbqt_qpagesetupdialog.cpp \
-	hbqt_qpainter.cpp \
-	hbqt_qpaintevent.cpp \
-	hbqt_qpalette.cpp \
-	hbqt_qpen.cpp \
-	hbqt_qpicture.cpp \
-	hbqt_qpixmap.cpp \
-	hbqt_qpoint.cpp \
-	hbqt_qpointf.cpp \
-	hbqt_qprintdialog.cpp \
-	hbqt_qprintpreviewdialog.cpp \
-	hbqt_qprogressbar.cpp \
-	hbqt_qprogressdialog.cpp \
-	hbqt_qpushbutton.cpp \
-	hbqt_qradialgradient.cpp \
-	hbqt_qradiobutton.cpp \
-	hbqt_qrect.cpp \
-	hbqt_qrectf.cpp \
-	hbqt_qregion.cpp \
-	hbqt_qresizeevent.cpp \
-	hbqt_qresource.cpp \
-	hbqt_qscrollarea.cpp \
-	hbqt_qscrollbar.cpp \
-	hbqt_qsignalmapper.cpp \
-	hbqt_qsize.cpp \
-	hbqt_qsizef.cpp \
-	hbqt_qsizegrip.cpp \
-	hbqt_qsizepolicy.cpp \
-	hbqt_qslider.cpp \
-	hbqt_qsound.cpp \
-	hbqt_qspinbox.cpp \
-	hbqt_qsplashscreen.cpp \
-	hbqt_qsplitter.cpp \
-	hbqt_qstandarditem.cpp \
-	hbqt_qstandarditemmodel.cpp \
-	hbqt_qstatusbar.cpp \
-	hbqt_qstringlist.cpp \
-	hbqt_qstringlistmodel.cpp \
-	hbqt_qstyle.cpp \
-	hbqt_qstyleditemdelegate.cpp \
-	hbqt_qstylehintreturn.cpp \
-	hbqt_qstylehintreturnmask.cpp \
-	hbqt_qstylehintreturnvariant.cpp \
-	hbqt_qstyleoption.cpp \
-	hbqt_qstyleoptionbutton.cpp \
-	hbqt_qstyleoptioncombobox.cpp \
-	hbqt_qstyleoptioncomplex.cpp \
-	hbqt_qstyleoptiondockwidget.cpp \
-	hbqt_qstyleoptionfocusrect.cpp \
-	hbqt_qstyleoptionframe.cpp \
-	hbqt_qstyleoptiongroupbox.cpp \
-	hbqt_qstyleoptionheader.cpp \
-	hbqt_qstyleoptionmenuitem.cpp \
-	hbqt_qstyleoptionprogressbar.cpp \
-	hbqt_qstyleoptionsizegrip.cpp \
-	hbqt_qstyleoptionslider.cpp \
-	hbqt_qstyleoptionspinbox.cpp \
-	hbqt_qstyleoptiontab.cpp \
-	hbqt_qstyleoptiontabbarbase.cpp \
-	hbqt_qstyleoptiontabwidgetframe.cpp \
-	hbqt_qstyleoptiontitlebar.cpp \
-	hbqt_qstyleoptiontoolbar.cpp \
-	hbqt_qstyleoptiontoolbox.cpp \
-	hbqt_qstyleoptiontoolbutton.cpp \
-	hbqt_qstyleoptionviewitem.cpp \
-	hbqt_qstylepainter.cpp \
-	hbqt_qsystemtrayicon.cpp \
-	hbqt_qtabbar.cpp \
-	hbqt_qtableview.cpp \
-	hbqt_qtablewidget.cpp \
-	hbqt_qtablewidgetitem.cpp \
-	hbqt_qtabwidget.cpp \
-	hbqt_qtextblock.cpp \
-	hbqt_qtextblockformat.cpp \
-	hbqt_qtextblockgroup.cpp \
-	hbqt_qtextbrowser.cpp \
-	hbqt_qtextboundaryfinder.cpp \
-	hbqt_qtextcharformat.cpp \
-	hbqt_qtextcodec.cpp \
-	hbqt_qtextcursor.cpp \
-	hbqt_qtextdecoder.cpp \
-	hbqt_qtextdocument.cpp \
-	hbqt_qtextdocumentfragment.cpp \
-	hbqt_qtextdocumentwriter.cpp \
-	hbqt_qtextedit.cpp \
-	hbqt_qtextencoder.cpp \
-	hbqt_qtextformat.cpp \
-	hbqt_qtextfragment.cpp \
-	hbqt_qtextframe.cpp \
-	hbqt_qtextframeformat.cpp \
-	hbqt_qtextimageformat.cpp \
-	hbqt_qtextinlineobject.cpp \
-	hbqt_qtextitem.cpp \
-	hbqt_qtextlayout.cpp \
-	hbqt_qtextlength.cpp \
-	hbqt_qtextline.cpp \
-	hbqt_qtextobject.cpp \
-	hbqt_qtextstream.cpp \
-	hbqt_qtimeedit.cpp \
-	hbqt_qtimer.cpp \
-	hbqt_qtoolbar.cpp \
-	hbqt_qtoolbox.cpp \
-	hbqt_qtoolbutton.cpp \
-	hbqt_qtreeview.cpp \
-	hbqt_qtreewidget.cpp \
-	hbqt_qtreewidgetitem.cpp \
-	hbqt_qurl.cpp \
-	hbqt_qvariant.cpp \
-	hbqt_qvboxlayout.cpp \
-	hbqt_qwebframe.cpp \
-	hbqt_qwebhistory.cpp \
-	hbqt_qwebhistoryinterface.cpp \
-	hbqt_qwebhistoryitem.cpp \
-	hbqt_qwebhittestresult.cpp \
-	hbqt_qwebpage.cpp \
-	hbqt_qwebpluginfactory.cpp \
-	hbqt_qwebsecurityorigin.cpp \
-	hbqt_qwebsettings.cpp \
-	hbqt_qwebview.cpp \
-	hbqt_qwheelevent.cpp \
-	hbqt_qwidget.cpp \
-	hbqt_qwidgetaction.cpp \
-	hbqt_qwidgetitem.cpp \
-	hbqt_qwindowsstyle.cpp \
-	hbqt_qwindowsxpstyle.cpp \
-	hbqt_qwizard.cpp \
+	moc_slots.cpp \
 	hbqt_base.cpp \
 	hbqt_utils.cpp \
 	hbqt_slots.cpp \
-	moc_slots.cpp \
+	QAbstractButton.cpp \
+	QAbstractItemModel.cpp \
+	QAbstractItemView.cpp \
+	QAbstractListModel.cpp \
+	QAbstractPrintDialog.cpp \
+	QAbstractScrollArea.cpp \
+	QAbstractSlider.cpp \
+	QAbstractSpinBox.cpp \
+	QAbstractTableModel.cpp \
+	QAction.cpp \
+	QApplication.cpp \
+	QBitmap.cpp \
+	QBoxLayout.cpp \
+	QBrush.cpp \
+	QCalendarWidget.cpp \
+	QCheckBox.cpp \
+	QClipboard.cpp \
+	QColor.cpp \
+	QColorDialog.cpp \
+	QComboBox.cpp \
+	QCommandLinkButton.cpp \
+	QCommonStyle.cpp \
+	QConicalGradient.cpp \
+	QCoreApplication.cpp \
+	QCursor.cpp \
+	QDateEdit.cpp \
+	QDateTime.cpp \
+	QDateTimeEdit.cpp \
+	QDesktopWidget.cpp \
+	QDial.cpp \
+	QDialog.cpp \
+	QDir.cpp \
+	QDirModel.cpp \
+	QDockWidget.cpp \
+	QDoubleSpinBox.cpp \
+	QDropEvent.cpp \
+	QDragMoveEvent.cpp \
+	QDragEnterEvent.cpp \
+	QDragLeaveEvent.cpp \
+	QErrorMessage.cpp \
+	QEvent.cpp \
+	QEventLoop.cpp \
+	QFileDialog.cpp \
+	QFileSystemModel.cpp \
+	QFocusEvent.cpp \
+	QFocusFrame.cpp \
+	QFont.cpp \
+	QFontComboBox.cpp \
+	QFontDatabase.cpp \
+	QFontDialog.cpp \
+	QFontInfo.cpp \
+	QFormLayout.cpp \
+	QFrame.cpp \
+	QFtp.cpp \
+	QGradient.cpp \
+	QGridLayout.cpp \
+	QGroupBox.cpp \
+	QHBoxLayout.cpp \
+	QHeaderView.cpp \
+	QHttp.cpp \
+	QIcon.cpp \
+	QImage.cpp \
+	QImageReader.cpp \
+	QImageWriter.cpp \
+	QInputDialog.cpp \
+	QInputEvent.cpp \
+	QKeyEvent.cpp \
+	QKeySequence.cpp \
+	QLabel.cpp \
+	QLatin1Char.cpp \
+	QLatin1String.cpp \
+	QLayout.cpp \
+	QLayoutItem.cpp \
+	QLCDNumber.cpp \
+	QLine.cpp \
+	QLinearGradient.cpp \
+	QLineEdit.cpp \
+	QList.cpp \
+	QListView.cpp \
+	QListWidget.cpp \
+	QListWidgetItem.cpp \
+	QMainWindow.cpp \
+	QMenu.cpp \
+	QMenuBar.cpp \
+	QMessageBox.cpp \
+	QModelIndex.cpp \
+	QMouseEvent.cpp \
+	QMoveEvent.cpp \
+	QObject.cpp \
+	QPaintDevice.cpp \
+	QPageSetupDialog.cpp \
+	QPainter.cpp \
+	QPaintEvent.cpp \
+	QPalette.cpp \
+	QPen.cpp \
+	QPicture.cpp \
+	QPixmap.cpp \
+	QPoint.cpp \
+	QPointF.cpp \
+	QPrintDialog.cpp \
+	QPrintPreviewDialog.cpp \
+	QProgressBar.cpp \
+	QProgressDialog.cpp \
+	QPushButton.cpp \
+	QRadialGradient.cpp \
+	QRadioButton.cpp \
+	QRect.cpp \
+	QRectF.cpp \
+	QRegion.cpp \
+	QResizeEvent.cpp \
+	QResource.cpp \
+	QScrollArea.cpp \
+	QScrollBar.cpp \
+	QSignalMapper.cpp \
+	QSize.cpp \
+	QSizeF.cpp \
+	QSizeGrip.cpp \
+	QSizePolicy.cpp \
+	QSlider.cpp \
+	QSound.cpp \
+	QSpinBox.cpp \
+	QSplashScreen.cpp \
+	QSplitter.cpp \
+	QStandardItem.cpp \
+	QStandardItemModel.cpp \
+	QStatusBar.cpp \
+	QStringList.cpp \
+	QStringListModel.cpp \
+	QStyle.cpp \
+	QStyledItemDelegate.cpp \
+	QStyleHintReturn.cpp \
+	QStyleHintReturnMask.cpp \
+	QStyleHintReturnVariant.cpp \
+	QStyleOption.cpp \
+	QStyleOptionButton.cpp \
+	QStyleOptionComboBox.cpp \
+	QStyleOptionComplex.cpp \
+	QStyleOptionDockWidget.cpp \
+	QStyleOptionFocusRect.cpp \
+	QStyleOptionFrame.cpp \
+	QStyleOptionGroupBox.cpp \
+	QStyleOptionHeader.cpp \
+	QStyleOptionMenuItem.cpp \
+	QStyleOptionProgressBar.cpp \
+	QStyleOptionSizeGrip.cpp \
+	QStyleOptionSlider.cpp \
+	QStyleOptionSpinBox.cpp \
+	QStyleOptionTab.cpp \
+	QStyleOptionTabBarBase.cpp \
+	QStyleOptionTabWidgetFrame.cpp \
+	QStyleOptionTitleBar.cpp \
+	QStyleOptionToolBar.cpp \
+	QStyleOptionToolBox.cpp \
+	QStyleOptionToolButton.cpp \
+	QStyleOptionViewItem.cpp \
+	QStylePainter.cpp \
+	QSystemTrayIcon.cpp \
+	QTabBar.cpp \
+	QTableView.cpp \
+	QTableWidget.cpp \
+	QTableWidgetItem.cpp \
+	QTabWidget.cpp \
+	QTextBlock.cpp \
+	QTextBlockFormat.cpp \
+	QTextBlockGroup.cpp \
+	QTextBrowser.cpp \
+	QTextBoundaryFinder.cpp \
+	QTextCharFormat.cpp \
+	QTextCodec.cpp \
+	QTextCursor.cpp \
+	QTextDecoder.cpp \
+	QTextDocument.cpp \
+	QTextDocumentFragment.cpp \
+	QTextDocumentWriter.cpp \
+	QTextEdit.cpp \
+	QTextEncoder.cpp \
+	QTextFormat.cpp \
+	QTextFragment.cpp \
+	QTextFrame.cpp \
+	QTextFrameFormat.cpp \
+	QTextImageFormat.cpp \
+	QTextInlineObject.cpp \
+	QTextItem.cpp \
+	QTextLayout.cpp \
+	QTextLength.cpp \
+	QTextLine.cpp \
+	QTextObject.cpp \
+	QTextStream.cpp \
+	QTimeEdit.cpp \
+	QTimer.cpp \
+	QToolBar.cpp \
+	QToolBox.cpp \
+	QToolButton.cpp \
+	QTreeView.cpp \
+	QTreeWidget.cpp \
+	QTreeWidgetItem.cpp \
+	QUrl.cpp \
+	QVariant.cpp \
+	QVBoxLayout.cpp \
+	QWebFrame.cpp \
+	QWebHistory.cpp \
+	QWebHistoryInterface.cpp \
+	QWebHistoryItem.cpp \
+	QWebHitTestResult.cpp \
+	QWebPage.cpp \
+	QWebPluginFactory.cpp \
+	QWebSecurityOrigin.cpp \
+	QWebSettings.cpp \
+	QWebView.cpp \
+	QWheelEvent.cpp \
+	QWidget.cpp \
+	QWidgetAction.cpp \
+	QWidgetItem.cpp \
+	QWindowsStyle.cpp \
+	QWindowsXPStyle.cpp \
+	QWizard.cpp \
 
 
 
diff --git a/harbour/contrib/hbqt/hbqt_qabstractbutton.cpp b/harbour/contrib/hbqt/QAbstractButton.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractbutton.cpp
rename to harbour/contrib/hbqt/QAbstractButton.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp b/harbour/contrib/hbqt/QAbstractItemModel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractitemmodel.cpp
rename to harbour/contrib/hbqt/QAbstractItemModel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstractitemview.cpp b/harbour/contrib/hbqt/QAbstractItemView.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractitemview.cpp
rename to harbour/contrib/hbqt/QAbstractItemView.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstractlistmodel.cpp b/harbour/contrib/hbqt/QAbstractListModel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractlistmodel.cpp
rename to harbour/contrib/hbqt/QAbstractListModel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstractprintdialog.cpp b/harbour/contrib/hbqt/QAbstractPrintDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractprintdialog.cpp
rename to harbour/contrib/hbqt/QAbstractPrintDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstractscrollarea.cpp b/harbour/contrib/hbqt/QAbstractScrollArea.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractscrollarea.cpp
rename to harbour/contrib/hbqt/QAbstractScrollArea.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstractslider.cpp b/harbour/contrib/hbqt/QAbstractSlider.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractslider.cpp
rename to harbour/contrib/hbqt/QAbstractSlider.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstractspinbox.cpp b/harbour/contrib/hbqt/QAbstractSpinBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstractspinbox.cpp
rename to harbour/contrib/hbqt/QAbstractSpinBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qabstracttablemodel.cpp b/harbour/contrib/hbqt/QAbstractTableModel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qabstracttablemodel.cpp
rename to harbour/contrib/hbqt/QAbstractTableModel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qaction.cpp b/harbour/contrib/hbqt/QAction.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qaction.cpp
rename to harbour/contrib/hbqt/QAction.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qapplication.cpp b/harbour/contrib/hbqt/QApplication.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qapplication.cpp
rename to harbour/contrib/hbqt/QApplication.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qbitmap.cpp b/harbour/contrib/hbqt/QBitmap.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qbitmap.cpp
rename to harbour/contrib/hbqt/QBitmap.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qboxlayout.cpp b/harbour/contrib/hbqt/QBoxLayout.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qboxlayout.cpp
rename to harbour/contrib/hbqt/QBoxLayout.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qbrush.cpp b/harbour/contrib/hbqt/QBrush.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qbrush.cpp
rename to harbour/contrib/hbqt/QBrush.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcalendarwidget.cpp b/harbour/contrib/hbqt/QCalendarWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcalendarwidget.cpp
rename to harbour/contrib/hbqt/QCalendarWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcheckbox.cpp b/harbour/contrib/hbqt/QCheckBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcheckbox.cpp
rename to harbour/contrib/hbqt/QCheckBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qclipboard.cpp b/harbour/contrib/hbqt/QClipboard.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qclipboard.cpp
rename to harbour/contrib/hbqt/QClipboard.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcolor.cpp b/harbour/contrib/hbqt/QColor.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcolor.cpp
rename to harbour/contrib/hbqt/QColor.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcolordialog.cpp b/harbour/contrib/hbqt/QColorDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcolordialog.cpp
rename to harbour/contrib/hbqt/QColorDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcombobox.cpp b/harbour/contrib/hbqt/QComboBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcombobox.cpp
rename to harbour/contrib/hbqt/QComboBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcommandlinkbutton.cpp b/harbour/contrib/hbqt/QCommandLinkButton.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcommandlinkbutton.cpp
rename to harbour/contrib/hbqt/QCommandLinkButton.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcommonstyle.cpp b/harbour/contrib/hbqt/QCommonStyle.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcommonstyle.cpp
rename to harbour/contrib/hbqt/QCommonStyle.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qconicalgradient.cpp b/harbour/contrib/hbqt/QConicalGradient.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qconicalgradient.cpp
rename to harbour/contrib/hbqt/QConicalGradient.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcoreapplication.cpp b/harbour/contrib/hbqt/QCoreApplication.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcoreapplication.cpp
rename to harbour/contrib/hbqt/QCoreApplication.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qcursor.cpp b/harbour/contrib/hbqt/QCursor.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qcursor.cpp
rename to harbour/contrib/hbqt/QCursor.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdateedit.cpp b/harbour/contrib/hbqt/QDateEdit.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdateedit.cpp
rename to harbour/contrib/hbqt/QDateEdit.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdatetime.cpp b/harbour/contrib/hbqt/QDateTime.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdatetime.cpp
rename to harbour/contrib/hbqt/QDateTime.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdatetimeedit.cpp b/harbour/contrib/hbqt/QDateTimeEdit.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdatetimeedit.cpp
rename to harbour/contrib/hbqt/QDateTimeEdit.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdesktopwidget.cpp b/harbour/contrib/hbqt/QDesktopWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdesktopwidget.cpp
rename to harbour/contrib/hbqt/QDesktopWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdial.cpp b/harbour/contrib/hbqt/QDial.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdial.cpp
rename to harbour/contrib/hbqt/QDial.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdialog.cpp b/harbour/contrib/hbqt/QDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdialog.cpp
rename to harbour/contrib/hbqt/QDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdir.cpp b/harbour/contrib/hbqt/QDir.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdir.cpp
rename to harbour/contrib/hbqt/QDir.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdirmodel.cpp b/harbour/contrib/hbqt/QDirModel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdirmodel.cpp
rename to harbour/contrib/hbqt/QDirModel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdockwidget.cpp b/harbour/contrib/hbqt/QDockWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdockwidget.cpp
rename to harbour/contrib/hbqt/QDockWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdoublespinbox.cpp b/harbour/contrib/hbqt/QDoubleSpinBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdoublespinbox.cpp
rename to harbour/contrib/hbqt/QDoubleSpinBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdragenterevent.cpp b/harbour/contrib/hbqt/QDragEnterEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdragenterevent.cpp
rename to harbour/contrib/hbqt/QDragEnterEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdragleaveevent.cpp b/harbour/contrib/hbqt/QDragLeaveEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdragleaveevent.cpp
rename to harbour/contrib/hbqt/QDragLeaveEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdragmoveevent.cpp b/harbour/contrib/hbqt/QDragMoveEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdragmoveevent.cpp
rename to harbour/contrib/hbqt/QDragMoveEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qdropevent.cpp b/harbour/contrib/hbqt/QDropEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qdropevent.cpp
rename to harbour/contrib/hbqt/QDropEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qerrormessage.cpp b/harbour/contrib/hbqt/QErrorMessage.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qerrormessage.cpp
rename to harbour/contrib/hbqt/QErrorMessage.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qevent.cpp b/harbour/contrib/hbqt/QEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qevent.cpp
rename to harbour/contrib/hbqt/QEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qeventloop.cpp b/harbour/contrib/hbqt/QEventLoop.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qeventloop.cpp
rename to harbour/contrib/hbqt/QEventLoop.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfiledialog.cpp b/harbour/contrib/hbqt/QFileDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfiledialog.cpp
rename to harbour/contrib/hbqt/QFileDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfilesystemmodel.cpp b/harbour/contrib/hbqt/QFileSystemModel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfilesystemmodel.cpp
rename to harbour/contrib/hbqt/QFileSystemModel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfocusevent.cpp b/harbour/contrib/hbqt/QFocusEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfocusevent.cpp
rename to harbour/contrib/hbqt/QFocusEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfocusframe.cpp b/harbour/contrib/hbqt/QFocusFrame.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfocusframe.cpp
rename to harbour/contrib/hbqt/QFocusFrame.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfont.cpp b/harbour/contrib/hbqt/QFont.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfont.cpp
rename to harbour/contrib/hbqt/QFont.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfontcombobox.cpp b/harbour/contrib/hbqt/QFontComboBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfontcombobox.cpp
rename to harbour/contrib/hbqt/QFontComboBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfontdatabase.cpp b/harbour/contrib/hbqt/QFontDatabase.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfontdatabase.cpp
rename to harbour/contrib/hbqt/QFontDatabase.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfontdialog.cpp b/harbour/contrib/hbqt/QFontDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfontdialog.cpp
rename to harbour/contrib/hbqt/QFontDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qfontinfo.cpp b/harbour/contrib/hbqt/QFontInfo.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qfontinfo.cpp
rename to harbour/contrib/hbqt/QFontInfo.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qformlayout.cpp b/harbour/contrib/hbqt/QFormLayout.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qformlayout.cpp
rename to harbour/contrib/hbqt/QFormLayout.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qframe.cpp b/harbour/contrib/hbqt/QFrame.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qframe.cpp
rename to harbour/contrib/hbqt/QFrame.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qftp.cpp b/harbour/contrib/hbqt/QFtp.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qftp.cpp
rename to harbour/contrib/hbqt/QFtp.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qgradient.cpp b/harbour/contrib/hbqt/QGradient.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qgradient.cpp
rename to harbour/contrib/hbqt/QGradient.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qgridlayout.cpp b/harbour/contrib/hbqt/QGridLayout.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qgridlayout.cpp
rename to harbour/contrib/hbqt/QGridLayout.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qgroupbox.cpp b/harbour/contrib/hbqt/QGroupBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qgroupbox.cpp
rename to harbour/contrib/hbqt/QGroupBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qhboxlayout.cpp b/harbour/contrib/hbqt/QHBoxLayout.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qhboxlayout.cpp
rename to harbour/contrib/hbqt/QHBoxLayout.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qheaderview.cpp b/harbour/contrib/hbqt/QHeaderView.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qheaderview.cpp
rename to harbour/contrib/hbqt/QHeaderView.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qhttp.cpp b/harbour/contrib/hbqt/QHttp.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qhttp.cpp
rename to harbour/contrib/hbqt/QHttp.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qicon.cpp b/harbour/contrib/hbqt/QIcon.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qicon.cpp
rename to harbour/contrib/hbqt/QIcon.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qimage.cpp b/harbour/contrib/hbqt/QImage.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qimage.cpp
rename to harbour/contrib/hbqt/QImage.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qimagereader.cpp b/harbour/contrib/hbqt/QImageReader.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qimagereader.cpp
rename to harbour/contrib/hbqt/QImageReader.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qimagewriter.cpp b/harbour/contrib/hbqt/QImageWriter.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qimagewriter.cpp
rename to harbour/contrib/hbqt/QImageWriter.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qinputdialog.cpp b/harbour/contrib/hbqt/QInputDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qinputdialog.cpp
rename to harbour/contrib/hbqt/QInputDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qinputevent.cpp b/harbour/contrib/hbqt/QInputEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qinputevent.cpp
rename to harbour/contrib/hbqt/QInputEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qkeyevent.cpp b/harbour/contrib/hbqt/QKeyEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qkeyevent.cpp
rename to harbour/contrib/hbqt/QKeyEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qkeysequence.cpp b/harbour/contrib/hbqt/QKeySequence.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qkeysequence.cpp
rename to harbour/contrib/hbqt/QKeySequence.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlcdnumber.cpp b/harbour/contrib/hbqt/QLCDNumber.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlcdnumber.cpp
rename to harbour/contrib/hbqt/QLCDNumber.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlabel.cpp b/harbour/contrib/hbqt/QLabel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlabel.cpp
rename to harbour/contrib/hbqt/QLabel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlatin1char.cpp b/harbour/contrib/hbqt/QLatin1Char.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlatin1char.cpp
rename to harbour/contrib/hbqt/QLatin1Char.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlatin1string.cpp b/harbour/contrib/hbqt/QLatin1String.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlatin1string.cpp
rename to harbour/contrib/hbqt/QLatin1String.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlayout.cpp b/harbour/contrib/hbqt/QLayout.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlayout.cpp
rename to harbour/contrib/hbqt/QLayout.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlayoutitem.cpp b/harbour/contrib/hbqt/QLayoutItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlayoutitem.cpp
rename to harbour/contrib/hbqt/QLayoutItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qline.cpp b/harbour/contrib/hbqt/QLine.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qline.cpp
rename to harbour/contrib/hbqt/QLine.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlineedit.cpp b/harbour/contrib/hbqt/QLineEdit.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlineedit.cpp
rename to harbour/contrib/hbqt/QLineEdit.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlineargradient.cpp b/harbour/contrib/hbqt/QLinearGradient.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlineargradient.cpp
rename to harbour/contrib/hbqt/QLinearGradient.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlist.cpp b/harbour/contrib/hbqt/QList.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlist.cpp
rename to harbour/contrib/hbqt/QList.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlistview.cpp b/harbour/contrib/hbqt/QListView.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlistview.cpp
rename to harbour/contrib/hbqt/QListView.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlistwidget.cpp b/harbour/contrib/hbqt/QListWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlistwidget.cpp
rename to harbour/contrib/hbqt/QListWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qlistwidgetitem.cpp b/harbour/contrib/hbqt/QListWidgetItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qlistwidgetitem.cpp
rename to harbour/contrib/hbqt/QListWidgetItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qmainwindow.cpp b/harbour/contrib/hbqt/QMainWindow.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qmainwindow.cpp
rename to harbour/contrib/hbqt/QMainWindow.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qmenu.cpp b/harbour/contrib/hbqt/QMenu.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qmenu.cpp
rename to harbour/contrib/hbqt/QMenu.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qmenubar.cpp b/harbour/contrib/hbqt/QMenuBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qmenubar.cpp
rename to harbour/contrib/hbqt/QMenuBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qmessagebox.cpp b/harbour/contrib/hbqt/QMessageBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qmessagebox.cpp
rename to harbour/contrib/hbqt/QMessageBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qmodelindex.cpp b/harbour/contrib/hbqt/QModelIndex.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qmodelindex.cpp
rename to harbour/contrib/hbqt/QModelIndex.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qmouseevent.cpp b/harbour/contrib/hbqt/QMouseEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qmouseevent.cpp
rename to harbour/contrib/hbqt/QMouseEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qmoveevent.cpp b/harbour/contrib/hbqt/QMoveEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qmoveevent.cpp
rename to harbour/contrib/hbqt/QMoveEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qobject.cpp b/harbour/contrib/hbqt/QObject.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qobject.cpp
rename to harbour/contrib/hbqt/QObject.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpagesetupdialog.cpp b/harbour/contrib/hbqt/QPageSetupDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpagesetupdialog.cpp
rename to harbour/contrib/hbqt/QPageSetupDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpaintdevice.cpp b/harbour/contrib/hbqt/QPaintDevice.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpaintdevice.cpp
rename to harbour/contrib/hbqt/QPaintDevice.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpaintevent.cpp b/harbour/contrib/hbqt/QPaintEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpaintevent.cpp
rename to harbour/contrib/hbqt/QPaintEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpainter.cpp b/harbour/contrib/hbqt/QPainter.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpainter.cpp
rename to harbour/contrib/hbqt/QPainter.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpalette.cpp b/harbour/contrib/hbqt/QPalette.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpalette.cpp
rename to harbour/contrib/hbqt/QPalette.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpen.cpp b/harbour/contrib/hbqt/QPen.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpen.cpp
rename to harbour/contrib/hbqt/QPen.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpicture.cpp b/harbour/contrib/hbqt/QPicture.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpicture.cpp
rename to harbour/contrib/hbqt/QPicture.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpixmap.cpp b/harbour/contrib/hbqt/QPixmap.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpixmap.cpp
rename to harbour/contrib/hbqt/QPixmap.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpoint.cpp b/harbour/contrib/hbqt/QPoint.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpoint.cpp
rename to harbour/contrib/hbqt/QPoint.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpointf.cpp b/harbour/contrib/hbqt/QPointF.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpointf.cpp
rename to harbour/contrib/hbqt/QPointF.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qprintdialog.cpp b/harbour/contrib/hbqt/QPrintDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qprintdialog.cpp
rename to harbour/contrib/hbqt/QPrintDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qprintpreviewdialog.cpp b/harbour/contrib/hbqt/QPrintPreviewDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qprintpreviewdialog.cpp
rename to harbour/contrib/hbqt/QPrintPreviewDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qprogressbar.cpp b/harbour/contrib/hbqt/QProgressBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qprogressbar.cpp
rename to harbour/contrib/hbqt/QProgressBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qprogressdialog.cpp b/harbour/contrib/hbqt/QProgressDialog.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qprogressdialog.cpp
rename to harbour/contrib/hbqt/QProgressDialog.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qpushbutton.cpp b/harbour/contrib/hbqt/QPushButton.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qpushbutton.cpp
rename to harbour/contrib/hbqt/QPushButton.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qradialgradient.cpp b/harbour/contrib/hbqt/QRadialGradient.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qradialgradient.cpp
rename to harbour/contrib/hbqt/QRadialGradient.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qradiobutton.cpp b/harbour/contrib/hbqt/QRadioButton.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qradiobutton.cpp
rename to harbour/contrib/hbqt/QRadioButton.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qrect.cpp b/harbour/contrib/hbqt/QRect.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qrect.cpp
rename to harbour/contrib/hbqt/QRect.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qrectf.cpp b/harbour/contrib/hbqt/QRectF.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qrectf.cpp
rename to harbour/contrib/hbqt/QRectF.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qregion.cpp b/harbour/contrib/hbqt/QRegion.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qregion.cpp
rename to harbour/contrib/hbqt/QRegion.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qresizeevent.cpp b/harbour/contrib/hbqt/QResizeEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qresizeevent.cpp
rename to harbour/contrib/hbqt/QResizeEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qresource.cpp b/harbour/contrib/hbqt/QResource.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qresource.cpp
rename to harbour/contrib/hbqt/QResource.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qscrollarea.cpp b/harbour/contrib/hbqt/QScrollArea.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qscrollarea.cpp
rename to harbour/contrib/hbqt/QScrollArea.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qscrollbar.cpp b/harbour/contrib/hbqt/QScrollBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qscrollbar.cpp
rename to harbour/contrib/hbqt/QScrollBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsignalmapper.cpp b/harbour/contrib/hbqt/QSignalMapper.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsignalmapper.cpp
rename to harbour/contrib/hbqt/QSignalMapper.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsize.cpp b/harbour/contrib/hbqt/QSize.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsize.cpp
rename to harbour/contrib/hbqt/QSize.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsizef.cpp b/harbour/contrib/hbqt/QSizeF.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsizef.cpp
rename to harbour/contrib/hbqt/QSizeF.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsizegrip.cpp b/harbour/contrib/hbqt/QSizeGrip.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsizegrip.cpp
rename to harbour/contrib/hbqt/QSizeGrip.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsizepolicy.cpp b/harbour/contrib/hbqt/QSizePolicy.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsizepolicy.cpp
rename to harbour/contrib/hbqt/QSizePolicy.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qslider.cpp b/harbour/contrib/hbqt/QSlider.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qslider.cpp
rename to harbour/contrib/hbqt/QSlider.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsound.cpp b/harbour/contrib/hbqt/QSound.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsound.cpp
rename to harbour/contrib/hbqt/QSound.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qspinbox.cpp b/harbour/contrib/hbqt/QSpinBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qspinbox.cpp
rename to harbour/contrib/hbqt/QSpinBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsplashscreen.cpp b/harbour/contrib/hbqt/QSplashScreen.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsplashscreen.cpp
rename to harbour/contrib/hbqt/QSplashScreen.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsplitter.cpp b/harbour/contrib/hbqt/QSplitter.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsplitter.cpp
rename to harbour/contrib/hbqt/QSplitter.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstandarditem.cpp b/harbour/contrib/hbqt/QStandardItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstandarditem.cpp
rename to harbour/contrib/hbqt/QStandardItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstandarditemmodel.cpp b/harbour/contrib/hbqt/QStandardItemModel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstandarditemmodel.cpp
rename to harbour/contrib/hbqt/QStandardItemModel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstatusbar.cpp b/harbour/contrib/hbqt/QStatusBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstatusbar.cpp
rename to harbour/contrib/hbqt/QStatusBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstringlist.cpp b/harbour/contrib/hbqt/QStringList.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstringlist.cpp
rename to harbour/contrib/hbqt/QStringList.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstringlistmodel.cpp b/harbour/contrib/hbqt/QStringListModel.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstringlistmodel.cpp
rename to harbour/contrib/hbqt/QStringListModel.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyle.cpp b/harbour/contrib/hbqt/QStyle.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyle.cpp
rename to harbour/contrib/hbqt/QStyle.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstylehintreturn.cpp b/harbour/contrib/hbqt/QStyleHintReturn.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstylehintreturn.cpp
rename to harbour/contrib/hbqt/QStyleHintReturn.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstylehintreturnmask.cpp b/harbour/contrib/hbqt/QStyleHintReturnMask.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstylehintreturnmask.cpp
rename to harbour/contrib/hbqt/QStyleHintReturnMask.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstylehintreturnvariant.cpp b/harbour/contrib/hbqt/QStyleHintReturnVariant.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstylehintreturnvariant.cpp
rename to harbour/contrib/hbqt/QStyleHintReturnVariant.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoption.cpp b/harbour/contrib/hbqt/QStyleOption.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoption.cpp
rename to harbour/contrib/hbqt/QStyleOption.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionbutton.cpp b/harbour/contrib/hbqt/QStyleOptionButton.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionbutton.cpp
rename to harbour/contrib/hbqt/QStyleOptionButton.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptioncombobox.cpp b/harbour/contrib/hbqt/QStyleOptionComboBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptioncombobox.cpp
rename to harbour/contrib/hbqt/QStyleOptionComboBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptioncomplex.cpp b/harbour/contrib/hbqt/QStyleOptionComplex.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptioncomplex.cpp
rename to harbour/contrib/hbqt/QStyleOptionComplex.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiondockwidget.cpp b/harbour/contrib/hbqt/QStyleOptionDockWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiondockwidget.cpp
rename to harbour/contrib/hbqt/QStyleOptionDockWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionfocusrect.cpp b/harbour/contrib/hbqt/QStyleOptionFocusRect.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionfocusrect.cpp
rename to harbour/contrib/hbqt/QStyleOptionFocusRect.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionframe.cpp b/harbour/contrib/hbqt/QStyleOptionFrame.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionframe.cpp
rename to harbour/contrib/hbqt/QStyleOptionFrame.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiongroupbox.cpp b/harbour/contrib/hbqt/QStyleOptionGroupBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiongroupbox.cpp
rename to harbour/contrib/hbqt/QStyleOptionGroupBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionheader.cpp b/harbour/contrib/hbqt/QStyleOptionHeader.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionheader.cpp
rename to harbour/contrib/hbqt/QStyleOptionHeader.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionmenuitem.cpp b/harbour/contrib/hbqt/QStyleOptionMenuItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionmenuitem.cpp
rename to harbour/contrib/hbqt/QStyleOptionMenuItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionprogressbar.cpp b/harbour/contrib/hbqt/QStyleOptionProgressBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionprogressbar.cpp
rename to harbour/contrib/hbqt/QStyleOptionProgressBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionsizegrip.cpp b/harbour/contrib/hbqt/QStyleOptionSizeGrip.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionsizegrip.cpp
rename to harbour/contrib/hbqt/QStyleOptionSizeGrip.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionslider.cpp b/harbour/contrib/hbqt/QStyleOptionSlider.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionslider.cpp
rename to harbour/contrib/hbqt/QStyleOptionSlider.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionspinbox.cpp b/harbour/contrib/hbqt/QStyleOptionSpinBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionspinbox.cpp
rename to harbour/contrib/hbqt/QStyleOptionSpinBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiontab.cpp b/harbour/contrib/hbqt/QStyleOptionTab.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiontab.cpp
rename to harbour/contrib/hbqt/QStyleOptionTab.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiontabbarbase.cpp b/harbour/contrib/hbqt/QStyleOptionTabBarBase.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiontabbarbase.cpp
rename to harbour/contrib/hbqt/QStyleOptionTabBarBase.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiontabwidgetframe.cpp b/harbour/contrib/hbqt/QStyleOptionTabWidgetFrame.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiontabwidgetframe.cpp
rename to harbour/contrib/hbqt/QStyleOptionTabWidgetFrame.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiontitlebar.cpp b/harbour/contrib/hbqt/QStyleOptionTitleBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiontitlebar.cpp
rename to harbour/contrib/hbqt/QStyleOptionTitleBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiontoolbar.cpp b/harbour/contrib/hbqt/QStyleOptionToolBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiontoolbar.cpp
rename to harbour/contrib/hbqt/QStyleOptionToolBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiontoolbox.cpp b/harbour/contrib/hbqt/QStyleOptionToolBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiontoolbox.cpp
rename to harbour/contrib/hbqt/QStyleOptionToolBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptiontoolbutton.cpp b/harbour/contrib/hbqt/QStyleOptionToolButton.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptiontoolbutton.cpp
rename to harbour/contrib/hbqt/QStyleOptionToolButton.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleoptionviewitem.cpp b/harbour/contrib/hbqt/QStyleOptionViewItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleoptionviewitem.cpp
rename to harbour/contrib/hbqt/QStyleOptionViewItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstylepainter.cpp b/harbour/contrib/hbqt/QStylePainter.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstylepainter.cpp
rename to harbour/contrib/hbqt/QStylePainter.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qstyleditemdelegate.cpp b/harbour/contrib/hbqt/QStyledItemDelegate.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qstyleditemdelegate.cpp
rename to harbour/contrib/hbqt/QStyledItemDelegate.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qsystemtrayicon.cpp b/harbour/contrib/hbqt/QSystemTrayIcon.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qsystemtrayicon.cpp
rename to harbour/contrib/hbqt/QSystemTrayIcon.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtabbar.cpp b/harbour/contrib/hbqt/QTabBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtabbar.cpp
rename to harbour/contrib/hbqt/QTabBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtabwidget.cpp b/harbour/contrib/hbqt/QTabWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtabwidget.cpp
rename to harbour/contrib/hbqt/QTabWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtableview.cpp b/harbour/contrib/hbqt/QTableView.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtableview.cpp
rename to harbour/contrib/hbqt/QTableView.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtablewidget.cpp b/harbour/contrib/hbqt/QTableWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtablewidget.cpp
rename to harbour/contrib/hbqt/QTableWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtablewidgetitem.cpp b/harbour/contrib/hbqt/QTableWidgetItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtablewidgetitem.cpp
rename to harbour/contrib/hbqt/QTableWidgetItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextblock.cpp b/harbour/contrib/hbqt/QTextBlock.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextblock.cpp
rename to harbour/contrib/hbqt/QTextBlock.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextblockformat.cpp b/harbour/contrib/hbqt/QTextBlockFormat.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextblockformat.cpp
rename to harbour/contrib/hbqt/QTextBlockFormat.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextblockgroup.cpp b/harbour/contrib/hbqt/QTextBlockGroup.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextblockgroup.cpp
rename to harbour/contrib/hbqt/QTextBlockGroup.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextboundaryfinder.cpp b/harbour/contrib/hbqt/QTextBoundaryFinder.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextboundaryfinder.cpp
rename to harbour/contrib/hbqt/QTextBoundaryFinder.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextbrowser.cpp b/harbour/contrib/hbqt/QTextBrowser.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextbrowser.cpp
rename to harbour/contrib/hbqt/QTextBrowser.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextcharformat.cpp b/harbour/contrib/hbqt/QTextCharFormat.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextcharformat.cpp
rename to harbour/contrib/hbqt/QTextCharFormat.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextcodec.cpp b/harbour/contrib/hbqt/QTextCodec.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextcodec.cpp
rename to harbour/contrib/hbqt/QTextCodec.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextcursor.cpp b/harbour/contrib/hbqt/QTextCursor.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextcursor.cpp
rename to harbour/contrib/hbqt/QTextCursor.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextdecoder.cpp b/harbour/contrib/hbqt/QTextDecoder.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextdecoder.cpp
rename to harbour/contrib/hbqt/QTextDecoder.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextdocument.cpp b/harbour/contrib/hbqt/QTextDocument.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextdocument.cpp
rename to harbour/contrib/hbqt/QTextDocument.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextdocumentfragment.cpp b/harbour/contrib/hbqt/QTextDocumentFragment.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextdocumentfragment.cpp
rename to harbour/contrib/hbqt/QTextDocumentFragment.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextdocumentwriter.cpp b/harbour/contrib/hbqt/QTextDocumentWriter.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextdocumentwriter.cpp
rename to harbour/contrib/hbqt/QTextDocumentWriter.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextedit.cpp b/harbour/contrib/hbqt/QTextEdit.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextedit.cpp
rename to harbour/contrib/hbqt/QTextEdit.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextencoder.cpp b/harbour/contrib/hbqt/QTextEncoder.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextencoder.cpp
rename to harbour/contrib/hbqt/QTextEncoder.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextformat.cpp b/harbour/contrib/hbqt/QTextFormat.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextformat.cpp
rename to harbour/contrib/hbqt/QTextFormat.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextfragment.cpp b/harbour/contrib/hbqt/QTextFragment.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextfragment.cpp
rename to harbour/contrib/hbqt/QTextFragment.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextframe.cpp b/harbour/contrib/hbqt/QTextFrame.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextframe.cpp
rename to harbour/contrib/hbqt/QTextFrame.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextframeformat.cpp b/harbour/contrib/hbqt/QTextFrameFormat.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextframeformat.cpp
rename to harbour/contrib/hbqt/QTextFrameFormat.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextimageformat.cpp b/harbour/contrib/hbqt/QTextImageFormat.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextimageformat.cpp
rename to harbour/contrib/hbqt/QTextImageFormat.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextinlineobject.cpp b/harbour/contrib/hbqt/QTextInlineObject.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextinlineobject.cpp
rename to harbour/contrib/hbqt/QTextInlineObject.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextitem.cpp b/harbour/contrib/hbqt/QTextItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextitem.cpp
rename to harbour/contrib/hbqt/QTextItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextlayout.cpp b/harbour/contrib/hbqt/QTextLayout.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextlayout.cpp
rename to harbour/contrib/hbqt/QTextLayout.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextlength.cpp b/harbour/contrib/hbqt/QTextLength.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextlength.cpp
rename to harbour/contrib/hbqt/QTextLength.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextline.cpp b/harbour/contrib/hbqt/QTextLine.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextline.cpp
rename to harbour/contrib/hbqt/QTextLine.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextobject.cpp b/harbour/contrib/hbqt/QTextObject.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextobject.cpp
rename to harbour/contrib/hbqt/QTextObject.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtextstream.cpp b/harbour/contrib/hbqt/QTextStream.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtextstream.cpp
rename to harbour/contrib/hbqt/QTextStream.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtimeedit.cpp b/harbour/contrib/hbqt/QTimeEdit.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtimeedit.cpp
rename to harbour/contrib/hbqt/QTimeEdit.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtimer.cpp b/harbour/contrib/hbqt/QTimer.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtimer.cpp
rename to harbour/contrib/hbqt/QTimer.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtoolbar.cpp b/harbour/contrib/hbqt/QToolBar.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtoolbar.cpp
rename to harbour/contrib/hbqt/QToolBar.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtoolbox.cpp b/harbour/contrib/hbqt/QToolBox.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtoolbox.cpp
rename to harbour/contrib/hbqt/QToolBox.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtoolbutton.cpp b/harbour/contrib/hbqt/QToolButton.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtoolbutton.cpp
rename to harbour/contrib/hbqt/QToolButton.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtreeview.cpp b/harbour/contrib/hbqt/QTreeView.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtreeview.cpp
rename to harbour/contrib/hbqt/QTreeView.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtreewidget.cpp b/harbour/contrib/hbqt/QTreeWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtreewidget.cpp
rename to harbour/contrib/hbqt/QTreeWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qtreewidgetitem.cpp b/harbour/contrib/hbqt/QTreeWidgetItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qtreewidgetitem.cpp
rename to harbour/contrib/hbqt/QTreeWidgetItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qurl.cpp b/harbour/contrib/hbqt/QUrl.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qurl.cpp
rename to harbour/contrib/hbqt/QUrl.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qvboxlayout.cpp b/harbour/contrib/hbqt/QVBoxLayout.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qvboxlayout.cpp
rename to harbour/contrib/hbqt/QVBoxLayout.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qvariant.cpp b/harbour/contrib/hbqt/QVariant.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qvariant.cpp
rename to harbour/contrib/hbqt/QVariant.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebframe.cpp b/harbour/contrib/hbqt/QWebFrame.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebframe.cpp
rename to harbour/contrib/hbqt/QWebFrame.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebhistory.cpp b/harbour/contrib/hbqt/QWebHistory.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebhistory.cpp
rename to harbour/contrib/hbqt/QWebHistory.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebhistoryinterface.cpp b/harbour/contrib/hbqt/QWebHistoryInterface.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebhistoryinterface.cpp
rename to harbour/contrib/hbqt/QWebHistoryInterface.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp b/harbour/contrib/hbqt/QWebHistoryItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebhistoryitem.cpp
rename to harbour/contrib/hbqt/QWebHistoryItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebhittestresult.cpp b/harbour/contrib/hbqt/QWebHitTestResult.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebhittestresult.cpp
rename to harbour/contrib/hbqt/QWebHitTestResult.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebpage.cpp b/harbour/contrib/hbqt/QWebPage.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebpage.cpp
rename to harbour/contrib/hbqt/QWebPage.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebpluginfactory.cpp b/harbour/contrib/hbqt/QWebPluginFactory.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebpluginfactory.cpp
rename to harbour/contrib/hbqt/QWebPluginFactory.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebsecurityorigin.cpp b/harbour/contrib/hbqt/QWebSecurityOrigin.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebsecurityorigin.cpp
rename to harbour/contrib/hbqt/QWebSecurityOrigin.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebsettings.cpp b/harbour/contrib/hbqt/QWebSettings.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebsettings.cpp
rename to harbour/contrib/hbqt/QWebSettings.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwebview.cpp b/harbour/contrib/hbqt/QWebView.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwebview.cpp
rename to harbour/contrib/hbqt/QWebView.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwheelevent.cpp b/harbour/contrib/hbqt/QWheelEvent.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwheelevent.cpp
rename to harbour/contrib/hbqt/QWheelEvent.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwidget.cpp b/harbour/contrib/hbqt/QWidget.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwidget.cpp
rename to harbour/contrib/hbqt/QWidget.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwidgetaction.cpp b/harbour/contrib/hbqt/QWidgetAction.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwidgetaction.cpp
rename to harbour/contrib/hbqt/QWidgetAction.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwidgetitem.cpp b/harbour/contrib/hbqt/QWidgetItem.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwidgetitem.cpp
rename to harbour/contrib/hbqt/QWidgetItem.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwindowsstyle.cpp b/harbour/contrib/hbqt/QWindowsStyle.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwindowsstyle.cpp
rename to harbour/contrib/hbqt/QWindowsStyle.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwindowsxpstyle.cpp b/harbour/contrib/hbqt/QWindowsXPStyle.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwindowsxpstyle.cpp
rename to harbour/contrib/hbqt/QWindowsXPStyle.cpp
diff --git a/harbour/contrib/hbqt/hbqt_qwizard.cpp b/harbour/contrib/hbqt/QWizard.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqt_qwizard.cpp
rename to harbour/contrib/hbqt/QWizard.cpp
diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg
index dc31d572e6..fc800df20f 100644
--- a/harbour/contrib/hbqt/generator/hbqtgen.prg
+++ b/harbour/contrib/hbqt/generator/hbqtgen.prg
@@ -252,8 +252,8 @@ STATIC FUNCTION PullOutSection( cQth, cSec )
    LOCAL cTxt, n, nn, cTknB, cTknE
    LOCAL a_:={}
 
-   cTknB := '<'+cSec+'>'
-   cTknE := '</'+cSec+'>'
+   cTknB := '<' + cSec + '>'
+   cTknE := '</' + cSec + '>'
 
    IF ( n := at( cTknB, cQth ) ) > 0
       IF( nn := at( cTknE, cQth ) ) > 0
@@ -439,7 +439,7 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
       /* Insert information about prototypes not converted to functions */
       IF !empty( dummy_ )
          aadd( cpp_, '/*' )
-         aadd( cpp_, ' *  Constructed[ '+ hb_ntos( nCnvrtd ) +'/'+ hb_ntos( nFuncs ) +' [ '+ hb_ntos( nCnvrtd/nFuncs*100 ) +'% ] ]' )
+         aadd( cpp_, ' *  Constructed[ ' + hb_ntos( nCnvrtd ) + '/' + hb_ntos( nFuncs ) + ' [ ' + hb_ntos( nCnvrtd / nFuncs * 100 ) + '% ] ]' )
          aadd( cpp_, ' *  ' )
          aadd( cpp_, ' *  *** Unconvered Prototypes ***' )
          aadd( cpp_, ' *  -----------------------------' )
@@ -473,7 +473,7 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
       ENDIF
 
       /* Build Class PRG Source */
-      cFileCpp := cPathOut + s_PathSep + 'hbqt_'+ lower( cWidget ) +'.cpp'
+      cFileCpp := cPathOut + s_PathSep + cWidget + '.cpp'
       CreateTarget( cFileCpp, cpp_ )
 
       /* Build CLASS */
@@ -629,124 +629,124 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
 
             DO CASE
             CASE aA[ PRT_CAST ] == 'T'
-               aA[ PRT_BODY ] := 'hb_param( '+ cHBIdx +', HB_IT_ANY )'
-               aA[ PRT_DOC  ] := 'x'+ cDocNM
+               aA[ PRT_BODY ] := 'hb_param( ' + cHBIdx + ', HB_IT_ANY )'
+               aA[ PRT_DOC  ] := 'x' + cDocNM
 
             /* Values by reference */
             CASE aA[ PRT_CAST ] $ cInt .and. aA[ PRT_L_FAR ]
-               aadd( aPre, { aA[ PRT_CAST ] + ' i' + cDocNM + ' = 0;', nHBIdx, 'i'+ cDocNM, 'hb_storni' } )
+               aadd( aPre, { aA[ PRT_CAST ] + ' i' + cDocNM + ' = 0;', nHBIdx, 'i' + cDocNM, 'hb_storni' } )
                aA[ PRT_BODY ] := '&i' + cDocNM
-               aA[ PRT_DOC  ] := '@n'+ cDocNM
+               aA[ PRT_DOC  ] := '@n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLong .and. aA[ PRT_L_FAR ]
-               aadd( aPre, { aA[ PRT_CAST ] + ' i' + cDocNM + ' = 0;', nHBIdx, 'i'+ cDocNM, 'hb_stornl' } )
+               aadd( aPre, { aA[ PRT_CAST ] + ' i' + cDocNM + ' = 0;', nHBIdx, 'i' + cDocNM, 'hb_stornl' } )
                aA[ PRT_BODY ] := '&i' + cDocNM
-               aA[ PRT_DOC  ] := '@n'+ cDocNM
+               aA[ PRT_DOC  ] := '@n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLongLong .and. aA[ PRT_L_FAR ]
-               aadd( aPre, { aA[ PRT_CAST ] + ' i' + cDocNM + ' = 0;', nHBIdx, 'i'+ cDocNM, 'hb_stornint' } )
+               aadd( aPre, { aA[ PRT_CAST ] + ' i' + cDocNM + ' = 0;', nHBIdx, 'i' + cDocNM, 'hb_stornint' } )
                aA[ PRT_BODY ] := '&i' + cDocNM
-               aA[ PRT_DOC  ] := '@n'+ cDocNM
+               aA[ PRT_DOC  ] := '@n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cInt
-               s := 'hb_parni( '+ cHBIdx +' )'
+               s := 'hb_parni( ' + cHBIdx + ' )'
                IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" )
-                  aA[ PRT_BODY ] := '( HB_ISNUM( '+cHBIdx+' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
+                  aA[ PRT_BODY ] := '( HB_ISNUM( ' + cHBIdx + ' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
                ELSE
                   aA[ PRT_BODY ] := s
                ENDIF
-               aA[ PRT_DOC  ] := 'n'+ cDocNM
+               aA[ PRT_DOC  ] := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLong
-               s := 'hb_parnl( '+ cHBIdx +' )'
+               s := 'hb_parnl( ' + cHBIdx + ' )'
                IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" )
-                  aA[ PRT_BODY ] := '( HB_ISNUM( '+cHBIdx+' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
+                  aA[ PRT_BODY ] := '( HB_ISNUM( ' + cHBIdx + ' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
                ELSE
                   aA[ PRT_BODY ] := s
                ENDIF
-               aA[ PRT_DOC  ] := 'n'+ cDocNM
+               aA[ PRT_DOC  ] := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLongLong
-               s := 'hb_parnint( '+ cHBIdx +' )'
+               s := 'hb_parnint( ' + cHBIdx + ' )'
                IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" )
-                  aA[ PRT_BODY ] := '( HB_ISNUM( '+cHBIdx+' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
+                  aA[ PRT_BODY ] := '( HB_ISNUM( ' + cHBIdx + ' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
                ELSE
                   aA[ PRT_BODY ] := s
                ENDIF
-               aA[ PRT_DOC  ] := 'n'+ cDocNM
+               aA[ PRT_DOC  ] := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ 'double,qreal' .and. aA[ PRT_L_FAR ]
-               aadd( aPre, { 'qreal qr' + cDocNM + ' = 0;', nHBIdx, 'qr'+ cDocNM, 'hb_stornd'  } )
+               aadd( aPre, { 'qreal qr' + cDocNM + ' = 0;', nHBIdx, 'qr' + cDocNM, 'hb_stornd'  } )
                aA[ PRT_BODY ] := '&qr' + cDocNM
-               aA[ PRT_DOC  ] := '@n'+ cDocNM
+               aA[ PRT_DOC  ] := '@n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ 'double,qreal,float'
-               aA[ PRT_BODY ] := 'hb_parnd( '+ cHBIdx +' )'
-               aA[ PRT_DOC  ] := 'n'+ cDocNM
+               aA[ PRT_BODY ] := 'hb_parnd( ' + cHBIdx + ' )'
+               aA[ PRT_DOC  ] := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'uchar'
-               aA[ PRT_BODY ] := '( char ) hb_parni( '+ cHBIdx +' )'
-               aA[ PRT_DOC  ] := 'n'+ cDocNM
+               aA[ PRT_BODY ] := '( char ) hb_parni( ' + cHBIdx + ' )'
+               aA[ PRT_DOC  ] := 'n' + cDocNM
 
             CASE ( '::' $ aA[ PRT_CAST ] ) .and. aA[ PRT_L_FAR ]
-               aadd( aPre, { aA[ PRT_CAST ]+' i' + cDocNM + ';', nHBIdx, 'i'+ cDocNM, 'hb_storni' } )
+               aadd( aPre, { aA[ PRT_CAST ] + ' i' + cDocNM + ';', nHBIdx, 'i' + cDocNM, 'hb_storni' } )
                aA[ PRT_BODY ] := '&i' + cDocNM
-               aA[ PRT_DOC  ] := '@n'+ cDocNM
+               aA[ PRT_DOC  ] := '@n' + cDocNM
 
             CASE ( '::' $ aA[ PRT_CAST ] )
-               s := '( '+ aA[ PRT_CAST ] +' ) hb_parni( '+ cHBIdx +' )'
+               s := '( ' + aA[ PRT_CAST ] + ' ) hb_parni( ' + cHBIdx + ' )'
                IF !empty( aA[ PRT_DEFAULT ] ) .AND. !( aA[ PRT_DEFAULT ] == "0" )
                   IF ascan( aEnum, aA[ PRT_DEFAULT ] ) > 0
-                     ss := cWidget+'::'+aA[ PRT_DEFAULT ]
+                     ss := cWidget + '::' + aA[ PRT_DEFAULT ]
                   ELSE
                      ss := iif( '::' $ aA[ PRT_DEFAULT ], aA[ PRT_DEFAULT ], ;
-                        iif( isDigit( left( aA[ PRT_DEFAULT ], 1 ) ), aA[ PRT_DEFAULT ], cWidget+'::'+aA[ PRT_DEFAULT ] ) )
+                        iif( isDigit( left( aA[ PRT_DEFAULT ], 1 ) ), aA[ PRT_DEFAULT ], cWidget + '::' + aA[ PRT_DEFAULT ] ) )
                   ENDIF
-                  ss := '( '+ aA[ PRT_CAST ] +' ) '+ss
-                  aA[ PRT_BODY ] := '( HB_ISNUM( '+cHBIdx+' ) ? ' + s + ' : ' + ss + ' )'
+                  ss := '( ' + aA[ PRT_CAST ] + ' ) ' + ss
+                  aA[ PRT_BODY ] := '( HB_ISNUM( ' + cHBIdx + ' ) ? ' + s + ' : ' + ss + ' )'
                ELSE
                   aA[ PRT_BODY ] := s
                ENDIF
-               aA[ PRT_DOC  ] := 'n'+ cDocNM
+               aA[ PRT_DOC  ] := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'bool' .and. aA[ PRT_L_FAR ]
-               aadd( aPre, { 'bool i' + cDocNM + ' = 0;', nHBIdx, 'i'+ cDocNM, 'hb_stornl' } )
+               aadd( aPre, { 'bool i' + cDocNM + ' = 0;', nHBIdx, 'i' + cDocNM, 'hb_stornl' } )
                aA[ PRT_BODY ] := '&i' + cDocNM
-               aA[ PRT_DOC  ] := '@l'+ cDocNM
+               aA[ PRT_DOC  ] := '@l' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'bool'
-               aA[ PRT_BODY ] := 'hb_parl( '+ cHBIdx +' )'
-               aA[ PRT_DOC  ] := 'l'+ cDocNM
+               aA[ PRT_BODY ] := 'hb_parl( ' + cHBIdx + ' )'
+               aA[ PRT_DOC  ] := 'l' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'QString'
-               aA[ PRT_BODY ] := 'hbqt_par_QString( '+ cHBIdx +' )'
-               aA[ PRT_DOC  ] := 'c'+ cDocNM
+               aA[ PRT_BODY ] := 'hbqt_par_QString( ' + cHBIdx + ' )'
+               aA[ PRT_DOC  ] := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'FT_Face'
-               aA[ PRT_BODY ] := 'hbqt_par_FT_Face( '+ cHBIdx +' )'
-               aA[ PRT_DOC  ] := 'c'+ cDocNM
+               aA[ PRT_BODY ] := 'hbqt_par_FT_Face( ' + cHBIdx + ' )'
+               aA[ PRT_DOC  ] := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'QIcon'
-               aA[ PRT_BODY ] := 'QIcon( hbqt_par_QString( '+ cHBIdx +' ) )'
-               aA[ PRT_DOC  ] := 'c'+ cDocNM
+               aA[ PRT_BODY ] := 'QIcon( hbqt_par_QString( ' + cHBIdx + ' ) )'
+               aA[ PRT_DOC  ] := 'c' + cDocNM
 
             CASE aA[ PRT_L_FAR ]
                aA[ PRT_BODY ] := 'hbqt_par_' + aA[ PRT_CAST ] + '( ' + cHBIdx + ' )'
-               aA[ PRT_DOC  ] := 'p'+ cDocNM
+               aA[ PRT_DOC  ] := 'p' + cDocNM
 
             CASE aA[ PRT_L_AND ] .and. aA[ PRT_L_CONST ]
                s := '*hbqt_par_' + aA[ PRT_CAST ] + '( ' + cHBIdx + ' )'
                IF !empty( aA[ PRT_DEFAULT ] ) .and. ( '(' $ aA[ PRT_DEFAULT ] )
-                  //aA[ PRT_BODY ] := '( HB_ISNIL( '+cHBIdx+' ) ? ' + aA[ PRT_DEFAULT ] +' : '+ s +' )'
-                  aA[ PRT_BODY ] := '( HB_ISPOINTER( '+cHBIdx+' ) ? '+ s + ' : ' +aA[ PRT_DEFAULT ] +' )'
+                  //aA[ PRT_BODY ] := '( HB_ISNIL( ' + cHBIdx + ' ) ? ' + aA[ PRT_DEFAULT ] + ' : ' + s + ' )'
+                  aA[ PRT_BODY ] := '( HB_ISPOINTER( ' + cHBIdx + ' ) ? ' + s + ' : ' + aA[ PRT_DEFAULT ] + ' )'
                ELSE
                   aA[ PRT_BODY ] := s
                ENDIF
-               aA[ PRT_DOC  ] := 'p'+ cDocNM
+               aA[ PRT_DOC  ] := 'p' + cDocNM
 
             CASE aA[ PRT_L_AND ]
                aA[ PRT_BODY ] := '*hbqt_par_' + aA[ PRT_CAST ] + '( ' + cHBIdx + ' )'
-               aA[ PRT_DOC  ] := 'p'+ cDocNM
+               aA[ PRT_DOC  ] := 'p' + cDocNM
 
             OTHERWISE
                aA[ PRT_BODY ] := ''
@@ -754,8 +754,8 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
 
             ENDCASE
 
-            cParas += aA[ PRT_BODY ] +', '
-            cDocs  += aA[ PRT_DOC  ] +', '
+            cParas += aA[ PRT_BODY ] + ', '
+            cDocs  += aA[ PRT_DOC  ] + ', '
          NEXT
 
          IF right( cParas, 2 ) == ', '
@@ -766,14 +766,14 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
          /* Build complete code line */
          IF .t.
             aA     := aRet
-            cWdg   := 'hbqt_par_'+cWidget+'( 1 )->'
-            cParas := '( '+ cParas +' )'
+            cWdg   := 'hbqt_par_' + cWidget + '( 1 )->'
+            cParas := '( ' + cParas + ' )'
             cCmn   := cWdg + cFun + cParas
             cDocNM := THIS_PROPER( aA[ PRT_NAME ] )
 
             DO CASE
             CASE aA[ PRT_CAST ] == 'T'
-               cCmd := 'hb_retptr( '+ cCmn +' )'
+               cCmd := 'hb_retptr( ' + cCmn + ' )'
                cPrgRet := 'p' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'void'
@@ -781,69 +781,69 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
                cPrgRet := 'NIL'
 
             CASE aA[ PRT_CAST ] $ cInt
-               cCmd := 'hb_retni( '+ cCmn +' )'
+               cCmd := 'hb_retni( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLong
-               cCmd := 'hb_retnl( '+ cCmn +' )'
+               cCmd := 'hb_retnl( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLongLong
-               cCmd := 'hb_retnint( '+ cCmn +' )'
+               cCmd := 'hb_retnint( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ 'double,qreal'
-               cCmd := 'hb_retnd( '+ cCmn +' )'
+               cCmd := 'hb_retnd( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE ( '::' $ aA[ PRT_CAST ] )
-               cCmd := 'hb_retni( ( '+ aA[ PRT_CAST ] +' ) ' + cCmn +' )'
+               cCmd := 'hb_retni( ( ' + aA[ PRT_CAST ] + ' ) ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'bool'
-               cCmd := 'hb_retl( '+ cCmn +' )'
+               cCmd := 'hb_retl( ' + cCmn + ' )'
                cPrgRet := 'l' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'char' .AND. aA[ PRT_L_FAR ]
-               cCmd := 'hb_retc( '+ cCmn +' )'
+               cCmd := 'hb_retc( ' + cCmn + ' )'
                cPrgRet := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'char'
-               cCmd := 'hb_retni( '+ cCmn +' )'
+               cCmd := 'hb_retni( ' + cCmn + ' )'
                cPrgRet := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'QString'
-               cCmd := 'hb_retc( '+ cCmn +'.toLatin1().data()' +' )'
+               cCmd := 'hb_retc( ' + cCmn + '.toLatin1().data()' + ' )'
                cPrgRet := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'FT_Face'
-               cCmd := 'hb_retc( '+ cCmn +' )'
+               cCmd := 'hb_retc( ' + cCmn + ' )'
                cPrgRet := 'c' + cDocNM
 
             CASE aA[ PRT_L_FAR ]
-               cCmd := 'hb_retptr( ( '+ aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
+               cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
                cPrgRet := 'p' + cDocNM
 
-            CASE aA[ PRT_L_AND ] .and. aA[ PRT_L_CONST ]
-               cCmd := 'hb_retptr( new '+ aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
+            CASE aA[ PRT_L_AND ] .AND. aA[ PRT_L_CONST ]
+               cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
                cPrgRet := 'p' + cDocNM
 
             CASE aA[ PRT_L_CONST ]
-               cCmd := 'hb_retptr( new '+ aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
+               cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
                cPrgRet := 'p' + cDocNM
 
             CASE aA[ PRT_L_AND ]
-               cCmd := 'hb_retptr( ( '+ aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
+               cCmd := 'hb_retptr( ( ' + aA[ PRT_CAST ] + '* ) ' + cCmn + ' )'
                cPrgRet := 'p' + cDocNM
 
             OTHERWISE
                /* No attribute is attached to return value */
                IF left( aA[ PRT_CAST ], 1 ) == 'Q'
-                  cCmd := 'hb_retptr( new '+ aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
+                  cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
                   cPrgRet := 'p' + cDocNM
 
                ELSE
-                  OutStd( '<<< '+cProto + ' | ' + aA[ PRT_CAST ]+' >>>'  + s_NewLine )
+                  OutStd( '<<< ' + cProto + ' | ' + aA[ PRT_CAST ] + ' >>>' + s_NewLine )
                   cCmd := ''
                   cPrgRet := ''
 
@@ -851,53 +851,53 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
 
             ENDCASE
 
-            IF !empty( cCmd )
-               cCmd := strtran( cCmd, '(  )', '()' ) +';'
+            IF ! Empty( cCmd )
+               cCmd := StrTran( cCmd, '(  )', '()' ) + ';'
             ENDIF
          ENDIF
       ENDIF
    ENDIF
 
-   IF ( lSuccess := !empty( cCmd ) )
+   IF ( lSuccess := ! Empty( cCmd ) )
       IF ( n := ascan( func_, {|e_| e_[ 1 ] == cFun } ) ) > 0
          func_[ n,2 ]++
-         cHBFunc := cFun + '_' + hb_ntos( func_[ n,2 ] )
+         cHBFunc := cFun + '_' + hb_ntos( func_[ n, 2 ] )
       ELSE
          cHBFunc := cFun
          aadd( func_, { cFun, 0 } )
       ENDIF
 
       aadd( txt_, "/*" )
-      aadd( txt_, " * "+ strtran( cProto, chr(13), '' ) )
+      aadd( txt_, " * " + strtran( cProto, chr(13), '' ) )
       aadd( txt_, " */" )
 
-      aadd( txt_, "HB_FUNC( QT_" + upper( cWidget ) +"_"+ upper( cHBFunc ) +" )" )
-      aadd( txt_, "{"  )
+      aadd( txt_, "HB_FUNC( QT_" + upper( cWidget ) + "_" + upper( cHBFunc ) + " )" )
+      aadd( txt_, "{" )
 
       /* Insert parameters by reference */
-      IF !empty( aPre )
+      IF ! empty( aPre )
          FOR n := 1 TO len( aPre )
-            aadd( txt_, "   "+ aPre[ n, 1 ] )
+            aadd( txt_, "   " + aPre[ n, 1 ] )
          NEXT
-         aadd( txt_, ""   )
+         aadd( txt_, "" )
       ENDIF
 
       /* One line function body */
       aadd( txt_, "   "+ cCmd )
 
       /* Return values back to PRG */
-      IF !empty( aPre )
-         aadd( txt_, ""   )
+      IF ! empty( aPre )
+         aadd( txt_, "" )
          FOR n := 1 TO len( aPre )
-            aadd( txt_, "   "+ aPre[ n,4 ]+"( " + aPre[ n,3 ] +", "+ hb_ntos( aPre[ n,2 ] ) +" );" )
+            aadd( txt_, "   " + aPre[ n, 4 ] + "( " + aPre[ n, 3 ] + ", " + hb_ntos( aPre[ n, 2 ] ) + " );" )
          NEXT
       ENDIF
 
-      aadd( txt_, "}"  )
-      aadd( txt_, ""   )
+      aadd( txt_, "}" )
+      aadd( txt_, ""  )
 
-      aadd( doc_, 'Qt_'+ cWidget + '_' + cHBFunc +'( p'+ cWidget + ;
-                        iif( empty( cDocs ), '', ', '+ cDocs ) +' ) -> '+ cPrgRet )
+      aadd( doc_, 'Qt_' + cWidget + '_' + cHBFunc + '( p' + cWidget + ;
+                        iif( empty( cDocs ), '', ', ' + cDocs ) + ' ) -> ' + cPrgRet )
       aadd( doc_, '' )
    ENDIF
 
@@ -922,8 +922,8 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ )
    n := at( ' ', cProto )
    IF n > 0
       IF .t.
-         cRet := alltrim( substr( cProto, 1, n-1 ) )
-         cFun := alltrim( substr( cProto, n+1    ) )
+         cRet := alltrim( substr( cProto, 1, n - 1 ) )
+         cFun := alltrim( substr( cProto, n + 1    ) )
 
          aRet := array( PRT_ATTRB_MAX )
 
@@ -938,59 +938,59 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ )
          /* Build complete code line */
          IF .t.
             aA     := aRet
-            cWdg   := 'hbqt_par_'+ cWidget +'( 1 )->'
+            cWdg   := 'hbqt_par_' + cWidget + '( 1 )->'
             cCmn   := cWdg + cFun
             cDocNM := THIS_PROPER( aA[ PRT_NAME ] )
 
             DO CASE
             CASE aA[ PRT_CAST ] == 'T'
-               cCmd := 'hb_ret( '+ cCmn +' )'
+               cCmd := 'hb_ret( ' + cCmn + ' )'
                cPrgRet := 'x' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cInt
-               cCmd := 'hb_retni( '+ cCmn +' )'
+               cCmd := 'hb_retni( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLong
-               cCmd := 'hb_retnl( '+ cCmn +' )'
+               cCmd := 'hb_retnl( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ cIntLongLong
-               cCmd := 'hb_retnint( '+ cCmn +' )'
+               cCmd := 'hb_retnint( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] $ 'double,qreal'
-               cCmd := 'hb_retnd( '+ cCmn +' )'
+               cCmd := 'hb_retnd( ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE ( '::' $ aA[ PRT_CAST ] )
-               cCmd := 'hb_retni( ( '+ aA[ PRT_CAST ] +' ) ' + cCmn +' )'
+               cCmd := 'hb_retni( ( ' + aA[ PRT_CAST ] + ' ) ' + cCmn + ' )'
                cPrgRet := 'n' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'bool'
-               cCmd := 'hb_retl( '+ cCmn +' )'
+               cCmd := 'hb_retl( ' + cCmn + ' )'
                cPrgRet := 'l' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'char*'
-               cCmd := 'hb_retc( '+ cCmn +' )'
+               cCmd := 'hb_retc( ' + cCmn + ' )'
                cPrgRet := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'char'
-               cCmd := 'hb_retni( '+ cCmn +' )'
+               cCmd := 'hb_retni( ' + cCmn + ' )'
                cPrgRet := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'QString'
-               cCmd := 'hb_retc( '+ cCmn +'.toLatin1().data()' +' )'
+               cCmd := 'hb_retc( ' + cCmn + '.toLatin1().data()' + ' )'
                cPrgRet := 'c' + cDocNM
 
             CASE aA[ PRT_CAST ] == 'FT_Face'
-               cCmd := 'hb_retc( '+ cCmn +' )'
+               cCmd := 'hb_retc( ' + cCmn + ' )'
                cPrgRet := 'c' + cDocNM
 
             OTHERWISE
                /* No attribute is attached to return value */
                IF left( aA[ PRT_CAST ], 1 ) == 'Q'
-                  cCmd := 'hb_retptr( new '+ aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
+                  cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
                   cPrgRet := 'p' + cDocNM
 
                ELSE
@@ -1003,7 +1003,7 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ )
             ENDCASE
 
             IF !empty( cCmd )
-               cCmd := strtran( cCmd, '(  )', '()' ) +';'
+               cCmd := strtran( cCmd, '(  )', '()' ) + ';'
             ENDIF
          ENDIF
       ENDIF
@@ -1011,44 +1011,44 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ )
 
    IF ( lSuccess := !empty( cCmd ) )
       IF ( n := ascan( func_, {|e_| e_[ 1 ] == cFun } ) ) > 0
-         func_[ n,2 ]++
-         cHBFunc := cFun + '_' + hb_ntos( func_[ n,2 ] )
+         func_[ n, 2 ]++
+         cHBFunc := cFun + '_' + hb_ntos( func_[ n, 2 ] )
       ELSE
          cHBFunc := cFun
          aadd( func_, { cFun, 0 } )
       ENDIF
 
       aadd( txt_, "/*" )
-      aadd( txt_, " * "+ strtran( cProto, chr(13), '' ) )
+      aadd( txt_, " * " + strtran( cProto, chr( 13 ), '' ) )
       aadd( txt_, " */" )
 
-      aadd( txt_, "HB_FUNC( QT_" + upper( cWidget ) +"_"+ upper( cHBFunc ) +" )" )
-      aadd( txt_, "{"  )
+      aadd( txt_, "HB_FUNC( QT_" + upper( cWidget ) + "_" + upper( cHBFunc ) + " )" )
+      aadd( txt_, "{" )
 
       /* Insert parameters by reference */
       IF !empty( aPre )
          FOR n := 1 TO len( aPre )
-            aadd( txt_, "   "+ aPre[ n, 1 ] )
+            aadd( txt_, "   " + aPre[ n, 1 ] )
          NEXT
-         aadd( txt_, ""   )
+         aadd( txt_, "" )
       ENDIF
 
       /* One line function body */
-      aadd( txt_, "   "+ cCmd )
+      aadd( txt_, "   " + cCmd )
 
       /* Return values back to PRG */
       IF !empty( aPre )
-         aadd( txt_, ""   )
+         aadd( txt_, "" )
          FOR n := 1 TO len( aPre )
-            aadd( txt_, "   "+ aPre[ n,4 ]+"( " + aPre[ n,3 ] +", "+ hb_ntos( aPre[ n,2 ] ) +" );" )
+            aadd( txt_, "   " + aPre[ n, 4 ] + "( " + aPre[ n, 3 ] + ", " + hb_ntos( aPre[ n, 2 ] ) + " );" )
          NEXT
       ENDIF
 
-      aadd( txt_, "}"  )
-      aadd( txt_, ""   )
+      aadd( txt_, "}" )
+      aadd( txt_, "" )
 
-      aadd( doc_, 'Qt_'+ cWidget + '_' + cHBFunc +'( p'+ cWidget + ;
-                        iif( empty( cDocs ), '', ', '+ cDocs ) +' ) -> '+ cPrgRet )
+      aadd( doc_, 'Qt_' + cWidget + '_' + cHBFunc + '( p' + cWidget + ;
+                        iif( empty( cDocs ), '', ', ' + cDocs ) + ' ) -> ' + cPrgRet )
       aadd( doc_, '' )
    ENDIF
 
@@ -1203,7 +1203,7 @@ STATIC FUNCTION CreateTarget( cFile, txt_ )
 /*----------------------------------------------------------------------*/
 
 STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
-   LOCAL cFile := cPathOut + s_PathSep + 'T'+cWidget +'.prg'
+   LOCAL cFile := cPathOut + s_PathSep + 'T' + cWidget + '.prg'
    LOCAL s, n, cM, ss, cCall, sm, cClassType
    LOCAL nLen := len( cWidget )
    LOCAL txt_  :={}
@@ -1212,8 +1212,8 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
 
    aadd( txt_, '' )
 
-   n := ascan( cls_, {|e_| left( lower( e_[ 1 ] ),7 ) == 'inherit' .and. !empty( e_[ 2 ] ) } )
-   s := 'CREATE CLASS '+ cWidget + iif( n > 0, ' INHERIT ' + cls_[ n,2 ], '' )
+   n := ascan( cls_, {|e_| left( lower( e_[ 1 ] ), 7 ) == 'inherit' .and. !empty( e_[ 2 ] ) } )
+   s := 'CREATE CLASS ' + cWidget + iif( n > 0, ' INHERIT ' + cls_[ n, 2 ], '' )
 
    aadd( txt_, s  )
    aadd( txt_, '' )
@@ -1234,15 +1234,15 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
          n     := at( cWidget, s )
          sm    := substr( s, n+nLen+1 )
 
-         ss    := 'p'+cWidget+','
+         ss    := 'p' + cWidget + ','
          cM    := strtran( sm, ss, '' )
-         ss    := 'p'+cWidget
+         ss    := 'p' + cWidget
          cM    := strtran( cM, ss, '' )
          cM    := strtran( cM, '(  )', '()' )
          cM    := strtran( cM, '(  ', '( ' )
          cM    := iif( len( cM ) > 35, cM, pad( cM,35 ) )
 
-         ss    := 'p'+cWidget
+         ss    := 'p' + cWidget
          cCall := strtran( s, ss, '::pPtr' )
 
          aadd( txt_, '   METHOD  ' + cM + ' INLINE  ' + cCall )
@@ -1265,7 +1265,7 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
    CASE cClassType == "PLAINOBJECT"
       cM := 'New( ... )'
 
-      aadd( txt_, 'METHOD '+ cM + ' CLASS '+ cWidget )
+      aadd( txt_, 'METHOD ' + cM + ' CLASS ' + cWidget )
       aadd( txt_, '   LOCAL aP, nParams' )
       aadd( txt_, '' )
       aadd( txt_, '   aP := hb_aParams()' )
@@ -1273,37 +1273,37 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
       aadd( txt_, '' )
       aadd( txt_, '   DO CASE' )
       aadd( txt_, '   CASE nParams == 0' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'()' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '()' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 1' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 2' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 3' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 4' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 5' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 6' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 7' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 8' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams == 9' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   CASE nParams ==10' )
-      aadd( txt_, '      ::pPtr := Qt_'+ cWidget +'( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )' )
+      aadd( txt_, '      ::pPtr := Qt_' + cWidget + '( aP[ 1 ], aP[ 2 ], aP[ 3 ], aP[ 4 ], aP[ 5 ], aP[ 6 ], aP[ 7 ], aP[ 8 ], aP[ 9 ], aP[10 ] )' )
       aadd( txt_, '   ' )
       aadd( txt_, '   ENDCASE' )
       aadd( txt_, '' )
@@ -1314,11 +1314,11 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
    OTHERWISE
       cM := 'New( pParent )'
 
-      aadd( txt_, 'METHOD '+ cM + ' CLASS '+ cWidget )
+      aadd( txt_, 'METHOD ' + cM + ' CLASS ' + cWidget )
       aadd( txt_, '' )
       aadd( txt_, '   ::pParent := pParent' )
       aadd( txt_, '' )
-      aadd( txt_, '   ::pPtr := Qt_'+ cWidget +'( pParent )' )
+      aadd( txt_, '   ::pPtr := Qt_' + cWidget + '( pParent )' )
       aadd( txt_, '' )
       aadd( txt_, '   RETURN Self' )
       aadd( txt_, '' )
@@ -1343,13 +1343,13 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
    aadd( txt_, "CPP_SOURCES=\                                           " )
 
    /* Insert .cpp sources */
-   aadd( cpp_, 'base'  )
-   aadd( cpp_, 'utils' )
-   aadd( cpp_, 'slots' )
-   FOR EACH s IN cpp_
-      aadd( txt_, chr( 9 ) + 'hbqt_' + lower( s ) + '.cpp \' )
-   NEXT
    aadd( txt_, chr( 9 ) + 'moc_slots.cpp \' )
+   aadd( txt_, chr( 9 ) + 'hbqt_base.cpp \' )
+   aadd( txt_, chr( 9 ) + 'hbqt_utils.cpp \' )
+   aadd( txt_, chr( 9 ) + 'hbqt_slots.cpp \' )
+   FOR EACH s IN cpp_
+      aadd( txt_, chr( 9 ) + s + '.cpp \' )
+   NEXT
    aadd( txt_, "                                                        " )
    aadd( txt_, "                                                        " )
    aadd( txt_, "                                                        " )
@@ -1368,7 +1368,7 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
 
 STATIC FUNCTION BuildDocument( cWidget, doc_, cPathDoc, docum_ )
    LOCAL i, n, n1, nLen, nLen1, pWidget, cText, oWidget, cRet
-   LOCAL cFile := cPathDoc + s_PathSep + cWidget +'.txt'
+   LOCAL cFile := cPathDoc + s_PathSep + cWidget + '.txt'
    LOCAL txt_:={}
    LOCAL aHM_:= {}, aHF_:={}
 
@@ -1381,7 +1381,7 @@ STATIC FUNCTION BuildDocument( cWidget, doc_, cPathDoc, docum_ )
    aadd( txt_, ' * '  )
    aadd( txt_, ' *                   Pritpal Bedi <pritpal@vouchcac.com>                    ' )
    aadd( txt_, ' * '  )
-   aadd( txt_, ' *                          '+dtoc( date() ) + ' - ' + time()                 )
+   aadd( txt_, ' *                          ' + dtoc( date() ) + ' - ' + time()               )
    aadd( txt_, ' * '  )
    aadd( txt_, ' */ ' )
    aadd( txt_, '   '  )
@@ -1400,20 +1400,20 @@ STATIC FUNCTION BuildDocument( cWidget, doc_, cPathDoc, docum_ )
       aadd( txt_, '    *    QSomeObject():new( p1, , , p4 ) -> GPF                            ' )
       aadd( txt_, '    */                                                                     ' )
 
-      aeval( docum_, {|e| aadd( txt_, '   '+e ) } )
+      aeval( docum_, {|e| aadd( txt_, '   ' + e ) } )
       aadd( txt_, '   '  )
       aadd( txt_, '   '  )
    ENDIF
    //
    nLen    := len( cWidget )
    n       := at( cWidget, doc_[ 1 ] )
-   pWidget := 'p'+cWidget
-   oWidget := 'o'+substr( cWidget, 2 )
+   pWidget := 'p' + cWidget
+   oWidget := 'o' + substr( cWidget, 2 )
 
    FOR i := 1 TO len( doc_ )
       IF !empty( doc_[ i ] )
          cText := substr( doc_[ i ], n+nLen+1 )
-         cText := strtran( cText, pWidget+', ', '' )
+         cText := strtran( cText, pWidget + ', ', '' )
          cText := strtran( cText, pWidget, '' )
          cText := strtran( cText, '(  )', '()' )
 
@@ -1423,8 +1423,8 @@ STATIC FUNCTION BuildDocument( cWidget, doc_, cPathDoc, docum_ )
          nLen1 := len( cText )
          nLen1 := max( 80, nLen1 )
          IF !empty( cRet )
-            aadd( txt_, '   '+ oWidget +':'+ pad( cText,nLen1 ) +' -> '+ cRet )
-            aadd( aHM_, { oWidget +' : '+ cText, cRet } )
+            aadd( txt_, '   ' + oWidget + ':' + pad( cText,nLen1 ) + ' -> ' + cRet )
+            aadd( aHM_, { oWidget + ' : ' + cText, cRet } )
          ENDIF
       ENDIF
    NEXT
@@ -1446,11 +1446,11 @@ STATIC FUNCTION BuildDocument( cWidget, doc_, cPathDoc, docum_ )
          nLen1 := len( cText )
          nLen1 := max( 80, nLen1 )
 
-         aadd( txt_, '   '+ pad( cText, nLen1 ) +' -> '+ cRet )
+         aadd( txt_, '   ' + pad( cText, nLen1 ) + ' -> ' + cRet )
          aadd( aHF_, { cText, cRet } )
       ENDIF
    NEXT
-   //aeval( doc_, {|e| aadd( txt_, '   '+e ) } )
+   //aeval( doc_, {|e| aadd( txt_, '   ' + e ) } )
 
    aadd( txt_, ' '    )
    aadd( txt_, "/*----------------------------------------------------------------------*/"   )
@@ -1484,7 +1484,7 @@ FUNCTION Build_HTML( cWidget, aHM_, aHF_, cPathOut, docum_ )
    aColumns      := { { 1,'Function', 'C', 100 },;
                       { 2,'Returns' , 'C',  20 } }
 
-   //cTitle := 'harbour/contrib/hbqt/'+ cWidget
+   //cTitle := 'harbour/contrib/hbqt/' + cWidget
 
    aHTML  := {}
    nCols  := len( aColumns )
@@ -1492,28 +1492,28 @@ FUNCTION Build_HTML( cWidget, aHM_, aHF_, cPathOut, docum_ )
    aadd( aHtml, "<HTML>" )
    Build_HtmlHeader( @aHTML, .F. )
 
-   s := '<BODY BGCOLOR="'+ SetColorBG +'" TEXT="' + SetColorText +'"' + '>'
+   s := '<BODY BGCOLOR="' + SetColorBG + '" TEXT="' + SetColorText + '"' + '>'
    aadd( aHtml, s )
 
    Build_HtmlTable( @aHTML, , SetColorTable )
    aadd( aHtml, '<TBODY>' )
 
    /*       Class Documentation */
-   s := "<TR><TD colspan="+hb_ntos( nCols )+" align=CENTER bgcolor=#ffff80><B>"+ "CLASS METHODS" +"</B></TD></TR>"
+   s := "<TR><TD colspan=" + hb_ntos( nCols ) + " align=CENTER bgcolor=#ffff80><B>" + "CLASS METHODS" + "</B></TD></TR>"
    aadd( aHtml, s )
-   s := "<TR><TD colspan="+hb_ntos( nCols )+" align=CENTER bgcolor=#ffff80><B>"+ "Source: /harbour/contrib/hbqt/T"+ cWidget +".prg" +"</B></TD></TR>"
+   s := "<TR><TD colspan=" + hb_ntos( nCols ) + " align=CENTER bgcolor=#ffff80><B>" + "Source: /harbour/contrib/hbqt/T" + cWidget + ".prg" + "</B></TD></TR>"
    aadd( aHtml, s )
-   s := QT_WEB+QT_VER+"/"+ lower( cWidget )+".htm"
-   s := "<TR><TD colspan="+hb_ntos( nCols )+' align=CENTER bgcolor=#ffff80><B><a href="'+s+'">'+ s +"</a></B></TD></TR>"
+   s := QT_WEB + QT_VER + "/" + lower( cWidget ) + ".htm"
+   s := "<TR><TD colspan=" + hb_ntos( nCols ) + ' align=CENTER bgcolor=#ffff80><B><a href="' + s + '">' + s + "</a></B></TD></TR>"
    aadd( aHtml, s )
    //
    IF !empty( docum_ )
       s := "<TR>"
 
-      cPara := 'pr'+ hb_ntos( ++nCounter )
+      cPara := 'pr' + hb_ntos( ++nCounter )
 
       s += '<TD  class="only" >'
-      s += '<PRE id="'+cPara+'">'
+      s += '<PRE id="' + cPara + '">'
       s += CRLF
 
       for i := 1 to len( docum_ )
@@ -1581,11 +1581,11 @@ FUNCTION Build_HtmlTable( aHTML, cTitle, SetColorTable )
 
    s := '<TABLE ' +;
         'BGCOLOR="'    + SetColorTable + '" ' +;
-        'BORDER='      + hb_ntos( nBorder )+' ' +;
+        'BORDER='      + hb_ntos( nBorder ) + ' ' +;
         'FRAME=ALL '   +;
-        'CellPadding=' + hb_ntos( nCellPadding )+' ' +;
-        'CellSpacing=' + hb_ntos( nCellSpacing )+' ' +;
-        'COLS='        + hb_ntos( nCols )+' ' +;
+        'CellPadding=' + hb_ntos( nCellPadding ) + ' ' +;
+        'CellSpacing=' + hb_ntos( nCellSpacing ) + ' ' +;
+        'COLS='        + hb_ntos( nCols ) + ' ' +;
         'WIDTH=90% '   +;
         '>'
    aadd( aHtml, s )
@@ -1643,5 +1643,3 @@ endif
    RETURN Nil
 
 /*----------------------------------------------------------------------*/
-
-