summaryrefslogtreecommitdiffstats
path: root/src/kmplayerprocess.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:08:09 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:08:09 -0600
commit75cf20e5d10de7b6ab506bd1ad6321c77ff1ad5c (patch)
treeeee3e440800d8fe8d3989b919dd349401cd37282 /src/kmplayerprocess.cpp
parenta34aeb25a3006e5a708ec955159226e8b197dc27 (diff)
downloadkmplayer-75cf20e5d10de7b6ab506bd1ad6321c77ff1ad5c.tar.gz
kmplayer-75cf20e5d10de7b6ab506bd1ad6321c77ff1ad5c.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/kmplayerprocess.cpp')
-rw-r--r--src/kmplayerprocess.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index ff230a9..3f258d4 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -212,8 +212,8 @@ bool Process::play (Source * src, NodePtr _mrl) {
if (!changed || KURL (m_url).isLocalFile ())
return deMediafiedPlay ();
m_url = url;
- m_job = KIO::stat (m_url, false);
- connect(m_job, TQT_SIGNAL (result(KIO::Job *)), this, TQT_SLOT(result(KIO::Job *)));
+ m_job = TDEIO::stat (m_url, false);
+ connect(m_job, TQT_SIGNAL (result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *)));
return true;
#else
return deMediafiedPlay ();
@@ -224,12 +224,12 @@ bool Process::deMediafiedPlay () {
return false;
}
-void Process::result (KIO::Job * job) {
+void Process::result (TDEIO::Job * job) {
#if KDE_IS_VERSION(3,3,91)
- KIO::UDSEntry entry = static_cast <KIO::StatJob *> (job)->statResult ();
- KIO::UDSEntry::iterator e = entry.end ();
- for (KIO::UDSEntry::iterator it = entry.begin (); it != e; ++it)
- if ((*it).m_uds == KIO::UDS_LOCAL_PATH) {
+ TDEIO::UDSEntry entry = static_cast <TDEIO::StatJob *> (job)->statResult ();
+ TDEIO::UDSEntry::iterator e = entry.end ();
+ for (TDEIO::UDSEntry::iterator it = entry.begin (); it != e; ++it)
+ if ((*it).m_uds == TDEIO::UDS_LOCAL_PATH) {
m_url = KURL::fromPathOrURL ((*it).m_str).url ();
break;
}
@@ -926,7 +926,7 @@ KDE_NO_CDTOR_EXPORT MPlayerPreferencesPage::MPlayerPreferencesPage (MPlayer * p)
: m_process (p), m_configframe (0L) {
}
-KDE_NO_EXPORT void MPlayerPreferencesPage::write (KConfig * config) {
+KDE_NO_EXPORT void MPlayerPreferencesPage::write (TDEConfig * config) {
config->setGroup (strMPlayerPatternGroup);
for (int i = 0; i < int (pat_last); i++)
config->writeEntry
@@ -938,7 +938,7 @@ KDE_NO_EXPORT void MPlayerPreferencesPage::write (KConfig * config) {
config->writeEntry (strAlwaysBuildIndex, alwaysbuildindex);
}
-KDE_NO_EXPORT void MPlayerPreferencesPage::read (KConfig * config) {
+KDE_NO_EXPORT void MPlayerPreferencesPage::read (TDEConfig * config) {
config->setGroup (strMPlayerPatternGroup);
for (int i = 0; i < int (pat_last); i++)
m_patterns[i].setPattern (config->readEntry
@@ -1589,10 +1589,10 @@ KDE_NO_EXPORT void XMLPreferencesFrame::showEvent (TQShowEvent *) {
m_process->getConfigData ();
}
-KDE_NO_EXPORT void XMLPreferencesPage::write (KConfig *) {
+KDE_NO_EXPORT void XMLPreferencesPage::write (TDEConfig *) {
}
-KDE_NO_EXPORT void XMLPreferencesPage::read (KConfig *) {
+KDE_NO_EXPORT void XMLPreferencesPage::read (TDEConfig *) {
}
KDE_NO_EXPORT void XMLPreferencesPage::sync (bool fromUI) {
@@ -2031,18 +2031,18 @@ KDE_NO_EXPORT void NpStream::open () {
finish_reason = BecauseDone;
emit stateChanged ();
} else {
- job = KIO::get (url, false, false);
+ job = TDEIO::get (url, false, false);
job->addMetaData ("errorPage", "false");
- connect (job, TQT_SIGNAL (data (KIO::Job *, const TQByteArray &)),
- this, TQT_SLOT (slotData (KIO::Job *, const TQByteArray &)));
- connect (job, TQT_SIGNAL (result (KIO::Job *)),
- this, TQT_SLOT (slotResult (KIO::Job *)));
- connect (job, TQT_SIGNAL (redirection (KIO::Job *, const KURL &)),
- this, TQT_SLOT (redirection (KIO::Job *, const KURL &)));
- connect (job, TQT_SIGNAL (mimetype (KIO::Job *, const TQString &)),
- TQT_SLOT (slotMimetype (KIO::Job *, const TQString &)));
- connect (job, TQT_SIGNAL (totalSize (KIO::Job *, KIO::filesize_t)),
- TQT_SLOT (slotTotalSize (KIO::Job *, KIO::filesize_t)));
+ connect (job, TQT_SIGNAL (data (TDEIO::Job *, const TQByteArray &)),
+ this, TQT_SLOT (slotData (TDEIO::Job *, const TQByteArray &)));
+ connect (job, TQT_SIGNAL (result (TDEIO::Job *)),
+ this, TQT_SLOT (slotResult (TDEIO::Job *)));
+ connect (job, TQT_SIGNAL (redirection (TDEIO::Job *, const KURL &)),
+ this, TQT_SLOT (redirection (TDEIO::Job *, const KURL &)));
+ connect (job, TQT_SIGNAL (mimetype (TDEIO::Job *, const TQString &)),
+ TQT_SLOT (slotMimetype (TDEIO::Job *, const TQString &)));
+ connect (job, TQT_SIGNAL (totalSize (TDEIO::Job *, TDEIO::filesize_t)),
+ TQT_SLOT (slotTotalSize (TDEIO::Job *, TDEIO::filesize_t)));
}
}
@@ -2055,14 +2055,14 @@ KDE_NO_EXPORT void NpStream::close () {
}
}
-KDE_NO_EXPORT void NpStream::slotResult (KIO::Job *jb) {
+KDE_NO_EXPORT void NpStream::slotResult (TDEIO::Job *jb) {
kdDebug() << "slotResult " << bytes << " err:" << jb->error () << endl;
finish_reason = jb->error () ? BecauseError : BecauseDone;
- job = 0L; // signal KIO::Job::result deletes itself
+ job = 0L; // signal TDEIO::Job::result deletes itself
emit stateChanged ();
}
-KDE_NO_EXPORT void NpStream::slotData (KIO::Job*, const TQByteArray& qb) {
+KDE_NO_EXPORT void NpStream::slotData (TDEIO::Job*, const TQByteArray& qb) {
pending_buf = qb; // we suspend job, so qb should be valid until resume
if (qb.size()) {
job->suspend ();
@@ -2071,16 +2071,16 @@ KDE_NO_EXPORT void NpStream::slotData (KIO::Job*, const TQByteArray& qb) {
}
}
-KDE_NO_EXPORT void NpStream::redirection (KIO::Job *, const KURL &u) {
+KDE_NO_EXPORT void NpStream::redirection (TDEIO::Job *, const KURL &u) {
url = u;
emit redirected (stream_id, url);
}
-void NpStream::slotMimetype (KIO::Job *, const TQString &mime) {
+void NpStream::slotMimetype (TDEIO::Job *, const TQString &mime) {
mimetype = mime;
}
-void NpStream::slotTotalSize (KIO::Job *, KIO::filesize_t sz) {
+void NpStream::slotTotalSize (TDEIO::Job *, TDEIO::filesize_t sz) {
content_length = sz;
}
@@ -2537,11 +2537,11 @@ NpStream::NpStream (TQObject *p, TQ_UINT32, const KURL & url)
: TQObject (p) {}
KDE_NO_CDTOR_EXPORT NpStream::~NpStream () {}
-void NpStream::slotResult (KIO::Job*) {}
-void NpStream::slotData (KIO::Job*, const TQByteArray&) {}
-void NpStream::redirection (KIO::Job *, const KURL &) {}
-void NpStream::slotMimetype (KIO::Job *, const TQString &) {}
-void NpStream::slotTotalSize (KIO::Job *, KIO::filesize_t) {}
+void NpStream::slotResult (TDEIO::Job*) {}
+void NpStream::slotData (TDEIO::Job*, const TQByteArray&) {}
+void NpStream::redirection (TDEIO::Job *, const KURL &) {}
+void NpStream::slotMimetype (TDEIO::Job *, const TQString &) {}
+void NpStream::slotTotalSize (TDEIO::Job *, TDEIO::filesize_t) {}
KDE_NO_CDTOR_EXPORT
NpPlayer::NpPlayer (TQObject * parent, Settings * settings, const TQString &)