From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- arts/kde/kartsserver.cpp | 2 +- arts/kde/kioinputstream_impl.cpp | 42 ++++++++++++++++++++-------------------- arts/kde/kioinputstream_impl.h | 12 ++++++------ arts/kde/kplayobjectfactory.cc | 4 ++-- arts/knotify/knotify.cpp | 32 +++++++++++++++--------------- arts/knotify/knotify.h | 4 ++-- 6 files changed, 48 insertions(+), 48 deletions(-) (limited to 'arts') diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index 50a2ae462..cd97d0cc5 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -59,7 +59,7 @@ Arts::SoundServerV2 KArtsServer::server(void) // aRts seems not to be running, let's try to run it // First, let's read the configuration as in kcmarts - KConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); + TDEConfig config("kcmartsrc", false /*bReadOnly*/, false /*bUseKDEGlobals*/); TDEProcess proc; config.setGroup("Arts"); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index 8c131bfd1..ab215a585 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -75,19 +75,19 @@ void KIOInputStream_impl::streamStart() if(m_job != 0) m_job->kill(); - m_job = KIO::get(m_url, false, false); + m_job = TDEIO::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)); - TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - TQObject::connect(m_job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotResult(KIO::Job *))); - TQObject::connect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &))); - TQObject::connect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t))); + 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))); m_streamStarted = true; } @@ -98,14 +98,14 @@ void KIOInputStream_impl::streamEnd() if(m_job != 0) { - TQObject::disconnect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - TQObject::disconnect(m_job, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotResult(KIO::Job *))); - TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(KIO::Job *, const TQString &))); - TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( KIO::Job *, KIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t))); + 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))); if ( m_streamPulled ) outdata.endPull(); @@ -124,7 +124,7 @@ bool KIOInputStream_impl::openURL(const std::string& url) return true; } -void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data) +void KIOInputStream_impl::slotData(TDEIO::Job *, const TQByteArray &data) { if(m_finished) m_finished = false; @@ -136,7 +136,7 @@ void KIOInputStream_impl::slotData(KIO::Job *, const TQByteArray &data) processQueue(); } -void KIOInputStream_impl::slotResult(KIO::Job *job) +void KIOInputStream_impl::slotResult(TDEIO::Job *job) { // jobs delete themselves after emitting their result m_finished = true; @@ -151,13 +151,13 @@ void KIOInputStream_impl::slotResult(KIO::Job *job) } } -void KIOInputStream_impl::slotScanMimeType(KIO::Job *, const TQString &mimetype) +void KIOInputStream_impl::slotScanMimeType(TDEIO::Job *, const TQString &mimetype) { kdDebug( 400 ) << "got mimetype: " << mimetype << endl; emit mimeTypeFound(mimetype); } -void KIOInputStream_impl::slotTotalSize(KIO::Job *, KIO::filesize_t size) +void KIOInputStream_impl::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size) { m_size = size; } diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h index 5377fc808..06052e04b 100644 --- a/arts/kde/kioinputstream_impl.h +++ b/arts/kde/kioinputstream_impl.h @@ -62,14 +62,14 @@ signals: void mimeTypeFound(const TQString & mimetype); private slots: - void slotData(KIO::Job *, const TQByteArray &); - void slotResult(KIO::Job *); - void slotScanMimeType(KIO::Job *, const TQString &mimetype); - void slotTotalSize(KIO::Job *, KIO::filesize_t size); + void slotData(TDEIO::Job *, const TQByteArray &); + void slotResult(TDEIO::Job *); + void slotScanMimeType(TDEIO::Job *, const TQString &mimetype); + void slotTotalSize(TDEIO::Job *, TDEIO::filesize_t size); private: KURL m_url; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; TQByteArray m_data; bool m_finished; bool m_firstBuffer; @@ -79,7 +79,7 @@ private: unsigned int m_packetBuffer; const unsigned int m_packetSize; - KIO::filesize_t m_size; + TDEIO::filesize_t m_size; static const unsigned int PACKET_COUNT; }; diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc index 29ee20e3d..c09692946 100644 --- a/arts/kde/kplayobjectfactory.cc +++ b/arts/kde/kplayobjectfactory.cc @@ -69,7 +69,7 @@ KPlayObject *KPlayObjectFactory::createPlayObject(const KURL& _url, const TQStri // I hate it // It sucks // kio_media please die - KURL url = KIO::NetAccess::mostLocalURL(_url, 0); + KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0); if(!m_server.isNull()) { @@ -140,7 +140,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons // I hate it // It sucks // kio_media please die - KURL url = KIO::NetAccess::mostLocalURL(_url, 0); + KURL url = TDEIO::NetAccess::mostLocalURL(_url, 0); // return a NULL playobject if the server is NULL if ( d->server.isNull() || url.isEmpty() ) diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 5ff633516..b8c1642f9 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -73,10 +73,10 @@ class KNotifyPrivate { public: - KConfig* globalEvents; - KConfig* globalConfig; - TQMap events; - TQMap configs; + TDEConfig* globalEvents; + TDEConfig* globalConfig; + TQMap events; + TQMap configs; TQString externalPlayer; TDEProcess *externalPlayerProc; @@ -136,8 +136,8 @@ KDE_EXPORT int kdemain(int argc, char **argv) // abort this. #ifndef WITHOUT_ARTS - KConfigGroup config( TDEGlobal::config(), "StartProgress" ); - KConfig artsKCMConfig( "kcmartsrc" ); + TDEConfigGroup config( TDEGlobal::config(), "StartProgress" ); + TDEConfig artsKCMConfig( "kcmartsrc" ); artsKCMConfig.setGroup( "Arts" ); bool useArts = artsKCMConfig.readBoolEntry( "StartServer", true ); if (useArts) @@ -245,8 +245,8 @@ KNotify::KNotify( bool useArts ) : TQObject(), DCOPObject("Notify") { d = new KNotifyPrivate; - d->globalEvents = new KConfig("knotify/eventsrc", true, false, "data"); - d->globalConfig = new KConfig("knotify.eventsrc", true, false); + d->globalEvents = new TDEConfig("knotify/eventsrc", true, false, "data"); + d->globalConfig = new TDEConfig("knotify.eventsrc", true, false); d->externalPlayerProc = 0; d->useArts = useArts; d->inStartup = true; @@ -285,7 +285,7 @@ KNotify::~KNotify() void KNotify::loadConfig() { // load external player settings - KConfig *kc = TDEGlobal::config(); + TDEConfig *kc = TDEGlobal::config(); kc->setGroup("Misc"); d->useExternal = kc->readBoolEntry( "Use external player", false ); d->externalPlayer = kc->readPathEntry("External player"); @@ -313,7 +313,7 @@ void KNotify::reconfigure() // clear loaded config files d->globalConfig->reparseConfiguration(); - for ( TQMapIterator it = d->configs.begin(); it != d->configs.end(); ++it ) + for ( TQMapIterator it = d->configs.begin(); it != d->configs.end(); ++it ) delete it.data(); d->configs.clear(); } @@ -344,8 +344,8 @@ void KNotify::notify(const TQString &event, const TQString &fromApp, } TQString commandline; - KConfig *eventsFile = NULL; - KConfig *configFile = NULL; + TDEConfig *eventsFile = NULL; + TDEConfig *configFile = NULL; // check for valid events if ( !event.isEmpty() ) { @@ -354,13 +354,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp, if ( d->events.contains( fromApp ) ) { eventsFile = d->events[fromApp]; } else { - eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false); + eventsFile=new TDEConfig(locate("data", fromApp+"/eventsrc"),true,false); d->events.insert( fromApp, eventsFile ); } if ( d->configs.contains( fromApp) ) { configFile = d->configs[fromApp]; } else { - configFile=new KConfig(fromApp+".eventsrc",true,false); + configFile=new TDEConfig(fromApp+".eventsrc",true,false); d->configs.insert( fromApp, configFile ); } @@ -588,12 +588,12 @@ bool KNotify::notifyByMessagebox(const TQString &text, int level, WId winId) bool KNotify::notifyByPassivePopup( const TQString &text, const TQString &appName, - KConfig* eventsFile, + TDEConfig* eventsFile, WId senderWinId ) { KIconLoader iconLoader( appName ); if ( eventsFile != NULL ) { - KConfigGroup config( eventsFile, "!Global!" ); + TDEConfigGroup config( eventsFile, "!Global!" ); TQString iconName = config.readEntry( "IconName", appName ); TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small ); TQString title = config.readEntry( "Comment", appName ); diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h index a6fec6747..410821af8 100644 --- a/arts/knotify/knotify.h +++ b/arts/knotify/knotify.h @@ -26,7 +26,7 @@ class KNotifyPrivate; class TDEProcess; -class KConfig; +class TDEConfig; class KNotify : public TQObject, public DCOPObject { @@ -75,7 +75,7 @@ private: bool notifyByLogfile(const TQString &text, const TQString &file); bool notifyByStderr(const TQString &text); bool notifyByPassivePopup(const TQString &text, const TQString &appName, - KConfig* eventsFile, WId winId ); + TDEConfig* eventsFile, WId winId ); bool notifyByExecute(const TQString &command, const TQString& event, const TQString& fromApp, -- cgit v1.2.1