From 75cf20e5d10de7b6ab506bd1ad6321c77ff1ad5c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:08:09 -0600 Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/kmplayer.h | 6 ++-- src/kmplayer_koffice_part.cpp | 2 +- src/kmplayer_koffice_part.h | 4 +-- src/kmplayer_part.cpp | 4 +-- src/kmplayer_rp.h | 2 +- src/kmplayer_smil.cpp | 2 +- src/kmplayer_smil.h | 2 +- src/kmplayerapp.cpp | 12 +++---- src/kmplayerappsource.h | 8 ++--- src/kmplayerbroadcast.cpp | 8 ++--- src/kmplayerbroadcast.h | 8 ++--- src/kmplayerconfig.cpp | 2 +- src/kmplayerconfig.h | 12 +++---- src/kmplayerpartbase.cpp | 48 ++++++++++++------------- src/kmplayerpartbase.h | 28 +++++++-------- src/kmplayerprocess.cpp | 66 +++++++++++++++++------------------ src/kmplayerprocess.h | 26 +++++++------- src/kmplayersource.h | 2 +- src/kmplayertvsource.cpp | 4 +-- src/kmplayertvsource.h | 6 ++-- src/kmplayervdr.cpp | 4 +-- src/kmplayervdr.h | 4 +-- 22 files changed, 130 insertions(+), 130 deletions(-) diff --git a/src/kmplayer.h b/src/kmplayer.h index 404a6d1..3e80d72 100644 --- a/src/kmplayer.h +++ b/src/kmplayer.h @@ -79,8 +79,8 @@ public: protected: void saveOptions (); void readOptions (); - void saveProperties (KConfig * config); - void readProperties (KConfig * config); + void saveProperties (TDEConfig * config); + void readProperties (TDEConfig * config); void initActions (); void initStatusBar (); void initView (); @@ -144,7 +144,7 @@ private slots: private: void menuItemClicked (TQPopupMenu * menu, int id); void minimalMode (bool deco=true); - KConfig * config; + TDEConfig * config; KSystemTray * m_systray; KMPlayer::PartBase * m_player; KMPlayer::View * m_view; diff --git a/src/kmplayer_koffice_part.cpp b/src/kmplayer_koffice_part.cpp index 76dc11f..56b4914 100644 --- a/src/kmplayer_koffice_part.cpp +++ b/src/kmplayer_koffice_part.cpp @@ -93,7 +93,7 @@ KParts::Part *KMPlayerFactory::createPartObject KOfficeMPlayer::KOfficeMPlayer (TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode) : KoDocument (parentWidget, widgetName, parent, name, singleViewMode), - m_config (new KConfig ("kmplayerrc")), + m_config (new TDEConfig ("kmplayerrc")), m_player (new KMPlayer (parentWidget, 0L, 0L, 0L, m_config)) { setInstance (KMPlayerFactory::instance (), false); diff --git a/src/kmplayer_koffice_part.h b/src/kmplayer_koffice_part.h index ec71061..1bcf305 100644 --- a/src/kmplayer_koffice_part.h +++ b/src/kmplayer_koffice_part.h @@ -41,7 +41,7 @@ class TDEProcess; class TDEAboutData; class KMPlayer; class TDEInstance; -class KConfig; +class TDEConfig; class TQIODevice; #ifdef HAVE_KOFFICE @@ -78,7 +78,7 @@ public: protected: virtual KoView* createViewInstance (TQWidget* parent, const char* name); private: - KConfig * m_config; + TDEConfig * m_config; KMPlayer * m_player; KOfficeMPlayerView * m_view; }; diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp index 1073a50..37ba960 100644 --- a/src/kmplayer_part.cpp +++ b/src/kmplayer_part.cpp @@ -138,7 +138,7 @@ static bool getBoolValue (const TQString & value) { KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *wname, TQObject * parent, const char *name, const TQStringList &args) - : PartBase (wparent, wname, parent, name, new KConfig ("kmplayerrc")), + : PartBase (wparent, wname, parent, name, new TDEConfig ("kmplayerrc")), m_master (0L), m_browserextension (new KMPlayerBrowserExtension (this)), m_liveconnectextension (new KMPlayerLiveConnectExtension (this)), @@ -863,7 +863,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::KMPlayerLiveConnectExtension ( m_started (false), m_enablefinish (false), m_evaluating (false) { - connect (parent, TQT_SIGNAL (started (KIO::Job *)), this, TQT_SLOT (started ())); + connect (parent, TQT_SIGNAL (started (TDEIO::Job *)), this, TQT_SLOT (started ())); } KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension() { diff --git a/src/kmplayer_rp.h b/src/kmplayer_rp.h index a158a7d..29dad0c 100644 --- a/src/kmplayer_rp.h +++ b/src/kmplayer_rp.h @@ -27,7 +27,7 @@ #include "kmplayerplaylist.h" #include "kmplayer_smil.h" -namespace KIO { +namespace TDEIO { class Job; } diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp index 1b2d914..3c2d196 100644 --- a/src/kmplayer_smil.cpp +++ b/src/kmplayer_smil.cpp @@ -1394,7 +1394,7 @@ KDE_NO_CDTOR_EXPORT MediaTypeRuntime::~MediaTypeRuntime () { } /** - * re-implement for pending KIO::Job operations + * re-implement for pending TDEIO::Job operations */ KDE_NO_EXPORT void KMPlayer::MediaTypeRuntime::reset () { clear (); diff --git a/src/kmplayer_smil.h b/src/kmplayer_smil.h index a6d0370..e624ff8 100644 --- a/src/kmplayer_smil.h +++ b/src/kmplayer_smil.h @@ -32,7 +32,7 @@ class TQTextStream; class TQImage; class TQPainter; -namespace KIO { +namespace TDEIO { class Job; } diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 0b7ccde..a4b2ccf 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -1028,12 +1028,12 @@ KDE_NO_EXPORT void KMPlayerApp::addURL (const KURL& url) { d->appendChild (new KMPlayer::GenericURL (d, url.url ())); } -KDE_NO_EXPORT void KMPlayerApp::saveProperties (KConfig * config) { +KDE_NO_EXPORT void KMPlayerApp::saveProperties (TDEConfig * config) { config->writeEntry ("URL", m_player->source ()->url ().url ()); config->writeEntry ("Visible", isVisible ()); } -KDE_NO_EXPORT void KMPlayerApp::readProperties (KConfig * config) { +KDE_NO_EXPORT void KMPlayerApp::readProperties (TDEConfig * config) { KURL url (config->readEntry ("URL", TQString ())); openDocumentFile (url); if (!config->readBoolEntry ("Visible", true) && m_systray) @@ -2019,12 +2019,12 @@ KDE_NO_EXPORT TQString KMPlayerDVDSource::prettyName () { static const char * strPlayDVD = "Immediately Play DVD"; -KDE_NO_EXPORT void KMPlayerDVDSource::write (KConfig * config) { +KDE_NO_EXPORT void KMPlayerDVDSource::write (TDEConfig * config) { config->setGroup (strMPlayerGroup); config->writeEntry (strPlayDVD, m_auto_play); } -KDE_NO_EXPORT void KMPlayerDVDSource::read (KConfig * config) { +KDE_NO_EXPORT void KMPlayerDVDSource::read (TDEConfig * config) { config->setGroup (strMPlayerGroup); m_auto_play = config->readBoolEntry (strPlayDVD, true); } @@ -2195,12 +2195,12 @@ KDE_NO_EXPORT TQString KMPlayerVCDSource::prettyName () { static const char * strPlayVCD = "Immediately Play VCD"; -KDE_NO_EXPORT void KMPlayerVCDSource::write (KConfig * config) { +KDE_NO_EXPORT void KMPlayerVCDSource::write (TDEConfig * config) { config->setGroup (strMPlayerGroup); config->writeEntry (strPlayVCD, m_auto_play); } -KDE_NO_EXPORT void KMPlayerVCDSource::read (KConfig * config) { +KDE_NO_EXPORT void KMPlayerVCDSource::read (TDEConfig * config) { config->setGroup (strMPlayerGroup); m_auto_play = config->readBoolEntry (strPlayVCD, true); } diff --git a/src/kmplayerappsource.h b/src/kmplayerappsource.h index ec9fcda..b8e1921 100644 --- a/src/kmplayerappsource.h +++ b/src/kmplayerappsource.h @@ -82,8 +82,8 @@ public: virtual TQString filterOptions (); virtual void setIdentified (bool b = true); virtual TQString prettyName (); - virtual void write (KConfig *); - virtual void read (KConfig *); + virtual void write (TDEConfig *); + virtual void read (TDEConfig *); virtual void sync (bool); virtual void prefLocation (TQString & item, TQString & icon, TQString & tab); virtual TQFrame * prefPage (TQWidget * parent); @@ -155,8 +155,8 @@ public: virtual bool processOutput (const TQString & line); virtual void setIdentified (bool b = true); virtual TQString prettyName (); - virtual void write (KConfig *); - virtual void read (KConfig *); + virtual void write (TDEConfig *); + virtual void read (TDEConfig *); virtual void sync (bool); virtual void prefLocation (TQString & item, TQString & icon, TQString & tab); virtual TQFrame * prefPage (TQWidget * parent); diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp index 197d7e5..845a47c 100644 --- a/src/kmplayerbroadcast.cpp +++ b/src/kmplayerbroadcast.cpp @@ -412,7 +412,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerBroadcastConfig::~KMPlayerBroadcastConfig () { stopServer (); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::write (KConfig * config) { +KDE_NO_EXPORT void KMPlayerBroadcastConfig::write (TDEConfig * config) { config->setGroup (strBroadcast); config->writeEntry (strFFServerCustomSetting, ffserversettings.list (), ';'); TQStringList sl; @@ -423,7 +423,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::write (KConfig * config) { config->writeEntry (strFFServerProfiles, sl, ';'); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::read (KConfig * config) { +KDE_NO_EXPORT void KMPlayerBroadcastConfig::read (TDEConfig * config) { std::for_each (ffserversettingprofiles.begin (), ffserversettingprofiles.end (), KMPlayer::Deleter()); ffserversettingprofiles.clear (); config->setGroup (strBroadcast); @@ -612,7 +612,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::sourceChanged (KMPlayer::Source *, K KDE_NO_CDTOR_EXPORT KMPlayerFFServerConfig::KMPlayerFFServerConfig () { } -KDE_NO_EXPORT void KMPlayerFFServerConfig::write (KConfig * config) { +KDE_NO_EXPORT void KMPlayerFFServerConfig::write (TDEConfig * config) { config->setGroup (strBroadcast); config->writeEntry (strBindAddress, bindaddress); config->writeEntry (strFFServerPort, ffserverport); @@ -622,7 +622,7 @@ KDE_NO_EXPORT void KMPlayerFFServerConfig::write (KConfig * config) { config->writeEntry (strFeedFileSize, feedfilesize); } -KDE_NO_EXPORT void KMPlayerFFServerConfig::read (KConfig * config) { +KDE_NO_EXPORT void KMPlayerFFServerConfig::read (TDEConfig * config) { config->setGroup (strBroadcast); bindaddress = config->readEntry (strBindAddress, "0.0.0.0"); ffserverport = config->readNumEntry (strFFServerPort, 8090); diff --git a/src/kmplayerbroadcast.h b/src/kmplayerbroadcast.h index d3c5cd2..4d79c13 100644 --- a/src/kmplayerbroadcast.h +++ b/src/kmplayerbroadcast.h @@ -135,8 +135,8 @@ class KMPLAYER_NO_EXPORT KMPlayerFFServerConfig : public KMPlayer::PreferencesPa public: KMPlayerFFServerConfig (); KDE_NO_CDTOR_EXPORT ~KMPlayerFFServerConfig () {} - virtual void write (KConfig *); - virtual void read (KConfig *); + virtual void write (TDEConfig *); + virtual void read (TDEConfig *); virtual void sync (bool fromUI); virtual void prefLocation (TQString & item, TQString & icon, TQString & tab); virtual TQFrame * prefPage (TQWidget * parent); @@ -160,8 +160,8 @@ public: KMPlayerBroadcastConfig (KMPlayer::PartBase * player, KMPlayerFFServerConfig * fsc); KDE_NO_CDTOR_EXPORT ~KMPlayerBroadcastConfig (); - virtual void write (KConfig *); - virtual void read (KConfig *); + virtual void write (TDEConfig *); + virtual void read (TDEConfig *); virtual void sync (bool fromUI); virtual void prefLocation (TQString & item, TQString & icon, TQString & tab); virtual TQFrame * prefPage (TQWidget * parent); diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp index 3337585..5839b79 100644 --- a/src/kmplayerconfig.cpp +++ b/src/kmplayerconfig.cpp @@ -83,7 +83,7 @@ static OutputDriver _vds [] = { static const int ADRIVER_ARTS_INDEX = 4; -KDE_NO_CDTOR_EXPORT Settings::Settings (PartBase * player, KConfig * config) +KDE_NO_CDTOR_EXPORT Settings::Settings (PartBase * player, TDEConfig * config) : pagelist (0L), configdialog (0L), m_config (config), m_player (player) { audiodrivers = _ads; videodrivers = _vds; diff --git a/src/kmplayerconfig.h b/src/kmplayerconfig.h index 9888a71..2dcb571 100644 --- a/src/kmplayerconfig.h +++ b/src/kmplayerconfig.h @@ -29,7 +29,7 @@ #include -class KConfig; +class TDEConfig; namespace KMPlayer { @@ -82,8 +82,8 @@ struct Deleter { class KMPLAYER_EXPORT PreferencesPage { public: virtual ~PreferencesPage () {} - virtual void write (KConfig *) = 0; - virtual void read (KConfig *) = 0; + virtual void write (TDEConfig *) = 0; + virtual void read (TDEConfig *) = 0; virtual void sync (bool fromUI) = 0; virtual void prefLocation (TQString & item, TQString & icon, TQString & tab) = 0; virtual TQFrame * prefPage (TQWidget * parent) = 0; @@ -97,7 +97,7 @@ class KMPLAYER_EXPORT Settings : public TQObject { Q_OBJECT public: - Settings (PartBase *, KConfig * part); + Settings (PartBase *, TDEConfig * part); ~Settings (); bool createDialog () KDE_NO_EXPORT; void show (const char * pagename = 0L); @@ -106,7 +106,7 @@ public: void applyColorSetting (bool only_changed_ones); Preferences *configDialog() const { return configdialog; } View * defaultView (); - KConfig * kconfig () { return m_config; } + TDEConfig * kconfig () { return m_config; } TQStringList urllist; TQStringList sub_urllist; @@ -196,7 +196,7 @@ private slots: void getHelp (); private: Preferences * configdialog; - KConfig * m_config; + TDEConfig * m_config; PartBase * m_player; }; diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp index a4fa5d4..8e171b6 100644 --- a/src/kmplayerpartbase.cpp +++ b/src/kmplayerpartbase.cpp @@ -106,7 +106,7 @@ inline BookmarkManager::BookmarkManager(const TQString & bmfile) //----------------------------------------------------------------------------- PartBase::PartBase (TQWidget * wparent, const char *wname, - TQObject * parent, const char *name, KConfig * config) + TQObject * parent, const char *name, TDEConfig * config) : KMediaPlayer::Player (wparent, wname ? wname : "kde_kmplayer_view", parent, name ? name : "kde_kmplayer_part"), m_config (config), m_view (new View (wparent, wname ? wname : "kde_kmplayer_view")), @@ -1679,7 +1679,7 @@ KDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) { } } -KDE_NO_EXPORT void URLSource::kioData (KIO::Job * job, const TQByteArray & d) { +KDE_NO_EXPORT void URLSource::kioData (TDEIO::Job * job, const TQByteArray & d) { SharedPtr rinfo = m_resolve_info; while (rinfo && rinfo->job != job) rinfo = rinfo->next; @@ -1711,7 +1711,7 @@ KDE_NO_EXPORT void URLSource::kioData (KIO::Job * job, const TQByteArray & d) { } } -KDE_NO_EXPORT void URLSource::kioMimetype (KIO::Job * job, const TQString & mimestr) { +KDE_NO_EXPORT void URLSource::kioMimetype (TDEIO::Job * job, const TQString & mimestr) { SharedPtr rinfo = m_resolve_info; while (rinfo && rinfo->job != job) rinfo = rinfo->next; @@ -1725,7 +1725,7 @@ KDE_NO_EXPORT void URLSource::kioMimetype (KIO::Job * job, const TQString & mime job->kill (false); } -KDE_NO_EXPORT void URLSource::kioResult (KIO::Job * job) { +KDE_NO_EXPORT void URLSource::kioResult (TDEIO::Job * job) { SharedPtr previnfo, rinfo = m_resolve_info; while (rinfo && rinfo->job != job) { previnfo = rinfo; @@ -1849,18 +1849,18 @@ bool URLSource::resolveURL (NodePtr m) { (url.protocol ().startsWith (TQString ("http")) || url.protocol () == TQString::fromLatin1 ("media") || url.protocol () == TQString::fromLatin1 ("remote")))) { - KIO::Job * job = KIO::get (url, false, false); + TDEIO::Job * job = TDEIO::get (url, false, false); job->addMetaData ("PropagateHttpHeader", "true"); job->addMetaData ("errorPage", "false"); m_resolve_info = new ResolveInfo (m, job, m_resolve_info); - connect (m_resolve_info->job, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&)), - this, TQT_SLOT (kioData (KIO::Job *, const TQByteArray &))); - //connect( m_job, TQT_SIGNAL(connected(KIO::Job*)), - // this, TQT_SLOT(slotConnected(KIO::Job*))); - connect(m_resolve_info->job, TQT_SIGNAL(mimetype(KIO::Job*,const TQString&)), - this, TQT_SLOT (kioMimetype (KIO::Job *, const TQString &))); - connect (m_resolve_info->job, TQT_SIGNAL (result (KIO::Job *)), - this, TQT_SLOT (kioResult (KIO::Job *))); + connect (m_resolve_info->job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQT_SLOT (kioData (TDEIO::Job *, const TQByteArray &))); + //connect( m_job, TQT_SIGNAL(connected(TDEIO::Job*)), + // this, TQT_SLOT(slotConnected(TDEIO::Job*))); + connect(m_resolve_info->job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQT_SLOT (kioMimetype (TDEIO::Job *, const TQString &))); + connect (m_resolve_info->job, TQT_SIGNAL (result (TDEIO::Job *)), + this, TQT_SLOT (kioResult (TDEIO::Job *))); static_cast (m_player->view ())->controlPanel ()->setPlaying (true); m_player->updateStatus (i18n ("Connecting")); m_player->setLoaded (0); @@ -1944,13 +1944,13 @@ KDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) { } if (memory_cache->preserve (str)) { //kdDebug () << "downloading " << str << endl; - job = KIO::get (kurl, false, 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 (mimetype (KIO::Job *, const TQString &)), - this, TQT_SLOT (slotMimetype (KIO::Job *, const TQString &))); + job = TDEIO::get (kurl, false, false); + 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 (mimetype (TDEIO::Job *, const TQString &)), + this, TQT_SLOT (slotMimetype (TDEIO::Job *, const TQString &))); } else { //kdDebug () << "download preserved " << str << endl; connect (memory_cache, TQT_SIGNAL (preserveRemoved (const TQString &)), @@ -1972,12 +1972,12 @@ KDE_NO_EXPORT void RemoteObjectPrivate::clear () { } } -KDE_NO_EXPORT void RemoteObjectPrivate::slotResult (KIO::Job * kjob) { +KDE_NO_EXPORT void RemoteObjectPrivate::slotResult (TDEIO::Job * kjob) { if (!kjob->error ()) memory_cache->add (url, data); else data.resize (0); - job = 0L; // signal KIO::Job::result deletes itself + job = 0L; // signal TDEIO::Job::result deletes itself remote_object->remoteReady (data); } @@ -1992,7 +1992,7 @@ void RemoteObjectPrivate::cachePreserveRemoved (const TQString & str) { } KDE_NO_EXPORT -void RemoteObjectPrivate::slotData (KIO::Job*, const TQByteArray& qb) { +void RemoteObjectPrivate::slotData (TDEIO::Job*, const TQByteArray& qb) { if (qb.size ()) { int old_size = data.size (); data.resize (old_size + qb.size ()); @@ -2001,7 +2001,7 @@ void RemoteObjectPrivate::slotData (KIO::Job*, const TQByteArray& qb) { } KDE_NO_EXPORT -void RemoteObjectPrivate::slotMimetype (KIO::Job *, const TQString & m) { +void RemoteObjectPrivate::slotMimetype (TDEIO::Job *, const TQString & m) { mime = m; } diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h index ee53ba9..cbd133f 100644 --- a/src/kmplayerpartbase.h +++ b/src/kmplayerpartbase.h @@ -40,12 +40,12 @@ class TDEAboutData; class TDEInstance; class KActionCollection; class KBookmarkMenu; -class KConfig; +class TDEConfig; class TQIODevice; class TQTextStream; class TQListViewItem; -namespace KIO { +namespace TDEIO { class Job; } @@ -87,9 +87,9 @@ public slots: virtual void jump (NodePtr e); void play (); private slots: - void kioData (KIO::Job *, const TQByteArray &); - void kioMimetype (KIO::Job *, const TQString &); - void kioResult (KIO::Job *); + void kioData (TDEIO::Job *, const TQByteArray &); + void kioMimetype (TDEIO::Job *, const TQString &); + void kioResult (TDEIO::Job *); protected: virtual bool requestPlayURL (NodePtr mrl); virtual bool resolveURL (NodePtr mrl); @@ -97,10 +97,10 @@ private: void read (NodePtr mrl, TQTextStream &); void stopResolving (); struct ResolveInfo { - ResolveInfo (NodePtr mrl, KIO::Job * j, SharedPtr & n) + ResolveInfo (NodePtr mrl, TDEIO::Job * j, SharedPtr & n) : resolving_mrl (mrl), job (j), progress (0), next (n) {} NodePtrW resolving_mrl; - KIO::Job * job; + TDEIO::Job * job; TQByteArray data; int progress; SharedPtr next; @@ -118,7 +118,7 @@ class KMPLAYER_EXPORT PartBase : public KMediaPlayer::Player { K_DCOP public: typedef TQMap ProcessMap; - PartBase (TQWidget * parent, const char * wname,TQObject * objectParent, const char * name, KConfig *); + PartBase (TQWidget * parent, const char * wname,TQObject * objectParent, const char * name, TDEConfig *); ~PartBase (); void init (KActionCollection * = 0L); virtual KMediaPlayer::View* view (); @@ -148,7 +148,7 @@ public: TQMap & players () { return m_players; } TQMap & recorders () { return m_recorders; } TQMap & sources () { return m_sources; } - KConfig * config () const { return m_config; } + TDEConfig * config () const { return m_config; } bool mayResize () const { return !m_noresize; } void updatePlayerMenu (ControlPanel *); void updateInfo (const TQString & msg); @@ -233,7 +233,7 @@ protected slots: void audioSelected (int); void subtitleSelected (int); protected: - KConfig * m_config; + TDEConfig * m_config; TQGuardedPtr m_view; TQMap temp_backends; Settings * m_settings; @@ -286,14 +286,14 @@ public: ~RemoteObjectPrivate (); bool download (const TQString &); void clear (); - KIO::Job * job; + TDEIO::Job * job; TQString url; TQByteArray data; TQString mime; private slots: - void slotResult (KIO::Job*); - void slotData (KIO::Job*, const TQByteArray& qb); - void slotMimetype (KIO::Job * job, const TQString & mimestr); + void slotResult (TDEIO::Job*); + void slotData (TDEIO::Job*, const TQByteArray& qb); + void slotMimetype (TDEIO::Job * job, const TQString & mimestr); void cachePreserveRemoved (const TQString &); private: RemoteObject * remote_object; 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 (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 (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 &) diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h index 2a34d87..d1de37d 100644 --- a/src/kmplayerprocess.h +++ b/src/kmplayerprocess.h @@ -37,7 +37,7 @@ class TQWidget; class TDEProcess; -namespace KIO { +namespace TDEIO { class Job; class TransferJob; } @@ -96,7 +96,7 @@ public slots: virtual bool brightness (int pos, bool absolute); protected slots: void rescheduledStateChanged (); - void result (KIO::Job *); + void result (TDEIO::Job *); protected: void setState (State newstate); virtual bool deMediafiedPlay (); @@ -107,7 +107,7 @@ protected: State m_state; State m_old_state; TDEProcess * m_process; - KIO::Job * m_job; + TDEIO::Job * m_job; TQString m_url; int m_request_seek; const char ** m_supported_sources; @@ -206,8 +206,8 @@ public: }; MPlayerPreferencesPage (MPlayer *); KDE_NO_CDTOR_EXPORT ~MPlayerPreferencesPage () {} - void write (KConfig *); - void read (KConfig *); + void write (TDEConfig *); + void read (TDEConfig *); void sync (bool fromUI); void prefLocation (TQString & item, TQString & icon, TQString & tab); TQFrame * prefPage (TQWidget * parent); @@ -363,8 +363,8 @@ class KMPLAYER_NO_EXPORT XMLPreferencesPage : public PreferencesPage { public: XMLPreferencesPage (CallbackProcess *); ~XMLPreferencesPage (); - void write (KConfig *); - void read (KConfig *); + void write (TDEConfig *); + void read (TDEConfig *); void sync (bool fromUI); void prefLocation (TQString & item, TQString & icon, TQString & tab); TQFrame * prefPage (TQWidget * parent); @@ -438,7 +438,7 @@ public: KURL url; TQByteArray pending_buf; - KIO::TransferJob *job; + TDEIO::TransferJob *job; timeval data_arrival; TQ_UINT32 bytes; TQ_UINT32 stream_id; @@ -449,11 +449,11 @@ signals: void stateChanged (); void redirected (TQ_UINT32, const KURL &); private slots: - void slotResult (KIO::Job*); - void slotData (KIO::Job*, const TQByteArray& qb); - void redirection (KIO::Job *, const KURL &url); - void slotMimetype (KIO::Job *, const TQString &mime); - void slotTotalSize (KIO::Job *, KIO::filesize_t sz); + void slotResult (TDEIO::Job*); + void slotData (TDEIO::Job*, const TQByteArray& qb); + void redirection (TDEIO::Job *, const KURL &url); + void slotMimetype (TDEIO::Job *, const TQString &mime); + void slotTotalSize (TDEIO::Job *, TDEIO::filesize_t sz); }; class KMPLAYER_NO_EXPORT NpPlayer : public Process { diff --git a/src/kmplayersource.h b/src/kmplayersource.h index cf765ce..b4a7e7c 100644 --- a/src/kmplayersource.h +++ b/src/kmplayersource.h @@ -28,7 +28,7 @@ #include "kmplayerplaylist.h" #include "kmplayerprocess.h" -class KConfig; +class TDEConfig; class TQWidget; class TQFrame; diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp index 770bf9b..b2b5714 100644 --- a/src/kmplayertvsource.cpp +++ b/src/kmplayertvsource.cpp @@ -522,7 +522,7 @@ KDE_NO_EXPORT TQString KMPlayerTVSource::prettyName () { return name; } -KDE_NO_EXPORT void KMPlayerTVSource::write (KConfig * m_config) { +KDE_NO_EXPORT void KMPlayerTVSource::write (TDEConfig * m_config) { if (!config_read) return; m_config->setGroup (strTV); m_config->writeEntry (strTVDriver, tvdriver); @@ -541,7 +541,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::readXML () { sync (false); } -KDE_NO_EXPORT void KMPlayerTVSource::read (KConfig * m_config) { +KDE_NO_EXPORT void KMPlayerTVSource::read (TDEConfig * m_config) { m_config->setGroup (strTV); tvdriver = m_config->readEntry (strTVDriver, "v4l"); } diff --git a/src/kmplayertvsource.h b/src/kmplayertvsource.h index da42c21..2a82f21 100644 --- a/src/kmplayertvsource.h +++ b/src/kmplayertvsource.h @@ -44,7 +44,7 @@ class TQGroupBox; class TQLineEdit; class TQCheckBox; class KComboBox; -class KConfig; +class TDEConfig; class KMPLAYER_NO_EXPORT TVDevicePage : public TQFrame { @@ -189,8 +189,8 @@ public: virtual KMPlayer::NodePtr root (); void buildMenu (); virtual TQString prettyName (); - virtual void write (KConfig *); - virtual void read (KConfig *); + virtual void write (TDEConfig *); + virtual void read (TDEConfig *); virtual void sync (bool); virtual void prefLocation (TQString & item, TQString & icon, TQString & tab); virtual TQFrame * prefPage (TQWidget * parent); diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp index bf61f8e..20dd120 100644 --- a/src/kmplayervdr.cpp +++ b/src/kmplayervdr.cpp @@ -635,7 +635,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::keyBlue () { queueCommand ("HITK BLUE\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::write (KConfig * m_config) { +KDE_NO_EXPORT void KMPlayerVDRSource::write (TDEConfig * m_config) { m_config->setGroup (strVDR); m_config->writeEntry (strVDRPort, tcp_port); m_config->writeEntry (strXVPort, m_xvport); @@ -643,7 +643,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::write (KConfig * m_config) { m_config->writeEntry (strXVScale, scale); } -KDE_NO_EXPORT void KMPlayerVDRSource::read (KConfig * m_config) { +KDE_NO_EXPORT void KMPlayerVDRSource::read (TDEConfig * m_config) { m_config->setGroup (strVDR); tcp_port = m_config->readNumEntry (strVDRPort, 2001); m_xvport = m_config->readNumEntry (strXVPort, 0); diff --git a/src/kmplayervdr.h b/src/kmplayervdr.h index 6cddfb0..6f81313 100644 --- a/src/kmplayervdr.h +++ b/src/kmplayervdr.h @@ -77,8 +77,8 @@ public: virtual bool hasLength (); virtual bool isSeekable (); virtual TQString prettyName (); - virtual void write (KConfig *); - virtual void read (KConfig *); + virtual void write (TDEConfig *); + virtual void read (TDEConfig *); virtual void sync (bool); virtual void prefLocation (TQString & item, TQString & icon, TQString & tab); virtual TQFrame * prefPage (TQWidget * parent);