diff options
Diffstat (limited to 'arts')
30 files changed, 101 insertions, 101 deletions
diff --git a/arts/kde/README b/arts/kde/README index 2d34f08fd..8c3405e33 100644 --- a/arts/kde/README +++ b/arts/kde/README @@ -6,7 +6,7 @@ libartskde is a simple KDE->aRts wrapper that allows the developer to use KDE technology to access aRts. ie. no need to deal with std::string's anymore -etc.. you can just use QString's or KURL's +etc.. you can just use TQString's or KURL's to play sound 2. How to use it to play sounds? diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h index b25085a78..ad1afbed7 100644 --- a/arts/kde/kartsdispatcher.h +++ b/arts/kde/kartsdispatcher.h @@ -61,9 +61,9 @@ namespace Arts * } * \endcode */ -class KDE_EXPORT KArtsDispatcher : public TQObject +class TDE_EXPORT KArtsDispatcher : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** * Constructor. diff --git a/arts/kde/kartsfloatwatch.h b/arts/kde/kartsfloatwatch.h index cc6671556..b8cb229f0 100644 --- a/arts/kde/kartsfloatwatch.h +++ b/arts/kde/kartsfloatwatch.h @@ -44,11 +44,11 @@ namespace Arts { class KFloatWatchProxy_impl; } * \code * StereoVolumeControl stereoVolumeControl = ...; * KArtsFloatWatch *w = new KArtsFloatWatch(stereoVolumeControl, "scaleFactor_changed", this); - * connect(w, TQT_SIGNAL(valueChanged(float)), this, TQT_SLOT(setValue(float))); + * connect(w, TQ_SIGNAL(valueChanged(float)), this, TQ_SLOT(setValue(float))); * \endcode */ class KArtsFloatWatch : public TQObject { - Q_OBJECT + TQ_OBJECT private: KArtsFloatWatchPrivate *d; friend class Arts::KFloatWatchProxy_impl; diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index 3011068ed..d7ad91d65 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -19,9 +19,9 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <flowsystem.h> -#include <ksimpleconfig.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <tqfile.h> #include "kartsserver.h" @@ -68,7 +68,7 @@ Arts::SoundServerV2 KArtsServer::server(void) bool x11Comm = config.readBoolEntry("X11GlobalComm", false); // put the value of x11Comm into .mcoprc - KSimpleConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); + TDESimpleConfig X11CommConfig(TQDir::homeDirPath()+"/.mcoprc"); if(x11Comm) X11CommConfig.writeEntry("GlobalComm", "Arts::X11GlobalComm"); diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h index c0c04e66d..a5346aa06 100644 --- a/arts/kde/kartsserver.h +++ b/arts/kde/kartsserver.h @@ -36,7 +36,7 @@ */ class KDE_ARTS_EXPORT KArtsServer : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/arts/kde/kaudioconverter.cpp b/arts/kde/kaudioconverter.cpp index 1eb8c20e5..e959851f9 100644 --- a/arts/kde/kaudioconverter.cpp +++ b/arts/kde/kaudioconverter.cpp @@ -74,7 +74,7 @@ bool KAudioConverter::setup(int samplingRate) void KAudioConverter::slotMimeType(const TQString &mimeType) { m_mimeType = mimeType; - kapp->exit_loop(); + tdeApp->exit_loop(); } void KAudioConverter::requestPlayObject(const KURL &url) @@ -88,13 +88,13 @@ void KAudioConverter::requestPlayObject(const KURL &url) Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl(); inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl); - TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &))); + TQObject::connect(inputStreamImpl, TQ_SIGNAL(mimeTypeFound(const TQString &)), TQ_SLOT(slotMimeType(const TQString &))); inputStream.openURL(url.url().latin1()); inputStream.streamStart(); // ugly hacks.. :/ - kapp->enter_loop(); + tdeApp->enter_loop(); queryInterface = "Arts::StreamPlayObject"; } @@ -161,9 +161,9 @@ void KAudioConverter::start() Arts::connect(m_incoming->object(), "left", m_request, "left"); Arts::connect(m_incoming->object(), "right", m_request, "right"); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockSize(long)), TQT_SIGNAL(newBlockSize(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockPointer(long)), TQT_SIGNAL(newBlockPointer(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newData()), TQT_SIGNAL(newData())); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockSize(long)), TQ_SIGNAL(newBlockSize(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockPointer(long)), TQ_SIGNAL(newBlockPointer(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newData()), TQ_SIGNAL(newData())); // Special mpeglib case // TODO: needed at all?? diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h index 0022d9bba..773018021 100644 --- a/arts/kde/kaudioconverter.h +++ b/arts/kde/kaudioconverter.h @@ -31,7 +31,7 @@ class TQString; class KAudioConverter : public TQObject { -Q_OBJECT +TQ_OBJECT public: KAudioConverter(); ~KAudioConverter(); diff --git a/arts/kde/kaudioplaystream.h b/arts/kde/kaudioplaystream.h index 6bcbd20ce..106112b6a 100644 --- a/arts/kde/kaudioplaystream.h +++ b/arts/kde/kaudioplaystream.h @@ -40,7 +40,7 @@ class KAudioPlayStreamPrivate; */ class KDE_ARTS_EXPORT KAudioPlayStream : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Creates a KAudioPlayStream on server with a title. You should pass the KArtsServer also diff --git a/arts/kde/kaudioplaystream_p.h b/arts/kde/kaudioplaystream_p.h index a790a8c33..93cb92429 100644 --- a/arts/kde/kaudioplaystream_p.h +++ b/arts/kde/kaudioplaystream_p.h @@ -37,7 +37,7 @@ class KAudioPlayStream; class KByteSoundProducer; class KAudioPlayStreamPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: KAudioPlayStreamPrivate( KArtsServer*, const TQString title, TQObject*, const char* =0 ); ~KAudioPlayStreamPrivate(); diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp index eb08abdb7..02c88411a 100644 --- a/arts/kde/kaudiorecordstream.cpp +++ b/arts/kde/kaudiorecordstream.cpp @@ -66,7 +66,7 @@ KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const TQString & d->inqueue.setAutoDelete( true ); d->title = title; - connect( d->kserver, TQT_SIGNAL( restartedServer() ), TQT_SLOT( slotRestartedServer() ) ); + connect( d->kserver, TQ_SIGNAL( restartedServer() ), TQ_SLOT( slotRestartedServer() ) ); d->in = Arts::DynamicCast( d->kserver->server().createObject( "Arts::Synth_AMAN_RECORD" ) ); d->effectStack = Arts::DynamicCast( d->kserver->server().createObject( "Arts::StereoEffectStack" ) ); @@ -196,8 +196,8 @@ void KAudioRecordStream::start( int samplingRate, int bits, int channels ) d->receiver_base = new KByteSoundReceiver( samplingRate, bits, channels, d->title.local8Bit() ); d->receiver = Arts::ByteSoundReceiver::_from_base( d->receiver_base ); - connect( d->receiver_base, TQT_SIGNAL( data( const char *, unsigned int ) ), - TQT_SLOT( slotData( const char *, unsigned int ) ) ); + connect( d->receiver_base, TQ_SIGNAL( data( const char *, unsigned int ) ), + TQ_SLOT( slotData( const char *, unsigned int ) ) ); Arts::connect( d->convert, "outdata", d->receiver, "indata" ); d->convert.start(); diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h index bbdb6d736..a1e4f1931 100644 --- a/arts/kde/kaudiorecordstream.h +++ b/arts/kde/kaudiorecordstream.h @@ -40,7 +40,7 @@ namespace Arts { class StereoEffectStack; } */ class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/arts/kde/kaudiorecordstream_p.h b/arts/kde/kaudiorecordstream_p.h index 1d38b2278..727f384ec 100644 --- a/arts/kde/kaudiorecordstream_p.h +++ b/arts/kde/kaudiorecordstream_p.h @@ -32,7 +32,7 @@ class KByteSoundReceiver : public TQObject, public Arts::ByteSoundReceiver_skel, public Arts::StdSynthModule { - Q_OBJECT + TQ_OBJECT public: KByteSoundReceiver( int rate, int bits, int channels, const char * title ); diff --git a/arts/kde/kconverttest.cpp b/arts/kde/kconverttest.cpp index 647c2f320..6c5706122 100644 --- a/arts/kde/kconverttest.cpp +++ b/arts/kde/kconverttest.cpp @@ -81,13 +81,13 @@ int main(int argc, char **argv) // converter.setup(44100); converter.requestPlayObject(url); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamStart()), get, TQT_SLOT(slotRawStreamStart())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamStart()), get, TQ_SLOT(slotRawStreamStart())); - TQObject::connect(&converter, TQT_SIGNAL(newBlockSize(long)), get, TQT_SLOT(slotNewBlockSize(long))); - TQObject::connect(&converter, TQT_SIGNAL(newBlockPointer(long)), get, TQT_SLOT(slotNewBlockPointer(long))); - TQObject::connect(&converter, TQT_SIGNAL(newData()), get, TQT_SLOT(slotNewData())); + TQObject::connect(&converter, TQ_SIGNAL(newBlockSize(long)), get, TQ_SLOT(slotNewBlockSize(long))); + TQObject::connect(&converter, TQ_SIGNAL(newBlockPointer(long)), get, TQ_SLOT(slotNewBlockPointer(long))); + TQObject::connect(&converter, TQ_SIGNAL(newData()), get, TQ_SLOT(slotNewData())); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamFinished()), get, TQT_SLOT(slotRawStreamFinished())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamFinished()), get, TQ_SLOT(slotRawStreamFinished())); converter.start(); diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h index 7e7cc6c50..f74b62859 100644 --- a/arts/kde/kconverttest.h +++ b/arts/kde/kconverttest.h @@ -26,7 +26,7 @@ class KConvertTest : public TQObject { -Q_OBJECT +TQ_OBJECT public: KConvertTest(); diff --git a/arts/kde/kdatarequest_impl.h b/arts/kde/kdatarequest_impl.h index 7d90c8b73..4abe72c03 100644 --- a/arts/kde/kdatarequest_impl.h +++ b/arts/kde/kdatarequest_impl.h @@ -32,7 +32,7 @@ namespace Arts class KDataRequest_impl : public TQObject, virtual public KDataRequest_skel, virtual public StdSynthModule { -Q_OBJECT +TQ_OBJECT public: KDataRequest_impl(); ~KDataRequest_impl(); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index d893675cd..38acef54d 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -80,14 +80,14 @@ void TDEIOInputStream_impl::streamStart() m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg"); m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION)); - TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::connect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); m_streamStarted = true; } @@ -98,14 +98,14 @@ void TDEIOInputStream_impl::streamEnd() if(m_job != 0) { - TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::disconnect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::disconnect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::disconnect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::disconnect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); if ( m_streamPulled ) outdata.endPull(); diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 1d18f6421..45bb34cd1 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -35,7 +35,7 @@ class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_s virtual public InputStream_skel, virtual public StdSynthModule { -Q_OBJECT +TQ_OBJECT public: TDEIOInputStream_impl(); ~TDEIOInputStream_impl(); diff --git a/arts/kde/kplayobject.cpp b/arts/kde/kplayobject.cpp index f11c0eb8f..a9b3a8a36 100644 --- a/arts/kde/kplayobject.cpp +++ b/arts/kde/kplayobject.cpp @@ -179,7 +179,7 @@ void KDE::PlayObject::play() if ( d->creator ) delete d->creator; d->creator = new KDE::PlayObjectCreator( d->server ); - d->creator->create( d->url, d->createBUS, this, TQT_SLOT( attachPlayObject( Arts::PlayObject ) ) ); + d->creator->create( d->url, d->createBUS, this, TQ_SLOT( attachPlayObject( Arts::PlayObject ) ) ); kdDebug( 400 ) << "KDE::PlayObject::play(): creator called" << endl; d->internalState = Arts::posPlaying; } diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index f5bd849be..b53ba0003 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -27,9 +27,9 @@ #include <kurl.h> #include <tqobject.h> -class KDE_EXPORT KPlayObject : public TQObject +class TDE_EXPORT KPlayObject : public TQObject { -Q_OBJECT +TQ_OBJECT public: KPlayObject(); KPlayObject(Arts::PlayObject playobject, bool isStream); @@ -185,9 +185,9 @@ class PlayObjectFactory; * internal state until the real Arts::PlayObject got created, afterwards * the state of the Arts::PlayObject will be returned. */ -class KDE_EXPORT PlayObject : public TQObject +class TDE_EXPORT PlayObject : public TQObject { -Q_OBJECT +TQ_OBJECT public: ~PlayObject(); diff --git a/arts/kde/kplayobjectcreator.cpp b/arts/kde/kplayobjectcreator.cpp index 039c8a3bc..4b8f0ba01 100644 --- a/arts/kde/kplayobjectcreator.cpp +++ b/arts/kde/kplayobjectcreator.cpp @@ -44,7 +44,7 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj if (m_server.isNull() || url.isEmpty() ) return false; - connect( this, TQT_SIGNAL( playObjectCreated( Arts::PlayObject ) ), + connect( this, TQ_SIGNAL( playObjectCreated( Arts::PlayObject ) ), receiver, slot ); // check if the URL is a local file @@ -57,8 +57,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj m_instream = Arts::TDEIOInputStream::_from_base(instream_impl); // signal will be called once the ioslave knows the mime-type of the stream - connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)), - this, TQT_SLOT(slotMimeType(const TQString &))); + connect(instream_impl, TQ_SIGNAL(mimeTypeFound(const TQString &)), + this, TQ_SLOT(slotMimeType(const TQString &))); // GO! m_instream.openURL(url.url().latin1()); diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index 74e571c8e..e0935ed22 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -31,7 +31,7 @@ namespace KDE { class PlayObjectCreator : public TQObject { -Q_OBJECT +TQ_OBJECT public: PlayObjectCreator(Arts::SoundServerV2 server); ~PlayObjectCreator(); diff --git a/arts/kde/kplayobjectfactory.cpp b/arts/kde/kplayobjectfactory.cpp index 708fe516e..ef10a925b 100644 --- a/arts/kde/kplayobjectfactory.cpp +++ b/arts/kde/kplayobjectfactory.cpp @@ -179,7 +179,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons d->helper->po = d->playObj; d->helper->ap = d->amanPlay; if( d->playObj->object().isNull() && d->amanPlay ) - TQObject::connect( d->playObj, TQT_SIGNAL( playObjectCreated() ), d->helper, TQT_SLOT( connectAmanPlay() ) ); + TQObject::connect( d->playObj, TQ_SIGNAL( playObjectCreated() ), d->helper, TQ_SLOT( connectAmanPlay() ) ); else d->helper->connectAmanPlay(); } diff --git a/arts/kde/kplayobjectfactory.h b/arts/kde/kplayobjectfactory.h index 9d4e41647..a0bc841c2 100644 --- a/arts/kde/kplayobjectfactory.h +++ b/arts/kde/kplayobjectfactory.h @@ -30,7 +30,7 @@ class KArtsServer; -class KDE_EXPORT KPlayObjectFactory +class TDE_EXPORT KPlayObjectFactory { public: /** @@ -76,7 +76,7 @@ class POFHelper; * use the KDE multimedia framework can be found in the documentation * for KDE::PlayObject. */ -class KDE_EXPORT PlayObjectFactory// : public TQObject ### for KDE4 make it a TQObject to be able to receive signals +class TDE_EXPORT PlayObjectFactory// : public TQObject ### for KDE4 make it a TQObject to be able to receive signals { public: /** diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h index d1eb32a3c..9f4586e18 100644 --- a/arts/kde/kplayobjectfactory_p.h +++ b/arts/kde/kplayobjectfactory_p.h @@ -32,7 +32,7 @@ namespace KDE class POFHelper : public TQObject { friend class PlayObjectFactory; - Q_OBJECT + TQ_OBJECT private slots: void connectAmanPlay(); private: diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index f78c5c5db..618a2ccd5 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -19,7 +19,7 @@ #include <tqaccel.h> #include <tqcursor.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <X11/Xlib.h> #include <X11/Xutil.h> #else @@ -49,7 +49,7 @@ KFullscreenVideoWidget::KFullscreenVideoWidget( KVideoWidget *parent, const char { this->videoWidget = parent; setEraseColor( black ); - setCursor(TQCursor(Qt::BlankCursor)); + setCursor(TQCursor(TQt::BlankCursor)); } void KFullscreenVideoWidget::windowActivationChange( bool ) @@ -62,7 +62,7 @@ void KFullscreenVideoWidget::windowActivationChange( bool ) bool KFullscreenVideoWidget::x11Event( XEvent *event ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (event->type == ClientMessage && event->xclient.message_type == XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False )) @@ -93,7 +93,7 @@ void KVideoWidget::init(void) { setMinimumSize(0, 0); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); fullscreenWidget = 0; poVideo = Arts::VideoPlayObject::null(); @@ -102,16 +102,16 @@ void KVideoWidget::init(void) // Setup actions new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen", - CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()), + CTRL+SHIFT+Key_F, this, TQ_SLOT(fullscreenActivated()), actionCollection(), "fullscreen_mode" ); new TDERadioAction( i18n("&Half Size"), ALT+Key_0, - TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()), + this, TQ_SLOT(halfSizeActivated()), actionCollection(), "half_size" ); new TDERadioAction( i18n("&Normal Size"), ALT+Key_1, - TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()), + this, TQ_SLOT(normalSizeActivated()), actionCollection(), "normal_size" ); new TDERadioAction( i18n("&Double Size"), ALT+Key_2, - TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()), + this, TQ_SLOT(doubleSizeActivated()), actionCollection(), "double_size" ); ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" ); @@ -191,7 +191,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo ) TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY Window root; Pixmap pixmap; XImage *xImage; @@ -213,7 +213,7 @@ TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo ) } // Convert 32bit RGBA image data into Qt image - TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (QRgb *)0, 0, TQImage::IgnoreEndian ).copy(); + TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (TQRgb *)0, 0, TQImage::IgnoreEndian ).copy(); // Free X11 resources and return Qt image XDestroyImage( xImage ); @@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event ) emit mouseButtonPressed( event->button(), pos, event->state() ); // ### Remove in KDE4 - if ( event->button() == Qt::RightButton ) + if ( event->button() == TQt::RightButton ) emit rightButtonPressed( pos ); } @@ -358,7 +358,7 @@ void KVideoWidget::resizeNotify( int width, int height ) bool KVideoWidget::x11Event( XEvent *event ) { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (event->type == ClientMessage && event->xclient.message_type == XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False )) @@ -379,20 +379,20 @@ void KVideoWidget::fullscreenActivated() fullscreenWidget = new KFullscreenVideoWidget( this ); // Interconnect mouse button signals - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); // ### Remove in KDE4 - connect( fullscreenWidget, TQT_SIGNAL(rightButtonPressed(const TQPoint &)), - this, TQT_SIGNAL(rightButtonPressed(const TQPoint &)) ); + connect( fullscreenWidget, TQ_SIGNAL(rightButtonPressed(const TQPoint &)), + this, TQ_SIGNAL(rightButtonPressed(const TQPoint &)) ); // Leave fullscreen mode with <Escape> key TQAccel *a = new TQAccel( fullscreenWidget ); a->connectItem( a->insertItem( Key_Escape ), - this, TQT_SLOT(setWindowed()) ); + this, TQ_SLOT(setWindowed()) ); fullscreenWidget->setFocus(); fullscreenWidget->showFullScreen(); diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h index 0e3881a93..9cd8239a9 100644 --- a/arts/kde/kvideowidget.h +++ b/arts/kde/kvideowidget.h @@ -20,7 +20,7 @@ class KDE_ARTS_EXPORT KVideoWidget : public TQWidget, virtual public KXMLGUIClient { -Q_OBJECT +TQ_OBJECT public: KVideoWidget( KXMLGUIClient *clientParent, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp index d5e8c8642..a4f1430f4 100644 --- a/arts/kde/mcop-dcop/kmcop.cpp +++ b/arts/kde/mcop-dcop/kmcop.cpp @@ -17,7 +17,7 @@ */ #include <kdebug.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> @@ -54,15 +54,15 @@ int main(int argc, char **argv) aboutdata.addAuthor("Nikolas Zimmermann", I18N_NOOP("Author"), "wildfox@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutdata); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if(!KUniqueApplication::start()) + if(!TDEUniqueApplication::start()) { kdDebug() << "Running kmcop found" << endl; return 0; } - KUniqueApplication app; + TDEUniqueApplication app; app.disableSessionManagement(); KArtsDispatcher dispatcher; diff --git a/arts/kde/mcop-dcop/kmcop.h b/arts/kde/mcop-dcop/kmcop.h index 5ffa57bcd..aae0792b3 100644 --- a/arts/kde/mcop-dcop/kmcop.h +++ b/arts/kde/mcop-dcop/kmcop.h @@ -29,7 +29,7 @@ class KMCOPPrivate; class KMCOP : public TQObject, public DCOPObject { -Q_OBJECT +TQ_OBJECT K_DCOP public: diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 101c7967b..85b8f36ba 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -62,9 +62,9 @@ #include <kplayobjectfactory.h> #include <kaudiomanagerplay.h> #endif -#include <kprocess.h> -#include <kstandarddirs.h> -#include <kuniqueapplication.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> +#include <tdeuniqueapplication.h> #include <twin.h> #include "knotify.h" @@ -102,7 +102,7 @@ class KNotifyPrivate #endif extern "C"{ - KDE_EXPORT int kdemain(int argc, char **argv) { + TDE_EXPORT int kdemain(int argc, char **argv) { TDEAboutData aboutdata("knotify", I18N_NOOP("KNotify"), "3.0", I18N_NOOP("TDE Notification Server"), TDEAboutData::License_GPL, "(C) 1997-2003, KDE Developers"); @@ -112,15 +112,15 @@ extern "C"{ aboutdata.addAuthor("Charles Samuels",I18N_NOOP("Previous Maintainer"),"charles@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutdata ); - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); // initialize application - if ( !KUniqueApplication::start() ) { + if ( !TDEUniqueApplication::start() ) { kdDebug() << "Running knotify found" << endl; return 0; } - KUniqueApplication app; + TDEUniqueApplication app; app.disableSessionManagement(); // KNotify is started on KDE startup and on demand (using @@ -247,7 +247,7 @@ KNotify::KNotify( bool useArts ) d->playObjects.setAutoDelete(true); d->audioManager = 0; if( useArts ) { - connect( soundServer, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( restartedArtsd() ) ); + connect( soundServer, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( restartedArtsd() ) ); restartedArtsd(); //started allready need to initialize d->audioManager } #endif @@ -298,7 +298,7 @@ void KNotify::loadConfig() { void KNotify::reconfigure() { - kapp->config()->reparseConfiguration(); + tdeApp->config()->reparseConfiguration(); loadConfig(); // clear loaded config files @@ -530,7 +530,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( !d->playTimer ) { d->playTimer = new TQTimer( this ); - connect( d->playTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( playTimeout() ) ); + connect( d->playTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( playTimeout() ) ); } if ( !d->playTimer->isActive() ) { d->playTimer->start( 1000 ); @@ -543,7 +543,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int TDEProcess *proc = d->externalPlayerProc; if (!proc) { proc = d->externalPlayerProc = new TDEProcess; - connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * )), TQ_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { soundFinished( eventId, PlayerBusy ); @@ -756,12 +756,12 @@ void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason ) WId KNotify::checkWinId( const TQString &appName, WId senderWinId ) { if ( senderWinId == 0 ) { - TQCString senderId = kapp->dcopClient()->senderId(); + TQCString senderId = tdeApp->dcopClient()->senderId(); TQCString compare = (appName + "-mainwindow").latin1(); int len = compare.length(); // kdDebug() << "notifyByPassivePopup: appName=" << appName << " sender=" << senderId << endl; - QCStringList objs = kapp->dcopClient()->remoteObjects( senderId ); + QCStringList objs = tdeApp->dcopClient()->remoteObjects( senderId ); for (QCStringList::ConstIterator it = objs.begin(); it != objs.end(); ++it ) { TQCString obj( *it ); if ( obj.left(len) == compare) { @@ -769,7 +769,7 @@ WId KNotify::checkWinId( const TQString &appName, WId senderWinId ) TQCString replyType; TQByteArray data, replyData; - if ( kapp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) { + if ( tdeApp->dcopClient()->call(senderId, obj, "getWinID()", data, replyType, replyData) ) { TQDataStream answer(replyData, IO_ReadOnly); if (replyType == "int") { answer >> senderWinId; diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index 8348f3d40..b74fca3b2 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -30,7 +30,7 @@ class TDEConfig; class KNotify : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: |