summaryrefslogtreecommitdiffstats
path: root/kdesktop/kwebdesktop/kwebdesktop.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kdesktop/kwebdesktop/kwebdesktop.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/kwebdesktop/kwebdesktop.cpp')
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index e845750a1..58fd0b7b8 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -51,16 +51,16 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url )
: m_webDesktop(webDesktop), m_url(url)
{
kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl;
- KIO::Job * job = KIO::get(m_url, false, false);
- connect( job, TQT_SIGNAL( result( KIO::Job *)),
- this, TQT_SLOT( slotFinished(KIO::Job *)));
- connect( job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &)),
- this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &)));
+ TDEIO::Job * job = TDEIO::get(m_url, false, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
+ this, TQT_SLOT( slotFinished(TDEIO::Job *)));
+ connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+ this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
}
-void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type )
+void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type )
{
- KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job);
+ TDEIO::SimpleJob *sjob = static_cast<TDEIO::SimpleJob *>(job);
// Update our URL in case of a redirection
m_url = sjob->url();
TQString type = _type; // necessary copy if we plan to use it
@@ -73,7 +73,7 @@ void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type )
part->openURL( m_url );
}
-void KWebDesktopRun::slotFinished( KIO::Job * job )
+void KWebDesktopRun::slotFinished( TDEIO::Job * job )
{
// The whole point of all this is to abort silently on error
if (job->error())
@@ -126,7 +126,7 @@ int main( int argc, char **argv )
int ret = app.exec();
- KIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
+ TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
delete webDesktop;
delete run;
//khtml::Cache::clear();