diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:32:59 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:32:59 -0600 |
commit | 2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d (patch) | |
tree | ea24a96bad3bb7356ec1a2dca2a1338692d79745 /atlantik | |
parent | d6f3812c8d969a673b420beca2482804177704fb (diff) | |
download | tdegames-2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d.tar.gz tdegames-2f84d0e2d3d4252e6aee24aceafa45dbdb7f4d1d.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'atlantik')
-rw-r--r-- | atlantik/client/atlantik.cpp | 6 | ||||
-rw-r--r-- | atlantik/client/atlantik.h | 2 | ||||
-rw-r--r-- | atlantik/client/monopigator.cpp | 10 | ||||
-rw-r--r-- | atlantik/client/monopigator.h | 6 | ||||
-rw-r--r-- | atlantik/kio_atlantik/kio_atlantik.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index fbdba102..ff93cafe 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -212,7 +212,7 @@ Atlantik::Atlantik () void Atlantik::readConfig() { // Read configuration settings - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); // General configuration config->setGroup("General"); @@ -508,7 +508,7 @@ void Atlantik::configureNotifications() void Atlantik::slotUpdateConfig() { - KConfig *config=kapp->config(); + TDEConfig *config=kapp->config(); bool optBool, configChanged = false; TQString optStr; @@ -761,7 +761,7 @@ void Atlantik::initNetworkObject() void Atlantik::clientCookie(TQString cookie) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); if (cookie.isNull()) { diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h index 60ebb978..76e716b8 100644 --- a/atlantik/client/atlantik.h +++ b/atlantik/client/atlantik.h @@ -102,7 +102,7 @@ public: Atlantik(); /** - * Read the configuration settings using KConfig. + * Read the configuration settings using TDEConfig. * */ void readConfig(); diff --git a/atlantik/client/monopigator.cpp b/atlantik/client/monopigator.cpp index 7e0a834d..178c1a54 100644 --- a/atlantik/client/monopigator.cpp +++ b/atlantik/client/monopigator.cpp @@ -45,7 +45,7 @@ void Monopigator::loadData(const KURL &url) m_downloadData->open(IO_WriteOnly); m_downloadData->reset(); - m_job = KIO::get(url, true, false); + m_job = TDEIO::get(url, true, false); m_job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING)); if (!m_timer) @@ -54,18 +54,18 @@ void Monopigator::loadData(const KURL &url) m_timer->start(10000, true); } - connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - connect(m_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *))); + connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); } -void Monopigator::slotData(KIO::Job *, const TQByteArray &data) +void Monopigator::slotData(TDEIO::Job *, const TQByteArray &data) { m_timer->stop(); m_downloadData->writeBlock(data.data(), data.size()); } -void Monopigator::slotResult(KIO::Job *job) +void Monopigator::slotResult(TDEIO::Job *job) { processData(m_downloadData->buffer(), !job->error()); m_job = 0; diff --git a/atlantik/client/monopigator.h b/atlantik/client/monopigator.h index 519e3d6b..1a16943f 100644 --- a/atlantik/client/monopigator.h +++ b/atlantik/client/monopigator.h @@ -44,8 +44,8 @@ signals: void timeout(); private slots: - void slotData(KIO::Job *, const TQByteArray &); - void slotResult(KIO::Job *); + void slotData(TDEIO::Job *, const TQByteArray &); + void slotResult(TDEIO::Job *); void slotTimeout(); private: @@ -53,7 +53,7 @@ private: TQBuffer *m_downloadData; TQTimer *m_timer; - KIO::Job *m_job; + TDEIO::Job *m_job; }; class MonopigatorEntry : public TQObject, public TQListViewItem diff --git a/atlantik/kio_atlantik/kio_atlantik.h b/atlantik/kio_atlantik/kio_atlantik.h index de1804e8..8c109ec2 100644 --- a/atlantik/kio_atlantik/kio_atlantik.h +++ b/atlantik/kio_atlantik/kio_atlantik.h @@ -14,7 +14,7 @@ // the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, // Boston, MA 02110-1301, USA. -class AtlantikProtocol : public KIO::SlaveBase +class AtlantikProtocol : public TDEIO::SlaveBase { public: AtlantikProtocol( const TQCString &pool, const TQCString &app) : SlaveBase( "atlantik", pool, app ) {} |