From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- arts/kde/kartsdispatcher.h | 2 +- arts/kde/kartsserver.cpp | 6 +++--- arts/kde/kartsserver.h | 2 +- arts/kde/kaudioconverter.h | 2 +- arts/kde/kaudiorecordstream.h | 2 +- arts/kde/kconverttest.h | 2 +- arts/kde/kioinputstream_impl.cpp | 2 +- arts/kde/kplayobject.cc | 8 ++++---- arts/kde/kplayobject.h | 4 ++-- arts/kde/kplayobjectcreator.h | 2 +- arts/kde/kplayobjectfactory.cc | 2 +- arts/kde/kplayobjectfactory_p.h | 2 +- arts/kde/kvideowidget.cpp | 6 +++--- arts/kde/kvideowidget.h | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) (limited to 'arts/kde') diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h index dcd094844..26eb115d9 100644 --- a/arts/kde/kartsdispatcher.h +++ b/arts/kde/kartsdispatcher.h @@ -61,7 +61,7 @@ namespace Arts * } * \endcode */ -class KDE_EXPORT KArtsDispatcher : public QObject +class KDE_EXPORT KArtsDispatcher : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index ee220be17..b4c3f963b 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void) X11CommConfig.sync(); - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper"))); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))); if(rt) - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))); else - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))); proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) ); diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h index c01829cf1..0735e2082 100644 --- a/arts/kde/kartsserver.h +++ b/arts/kde/kartsserver.h @@ -34,7 +34,7 @@ * artsd on KDE startup, but at the very least there will always be third * party PlayObjects that will crash. So, this is necessary. */ -class KDE_ARTS_EXPORT KArtsServer : public QObject +class KDE_ARTS_EXPORT KArtsServer : public TQObject { Q_OBJECT diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h index 21876e037..0022d9bba 100644 --- a/arts/kde/kaudioconverter.h +++ b/arts/kde/kaudioconverter.h @@ -29,7 +29,7 @@ class KURL; class TQString; -class KAudioConverter : public QObject +class KAudioConverter : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h index fdd4353fe..8caab8325 100644 --- a/arts/kde/kaudiorecordstream.h +++ b/arts/kde/kaudiorecordstream.h @@ -38,7 +38,7 @@ namespace Arts { class StereoEffectStack; } * @author Matthias Kretz * @since 3.2 */ -class KDE_ARTS_EXPORT KAudioRecordStream : public QObject +class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject { Q_OBJECT diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h index 1d0b10f87..7e7cc6c50 100644 --- a/arts/kde/kconverttest.h +++ b/arts/kde/kconverttest.h @@ -24,7 +24,7 @@ #include -class KConvertTest : public QObject +class KConvertTest : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index f7df6347c..e88d5a3c0 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart() m_job = KIO::get(m_url, false, false); m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg"); - m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION)); + m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION)); TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cc index becb20a58..7c71be31f 100644 --- a/arts/kde/kplayobject.cc +++ b/arts/kde/kplayobject.cc @@ -65,7 +65,7 @@ void KPlayObject::halt() TQString KPlayObject::description() { - return TQString::fromLatin1(object().description().c_str()); + return TQString::tqfromLatin1(object().description().c_str()); } Arts::poTime KPlayObject::currentTime() @@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities() TQString KPlayObject::mediaName() { - return TQString::fromLatin1(object().mediaName().c_str()); + return TQString::tqfromLatin1(object().mediaName().c_str()); } Arts::poState KPlayObject::state() @@ -243,7 +243,7 @@ TQString KDE::PlayObject::description() { if ( object().isNull() ) return TQString(); - return TQString::fromLatin1(object().description().c_str()); + return TQString::tqfromLatin1(object().description().c_str()); } Arts::poTime KDE::PlayObject::currentTime() @@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName() { if ( object().isNull() ) return TQString(); - return TQString::fromLatin1(object().mediaName().c_str()); + return TQString::tqfromLatin1(object().mediaName().c_str()); } Arts::poState KDE::PlayObject::state() diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h index 907723cf3..4aafe0b58 100644 --- a/arts/kde/kplayobject.h +++ b/arts/kde/kplayobject.h @@ -27,7 +27,7 @@ #include #include -class KDE_EXPORT KPlayObject : public QObject +class KDE_EXPORT KPlayObject : public TQObject { Q_OBJECT public: @@ -185,7 +185,7 @@ 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 QObject +class KDE_EXPORT PlayObject : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h index f012de2cd..d52e18a1e 100644 --- a/arts/kde/kplayobjectcreator.h +++ b/arts/kde/kplayobjectcreator.h @@ -29,7 +29,7 @@ namespace KDE { -class PlayObjectCreator : public QObject +class PlayObjectCreator : public TQObject { Q_OBJECT public: diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index 99a2e2edb..c02b896a5 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons } // decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd - if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) ) + if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) ) { // we rely on the delivered mimetype if it's a local file d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false ); diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h index f81349251..6d4b1fa26 100644 --- a/arts/kde/kplayobjectfactory_p.h +++ b/arts/kde/kplayobjectfactory_p.h @@ -29,7 +29,7 @@ namespace KDE /** * @internal */ -class POFHelper : public QObject +class POFHelper : public TQObject { friend class PlayObjectFactory; Q_OBJECT diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index 6aeeb8e8f..cea85bd2c 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -92,7 +92,7 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f ) void KVideoWidget::init(void) { setMinimumSize(0, 0); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setFocusPolicy( ClickFocus ); fullscreenWidget = 0; @@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo ) } setBackgroundMode( PaletteBackground ); - repaint(); + tqrepaint(); // Resize GUI videoWidth = 0; @@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize() doubleSizeActivated(); } -TQSize KVideoWidget::sizeHint() const +TQSize KVideoWidget::tqsizeHint() const { return TQSize( videoWidth, videoHeight ); } diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h index 0e3881a93..734fe4b01 100644 --- a/arts/kde/kvideowidget.h +++ b/arts/kde/kvideowidget.h @@ -36,7 +36,7 @@ public: bool isNormalSize(); bool isDoubleSize(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; virtual int heightForWidth ( int w ) const; -- cgit v1.2.3