summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
Diffstat (limited to 'arts')
-rw-r--r--arts/kde/kartsdispatcher.h2
-rw-r--r--arts/kde/kartsserver.cpp6
-rw-r--r--arts/kde/kartsserver.h2
-rw-r--r--arts/kde/kaudioconverter.h2
-rw-r--r--arts/kde/kaudiorecordstream.h2
-rw-r--r--arts/kde/kconverttest.h2
-rw-r--r--arts/kde/kioinputstream_impl.cpp4
-rw-r--r--arts/kde/kplayobject.cc8
-rw-r--r--arts/kde/kplayobject.h4
-rw-r--r--arts/kde/kplayobjectcreator.h2
-rw-r--r--arts/kde/kplayobjectfactory.cc4
-rw-r--r--arts/kde/kplayobjectfactory_p.h2
-rw-r--r--arts/kde/kvideowidget.cpp18
-rw-r--r--arts/kde/kvideowidget.h2
-rw-r--r--arts/knotify/knotify.cpp14
15 files changed, 37 insertions, 37 deletions
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..a1b75e2f5 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"))).data();
if(rt)
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
else
- proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));
+ proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
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 <kretz@kde.org>
* @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 <tqobject.h>
-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..15994625e 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 &)));
@@ -213,7 +213,7 @@ void KIOInputStream_impl::processQueue()
void KIOInputStream_impl::request_outdata(DataPacket<mcopbyte> *packet)
{
processQueue();
- packet->size = std::min(m_packetSize, m_data.size());
+ packet->size = std::min(m_packetSize, (unsigned int)m_data.size());
kdDebug( 400 ) << "STREAMING: Filling one DataPacket with " << packet->size << " bytes of the stream!" << endl;
if (!m_finished) {
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 <kurl.h>
#include <tqobject.h>
-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..3e83d54da 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 );
@@ -202,7 +202,7 @@ TQStringList KDE::PlayObjectFactory::mimeTypes(void)
for(vector<string>::iterator mimetype = mimetypes->begin();
mimetype != mimetypes->end(); ++mimetype)
{
- TQString name = TQString::fromLocal8Bit((*mimetype).c_str()).stripWhiteSpace();
+ TQString name = TQString(TQString::fromLocal8Bit((*mimetype).c_str())).stripWhiteSpace();
if(KMimeType::mimeType(name))
results.append(name);
}
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..3f7193166 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -92,8 +92,8 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
void KVideoWidget::init(void)
{
setMinimumSize(0, 0);
- setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
- setFocusPolicy( ClickFocus );
+ tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ setFocusPolicy( TQ_ClickFocus );
fullscreenWidget = 0;
poVideo = Arts::VideoPlayObject::null();
@@ -102,16 +102,16 @@ void KVideoWidget::init(void)
// Setup actions
new KToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
- CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()),
+ CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
actionCollection(), "fullscreen_mode" );
new KRadioAction( i18n("&Half Size"), ALT+Key_0,
- this, TQT_SLOT(halfSizeActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
actionCollection(), "half_size" );
new KRadioAction( i18n("&Normal Size"), ALT+Key_1,
- this, TQT_SLOT(normalSizeActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
actionCollection(), "normal_size" );
new KRadioAction( i18n("&Double Size"), ALT+Key_2,
- this, TQT_SLOT(doubleSizeActivated()),
+ TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
actionCollection(), "double_size" );
((KToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@@ -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 );
}
@@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event )
emit mouseButtonPressed( event->button(), pos, event->state() );
// ### Remove in KDE4
- if ( event->button() == RightButton )
+ if ( event->button() == Qt::RightButton )
emit rightButtonPressed( pos );
}
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;
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index ea20608ba..40d85d460 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
if ( !event.isEmpty() ) {
// get config file
- if ( d->events.contains( fromApp ) ) {
+ if ( d->events.tqcontains( fromApp ) ) {
eventsFile = d->events[fromApp];
} else {
eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
d->events.insert( fromApp, eventsFile );
}
- if ( d->configs.contains( fromApp) ) {
+ if ( d->configs.tqcontains( fromApp) ) {
configFile = d->configs[fromApp];
} else {
configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -550,7 +550,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
return false; // Skip
}
proc->clearArguments();
- (*proc) << d->externalPlayer << TQFile::encodeName( soundFile );
+ (*proc) << d->externalPlayer << TQFile::encodeName( soundFile ).data();
d->externalPlayerEventId = eventId;
proc->start(KProcess::NotifyOnExit);
return true;
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
// append msg
TQTextStream strm( &logFile );
- strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+ strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
// close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
TQTextStream strm( stderr, IO_WriteOnly );
// output msg
- strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+ strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << text << endl;
return true;
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
++it;
if ( (*current)->state() != Arts::posPlaying )
{
- TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
+ TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
if ( eit != d->playObjectEventMap.end() )
{
soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
void KNotify::abortFirstPlayObject()
{
#ifndef WITHOUT_ARTS
- TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
+ TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
if ( it != d->playObjectEventMap.end() )
{
soundFinished( it.data(), Aborted );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 12:58:35 +0000