13 files changed, 19 insertions, 19 deletions
diff --git a/examples/SQL/README b/examples/SQL/README
index 823937f..eae6761 100644
--- a/examples/SQL/README
+++ b/examples/SQL/README
@@ -25,12 +25,12 @@ sqltable4.py:
 
 sqlsubclass5.py:
 
-  Similar to the former, and even more deviated from its qt ancestor,
+  Similar to the former, and even more deviated from its TQt ancestor,
   because the sense escaped me. This could be related to the different
   database layout needed for MySQL (Trolltech used PostgreSQL sequences,
   while we're using the simpler, but less powerful auto_increment here).
   If you enter and invalid date (e.g. day: 0) in the Paid column, it is
-  shown as "not yet", but produces some qt warnings. 
+  shown as "not yet", but produces some TQt warnings.
 
 runsqlex.py, sqlex.ui, sqlex.ui.h, connect.ui, connect.ui.h:
 
@@ -63,7 +63,7 @@ DB_USERNAME = "name"
 DB_PASSWORD = "pass"
 
 The dbconnect.py script is generated from dbconnect.ui, which was created
-with qt's designer. You can find it also in Boudewijn Rempt's book
+with TQt's designer. You can find it also in Boudewijn Rempt's book
 "GUI Programming with Python, using the TQt Toolkit". Although you won't find
 the SQL widgets discussed there, for the simple reason of the book being
 written before they appeared, it is a valuable source for anybody new in
diff --git a/examples/SQL/connect.ui.h b/examples/SQL/connect.ui.h
index fd37494..685f650 100644
--- a/examples/SQL/connect.ui.h
+++ b/examples/SQL/connect.ui.h
@@ -10,7 +10,7 @@
 void ConnectDialog::init()
 {
 from PyTQt.tqtsql import TQSqlDatabase
-#qDebug("ConnectDialog init")
+#tqDebug("ConnectDialog init")
 self.comboDriver.clear()
 self.comboDriver.insertStringList(TQSqlDatabase.drivers())
 }
diff --git a/examples/tqdir.py b/examples/tqdir.py
index 8ed9d5e..99875d0 100755
--- a/examples/tqdir.py
+++ b/examples/tqdir.py
@@ -248,7 +248,7 @@ if __name__ == '__main__':
         if msg:
             print(msg, file=sys.stderr)
         print("""\
-usage: qdir [--any | --dir | --custom] [--preview] [--default f] {--filter f} [caption ...]
+usage: tqdir [--any | --dir | --custom] [--preview] [--default f] {--filter f} [caption ...]
      --any         Get any filename, need not exist.
      --dir         Return a directory rather than a file.
      --custom      Opens a customized TQFileDialog with
diff --git a/examples/tqmag.py b/examples/tqmag.py
index df4a85d..1a7e448 100755
--- a/examples/tqmag.py
+++ b/examples/tqmag.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 #****************************************************************************
-#** $Id: qmag.py,v 1.1 2002/06/20 18:52:31 phil Exp $
+#** $Id: tqmag.py,v 1.1 2002/06/20 18:52:31 phil Exp $
 #**
 #** Copyright (C) 1992-1998 Troll Tech AS.  All rights reserved.
 #**
@@ -27,7 +27,7 @@ timer = (0, 20, 250, 333, 500, 1000, 2000, 3000, 5000, 10000)
 
 class MagWidget(TQWidget):
     def __init__(self, tqApp, parent = None, name = None):
-        self.qApp = tqApp
+        self.tqApp = tqApp
         TQWidget.__init__(self, parent, name)
         self.pm = TQPixmap()     # pixmap magnified
         self.p = TQPixmap()      # pixmap
@@ -70,7 +70,7 @@ class MagWidget(TQWidget):
                     10 + self.saveButton.fontMetrics().width("Save"), h)
 
         self.quitButton = TQPushButton(self)
-        self.connect(self.quitButton, SIGNAL("clicked()"), self.qApp, SLOT("quit()"))
+        self.connect(self.quitButton, SIGNAL("clicked()"), self.tqApp, SLOT("quit()"))
         self.quitButton.setText("Quit")
         self.quitButton.setGeometry(self.saveButton.geometry().right() + 2, 2,
                     10 + self.quitButton.fontMetrics().width("Quit"), h)
@@ -87,8 +87,8 @@ class MagWidget(TQWidget):
         self.resize(w, w)
 
         self.setMouseTracking(TRUE)
-        self.grabx = self.qApp.desktop().width() / 2
-        self.graby = self.qApp.desktop().height() / 2
+        self.grabx = self.tqApp.desktop().width() / 2
+        self.graby = self.tqApp.desktop().height() / 2
         self.grabAround(TQPoint(self.grabx, self.graby))
 
         #self.zoom.setCurrentItem(1)    # grabAround sets zoom factor
diff --git a/examples/tut10.py b/examples/tut10.py
index 507c979..e17e66d 100755
--- a/examples/tut10.py
+++ b/examples/tut10.py
@@ -135,7 +135,7 @@ class MyWidget(tqt.TQWidget):
         self.angle.setFocus()
 
 
-qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
+tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
 a = tqt.TQApplication(sys.argv)
 
 w = MyWidget()
diff --git a/examples/tut11.py b/examples/tut11.py
index a71ff03..1f7422e 100755
--- a/examples/tut11.py
+++ b/examples/tut11.py
@@ -203,7 +203,7 @@ class MyWidget(tqt.TQWidget):
         self.angle.setFocus()
 
 
-qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
+tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
 a = tqt.TQApplication(sys.argv)
 
 w = MyWidget()
diff --git a/examples/tut12.py b/examples/tut12.py
index f901b70..8228802 100755
--- a/examples/tut12.py
+++ b/examples/tut12.py
@@ -243,7 +243,7 @@ class MyWidget(tqt.TQWidget):
         self.angle.setFocus()
 
 
-qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
+tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
 a = tqt.TQApplication(sys.argv)
 
 w = MyWidget()
diff --git a/examples/tut13.py b/examples/tut13.py
index 8bade61..6b4d485 100755
--- a/examples/tut13.py
+++ b/examples/tut13.py
@@ -320,7 +320,7 @@ class GameBoard(tqt.TQWidget):
         self.cannonField.newTarget()
 
 
-qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
+tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
 a = tqt.TQApplication(sys.argv)
 
 gb = GameBoard()
diff --git a/examples/tut14.py b/examples/tut14.py
index 0111cab..11da6fa 100755
--- a/examples/tut14.py
+++ b/examples/tut14.py
@@ -368,7 +368,7 @@ class GameBoard(tqt.TQWidget):
         self.cannonField.newTarget()
 
 
-qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
+tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
 a = tqt.TQApplication(sys.argv)
 
 gb = GameBoard()
diff --git a/examples/tut2.py b/examples/tut2.py
index 0f34b16..ddfe5b1 100755
--- a/examples/tut2.py
+++ b/examples/tut2.py
@@ -12,7 +12,7 @@ quit = tqt.TQPushButton("Quit", None)
 quit.resize(75, 30)
 quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
 
-qt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
+tqt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
 
 a.setMainWidget(quit)
 quit.show()
diff --git a/examples/tut3.py b/examples/tut3.py
index 6cb1305..1eb6ca3 100755
--- a/examples/tut3.py
+++ b/examples/tut3.py
@@ -14,7 +14,7 @@ box.resize(200, 120)
 quit = tqt.TQPushButton("Quit", box)
 quit.setFont(tqt.TQFont("Times", 18, tqt.TQFont.Bold))
 
-qt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
+tqt.TQObject.connect(quit, tqt.SIGNAL("clicked()"), a, tqt.SLOT("quit()"))
 
 a.setMainWidget(box)
 box.show()
diff --git a/examples/tut9.py b/examples/tut9.py
index df0de2c..f95227f 100755
--- a/examples/tut9.py
+++ b/examples/tut9.py
@@ -94,7 +94,7 @@ class MyWidget(tqt.TQWidget):
         self.angle.setFocus()
 
 
-qt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
+tqt.TQApplication.setColorSpec(tqt.TQApplication.CustomColor)
 a = tqt.TQApplication(sys.argv)
 
 w = MyWidget()
diff --git a/examples/webbrowser/mainwindow.ui b/examples/webbrowser/mainwindow.ui
index 446a717..833b8f5 100644
--- a/examples/webbrowser/mainwindow.ui
+++ b/examples/webbrowser/mainwindow.ui
@@ -405,6 +405,6 @@
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
-    <include location="global" impldecl="in implementation">qaxwidget.h</include>
+    <include location="global" impldecl="in implementation">tqaxwidget.h</include>
 </includes>
 </UI>