Rename layout nt* related files to equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

34 files changed, 52 insertions, 51 deletions

diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index 1381a9f80..a9c49aaa8 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -45,7 +45,7 @@
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <ntqinputdialog.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqmainwindow.h>
 #include <tqmenudata.h>
 #include <ntqmessagebox.h>
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 4d149453d..ad9733816 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -50,7 +50,7 @@
 #include <tqwidget.h>
 #include <ntqmetaobject.h>
 #include <ntqapplication.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <ntqmessagebox.h>
 #include <tqlistbox.h>
 #include <tqiconview.h>
diff --git a/tools/designer/designer/dbconnectionimpl.cpp b/tools/designer/designer/dbconnectionimpl.cpp
index 745c56c52..ee9b8aef2 100644
--- a/tools/designer/designer/dbconnectionimpl.cpp
+++ b/tools/designer/designer/dbconnectionimpl.cpp
@@ -35,11 +35,11 @@
 #include "dbconnection.h"
 #include "project.h"
 #include "asciivalidator.h"
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqlineedit.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqsqldatabase.h>
 
 DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index 03acb323a..09d85aed3 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -33,8 +33,8 @@
 
 #include "dbconnectionsimpl.h"
 #include <tqptrlist.h>
-#include <ntqgroupbox.h>
-#include <ntqlayout.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
 #include "project.h"
 #include <tqlistbox.h>
 #include <tqcombobox.h>
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 62dce7889..52a190185 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -16,7 +16,7 @@
 #include <tqdialog.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp
index 274b12d3c..eee9df12b 100644
--- a/tools/designer/designer/editfunctionsimpl.cpp
+++ b/tools/designer/designer/editfunctionsimpl.cpp
@@ -45,9 +45,9 @@
 #include <tqcombobox.h>
 #include <tqstrlist.h>
 #include <ntqmessagebox.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
 #include <tqheader.h>
 #include <tqcheckbox.h>
 
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index d02fb6119..57de1bede 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -58,7 +58,7 @@
 #include <tqobjectlist.h>
 #include <tqtimer.h>
 #include <ntqapplication.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqstatusbar.h>
 #include <ntqapplication.h>
diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp
index 7f4cc84ef..695f8a3cd 100644
--- a/tools/designer/designer/layout.cpp
+++ b/tools/designer/designer/layout.cpp
@@ -36,7 +36,7 @@
 #include <widgetdatabase.h>
 #include "widgetfactory.h"
 
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
 #include <tqpainter.h>
 #include <tqpen.h>
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 61af84c55..3ac9c170d 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -38,7 +38,7 @@
 #include <tqmap.h>
 #include <ntqguardedptr.h>
 #include <tqobject.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqwidgetlist.h>
 
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index f91ca5d58..c24e84e98 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -110,7 +110,7 @@
 #include <tqlistbox.h>
 #include <ntqdockwindow.h>
 #include <tqstylefactory.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
 #include <tqprocess.h>
 #include <tqsettings.h>
 #include <ntqaccel.h>
@@ -785,7 +785,7 @@ void MainWindow::helpContents()
 	TQString classname =  WidgetFactory::classNameOf( propertyEditor->widget() );
 	if ( source.isEmpty() || source == "designer-manual.html" ) {
 	    if ( classname.lower() == "spacer" )
-		source = "qspaceritem.html#details";
+		source = "tqspaceritem.html#details";
 	    else if ( classname == "TQLayoutWidget" )
 		source = "layout.html";
 	    else
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index 82b29a6e3..14734ac91 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -43,7 +43,7 @@
 
 #include <ntqapplication.h>
 #include <tqobject.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqptrdict.h>
 #include <tqobjectlist.h>
 #include <tqstrlist.h>
diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp
index 450f01876..8a609c223 100644
--- a/tools/designer/designer/multilineeditorimpl.cpp
+++ b/tools/designer/designer/multilineeditorimpl.cpp
@@ -42,7 +42,7 @@
 #include <tqtextedit.h>
 #include <./private/qrichtext_p.h>
 #include <tqpushbutton.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <ntqapplication.h>
 #include <tqaction.h>
diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp
index 4a82b0eb0..df27dc318 100644
--- a/tools/designer/designer/paletteeditoradvancedimpl.cpp
+++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp
@@ -42,7 +42,7 @@
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tqpainter.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
 
 /*!
     Class used by PaletteEditor for bold combobox items
diff --git a/tools/designer/designer/previewframe.cpp b/tools/designer/designer/previewframe.cpp
index b3da648d9..f74076a4c 100644
--- a/tools/designer/designer/previewframe.cpp
+++ b/tools/designer/designer/previewframe.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <ntqvbox.h>
+#include <tqvbox.h>
 #include <tqpainter.h>
 
 #include "previewframe.h"
diff --git a/tools/designer/designer/previewframe.h b/tools/designer/designer/previewframe.h
index 017e5cb00..9f79f4540 100644
--- a/tools/designer/designer/previewframe.h
+++ b/tools/designer/designer/previewframe.h
@@ -34,7 +34,7 @@
 #ifndef PREVIEWFRAME_H
 #define PREVIEWFRAME_H
 
-#include <ntqvbox.h>
+#include <tqvbox.h>
 #include <tqworkspace.h>
 
 #include "previewwidgetimpl.h"
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index d388dd1c1..898a03039 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -60,7 +60,7 @@
 #include <ntqmetaobject.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
-#include <ntqhbox.h>
+#include <tqhbox.h>
 #include <tqfontdialog.h>
 #include <tqspinbox.h>
 #include <tqevent.h>
@@ -70,7 +70,7 @@
 #include <tqcolor.h>
 #include <tqcolordialog.h>
 #include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqsizepolicy.h>
 #include <tqbitmap.h>
 #include <tqtooltip.h>
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index 23b5cb2f4..afe518a3a 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -42,7 +42,7 @@
 #include <tqtabwidget.h>
 #include <ntqmodules.h>
 #include <tqptrlist.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include "hierarchyview.h"
diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/qcompletionedit.cpp
index f2fdfc0f7..aba4dc872 100644
--- a/tools/designer/designer/qcompletionedit.cpp
+++ b/tools/designer/designer/qcompletionedit.cpp
@@ -35,7 +35,7 @@
 #include <tqlistbox.h>
 #include <tqsizegrip.h>
 #include <ntqapplication.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
 
 TQCompletionEdit::TQCompletionEdit( TQWidget *parent, const char *name )
     : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE )
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index eba4cbb0b..0226219e7 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -61,7 +61,7 @@
 #include <tqheader.h>
 #include <tqiconview.h>
 #include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
 #include <tqmenudata.h>
diff --git a/tools/designer/designer/sourceeditor.h b/tools/designer/designer/sourceeditor.h
index 613fb549c..cf94351ec 100644
--- a/tools/designer/designer/sourceeditor.h
+++ b/tools/designer/designer/sourceeditor.h
@@ -35,7 +35,7 @@
 #define SOURCEEDITOR_H
 
 #include "../interfaces/editorinterface.h"
-#include <ntqvbox.h>
+#include <tqvbox.h>
 #include <ntqguardedptr.h>
 
 class FormWindow;
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index b54fa16ee..9fe20026a 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -9,7 +9,7 @@
 #include <tqpoint.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqfileinfo.h>
 #include <tqmap.h>
 #include <tqdatetime.h>
diff --git a/tools/designer/designer/variabledialogimpl.cpp b/tools/designer/designer/variabledialogimpl.cpp
index 976f7da14..d0698d4ff 100644
--- a/tools/designer/designer/variabledialogimpl.cpp
+++ b/tools/designer/designer/variabledialogimpl.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <tqlistview.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <ntqmessagebox.h>
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index b585198eb..64f08f0bd 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -55,7 +55,7 @@
 #include <ntqfeatures.h>
 
 #include <tqpixmap.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
 #include <tqiconview.h>
 #ifndef TQT_NO_TABLE
 #include <tqtable.h>
@@ -69,7 +69,7 @@
 #include <tqmultilineedit.h>
 #include <tqtextedit.h>
 #include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
 #include <tqtabbar.h>
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index 6d3d78f8e..61afdd83d 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -34,7 +34,7 @@
 #include "arghintwidget.h"
 #include <tqbutton.h>
 #include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp
index 9f6469c2b..ee9d77331 100644
--- a/tools/designer/editor/completion.cpp
+++ b/tools/designer/editor/completion.cpp
@@ -35,7 +35,7 @@
 #include "paragdata.h"
 #include "editor.h"
 #include <tqlistbox.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
 #include <tqmap.h>
 #include <private/qrichtext_p.h>
 #include <ntqapplication.h>
diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp
index 521e202a6..a57f2ddb9 100644
--- a/tools/designer/editor/viewmanager.cpp
+++ b/tools/designer/editor/viewmanager.cpp
@@ -34,7 +34,7 @@
 #include "viewmanager.h"
 #include "editor.h"
 #include "markerwidget.h"
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <private/qrichtext_p.h>
 #include "paragdata.h"
 #include <tqobjectlist.h>
diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp
index d79e3e989..ca425f49b 100644
--- a/tools/designer/examples/credit/creditformbase.cpp
+++ b/tools/designer/examples/credit/creditformbase.cpp
@@ -15,7 +15,7 @@
 #include <tqspinbox.h>
 #include <tqmime.h>
 #include <tqdragobject.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include "creditformbase.ui.h"
diff --git a/tools/designer/examples/filechooser/widget/filechooser.cpp b/tools/designer/examples/filechooser/widget/filechooser.cpp
index 799772b8d..d7da1a19a 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.cpp
+++ b/tools/designer/examples/filechooser/widget/filechooser.cpp
@@ -2,7 +2,7 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqfiledialog.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
     : TQWidget( parent, name ), md( File )
diff --git a/tools/designer/examples/vcr/vcr.cpp b/tools/designer/examples/vcr/vcr.cpp
index c8dff0c32..ea4c39481 100644
--- a/tools/designer/examples/vcr/vcr.cpp
+++ b/tools/designer/examples/vcr/vcr.cpp
@@ -1,6 +1,6 @@
 #include "vcr.h"
 #include <tqpushbutton.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 
 static const char * rewind_xpm[] = {
 "16 16 3 1",
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 3e87b48dc..92ae66301 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -39,8 +39,8 @@
 #include <tqlineedit.h>
 
 #include <tqlabel.h>
-#include <ntqgroupbox.h>
-#include <ntqlayout.h>
+#include <tqgroupbox.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 #include <tqpushbutton.h>
 #include <tqmultilineedit.h>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 42976f657..973a8a65f 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -68,8 +68,8 @@ static TQString converted_widgets[] =
     "TQCheckBox", "TQColorDialog", "TQComboBox",
     "TQDateTimeEdit", "TQDesktopWidget", "TQDial", "TQDialog",
     "TQFileDialog", "TQFrame",
-    "TQGrid", "TQGridView",
-    "TQHeader",
+    "TQGrid", "TQGridView", "TQGroupBox",
+    "TQHBox", "TQHButtonGroup", "TQHeader", "TQHGroupBox",
     "TQIconView",
     "TQLabel", "TQLCDNumber", "TQLineEdit", "TQListBox", "TQListView", 
     "TQMainWindow", "TQMenuBar", "TQMultiLineEdit",
@@ -77,6 +77,7 @@ static TQString converted_widgets[] =
     "TQRadioButton",
     "TQScrollBar", "TQScrollView", "TQSizeGrip", "TQSlider", "TQSpinBox", "TQStatusBar",
     "TQTabBar", "TQTabDialog", "TQTabWidget", "TQTable", "TQTextBrowser", "TQTextEdit", "TQTextView", "TQToolBar", "TQToolBox", "TQToolButton", "TQToolTip",
+    "TQVBox", "TQVButtonGroup", "TQVGroupBox",
     "TQWidget", "TQWidgetStack", "TQWizard", "TQWorkspace"
 };
 size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString);
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index a9c950cc6..5abe9c8e3 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -289,7 +289,7 @@ void Uic::createFormDecl( const TQDomElement &e )
 	for ( i = 1; i < (int) nl.length(); i++ ) { // begin at 1, 0 is the toplevel widget
 	    TQString s = getClassName( nl.item(i).toElement() );
 	    if ( s == "TQLayoutWidget" )
-		continue; // hide qlayoutwidgets
+		continue; // hide tqlayoutwidgets
 	    if ( s == "Line" )
 		s = "TQFrame";
 	    if ( !(nofwd && customWidgets.contains(s)) )
@@ -803,7 +803,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
 	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
-		globalIncludes += "ntqlayout.h";
+		globalIncludes += "tqlayout.h";
 		globalIncludes += "ntqapplication.h";
 		continue;
 	    }
@@ -826,7 +826,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	    out << "#include <" << *it << ">" << endl;
     }
 
-    out << "#include <ntqlayout.h>" << endl;
+    out << "#include <tqlayout.h>" << endl;
     out << "#include <tqtooltip.h>" << endl;
     out << "#include <tqwhatsthis.h>" << endl;
     if ( objClass == "TQMainWindow" ) {
diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp
index b044649b0..bcd670290 100644
--- a/tools/designer/uic/uic.cpp
+++ b/tools/designer/uic/uic.cpp
@@ -811,11 +811,11 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla
     TQString objClass, objName;
     objClass = e.tagName();
 
-    TQString qlayout = "TQVBoxLayout";
+    TQString tqlayout = "TQVBoxLayout";
     if ( objClass == "hbox" )
-	qlayout = "TQHBoxLayout";
+	tqlayout = "TQHBoxLayout";
     else if ( objClass == "grid" )
-	qlayout = "TQGridLayout";
+	tqlayout = "TQGridLayout";
 
     bool isGrid = e.tagName() == "grid" ;
     objName = registerObject( getLayoutName( e ) );
@@ -833,10 +833,10 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla
 	out << indent << parent << "->setColumnLayout(0, TQt::Vertical );" << endl;
 	out << indent << parent << "->layout()->setSpacing( " << spacing << " );" << endl;
 	out << indent << parent << "->layout()->setMargin( " << margin << " );" << endl;
-	out << indent << objName << " = new " << qlayout << "( " << parent << "->layout() );" << endl;
+	out << indent << objName << " = new " << tqlayout << "( " << parent << "->layout() );" << endl;
 	out << indent << objName << "->setAlignment( TQt::AlignTop );" << endl;
     } else {
-	out << indent << objName << " = new " << qlayout << "( ";
+	out << indent << objName << " = new " << tqlayout << "( ";
 	if ( layout.isEmpty() )
 	    out << parent;
 	else {
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index 6d018f628..bcc567775 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -40,7 +40,7 @@
 #include "../designer/database2.h"
 #include <tqdom.h>
 #include <tqdir.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <ntqmetaobject.h>
 #include <domtool.h>
 #include <uib.h>
@@ -63,7 +63,7 @@
 #include <tqtoolbutton.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
 #include <tqbuttongroup.h>
 #include <tqiconview.h>
 #include <tqheader.h>
@@ -99,8 +99,8 @@
 #include <tqmenubar.h>
 #include <tqpopupmenu.h>
 #include <tqdatetimeedit.h>
-#include <ntqvbox.h>
-#include <ntqhbox.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
 #include <tqgrid.h>
 
 #include <stdlib.h>