summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/README4
-rw-r--r--examples/addressbook/centralwidget.cpp2
-rw-r--r--examples/buttongroups/buttongroups.cpp4
-rw-r--r--examples/chart/optionsform.cpp2
-rw-r--r--examples/chart/setdataform.cpp2
-rw-r--r--examples/checklists/checklists.cpp4
-rw-r--r--examples/cursor/cursor.cpp2
-rw-r--r--examples/customlayout/border.h2
-rw-r--r--examples/customlayout/card.h2
-rw-r--r--examples/customlayout/flow.h2
-rw-r--r--examples/customlayout/main.cpp2
-rw-r--r--examples/demo/display.cpp2
-rw-r--r--examples/demo/dnd/dnd.cpp2
-rw-r--r--examples/demo/graph.cpp4
-rw-r--r--examples/demo/i18n/i18n.cpp4
-rw-r--r--examples/demo/i18n/wrapper.h2
-rw-r--r--examples/demo/opengl/glinfotext.h2
-rw-r--r--examples/demo/opengl/glworkspace.cpp2
-rw-r--r--examples/demo/qasteroids/toplevel.cpp2
-rw-r--r--examples/demo/textdrawing/example.html2
-rw-r--r--examples/dragdrop/main.cpp2
-rw-r--r--examples/fonts/simple-tqfont-demo/viewer.cpp2
-rw-r--r--examples/i18n/main.cpp4
-rw-r--r--examples/i18n/mywidget.cpp4
-rw-r--r--examples/layout/layout.cpp2
-rw-r--r--examples/layout/layout.doc2
-rw-r--r--examples/lineedits/lineedits.cpp4
-rw-r--r--examples/lineedits/lineedits.h2
-rw-r--r--examples/listbox/listbox.cpp2
-rw-r--r--examples/listboxcombo/listboxcombo.cpp2
-rw-r--r--examples/listboxcombo/listboxcombo.h2
-rw-r--r--examples/mdi/application.cpp2
-rw-r--r--examples/movies/main.cpp2
-rw-r--r--examples/network/clientserver/client/client.cpp4
-rw-r--r--examples/network/clientserver/server/server.cpp2
-rw-r--r--examples/network/httpd/httpd.cpp2
-rw-r--r--examples/network/mail/composer.cpp2
-rw-r--r--examples/network/networkprotocol/view.h2
-rw-r--r--examples/opengl/box/globjwin.cpp2
-rw-r--r--examples/opengl/glpixmap/globjwin.cpp2
-rw-r--r--examples/opengl/overlay/globjwin.cpp2
-rw-r--r--examples/opengl/overlay_x11/README4
-rw-r--r--examples/opengl/overlay_x11/overlay_x11.doc4
-rw-r--r--examples/opengl/sharedbox/globjwin.cpp2
-rw-r--r--examples/opengl/texture/globjwin.cpp2
-rw-r--r--examples/popup/popup.cpp2
-rw-r--r--examples/process/process.cpp2
-rw-r--r--examples/progressbar/progressbar.cpp2
-rw-r--r--examples/rangecontrols/rangecontrols.cpp2
-rw-r--r--examples/rangecontrols/rangecontrols.h2
-rw-r--r--examples/regexptester/regexptester.cpp2
-rw-r--r--examples/richtext/richtext.cpp4
-rw-r--r--examples/richtext/richtext.h2
-rw-r--r--examples/rot13/rot13.cpp2
-rw-r--r--examples/scrollview/scrollview.cpp2
-rw-r--r--examples/showimg/imagetexteditor.cpp6
-rw-r--r--examples/sql/overview/custom1/main.h2
-rw-r--r--examples/sql/overview/form1/main.cpp2
-rw-r--r--examples/sql/overview/form2/main.h2
-rw-r--r--examples/tabdialog/tabdialog.cpp2
-rw-r--r--examples/tablet/tabletstats.cpp2
-rw-r--r--examples/thread/prodcons/prodcons.cpp2
-rw-r--r--examples/thread/semaphores/main.cpp2
-rw-r--r--examples/tictac/tictac.cpp2
-rw-r--r--examples/toplevel/options.ui2
-rw-r--r--examples/tqdir/tqdir.cpp2
-rw-r--r--examples/tqdir/tqdir.h2
-rw-r--r--examples/widgets/widgets.cpp6
-rw-r--r--examples/wizard/wizard.cpp4
-rw-r--r--examples/xform/xform.cpp4
70 files changed, 88 insertions, 88 deletions
diff --git a/examples/README b/examples/README
index 15f0d2e26..1fb637a5d 100644
--- a/examples/README
+++ b/examples/README
@@ -33,7 +33,7 @@ biff [Unix-specific]
buttongroups
This examples shows different types of group boxes (TQButtonGroup,
- and QGroupBox), and different kinds of buttons (TQCheckBox,
+ and TQGroupBox), and different kinds of buttons (TQCheckBox,
TQRadioButton, and TQPushButton). It also shows how to add a
TQPopupMenu to a button.
@@ -160,7 +160,7 @@ iconview
layout [obsolete]
This example shows simple and intermediate use of Qt's layout
- classes, TQGridLaout, QBoxLayout etc.
+ classes, TQGridLaout, TQBoxLayout etc.
life
An implementation of the life game with a Unix-flavor GUI.
diff --git a/examples/addressbook/centralwidget.cpp b/examples/addressbook/centralwidget.cpp
index 6d81d86f3..f7239b2ab 100644
--- a/examples/addressbook/centralwidget.cpp
+++ b/examples/addressbook/centralwidget.cpp
@@ -11,7 +11,7 @@
#include <tqtabwidget.h>
#include <tqlistview.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqwidget.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
diff --git a/examples/buttongroups/buttongroups.cpp b/examples/buttongroups/buttongroups.cpp
index 92f63b33a..0e52587ea 100644
--- a/examples/buttongroups/buttongroups.cpp
+++ b/examples/buttongroups/buttongroups.cpp
@@ -11,10 +11,10 @@
#include <tqpopupmenu.h>
#include <tqbuttongroup.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
#include <tqpushbutton.h>
/*
diff --git a/examples/chart/optionsform.cpp b/examples/chart/optionsform.cpp
index 321cc5a4c..731447e48 100644
--- a/examples/chart/optionsform.cpp
+++ b/examples/chart/optionsform.cpp
@@ -6,7 +6,7 @@
#include <tqframe.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
diff --git a/examples/chart/setdataform.cpp b/examples/chart/setdataform.cpp
index 310bf7f48..0e62e0352 100644
--- a/examples/chart/setdataform.cpp
+++ b/examples/chart/setdataform.cpp
@@ -3,7 +3,7 @@
#include <tqcolordialog.h>
#include <tqcombobox.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
#include <tqtable.h>
diff --git a/examples/checklists/checklists.cpp b/examples/checklists/checklists.cpp
index e77734ab0..dda701c5d 100644
--- a/examples/checklists/checklists.cpp
+++ b/examples/checklists/checklists.cpp
@@ -10,12 +10,12 @@
#include "checklists.h"
#include <tqlistview.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqlabel.h>
#include <tqvaluelist.h>
#include <tqstring.h>
#include <tqpushbutton.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
/*
* Constructor
diff --git a/examples/cursor/cursor.cpp b/examples/cursor/cursor.cpp
index 661c32a44..336e22c73 100644
--- a/examples/cursor/cursor.cpp
+++ b/examples/cursor/cursor.cpp
@@ -10,7 +10,7 @@
#include <tqlabel.h>
#include <tqbitmap.h>
#include <ntqapplication.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <ntqcursor.h>
// cb_bits and cm_bits were generated by X bitmap program.
diff --git a/examples/customlayout/border.h b/examples/customlayout/border.h
index 8229b118e..240f9859a 100644
--- a/examples/customlayout/border.h
+++ b/examples/customlayout/border.h
@@ -14,7 +14,7 @@
#ifndef BORDER_H
#define BORDER_H
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqptrlist.h>
class BorderWidgetItem : public TQWidgetItem
diff --git a/examples/customlayout/card.h b/examples/customlayout/card.h
index dfe314877..2ebcf57a4 100644
--- a/examples/customlayout/card.h
+++ b/examples/customlayout/card.h
@@ -14,7 +14,7 @@
#ifndef CARD_H
#define CARD_H
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqptrlist.h>
class CardLayout : public TQLayout
diff --git a/examples/customlayout/flow.h b/examples/customlayout/flow.h
index a2c854556..9debaa295 100644
--- a/examples/customlayout/flow.h
+++ b/examples/customlayout/flow.h
@@ -14,7 +14,7 @@
#ifndef FLOW_H
#define FLOW_H
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqptrlist.h>
class SimpleFlow : public TQLayout
diff --git a/examples/customlayout/main.cpp b/examples/customlayout/main.cpp
index f50945673..7dc3640f2 100644
--- a/examples/customlayout/main.cpp
+++ b/examples/customlayout/main.cpp
@@ -16,7 +16,7 @@
#include <ntqapplication.h>
#include <tqlabel.h>
#include <tqcolor.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
#include <tqpushbutton.h>
#include <tqmultilineedit.h>
#include <tqcolor.h>
diff --git a/examples/demo/display.cpp b/examples/demo/display.cpp
index 437fe5607..52b2d220d 100644
--- a/examples/demo/display.cpp
+++ b/examples/demo/display.cpp
@@ -10,7 +10,7 @@
#include "display.h"
#include <tqpainter.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <tqpushbutton.h>
#include <tqframe.h>
diff --git a/examples/demo/dnd/dnd.cpp b/examples/demo/dnd/dnd.cpp
index b9efb1668..bf5ddd0f1 100644
--- a/examples/demo/dnd/dnd.cpp
+++ b/examples/demo/dnd/dnd.cpp
@@ -1,6 +1,6 @@
#include <tqiconview.h>
#include <tqdragobject.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqmultilineedit.h>
#include "dnd.h"
diff --git a/examples/demo/graph.cpp b/examples/demo/graph.cpp
index 404564401..ddb5a9364 100644
--- a/examples/demo/graph.cpp
+++ b/examples/demo/graph.cpp
@@ -2,11 +2,11 @@
#include <tqcanvas.h>
#include <stdlib.h>
#include <tqdatetime.h>
-#include <ntqhbox.h>
+#include <tqhbox.h>
#include <tqpushbutton.h>
#include <tqslider.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
const int bounce_rtti = 1234;
diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp
index 8e40398d4..87678dfa1 100644
--- a/examples/demo/i18n/i18n.cpp
+++ b/examples/demo/i18n/i18n.cpp
@@ -3,8 +3,8 @@
#include "../textdrawing/textedit.h"
#include <tqaction.h>
-#include <ntqlayout.h>
-#include <ntqvbox.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
#include <tqworkspace.h>
#include <tqpopupmenu.h>
#include <tqmenubar.h>
diff --git a/examples/demo/i18n/wrapper.h b/examples/demo/i18n/wrapper.h
index 78fbb7735..155361ffa 100644
--- a/examples/demo/i18n/wrapper.h
+++ b/examples/demo/i18n/wrapper.h
@@ -1,7 +1,7 @@
#ifndef WRAPPER_H
#define WRAPPER_H
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqtranslator.h>
diff --git a/examples/demo/opengl/glinfotext.h b/examples/demo/opengl/glinfotext.h
index f5b6b3a49..3799c096d 100644
--- a/examples/demo/opengl/glinfotext.h
+++ b/examples/demo/opengl/glinfotext.h
@@ -1,4 +1,4 @@
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqtextview.h>
#include <tqfont.h>
#include "glinfo.h"
diff --git a/examples/demo/opengl/glworkspace.cpp b/examples/demo/opengl/glworkspace.cpp
index 419ec6deb..32c491be6 100644
--- a/examples/demo/opengl/glworkspace.cpp
+++ b/examples/demo/opengl/glworkspace.cpp
@@ -12,7 +12,7 @@
#include <tqprinter.h>
#include <tqpainter.h>
#include <tqcheckbox.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqimage.h>
#include "printpreview.h"
diff --git a/examples/demo/qasteroids/toplevel.cpp b/examples/demo/qasteroids/toplevel.cpp
index ad548127b..06e83af3e 100644
--- a/examples/demo/qasteroids/toplevel.cpp
+++ b/examples/demo/qasteroids/toplevel.cpp
@@ -6,7 +6,7 @@
// --- toplevel.cpp ---
#include <ntqaccel.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqlcdnumber.h>
#include <tqpushbutton.h>
diff --git a/examples/demo/textdrawing/example.html b/examples/demo/textdrawing/example.html
index 4056e2a11..d492428e4 100644
--- a/examples/demo/textdrawing/example.html
+++ b/examples/demo/textdrawing/example.html
@@ -208,7 +208,7 @@ Enables auto-resizing if <em>enable</em> is TRUE, or disables it if <em>enable</
<p>When auto-resizing is enabled, the label will resize itself to fit
the contents whenever the contents change. The top left corner is
not moved. This is useful for TQLabel widgets that are not managed by
-a <a href="ntqlayout.html">TQLayout</a> (e.g. top-level widgets).
+a <a href="tqlayout.html">TQLayout</a> (e.g. top-level widgets).
<p>Auto-resizing is disabled by default.
<p>See also <a href="#75b2a1">autoResize</a>(), <a href="tqwidget.html#ab3108">adjustSize</a>() and <a href="#614dd5">sizeHint</a>().
<h3 class="fn">void�<a name="191701"></a>TQLabel::setBuddy�(�<a href="tqwidget.html">TQWidget</a>�*�buddy�) <code>[virtual]</code></h3>
diff --git a/examples/dragdrop/main.cpp b/examples/dragdrop/main.cpp
index 6d942fef5..64e457653 100644
--- a/examples/dragdrop/main.cpp
+++ b/examples/dragdrop/main.cpp
@@ -12,7 +12,7 @@
#include <ntqapplication.h>
#include "dropsite.h"
#include "secret.h"
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqcombobox.h>
#include <tqlabel.h>
#include <tqpixmap.h>
diff --git a/examples/fonts/simple-tqfont-demo/viewer.cpp b/examples/fonts/simple-tqfont-demo/viewer.cpp
index 111abdbb7..77769afed 100644
--- a/examples/fonts/simple-tqfont-demo/viewer.cpp
+++ b/examples/fonts/simple-tqfont-demo/viewer.cpp
@@ -4,7 +4,7 @@
#include <tqstringlist.h>
#include <tqtextview.h>
#include <tqpushbutton.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
Viewer::Viewer()
:TQWidget()
diff --git a/examples/i18n/main.cpp b/examples/i18n/main.cpp
index 71c61a3a0..b32a985af 100644
--- a/examples/i18n/main.cpp
+++ b/examples/i18n/main.cpp
@@ -12,8 +12,8 @@
#include <tqfileinfo.h>
#include <ntqmessagebox.h>
#include <tqcheckbox.h>
-#include <ntqvbox.h>
-#include <ntqlayout.h>
+#include <tqvbox.h>
+#include <tqlayout.h>
#include <tqbuttongroup.h>
#include <tqpushbutton.h>
#include <tqsignalmapper.h>
diff --git a/examples/i18n/mywidget.cpp b/examples/i18n/mywidget.cpp
index 86cdee528..f16d44487 100644
--- a/examples/i18n/mywidget.cpp
+++ b/examples/i18n/mywidget.cpp
@@ -13,8 +13,8 @@
#include <tqlistbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <ntqhbox.h>
-#include <ntqvbox.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
#include <ntqaccel.h>
#include <tqpopupmenu.h>
#include <tqmenubar.h>
diff --git a/examples/layout/layout.cpp b/examples/layout/layout.cpp
index 1fdc675a8..1256afa3b 100644
--- a/examples/layout/layout.cpp
+++ b/examples/layout/layout.cpp
@@ -11,7 +11,7 @@
#include <tqlabel.h>
#include <tqcolor.h>
#include <tqpushbutton.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqmultilineedit.h>
#include <tqmenubar.h>
diff --git a/examples/layout/layout.doc b/examples/layout/layout.doc
index 52a39e5b5..c644c1de8 100644
--- a/examples/layout/layout.doc
+++ b/examples/layout/layout.doc
@@ -6,7 +6,7 @@
\title Layout Managers
This example shows simple and intermediate use of Qt's layout
- classes, TQGridLayout, QBoxLayout etc.
+ classes, TQGridLayout, TQBoxLayout etc.
<hr>
diff --git a/examples/lineedits/lineedits.cpp b/examples/lineedits/lineedits.cpp
index ddb4879c1..ef282193c 100644
--- a/examples/lineedits/lineedits.cpp
+++ b/examples/lineedits/lineedits.cpp
@@ -14,8 +14,8 @@
#include <tqframe.h>
#include <ntqvalidator.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
-#include <ntqhbox.h>
+#include <tqlayout.h>
+#include <tqhbox.h>
/*
* Constructor
diff --git a/examples/lineedits/lineedits.h b/examples/lineedits/lineedits.h
index d957c064d..57c541e4f 100644
--- a/examples/lineedits/lineedits.h
+++ b/examples/lineedits/lineedits.h
@@ -10,7 +10,7 @@
#ifndef LINEDITS_H
#define LINEDITS_H
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
class TQLineEdit;
class TQComboBox;
diff --git a/examples/listbox/listbox.cpp b/examples/listbox/listbox.cpp
index c5fceb6a3..539cba090 100644
--- a/examples/listbox/listbox.cpp
+++ b/examples/listbox/listbox.cpp
@@ -15,7 +15,7 @@
#include <tqspinbox.h>
#include <tqlistbox.h>
#include <tqbuttongroup.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
diff --git a/examples/listboxcombo/listboxcombo.cpp b/examples/listboxcombo/listboxcombo.cpp
index 2b083ecd7..d88440910 100644
--- a/examples/listboxcombo/listboxcombo.cpp
+++ b/examples/listboxcombo/listboxcombo.cpp
@@ -11,7 +11,7 @@
#include <tqcombobox.h>
#include <tqlistbox.h>
-#include <ntqhbox.h>
+#include <tqhbox.h>
#include <tqpushbutton.h>
#include <tqstring.h>
#include <tqpixmap.h>
diff --git a/examples/listboxcombo/listboxcombo.h b/examples/listboxcombo/listboxcombo.h
index 63a407768..03074b1c5 100644
--- a/examples/listboxcombo/listboxcombo.h
+++ b/examples/listboxcombo/listboxcombo.h
@@ -10,7 +10,7 @@
#ifndef LISTBOX_COMBO_H
#define LISTBOX_COMBO_H
-#include <ntqvbox.h>
+#include <tqvbox.h>
class TQListBox;
class TQLabel;
diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp
index f339e8839..739e1daa0 100644
--- a/examples/mdi/application.cpp
+++ b/examples/mdi/application.cpp
@@ -31,7 +31,7 @@
#include <tqpaintdevicemetrics.h>
#include <tqwhatsthis.h>
#include <tqobjectlist.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqsimplerichtext.h>
#include "filesave.xpm"
diff --git a/examples/movies/main.cpp b/examples/movies/main.cpp
index 50249b93f..15ac9befb 100644
--- a/examples/movies/main.cpp
+++ b/examples/movies/main.cpp
@@ -14,7 +14,7 @@
#include <tqpainter.h>
#include <ntqmessagebox.h>
#include <tqmovie.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
class MovieScreen : public TQFrame {
diff --git a/examples/network/clientserver/client/client.cpp b/examples/network/clientserver/client/client.cpp
index 2a8b6b3e0..8e80a8a90 100644
--- a/examples/network/clientserver/client/client.cpp
+++ b/examples/network/clientserver/client/client.cpp
@@ -9,8 +9,8 @@
#include <tqsocket.h>
#include <ntqapplication.h>
-#include <ntqvbox.h>
-#include <ntqhbox.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
#include <tqtextview.h>
#include <tqlineedit.h>
#include <tqlabel.h>
diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp
index c2d53255b..97a164ba7 100644
--- a/examples/network/clientserver/server/server.cpp
+++ b/examples/network/clientserver/server/server.cpp
@@ -10,7 +10,7 @@
#include <tqsocket.h>
#include <tqserversocket.h>
#include <ntqapplication.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqtextview.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp
index db01925e8..722354cd6 100644
--- a/examples/network/httpd/httpd.cpp
+++ b/examples/network/httpd/httpd.cpp
@@ -13,7 +13,7 @@
#include <ntqapplication.h>
#include <tqmainwindow.h>
#include <tqtextstream.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqlabel.h>
#include <tqtextview.h>
#include <tqpushbutton.h>
diff --git a/examples/network/mail/composer.cpp b/examples/network/mail/composer.cpp
index d0376750e..3b7ba596e 100644
--- a/examples/network/mail/composer.cpp
+++ b/examples/network/mail/composer.cpp
@@ -14,7 +14,7 @@
#include <tqmultilineedit.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
Composer::Composer( TQWidget *parent )
: TQWidget( parent )
diff --git a/examples/network/networkprotocol/view.h b/examples/network/networkprotocol/view.h
index 9a5583ff8..079e65a7c 100644
--- a/examples/network/networkprotocol/view.h
+++ b/examples/network/networkprotocol/view.h
@@ -10,7 +10,7 @@
#ifndef VIEW_H
#define VIEW_H
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqcstring.h>
#include <tqurloperator.h>
diff --git a/examples/opengl/box/globjwin.cpp b/examples/opengl/box/globjwin.cpp
index 59fd0d7ae..bd41b765b 100644
--- a/examples/opengl/box/globjwin.cpp
+++ b/examples/opengl/box/globjwin.cpp
@@ -9,7 +9,7 @@
#include <tqpushbutton.h>
#include <tqslider.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqframe.h>
#include <tqmenubar.h>
#include <tqpopupmenu.h>
diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp
index db20c5331..408b4920b 100644
--- a/examples/opengl/glpixmap/globjwin.cpp
+++ b/examples/opengl/glpixmap/globjwin.cpp
@@ -16,7 +16,7 @@
#include <tqpushbutton.h>
#include <tqslider.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqmenubar.h>
diff --git a/examples/opengl/overlay/globjwin.cpp b/examples/opengl/overlay/globjwin.cpp
index 93d6a6b4e..69f1becd3 100644
--- a/examples/opengl/overlay/globjwin.cpp
+++ b/examples/opengl/overlay/globjwin.cpp
@@ -7,7 +7,7 @@
**
*****************************************************************************/
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqframe.h>
#include <tqmenubar.h>
#include <tqpopupmenu.h>
diff --git a/examples/opengl/overlay_x11/README b/examples/opengl/overlay_x11/README
index d6afecfdc..1de87a43e 100644
--- a/examples/opengl/overlay_x11/README
+++ b/examples/opengl/overlay_x11/README
@@ -54,10 +54,10 @@ can put all kinds of TQt widgets (your own or those provided with Qt)
on top of the OpenGL image (widget), e.g. pushbuttons etc., and they
can be moved, resized, or removed without destroying the OpenGL image.
-Using with geometry management: The QLayout classes will not allow you
+Using with geometry management: The TQLayout classes will not allow you
to put one widget (the overlay) on top of another (the OpenGL widget);
that would defy the whole purpose of the automatic layout. The
-solution is to add just one of them to the QLayout object. Have it
+solution is to add just one of them to the TQLayout object. Have it
keep a pointer to the other (i.e. the TQGLWidget knows about its
overlay widget or vice versa). Implement the resizeEvent() method of
the widget you put in the layout, and make it call setGeometry() on
diff --git a/examples/opengl/overlay_x11/overlay_x11.doc b/examples/opengl/overlay_x11/overlay_x11.doc
index 844621779..990795a16 100644
--- a/examples/opengl/overlay_x11/overlay_x11.doc
+++ b/examples/opengl/overlay_x11/overlay_x11.doc
@@ -59,10 +59,10 @@ can put all kinds of TQt widgets (your own or standard TQt widgets) on
top of the OpenGL image (widget), e.g. pushbuttons etc., and they can
be moved, resized, or removed without destroying the OpenGL image.
-\i \e{Using with geometry management.} The QLayout classes don't permit
+\i \e{Using with geometry management.} The TQLayout classes don't permit
putting one widget (the overlay) on top of another (the OpenGL
widget); that would defy the whole purpose of the automatic layout.
-The solution is to add just one of them to the QLayout object. Have it
+The solution is to add just one of them to the TQLayout object. Have it
keep a pointer to the other (i.e. the TQGLWidget knows about its
overlay widget or vice versa). Implement the resizeEvent() method of
the widget you put in the layout, and make it call setGeometry() on
diff --git a/examples/opengl/sharedbox/globjwin.cpp b/examples/opengl/sharedbox/globjwin.cpp
index 709614385..33e7d10af 100644
--- a/examples/opengl/sharedbox/globjwin.cpp
+++ b/examples/opengl/sharedbox/globjwin.cpp
@@ -9,7 +9,7 @@
#include <tqpushbutton.h>
#include <tqslider.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqframe.h>
#include <tqmenubar.h>
#include <tqpopupmenu.h>
diff --git a/examples/opengl/texture/globjwin.cpp b/examples/opengl/texture/globjwin.cpp
index 6a53492af..a14b6626e 100644
--- a/examples/opengl/texture/globjwin.cpp
+++ b/examples/opengl/texture/globjwin.cpp
@@ -9,7 +9,7 @@
#include <tqpushbutton.h>
#include <tqslider.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqframe.h>
#include <tqmenubar.h>
#include <tqpopupmenu.h>
diff --git a/examples/popup/popup.cpp b/examples/popup/popup.cpp
index 25fd14b0a..17a2dae04 100644
--- a/examples/popup/popup.cpp
+++ b/examples/popup/popup.cpp
@@ -9,7 +9,7 @@
#include "popup.h"
#include <ntqapplication.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
FancyPopup::FancyPopup( TQWidget* parent, const char* name ):
TQLabel( parent, name, WType_Popup ){
diff --git a/examples/process/process.cpp b/examples/process/process.cpp
index 80730700a..5382c5e4a 100644
--- a/examples/process/process.cpp
+++ b/examples/process/process.cpp
@@ -9,7 +9,7 @@
#include <tqobject.h>
#include <tqprocess.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqtextview.h>
#include <tqpushbutton.h>
#include <ntqapplication.h>
diff --git a/examples/progressbar/progressbar.cpp b/examples/progressbar/progressbar.cpp
index d6e5c7c7f..0969f8101 100644
--- a/examples/progressbar/progressbar.cpp
+++ b/examples/progressbar/progressbar.cpp
@@ -12,7 +12,7 @@
#include <tqradiobutton.h>
#include <tqpushbutton.h>
#include <tqprogressbar.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <ntqmotifstyle.h>
diff --git a/examples/rangecontrols/rangecontrols.cpp b/examples/rangecontrols/rangecontrols.cpp
index a7d331ee3..ecea6927a 100644
--- a/examples/rangecontrols/rangecontrols.cpp
+++ b/examples/rangecontrols/rangecontrols.cpp
@@ -9,7 +9,7 @@
#include "rangecontrols.h"
-#include <ntqhbox.h>
+#include <tqhbox.h>
#include <tqlcdnumber.h>
#include <tqspinbox.h>
#include <tqlabel.h>
diff --git a/examples/rangecontrols/rangecontrols.h b/examples/rangecontrols/rangecontrols.h
index 2542111d3..6704b00b7 100644
--- a/examples/rangecontrols/rangecontrols.h
+++ b/examples/rangecontrols/rangecontrols.h
@@ -10,7 +10,7 @@
#ifndef RANGECONTROLS_H
#define RANGECONTROLS_H
-#include <ntqvbox.h>
+#include <tqvbox.h>
class TQCheckBox;
diff --git a/examples/regexptester/regexptester.cpp b/examples/regexptester/regexptester.cpp
index fb3c12f06..96fabcdb4 100644
--- a/examples/regexptester/regexptester.cpp
+++ b/examples/regexptester/regexptester.cpp
@@ -3,7 +3,7 @@
#include <tqclipboard.h>
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
#include <tqstatusbar.h>
diff --git a/examples/richtext/richtext.cpp b/examples/richtext/richtext.cpp
index 9a97228bb..dea4366c4 100644
--- a/examples/richtext/richtext.cpp
+++ b/examples/richtext/richtext.cpp
@@ -9,8 +9,8 @@
#include "richtext.h"
-#include <ntqhbox.h>
-#include <ntqhbox.h>
+#include <tqhbox.h>
+#include <tqhbox.h>
#include <tqpushbutton.h>
#include <tqtextview.h>
#include <tqbrush.h>
diff --git a/examples/richtext/richtext.h b/examples/richtext/richtext.h
index 77913f76d..cb1ca6a39 100644
--- a/examples/richtext/richtext.h
+++ b/examples/richtext/richtext.h
@@ -10,7 +10,7 @@
#ifndef RICHTEXT_H
#define RICHTEXT_H
-#include <ntqvbox.h>
+#include <tqvbox.h>
class TQTextView;
class TQPushButton;
diff --git a/examples/rot13/rot13.cpp b/examples/rot13/rot13.cpp
index b97eba408..4fb44d167 100644
--- a/examples/rot13/rot13.cpp
+++ b/examples/rot13/rot13.cpp
@@ -12,7 +12,7 @@
#include <tqmultilineedit.h>
#include <tqpushbutton.h>
#include <ntqapplication.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
Rot13::Rot13()
{
diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp
index 6e27b686a..62e474d27 100644
--- a/examples/scrollview/scrollview.cpp
+++ b/examples/scrollview/scrollview.cpp
@@ -15,7 +15,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
#include <ntqmessagebox.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqmultilineedit.h>
#include <tqsizegrip.h>
diff --git a/examples/showimg/imagetexteditor.cpp b/examples/showimg/imagetexteditor.cpp
index c0751148f..c007b3cb3 100644
--- a/examples/showimg/imagetexteditor.cpp
+++ b/examples/showimg/imagetexteditor.cpp
@@ -9,10 +9,10 @@
#include "imagetexteditor.h"
#include <tqimage.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqgrid.h>
-#include <ntqvbox.h>
-#include <ntqhbox.h>
+#include <tqvbox.h>
+#include <tqhbox.h>
#include <tqcombobox.h>
#include <tqmultilineedit.h>
#include <tqlabel.h>
diff --git a/examples/sql/overview/custom1/main.h b/examples/sql/overview/custom1/main.h
index 488c34bbc..d7878c528 100644
--- a/examples/sql/overview/custom1/main.h
+++ b/examples/sql/overview/custom1/main.h
@@ -10,7 +10,7 @@
#include <ntqapplication.h>
#include <tqdialog.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqsqldatabase.h>
diff --git a/examples/sql/overview/form1/main.cpp b/examples/sql/overview/form1/main.cpp
index cf3cb2895..73069a64e 100644
--- a/examples/sql/overview/form1/main.cpp
+++ b/examples/sql/overview/form1/main.cpp
@@ -10,7 +10,7 @@
#include <ntqapplication.h>
#include <tqdialog.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqsqldatabase.h>
#include <tqsqlcursor.h>
diff --git a/examples/sql/overview/form2/main.h b/examples/sql/overview/form2/main.h
index d4a4f58b2..4e1122605 100644
--- a/examples/sql/overview/form2/main.h
+++ b/examples/sql/overview/form2/main.h
@@ -10,7 +10,7 @@
#include <ntqapplication.h>
#include <tqdialog.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqsqldatabase.h>
diff --git a/examples/tabdialog/tabdialog.cpp b/examples/tabdialog/tabdialog.cpp
index 9df1d21ed..1d4059901 100644
--- a/examples/tabdialog/tabdialog.cpp
+++ b/examples/tabdialog/tabdialog.cpp
@@ -9,7 +9,7 @@
#include "tabdialog.h"
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqdatetime.h>
diff --git a/examples/tablet/tabletstats.cpp b/examples/tablet/tabletstats.cpp
index 106e0a83b..6b9cdb352 100644
--- a/examples/tablet/tabletstats.cpp
+++ b/examples/tablet/tabletstats.cpp
@@ -8,7 +8,7 @@
*****************************************************************************/
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <math.h>
diff --git a/examples/thread/prodcons/prodcons.cpp b/examples/thread/prodcons/prodcons.cpp
index 824556cc6..ed980d551 100644
--- a/examples/thread/prodcons/prodcons.cpp
+++ b/examples/thread/prodcons/prodcons.cpp
@@ -6,7 +6,7 @@
#include <tqpushbutton.h>
#include <tqcheckbox.h>
#include <tqprogressbar.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <tqevent.h>
#include <tqlabel.h>
#include <tqcstring.h>
diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp
index eb8e4675d..3c7dbc4a2 100644
--- a/examples/thread/semaphores/main.cpp
+++ b/examples/thread/semaphores/main.cpp
@@ -13,7 +13,7 @@
#include <tqthread.h>
#include <tqsemaphore.h>
#include <tqmutex.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <ntqmessagebox.h>
#include <tqlabel.h>
diff --git a/examples/tictac/tictac.cpp b/examples/tictac/tictac.cpp
index 5f7f66184..2057dd502 100644
--- a/examples/tictac/tictac.cpp
+++ b/examples/tictac/tictac.cpp
@@ -14,7 +14,7 @@
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <stdlib.h> // rand() function
#include <tqdatetime.h> // seed for rand()
diff --git a/examples/toplevel/options.ui b/examples/toplevel/options.ui
index e75916f5e..183f39b63 100644
--- a/examples/toplevel/options.ui
+++ b/examples/toplevel/options.ui
@@ -534,7 +534,7 @@ Note that this attribute is not supported on many windowing systems and will hav
</connections>
<includes>
<include location="global" impldecl="in declaration">ntqguardedptr.h</include>
- <include location="global" impldecl="in declaration">ntqvbox.h</include>
+ <include location="global" impldecl="in declaration">tqvbox.h</include>
<include location="global" impldecl="in implementation">tqfiledialog.h</include>
</includes>
<variables>
diff --git a/examples/tqdir/tqdir.cpp b/examples/tqdir/tqdir.cpp
index 9faa30738..0ea524713 100644
--- a/examples/tqdir/tqdir.cpp
+++ b/examples/tqdir/tqdir.cpp
@@ -15,7 +15,7 @@
#include <tqfileinfo.h>
#include <tqfile.h>
#include <tqtextstream.h>
-#include <ntqhbox.h>
+#include <tqhbox.h>
#include <tqspinbox.h>
#include <tqlabel.h>
#include <tqmultilineedit.h>
diff --git a/examples/tqdir/tqdir.h b/examples/tqdir/tqdir.h
index be76dfaea..bf5b71683 100644
--- a/examples/tqdir/tqdir.h
+++ b/examples/tqdir/tqdir.h
@@ -13,7 +13,7 @@
#include <tqscrollview.h>
#include <tqfiledialog.h>
#include <tqwidgetstack.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqurl.h>
#include <tqpixmap.h>
#include <tqstringlist.h>
diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp
index 44e866c1b..3931645d7 100644
--- a/examples/widgets/widgets.cpp
+++ b/examples/widgets/widgets.cpp
@@ -9,7 +9,7 @@
#include <ntqmessagebox.h>
#include <tqpixmap.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
#include <ntqapplication.h>
// Standard TQt widgets
@@ -21,7 +21,7 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqframe.h>
-#include <ntqgroupbox.h>
+#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqlcdnumber.h>
#include <tqmultilineedit.h>
@@ -35,7 +35,7 @@
#include <tqstatusbar.h>
#include <tqwhatsthis.h>
#include <tqtoolbutton.h>
-#include <ntqvbox.h>
+#include <tqvbox.h>
#include <tqtabbar.h>
#include <tqtabwidget.h>
#include <tqwidgetstack.h>
diff --git a/examples/wizard/wizard.cpp b/examples/wizard/wizard.cpp
index c0fbf5041..218d65dcd 100644
--- a/examples/wizard/wizard.cpp
+++ b/examples/wizard/wizard.cpp
@@ -10,8 +10,8 @@
#include "wizard.h"
#include <tqwidget.h>
-#include <ntqhbox.h>
-#include <ntqvbox.h>
+#include <tqhbox.h>
+#include <tqvbox.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp
index 0f4899bf1..71a4eed86 100644
--- a/examples/xform/xform.cpp
+++ b/examples/xform/xform.cpp
@@ -20,8 +20,8 @@
#include <tqslider.h>
#include <tqmenubar.h>
#include <tqfontdialog.h>
-#include <ntqlayout.h>
-#include <ntqvbox.h>
+#include <tqlayout.h>
+#include <tqvbox.h>
#include <tqwidgetstack.h>
#include <tqpainter.h>