From 006c6dcef6326b789e64b263783fe0e0c99f1a5f Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 27 Jul 2010 18:38:43 +0000 Subject: [PATCH] Revert previous commit...some bugs crept in since last build test a week ago and I woul prefer to fix them over the next few days before commiting this patch set. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1155623 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- examples/dcasttest.cc | 4 ++-- examples/flow.cc | 6 ++--- examples/hello_impl.cc | 4 ++-- examples/hello_impl.h | 4 ++-- examples/helloclient.cc | 4 ++-- examples/hellodynamic.cc | 4 ++-- examples/hellomain.cc | 4 ++-- examples/helloserver.cc | 4 ++-- examples/irdemo.cc | 4 ++-- examples/referenceinfo.cc | 4 ++-- examples/streamsound.cc | 4 ++-- examples/testasubsys.cc | 4 ++-- examples/testdhandle.cc | 4 ++-- examples/x11commtest.cc | 4 ++-- mcopidl/mcopidl.cc | 4 ++-- qtmcop/qiomanager.cc | 34 +++++++++++++-------------- qtmcop/qiomanager.h | 18 +++++++------- qtmcop/qiomanager_p.h | 20 ++++++++-------- soundserver/artscat.cc | 4 ++-- soundserver/artsd.cc | 4 ++-- soundserver/artsplay.cc | 4 ++-- soundserver/artsrec.cc | 4 ++-- soundserver/simplesoundserver_impl.cc | 4 ++-- soundserver/simplesoundserver_impl.h | 4 ++-- soundserver/soundserver_impl.cc | 4 ++-- soundserver/soundserver_impl.h | 4 ++-- soundserver/soundserverv2_impl.cc | 4 ++-- soundserver/soundserverv2_impl.h | 4 ++-- tests/testchangenotify.cc | 4 ++-- tests/testremote.cc | 4 ++-- tests/testwrapper.cc | 4 ++-- x11/x11globalcomm_impl.cc | 2 +- 32 files changed, 94 insertions(+), 94 deletions(-) diff --git a/examples/dcasttest.cc b/examples/dcasttest.cc index 2b0c4c7..5066cd7 100644 --- a/examples/dcasttest.cc +++ b/examples/dcasttest.cc @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/flow.cc b/examples/flow.cc index ca82452..eaddf32 100644 --- a/examples/flow.cc +++ b/examples/flow.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ @@ -45,7 +45,7 @@ int main() connect(sin, play, "invalue_left"); connect(sin, play, "invalue_right"); - // start all objects (maybe we should group objects like with TQWidget + // start all objects (maybe we should group objects like with QWidget // parents and such?) freq.start(); sin.start(); diff --git a/examples/hello_impl.cc b/examples/hello_impl.cc index 3bcd210..5f7bb68 100644 --- a/examples/hello_impl.cc +++ b/examples/hello_impl.cc @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/hello_impl.h b/examples/hello_impl.h index 10e080a..13c61a7 100644 --- a/examples/hello_impl.h +++ b/examples/hello_impl.h @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/helloclient.cc b/examples/helloclient.cc index b63fc9e..f5f3410 100644 --- a/examples/helloclient.cc +++ b/examples/helloclient.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/hellodynamic.cc b/examples/hellodynamic.cc index e6a65e6..b55cbf4 100644 --- a/examples/hellodynamic.cc +++ b/examples/hellodynamic.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/hellomain.cc b/examples/hellomain.cc index addf0d8..024f97a 100644 --- a/examples/hellomain.cc +++ b/examples/hellomain.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/helloserver.cc b/examples/helloserver.cc index bbc966c..01ffa41 100644 --- a/examples/helloserver.cc +++ b/examples/helloserver.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/irdemo.cc b/examples/irdemo.cc index 8607119..aedd832 100644 --- a/examples/irdemo.cc +++ b/examples/irdemo.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/referenceinfo.cc b/examples/referenceinfo.cc index 9f2b725..b980378 100644 --- a/examples/referenceinfo.cc +++ b/examples/referenceinfo.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/streamsound.cc b/examples/streamsound.cc index a5e4327..170d6de 100644 --- a/examples/streamsound.cc +++ b/examples/streamsound.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/testasubsys.cc b/examples/testasubsys.cc index c3ea6aa..b70bf9d 100644 --- a/examples/testasubsys.cc +++ b/examples/testasubsys.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/testdhandle.cc b/examples/testdhandle.cc index e012762..564687d 100644 --- a/examples/testdhandle.cc +++ b/examples/testdhandle.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/examples/x11commtest.cc b/examples/x11commtest.cc index 7f1bf2e..c1b27dd 100644 --- a/examples/x11commtest.cc +++ b/examples/x11commtest.cc @@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/mcopidl/mcopidl.cc b/mcopidl/mcopidl.cc index 59eaebd..a349bdf 100644 --- a/mcopidl/mcopidl.cc +++ b/mcopidl/mcopidl.cc @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Permission is also granted to link this program with the TQt - library, treating TQt like a library that normally accompanies the + Permission is also granted to link this program with the Qt + library, treating Qt like a library that normally accompanies the operating system kernel, whether or not that is in fact the case. */ diff --git a/qtmcop/qiomanager.cc b/qtmcop/qiomanager.cc index 2b4608f..a6990cf 100644 --- a/qtmcop/qiomanager.cc +++ b/qtmcop/qiomanager.cc @@ -22,8 +22,8 @@ #include "qiomanager.h" #include "qiomanager_p.h" -#include -#include +#include +#include #include "debug.h" #include "dispatcher.h" #include "thread.h" @@ -66,11 +66,11 @@ static bool qioBlocking; * QIOWatch: */ QIOWatch::QIOWatch(int fd, int type, IONotify *notify, - TQSocketNotifier::Type qtype, bool reentrant) + QSocketNotifier::Type qtype, bool reentrant) : _fd(fd), _type(type), _client(notify), _reentrant(reentrant) { - qsocketnotify = new TQSocketNotifier(fd,qtype,this); - connect(qsocketnotify,TQT_SIGNAL(activated(int)),this,TQT_SLOT(notify(int))); + qsocketnotify = new QSocketNotifier(fd,qtype,this); + connect(qsocketnotify,SIGNAL(activated(int)),this,SLOT(notify(int))); } void QIOWatch::notify(int socket) @@ -80,17 +80,17 @@ void QIOWatch::notify(int socket) } /* - * TQTimeWatch: + * QTimeWatch: */ -TQTimeWatch::TQTimeWatch(int milliseconds, TimeNotify *notify) +QTimeWatch::QTimeWatch(int milliseconds, TimeNotify *notify) { - timer = new TQTimer(this); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(notify()) ); + timer = new QTimer(this); + connect( timer, SIGNAL(timeout()), this, SLOT(notify()) ); timer->start(milliseconds); _client = notify; } -void TQTimeWatch::notify() +void QTimeWatch::notify() { qioManager->dispatch(this); } @@ -179,19 +179,19 @@ void QIOManager::watchFD(int fd, int types, IONotify *notify) if(types & IOType::read) { fdList.push_back( - new QIOWatch(fd, IOType::read, notify, TQSocketNotifier::Read, r) + new QIOWatch(fd, IOType::read, notify, QSocketNotifier::Read, r) ); } if(types & IOType::write) { fdList.push_back( - new QIOWatch(fd, IOType::write, notify, TQSocketNotifier::Write, r) + new QIOWatch(fd, IOType::write, notify, QSocketNotifier::Write, r) ); } if(types & IOType::except) { fdList.push_back( - new QIOWatch(fd, IOType::except, notify, TQSocketNotifier::Exception, + new QIOWatch(fd, IOType::except, notify, QSocketNotifier::Exception, r) ); } @@ -228,17 +228,17 @@ void QIOManager::addTimer(int milliseconds, TimeNotify *notify) notify = new HandleNotifications(); milliseconds = 0; } - timeList.push_back(new TQTimeWatch(milliseconds,notify)); + timeList.push_back(new QTimeWatch(milliseconds,notify)); } void QIOManager::removeTimer(TimeNotify *notify) { - list::iterator i; + list::iterator i; i = timeList.begin(); while(i != timeList.end()) { - TQTimeWatch *w = *i; + QTimeWatch *w = *i; if(w->client() == notify) { @@ -271,7 +271,7 @@ void QIOManager::dispatch(QIOWatch *ioWatch) qioLevel--; } -void QIOManager::dispatch(TQTimeWatch *timeWatch) +void QIOManager::dispatch(QTimeWatch *timeWatch) { qioLevel++; if(qioLevel == 1) diff --git a/qtmcop/qiomanager.h b/qtmcop/qiomanager.h index 3ab488c..3eafe51 100644 --- a/qtmcop/qiomanager.h +++ b/qtmcop/qiomanager.h @@ -30,20 +30,20 @@ #define QIOMANAGER_H #include "iomanager.h" -#include -#include -#include +#include +#include +#include #include #include "arts_export.h" namespace Arts { class QIOWatch; -class TQTimeWatch; +class QTimeWatch; /** - * QIOManager performs MCOP I/O inside the TQt event loop. This way, you will - * be able to receive requests and notifications inside TQt application. The + * QIOManager performs MCOP I/O inside the Qt event loop. This way, you will + * be able to receive requests and notifications inside Qt application. The * usual way to set it up is: * * 
@@ -59,13 +59,13 @@ class TQTimeWatch;
 class ARTS_EXPORT QIOManager : public IOManager {
 protected:
 	friend class QIOWatch;
-	friend class TQTimeWatch;
+	friend class QTimeWatch;
 
 	std::list fdList;
-	std::list timeList;
+	std::list timeList;
 
 	void dispatch(QIOWatch *ioWatch);
-	void dispatch(TQTimeWatch *timeWatch);
+	void dispatch(QTimeWatch *timeWatch);
 
 public:
 	QIOManager();
diff --git a/qtmcop/qiomanager_p.h b/qtmcop/qiomanager_p.h
index 4024d5e..8877b19 100644
--- a/qtmcop/qiomanager_p.h
+++ b/qtmcop/qiomanager_p.h
@@ -21,7 +21,7 @@
     */
 
 /*
- * BC - Status (2002-03-08): QIOWatch, TQTimeWatch.
+ * BC - Status (2002-03-08): QIOWatch, QTimeWatch.
  *
  * These classes provide implementation details and not meant to be used
  * in any way.
@@ -31,24 +31,24 @@
 #define QIOMANAGER_P_H
 
 #include "iomanager.h"
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 namespace Arts {
 
-class QIOWatch : public TQObject {
+class QIOWatch : public QObject {
 	Q_OBJECT
 protected:
-	TQSocketNotifier *qsocketnotify;
+	QSocketNotifier *qsocketnotify;
 	int _fd;
 	int _type;
 	IONotify *_client;
 	bool _reentrant;
 
 public:
-	QIOWatch(int fd, int type, IONotify *notify, TQSocketNotifier::Type qtype,
+	QIOWatch(int fd, int type, IONotify *notify, QSocketNotifier::Type qtype,
 				bool reentrant);
 
 	inline IONotify *client() { return _client; }
@@ -59,13 +59,13 @@ public slots:
 	void notify(int socket);
 };
 
-class TQTimeWatch : public TQObject {
+class QTimeWatch : public QObject {
 	Q_OBJECT
 protected:
-	TQTimer *timer;
+	QTimer *timer;
 	TimeNotify *_client;
 public:
-	TQTimeWatch(int milliseconds, TimeNotify *notify);
+	QTimeWatch(int milliseconds, TimeNotify *notify);
 
 	inline TimeNotify *client() { return _client; }
 public slots:
diff --git a/soundserver/artscat.cc b/soundserver/artscat.cc
index 4f53ae3..c6818c8 100644
--- a/soundserver/artscat.cc
+++ b/soundserver/artscat.cc
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/artsd.cc b/soundserver/artsd.cc
index fd91e8c..6b6a22e 100644
--- a/soundserver/artsd.cc
+++ b/soundserver/artsd.cc
@@ -18,8 +18,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/artsplay.cc b/soundserver/artsplay.cc
index d038989..b8dec3d 100644
--- a/soundserver/artsplay.cc
+++ b/soundserver/artsplay.cc
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.            
     */
 
diff --git a/soundserver/artsrec.cc b/soundserver/artsrec.cc
index 616994c..c53b0ff 100644
--- a/soundserver/artsrec.cc
+++ b/soundserver/artsrec.cc
@@ -19,8 +19,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/simplesoundserver_impl.cc b/soundserver/simplesoundserver_impl.cc
index 1dd895f..0f11c99 100644
--- a/soundserver/simplesoundserver_impl.cc
+++ b/soundserver/simplesoundserver_impl.cc
@@ -21,8 +21,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/simplesoundserver_impl.h b/soundserver/simplesoundserver_impl.h
index 0a5249d..33971fe 100644
--- a/soundserver/simplesoundserver_impl.h
+++ b/soundserver/simplesoundserver_impl.h
@@ -21,8 +21,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/soundserver_impl.cc b/soundserver/soundserver_impl.cc
index e006e6a..7c84792 100644
--- a/soundserver/soundserver_impl.cc
+++ b/soundserver/soundserver_impl.cc
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/soundserver_impl.h b/soundserver/soundserver_impl.h
index 13df438..670b146 100644
--- a/soundserver/soundserver_impl.h
+++ b/soundserver/soundserver_impl.h
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/soundserverv2_impl.cc b/soundserver/soundserverv2_impl.cc
index 45b76d2..932c4fd 100644
--- a/soundserver/soundserverv2_impl.cc
+++ b/soundserver/soundserverv2_impl.cc
@@ -19,8 +19,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/soundserver/soundserverv2_impl.h b/soundserver/soundserverv2_impl.h
index c1d2705..9ea74a9 100644
--- a/soundserver/soundserverv2_impl.h
+++ b/soundserver/soundserverv2_impl.h
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/tests/testchangenotify.cc b/tests/testchangenotify.cc
index 5b1ee0a..0447e7c 100644
--- a/tests/testchangenotify.cc
+++ b/tests/testchangenotify.cc
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/tests/testremote.cc b/tests/testremote.cc
index afa49ae..85bdfb2 100644
--- a/tests/testremote.cc
+++ b/tests/testremote.cc
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/tests/testwrapper.cc b/tests/testwrapper.cc
index b967c42..9be8c35 100644
--- a/tests/testwrapper.cc
+++ b/tests/testwrapper.cc
@@ -16,8 +16,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-    Permission is also granted to link this program with the TQt
-    library, treating TQt like a library that normally accompanies the
+    Permission is also granted to link this program with the Qt
+    library, treating Qt like a library that normally accompanies the
     operating system kernel, whether or not that is in fact the case.
 
     */
diff --git a/x11/x11globalcomm_impl.cc b/x11/x11globalcomm_impl.cc
index 4c54b9e..71ac0c1 100644
--- a/x11/x11globalcomm_impl.cc
+++ b/x11/x11globalcomm_impl.cc
@@ -21,7 +21,7 @@
 /*
  * This is based on Mark Donohoe's nice KRootProp class (found in
  * kdelibs/kdecore/krootprop.cpp). I couldn't use KRootProp directly, since
- * I wanted aRts (and even it's X11 support) to work without KDE and/or TQt
+ * I wanted aRts (and even it's X11 support) to work without KDE and/or Qt
  * installed at all.
  */