Browse Source

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
tags/v3.5.13
tpearson 9 years ago
parent
commit
006c6dcef6
32 changed files with 94 additions and 94 deletions
  1. +2
    -2
      examples/dcasttest.cc
  2. +3
    -3
      examples/flow.cc
  3. +2
    -2
      examples/hello_impl.cc
  4. +2
    -2
      examples/hello_impl.h
  5. +2
    -2
      examples/helloclient.cc
  6. +2
    -2
      examples/hellodynamic.cc
  7. +2
    -2
      examples/hellomain.cc
  8. +2
    -2
      examples/helloserver.cc
  9. +2
    -2
      examples/irdemo.cc
  10. +2
    -2
      examples/referenceinfo.cc
  11. +2
    -2
      examples/streamsound.cc
  12. +2
    -2
      examples/testasubsys.cc
  13. +2
    -2
      examples/testdhandle.cc
  14. +2
    -2
      examples/x11commtest.cc
  15. +2
    -2
      mcopidl/mcopidl.cc
  16. +17
    -17
      qtmcop/qiomanager.cc
  17. +9
    -9
      qtmcop/qiomanager.h
  18. +10
    -10
      qtmcop/qiomanager_p.h
  19. +2
    -2
      soundserver/artscat.cc
  20. +2
    -2
      soundserver/artsd.cc
  21. +2
    -2
      soundserver/artsplay.cc
  22. +2
    -2
      soundserver/artsrec.cc
  23. +2
    -2
      soundserver/simplesoundserver_impl.cc
  24. +2
    -2
      soundserver/simplesoundserver_impl.h
  25. +2
    -2
      soundserver/soundserver_impl.cc
  26. +2
    -2
      soundserver/soundserver_impl.h
  27. +2
    -2
      soundserver/soundserverv2_impl.cc
  28. +2
    -2
      soundserver/soundserverv2_impl.h
  29. +2
    -2
      tests/testchangenotify.cc
  30. +2
    -2
      tests/testremote.cc
  31. +2
    -2
      tests/testwrapper.cc
  32. +1
    -1
      x11/x11globalcomm_impl.cc

+ 2
- 2
examples/dcasttest.cc View File

@@ -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.

*/


+ 3
- 3
examples/flow.cc View File

@@ -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();


+ 2
- 2
examples/hello_impl.cc View File

@@ -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.
*/



+ 2
- 2
examples/hello_impl.h View File

@@ -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.

*/


+ 2
- 2
examples/helloclient.cc View File

@@ -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.

*/


+ 2
- 2
examples/hellodynamic.cc View File

@@ -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.

*/


+ 2
- 2
examples/hellomain.cc View File

@@ -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.

*/


+ 2
- 2
examples/helloserver.cc View File

@@ -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.

*/


+ 2
- 2
examples/irdemo.cc View File

@@ -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.

*/


+ 2
- 2
examples/referenceinfo.cc View File

@@ -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.

*/


+ 2
- 2
examples/streamsound.cc View File

@@ -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.

*/


+ 2
- 2
examples/testasubsys.cc View File

@@ -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.

*/


+ 2
- 2
examples/testdhandle.cc View File

@@ -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.

*/


+ 2
- 2
examples/x11commtest.cc View File

@@ -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.

*/


+ 2
- 2
mcopidl/mcopidl.cc View File

@@ -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.

*/


+ 17
- 17
qtmcop/qiomanager.cc View File

@@ -22,8 +22,8 @@

#include "qiomanager.h"
#include "qiomanager_p.h"
#include <tqsocketnotifier.h>
#include <tqapplication.h>
#include <qsocketnotifier.h>
#include <qapplication.h>
#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<TQTimeWatch *>::iterator i;
list<QTimeWatch *>::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)


+ 9
- 9
qtmcop/qiomanager.h View File

@@ -30,20 +30,20 @@
#define QIOMANAGER_H

#include "iomanager.h"
#include <tqobject.h>
#include <tqtimer.h>
#include <tqsocketnotifier.h>
#include <qobject.h>
#include <qtimer.h>
#include <qsocketnotifier.h>
#include <list>
#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:
*
* <pre>
@@ -59,13 +59,13 @@ class TQTimeWatch;
class ARTS_EXPORT QIOManager : public IOManager {
protected:
friend class QIOWatch;
friend class TQTimeWatch;
friend class QTimeWatch;

std::list<QIOWatch *> fdList;
std::list<TQTimeWatch *> timeList;
std::list<QTimeWatch *> timeList;

void dispatch(QIOWatch *ioWatch);
void dispatch(TQTimeWatch *timeWatch);
void dispatch(QTimeWatch *timeWatch);

public:
QIOManager();


+ 10
- 10
qtmcop/qiomanager_p.h View File

@@ -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 <tqobject.h>
#include <tqtimer.h>
#include <tqsocketnotifier.h>
#include <qobject.h>
#include <qtimer.h>
#include <qsocketnotifier.h>
#include <list>

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:


+ 2
- 2
soundserver/artscat.cc View File

@@ -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.

*/


+ 2
- 2
soundserver/artsd.cc View File

@@ -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.

*/


+ 2
- 2
soundserver/artsplay.cc View File

@@ -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.
*/



+ 2
- 2
soundserver/artsrec.cc View File

@@ -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.

*/


+ 2
- 2
soundserver/simplesoundserver_impl.cc View File

@@ -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.

*/


+ 2
- 2
soundserver/simplesoundserver_impl.h View File

@@ -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.

*/


+ 2
- 2
soundserver/soundserver_impl.cc View File

@@ -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.

*/


+ 2
- 2
soundserver/soundserver_impl.h View File

@@ -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.

*/


+ 2
- 2
soundserver/soundserverv2_impl.cc View File

@@ -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.

*/


+ 2
- 2
soundserver/soundserverv2_impl.h View File

@@ -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.

*/


+ 2
- 2
tests/testchangenotify.cc View File

@@ -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.

*/


+ 2
- 2
tests/testremote.cc View File

@@ -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.

*/


+ 2
- 2
tests/testwrapper.cc View File

@@ -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.

*/


+ 1
- 1
x11/x11globalcomm_impl.cc View File

@@ -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.
*/



Loading…
Cancel
Save