1 files changed, 11 insertions, 11 deletions

diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 00c83e8..c43596b 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -34,7 +34,7 @@
 #include <tqslider.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kmessagebox.h>
 #include <kaboutdata.h>
@@ -702,7 +702,7 @@ void PartBase::updateInfo (const TQString & msg) {
     emit infoUpdated (msg);
 }
 
-void PartBase::updatetqStatus (const TQString & msg) {
+void PartBase::updateStatus (const TQString & msg) {
     emit statusUpdated (msg);
 }
 
@@ -1376,7 +1376,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) {
     Recorder *rec = dynamic_cast <Recorder *> (p);
     if (rec && !rec->recordURL ().isEmpty ()) {
         kdDebug () << "recordState " << statemap[olds] << " -> " << statemap[news] << endl;
-        m_player->updatetqStatus (i18n ("Recorder %1 %2").arg (p->name ()).arg (statemap[news]));
+        m_player->updateStatus (i18n ("Recorder %1 %2").arg (p->name ()).arg (statemap[news]));
         p->viewer ()->view ()->controlPanel ()->setRecording (news > Process::Ready);
         if (news == Process::Ready) {
             if (olds > Process::Ready) {
@@ -1394,7 +1394,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) {
     } else {
         p->viewer()->view()->controlPanel()->setPlaying(news > Process::Ready);
         kdDebug () << "processState " << statemap[olds] << " -> " << statemap[news] << endl;
-        m_player->updatetqStatus (i18n ("Player %1 %2").arg (p->name ()).arg (statemap[news]));
+        m_player->updateStatus (i18n ("Player %1 %2").arg (p->name ()).arg (statemap[news]));
         if (!p->mrl () && news > Process::Ready) {
             p->stop (); // reschedule for Ready state
         } else if (news == Process::Playing) {
@@ -1437,7 +1437,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) {
 		}
                 if (m_player->view() &&
                         (!mrl || mrl->view_mode != Mrl::WindowMode))
-                    static_cast<View*>(m_player->view())->viewArea()->tqrepaint();
+                    static_cast<View*>(m_player->view())->viewArea()->repaint();
             } else
                 TQTimer::singleShot (0, this, TQT_SLOT (playCurrent ()));
         } else if (news == Process::Buffering) {
@@ -1502,7 +1502,7 @@ KDE_NO_EXPORT void URLSource::stopResolving () {
         for (SharedPtr <ResolveInfo> ri = m_resolve_info; ri; ri = ri->next)
             ri->job->kill ();
         m_resolve_info = 0L;
-        m_player->updatetqStatus (i18n ("Disconnected"));
+        m_player->updateStatus (i18n ("Disconnected"));
         m_player->setLoaded (100);
     }
 }
@@ -1650,7 +1650,7 @@ KDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) {
             readXML (cur_elm, textstream, line);
             //cur_elm->normalize ();
             if (m_document && m_document->firstChild ()) {
-                // SMIL documents have set its size of root-tqlayout
+                // SMIL documents have set its size of root-layout
                 Mrl * mrl = m_document->firstChild ()->mrl ();
                 if (mrl)
                     Source::setDimensions (m_document->firstChild (), mrl->width, mrl->height);
@@ -1724,7 +1724,7 @@ KDE_NO_EXPORT void URLSource::kioResult (KIO::Job * job) {
         kdWarning () << "Spurious kioData" << endl;
         return;
     }
-    m_player->updatetqStatus ("");
+    m_player->updateStatus ("");
     m_player->setLoaded (100);
     if (previnfo)
         previnfo->next = rinfo->next;
@@ -1836,8 +1836,8 @@ bool URLSource::resolveURL (NodePtr m) {
                 url.protocol ().compare (TQString ("rtp"))) ||
             (mimestr.isEmpty () &&
              (url.protocol ().startsWith (TQString ("http")) || 
-              url.protocol () == TQString::tqfromLatin1 ("media") ||
-              url.protocol () == TQString::tqfromLatin1 ("remote")))) {
+              url.protocol () == TQString::fromLatin1 ("media") ||
+              url.protocol () == TQString::fromLatin1 ("remote")))) {
         KIO::Job * job = KIO::get (url, false, false);
         job->addMetaData ("PropagateHttpHeader", "true");
         job->addMetaData ("errorPage", "false");
@@ -1851,7 +1851,7 @@ bool URLSource::resolveURL (NodePtr m) {
         connect (m_resolve_info->job, TQT_SIGNAL (result (KIO::Job *)),
                 this, TQT_SLOT (kioResult (KIO::Job *)));
         static_cast <View *> (m_player->view ())->controlPanel ()->setPlaying (true);
-        m_player->updatetqStatus (i18n ("Connecting"));
+        m_player->updateStatus (i18n ("Connecting"));
         m_player->setLoaded (0);
         return false; // wait for result ..
     }