diff options
| author | Michele Calgaro <[email protected]> | 2024-05-03 12:15:51 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-05-03 13:17:15 +0900 |
| commit | 22a46b7525fb4db31bdd603c7a18a9204144ef0f (patch) | |
| tree | 3b66e89fa223a12e750ac61ce9bbb5238adc221a /src | |
| parent | 132da05296348b21a3c600ecc299d3440e8f0f72 (diff) | |
| download | kmplayer-22a46b7525fb4db31bdd603c7a18a9204144ef0f.tar.gz kmplayer-22a46b7525fb4db31bdd603c7a18a9204144ef0f.zip | |
Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'src')
40 files changed, 1040 insertions, 1040 deletions
diff --git a/src/kmplayer.h b/src/kmplayer.h index ebe68d7..6c80cb8 100644 --- a/src/kmplayer.h +++ b/src/kmplayer.h @@ -67,12 +67,12 @@ public: void addURL (const KURL& url); KMPlayer::PartBase * player () const { return m_player; } void resizePlayer (int percentage); - KDE_NO_EXPORT TDERecentFilesAction * recentFiles () const { return fileOpenRecent; } - KDE_NO_EXPORT KMPlayer::View *view () const { return m_view; } + TDE_NO_EXPORT TDERecentFilesAction * recentFiles () const { return fileOpenRecent; } + TDE_NO_EXPORT KMPlayer::View *view () const { return m_view; } bool broadcasting () const; void showBroadcastConfig (); void hideBroadcastConfig (); - KDE_NO_EXPORT KMPlayerBroadcastConfig * broadcastConfig () const { return m_broadcastconfig; } + TDE_NO_EXPORT KMPlayerBroadcastConfig * broadcastConfig () const { return m_broadcastconfig; } /* After createGUI() some menu's have to readded again */ void initMenu (); void restoreFromConfig (); diff --git a/src/kmplayer_asx.cpp b/src/kmplayer_asx.cpp index 26869f3..1ac7de7 100644 --- a/src/kmplayer_asx.cpp +++ b/src/kmplayer_asx.cpp @@ -31,7 +31,7 @@ static TQString getAsxAttribute (Element * e, const TQString & attr) { return TQString (); } -KDE_NO_EXPORT NodePtr ASX::Asx::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr ASX::Asx::childFromTag (const TQString & tag) { const char * name = tag.latin1 (); if (!strcasecmp (name, "entry")) return new ASX::Entry (m_doc); @@ -46,7 +46,7 @@ KDE_NO_EXPORT NodePtr ASX::Asx::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT Node::PlayType ASX::Asx::playType () { +TDE_NO_EXPORT Node::PlayType ASX::Asx::playType () { if (cached_ismrl_version != document ()->m_tree_version) for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { if (e->id == id_node_title) @@ -59,7 +59,7 @@ KDE_NO_EXPORT Node::PlayType ASX::Asx::playType () { //----------------------------------------------------------------------------- -KDE_NO_EXPORT NodePtr ASX::Entry::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr ASX::Entry::childFromTag (const TQString & tag) { const char * name = tag.latin1 (); if (!strcasecmp (name, "ref")) return new ASX::Ref (m_doc); @@ -76,7 +76,7 @@ KDE_NO_EXPORT NodePtr ASX::Entry::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT Node::PlayType ASX::Entry::playType () { +TDE_NO_EXPORT Node::PlayType ASX::Entry::playType () { if (cached_ismrl_version != document ()->m_tree_version) { ref_child_count = 0; NodePtr ref; @@ -100,7 +100,7 @@ KDE_NO_EXPORT Node::PlayType ASX::Entry::playType () { return play_type_none; } -KDE_NO_EXPORT void ASX::Entry::activate () { +TDE_NO_EXPORT void ASX::Entry::activate () { resolved = true; for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (e->id == id_node_param) { @@ -116,30 +116,30 @@ KDE_NO_EXPORT void ASX::Entry::activate () { Mrl::activate (); } -KDE_NO_EXPORT void ASX::Entry::deactivate () { +TDE_NO_EXPORT void ASX::Entry::deactivate () { PlayListNotify * n = document ()->notify_listener; if (n) n->setInfoMessage (TQString ()); } -KDE_NO_EXPORT bool ASX::Entry::expose () const { +TDE_NO_EXPORT bool ASX::Entry::expose () const { return ref_child_count > 1 && !pretty_name.isEmpty (); } //----------------------------------------------------------------------------- -KDE_NO_EXPORT void ASX::Ref::opened () { +TDE_NO_EXPORT void ASX::Ref::opened () { src = getAsxAttribute (this, "href"); //kdDebug () << "Ref attr found src: " << src << endl; } -KDE_NO_EXPORT bool ASX::Ref::expose () const { +TDE_NO_EXPORT bool ASX::Ref::expose () const { return !src.isEmpty (); } //----------------------------------------------------------------------------- -KDE_NO_EXPORT void ASX::EntryRef::opened () { +TDE_NO_EXPORT void ASX::EntryRef::opened () { src = getAsxAttribute (this, "href"); //kdDebug () << "EntryRef attr found src: " << src << endl; } diff --git a/src/kmplayer_asx.h b/src/kmplayer_asx.h index 7eec2b9..56efdfc 100644 --- a/src/kmplayer_asx.h +++ b/src/kmplayer_asx.h @@ -46,7 +46,7 @@ class KMPLAYER_NO_EXPORT Asx : public Mrl { public: KDE_NO_CDTOR_EXPORT Asx (NodePtr & d) : Mrl (d, id_node_asx) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "ASX"; } + TDE_NO_EXPORT const char * nodeName () const { return "ASX"; } bool expose () const { return !pretty_name.isEmpty (); } PlayType playType (); }; @@ -59,7 +59,7 @@ public: KDE_NO_CDTOR_EXPORT Entry (NodePtr & d) : Mrl (d, id_node_entry), ref_child_count (0) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "Entry"; } + TDE_NO_EXPORT const char * nodeName () const { return "Entry"; } /** * False, but since we might have a 'base' child, we can have a rel. src */ @@ -78,7 +78,7 @@ public: KDE_NO_CDTOR_EXPORT Ref (NodePtr & d) : Mrl (d, id_node_ref) {} //NodePtr childFromTag (const TQString & tag); void opened (); - KDE_NO_EXPORT const char * nodeName () const { return "Ref"; } + TDE_NO_EXPORT const char * nodeName () const { return "Ref"; } bool expose () const; }; @@ -90,7 +90,7 @@ public: KDE_NO_CDTOR_EXPORT EntryRef (NodePtr & d) : Mrl (d, id_node_entryref) {} //NodePtr childFromTag (const TQString & tag); void opened (); - KDE_NO_EXPORT const char * nodeName () const { return "EntryRef"; } + TDE_NO_EXPORT const char * nodeName () const { return "EntryRef"; } }; } //namespace ASX diff --git a/src/kmplayer_atom.h b/src/kmplayer_atom.h index 09eec97..9aec0fd 100644 --- a/src/kmplayer_atom.h +++ b/src/kmplayer_atom.h @@ -43,7 +43,7 @@ class KMPLAYER_NO_EXPORT Feed : public Mrl { public: KDE_NO_CDTOR_EXPORT Feed (NodePtr & d) : Mrl (d, id_node_feed) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "feed"; } + TDE_NO_EXPORT const char * nodeName () const { return "feed"; } void closed (); bool expose () const { return !pretty_name.isEmpty (); } }; @@ -52,7 +52,7 @@ class KMPLAYER_NO_EXPORT Entry : public Mrl { public: KDE_NO_CDTOR_EXPORT Entry (NodePtr & d) : Mrl (d, id_node_entry) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "entry"; } + TDE_NO_EXPORT const char * nodeName () const { return "entry"; } PlayType playType () { return play_type_none; } void closed (); }; @@ -60,7 +60,7 @@ public: class KMPLAYER_NO_EXPORT Link : public Mrl { public: KDE_NO_CDTOR_EXPORT Link (NodePtr & d) : Mrl (d, id_node_link) {} - KDE_NO_EXPORT const char * nodeName () const { return "link"; } + TDE_NO_EXPORT const char * nodeName () const { return "link"; } PlayType playType (); void closed (); }; @@ -68,7 +68,7 @@ public: class KMPLAYER_NO_EXPORT Content : public Mrl { public: KDE_NO_CDTOR_EXPORT Content (NodePtr &d) : Mrl(d, id_node_content) {} - KDE_NO_EXPORT const char * nodeName () const { return "content"; } + TDE_NO_EXPORT const char * nodeName () const { return "content"; } PlayType playType (); void closed (); //bool expose () const { return isPlayable (); } diff --git a/src/kmplayer_def.h b/src/kmplayer_def.h index 7c3ee7f..044be16 100644 --- a/src/kmplayer_def.h +++ b/src/kmplayer_def.h @@ -31,16 +31,16 @@ #include <kdemacros.h> #undef KDE_NO_CDTOR_EXPORT -#undef KDE_NO_EXPORT -#ifndef KDE_EXPORT - #define KDE_EXPORT +#undef TDE_NO_EXPORT +#ifndef TDE_EXPORT + #define TDE_EXPORT #endif #if __GNUC__ - 0 > 3 && __GNUC_MINOR__ - 0 > 1 # define KMPLAYER_NO_EXPORT __attribute__ ((visibility("hidden"))) # define KMPLAYER_EXPORT __attribute__ ((visibility("default"))) # define KMPLAYER_NO_MBR_EXPORT __attribute__ ((visibility("hidden"))) # define KDE_NO_CDTOR_EXPORT -# define KDE_NO_EXPORT +# define TDE_NO_EXPORT #elif __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 3) #if __GNUC__ - 0 > 3 #define KMPLAYER_NO_EXPORT __attribute__ ((visibility("hidden"))) @@ -48,18 +48,18 @@ #define KMPLAYER_NO_EXPORT #endif #define KDE_NO_CDTOR_EXPORT __attribute__ ((visibility("hidden"))) - #define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) + #define TDE_NO_EXPORT __attribute__ ((visibility("hidden"))) #define KMPLAYER_EXPORT __attribute__ ((visibility("default"))) #define KMPLAYER_NO_MBR_EXPORT #elif __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 2) #define KDE_NO_CDTOR_EXPORT - #define KDE_NO_EXPORT __attribute__ ((visibility("hidden"))) + #define TDE_NO_EXPORT __attribute__ ((visibility("hidden"))) #define KMPLAYER_EXPORT #define KMPLAYER_NO_EXPORT #define KMPLAYER_NO_MBR_EXPORT #else #define KDE_NO_CDTOR_EXPORT - #define KDE_NO_EXPORT + #define TDE_NO_EXPORT #define KMPLAYER_EXPORT #define KMPLAYER_NO_EXPORT #define KMPLAYER_NO_MBR_EXPORT diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp index 2efc6ce..9b6ec3f 100644 --- a/src/kmplayer_part.cpp +++ b/src/kmplayer_part.cpp @@ -117,7 +117,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerFactory::~KMPlayerFactory () { delete s_instance; } -KDE_NO_EXPORT KParts::Part *KMPlayerFactory::createPartObject +TDE_NO_EXPORT KParts::Part *KMPlayerFactory::createPartObject (TQWidget *wparent, const char *wname, TQObject *parent, const char * name, const char * cls, const TQStringList & args) { @@ -392,16 +392,16 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::~KMPlayerPart () { m_config = 0L; } -KDE_NO_EXPORT bool KMPlayerPart::allowRedir (const KURL & url) const { +TDE_NO_EXPORT bool KMPlayerPart::allowRedir (const KURL & url) const { return kapp->authorizeURLAction ("redirect", m_docbase, url); } -KDE_NO_EXPORT void KMPlayerPart::setAutoControls (bool b) { +TDE_NO_EXPORT void KMPlayerPart::setAutoControls (bool b) { m_auto_controls = b; m_view->controlPanel ()->setAutoControls (b); } -KDE_NO_EXPORT void KMPlayerPart::viewerPartDestroyed (TQObject * o) { +TDE_NO_EXPORT void KMPlayerPart::viewerPartDestroyed (TQObject * o) { if (o == m_master) m_master = 0L; kdDebug () << "KMPlayerPart(" << this << ")::viewerPartDestroyed" << endl; @@ -411,14 +411,14 @@ KDE_NO_EXPORT void KMPlayerPart::viewerPartDestroyed (TQObject * o) { (*i)->updatePlayerMenu (m_view->controlPanel ()); } -KDE_NO_EXPORT void KMPlayerPart::viewerPartProcessChanged (const char *) { +TDE_NO_EXPORT void KMPlayerPart::viewerPartProcessChanged (const char *) { const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end(); KMPlayerPartList::iterator i = std::find_if (kmplayerpart_static->partlist.begin (), e, GroupPredicate (this, m_group)); if (i != e && *i != this) (*i)->updatePlayerMenu (m_view->controlPanel ()); } -KDE_NO_EXPORT void KMPlayerPart::viewerPartSourceChanged(Source *o, Source *s) { +TDE_NO_EXPORT void KMPlayerPart::viewerPartSourceChanged(Source *o, Source *s) { kdDebug () << "KMPlayerPart::source changed " << m_master << endl; if (m_master && m_view) { connectSource (o, s); @@ -426,7 +426,7 @@ KDE_NO_EXPORT void KMPlayerPart::viewerPartSourceChanged(Source *o, Source *s) { } } -KDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) { +TDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) { kdDebug () << "KMPlayerPart::openURL " << _url.url() << endl; Source * urlsource = m_sources ["urlsource"]; KMPlayerHRefSource * hrefsource = static_cast <KMPlayerHRefSource *>(m_sources ["hrefsource"]); @@ -506,14 +506,14 @@ KDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) { return true; } -KDE_NO_EXPORT bool KMPlayerPart::openNewURL (const KURL & url) { +TDE_NO_EXPORT bool KMPlayerPart::openNewURL (const KURL & url) { m_file_name.truncate (0); m_havehref = false; m_sources ["urlsource"]->setAutoPlay (true); return openURL (url); } -KDE_NO_EXPORT void KMPlayerPart::waitForImageWindowTimeOut () { +TDE_NO_EXPORT void KMPlayerPart::waitForImageWindowTimeOut () { if (!m_master) { // still no ImageWindow attached, eg. audio only const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end(); @@ -536,7 +536,7 @@ KDE_NO_EXPORT void KMPlayerPart::waitForImageWindowTimeOut () { } } -KDE_NO_EXPORT bool KMPlayerPart::closeURL () { +TDE_NO_EXPORT bool KMPlayerPart::closeURL () { if (!m_group.isEmpty ()) { kmplayerpart_static->partlist.remove (this); m_group.truncate (0); @@ -544,7 +544,7 @@ KDE_NO_EXPORT bool KMPlayerPart::closeURL () { return PartBase::closeURL (); } -KDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) { +TDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) { m_master = m; m->connectPanel (m_view->controlPanel ()); m->updatePlayerMenu (m_view->controlPanel ()); @@ -567,7 +567,7 @@ KDE_NO_EXPORT void KMPlayerPart::connectToPart (KMPlayerPart * m) { } } -KDE_NO_EXPORT void KMPlayerPart::setLoaded (int percentage) { +TDE_NO_EXPORT void KMPlayerPart::setLoaded (int percentage) { PartBase::setLoaded (percentage); if (percentage < 100) { m_browserextension->setLoadingProgress (percentage); @@ -576,7 +576,7 @@ KDE_NO_EXPORT void KMPlayerPart::setLoaded (int percentage) { } } -KDE_NO_EXPORT void KMPlayerPart::playingStarted () { +TDE_NO_EXPORT void KMPlayerPart::playingStarted () { const KMPlayerPartList::iterator e =kmplayerpart_static->partlist.end(); KMPlayerPartList::iterator i = std::find_if (kmplayerpart_static->partlist.begin (), e, GroupPredicate (this, m_group)); if (i != e && *i != this && m_view && (*i)->source()) { @@ -600,7 +600,7 @@ KDE_NO_EXPORT void KMPlayerPart::playingStarted () { m_browserextension->infoMessage (i18n("KMPlayer: Playing")); } -KDE_NO_EXPORT void KMPlayerPart::playingStopped () { +TDE_NO_EXPORT void KMPlayerPart::playingStopped () { KMPlayer::PartBase::playingStopped (); if (m_started_emited) { m_started_emited = false; @@ -615,7 +615,7 @@ KDE_NO_EXPORT void KMPlayerPart::playingStopped () { m_view->controlPanel ()->setPlaying (false); } -KDE_NO_EXPORT void KMPlayerPart::setMenuZoom (int id) { +TDE_NO_EXPORT void KMPlayerPart::setMenuZoom (int id) { int w = 0, h = 0; if (m_source) m_source->dimensions (w, h); @@ -637,7 +637,7 @@ KDE_NO_EXPORT void KMPlayerPart::setMenuZoom (int id) { int (scale * m_view->viewer ()->height())); } -KDE_NO_EXPORT void KMPlayerPart::statusPosition (int pos, int length) { +TDE_NO_EXPORT void KMPlayerPart::statusPosition (int pos, int length) { int left = (length - pos) / 10; if (left != last_time_left) { last_time_left = left; @@ -661,32 +661,32 @@ KDE_NO_CDTOR_EXPORT KMPlayerBrowserExtension::KMPlayerBrowserExtension (KMPlayer : KParts::BrowserExtension (parent, "KMPlayer Browser Extension") { } -KDE_NO_EXPORT void KMPlayerBrowserExtension::urlChanged (const TQString & url) { +TDE_NO_EXPORT void KMPlayerBrowserExtension::urlChanged (const TQString & url) { emit setLocationBarURL (url); } -KDE_NO_EXPORT void KMPlayerBrowserExtension::setLoadingProgress (int percentage) { +TDE_NO_EXPORT void KMPlayerBrowserExtension::setLoadingProgress (int percentage) { emit loadingProgress (percentage); } -KDE_NO_EXPORT void KMPlayerBrowserExtension::saveState (TQDataStream & stream) { +TDE_NO_EXPORT void KMPlayerBrowserExtension::saveState (TQDataStream & stream) { stream << static_cast <PartBase *> (parent ())->url ().url (); } -KDE_NO_EXPORT void KMPlayerBrowserExtension::restoreState (TQDataStream & stream) { +TDE_NO_EXPORT void KMPlayerBrowserExtension::restoreState (TQDataStream & stream) { TQString url; stream >> url; static_cast <PartBase *> (parent ())->openURL (KURL(url)); } -KDE_NO_EXPORT void KMPlayerBrowserExtension::requestOpenURL (const KURL & url, const TQString & target, const TQString & service) { +TDE_NO_EXPORT void KMPlayerBrowserExtension::requestOpenURL (const KURL & url, const TQString & target, const TQString & service) { KParts::URLArgs args; args.frameName = target; args.serviceType = service; emit openURLRequest (url, args); } -KDE_NO_EXPORT void KMPlayerBrowserExtension::slotRequestOpenURL (const KURL &url, const TQString &target) { +TDE_NO_EXPORT void KMPlayerBrowserExtension::slotRequestOpenURL (const KURL &url, const TQString &target) { requestOpenURL (url, target, TQString ()); } @@ -870,11 +870,11 @@ KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension( kdDebug () << "KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension()" << endl; } -KDE_NO_EXPORT void KMPlayerLiveConnectExtension::started () { +TDE_NO_EXPORT void KMPlayerLiveConnectExtension::started () { m_started = true; } -KDE_NO_EXPORT void KMPlayerLiveConnectExtension::finished () { +TDE_NO_EXPORT void KMPlayerLiveConnectExtension::finished () { if (m_started && m_enablefinish) { KParts::LiveConnectExtension::ArgList args; args.push_back (qMakePair (KParts::LiveConnectExtension::TypeString, TQString("if (window.onFinished) onFinished();"))); @@ -884,7 +884,7 @@ KDE_NO_EXPORT void KMPlayerLiveConnectExtension::finished () { } } -KDE_NO_EXPORT void KMPlayerLiveConnectExtension::evaluate ( +TDE_NO_EXPORT void KMPlayerLiveConnectExtension::evaluate ( const TQString & scr, TQString & result) { TQString script (scr); KParts::LiveConnectExtension::ArgList args; @@ -902,7 +902,7 @@ KDE_NO_EXPORT void KMPlayerLiveConnectExtension::evaluate ( result = script_result; } -KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::get +TDE_NO_EXPORT bool KMPlayerLiveConnectExtension::get (const unsigned long id, const TQString & name, KParts::LiveConnectExtension::Type & type, unsigned long & rid, TQString & rval) @@ -942,7 +942,7 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::get return true; } -KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::put +TDE_NO_EXPORT bool KMPlayerLiveConnectExtension::put (const unsigned long, const TQString & name, const TQString & val) { if (name == "__kmplayer__res") { script_result = val; @@ -973,7 +973,7 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::put return true; } -KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call +TDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call (const unsigned long id, const TQString & name, const TQStringList & args, KParts::LiveConnectExtension::Type & type, unsigned long & rid, TQString & rval) { @@ -1091,10 +1091,10 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call return true; } -KDE_NO_EXPORT void KMPlayerLiveConnectExtension::unregister (const unsigned long) { +TDE_NO_EXPORT void KMPlayerLiveConnectExtension::unregister (const unsigned long) { } -KDE_NO_EXPORT void KMPlayerLiveConnectExtension::setSize (int w, int h) { +TDE_NO_EXPORT void KMPlayerLiveConnectExtension::setSize (int w, int h) { KMPlayer::View * view = static_cast <KMPlayer::View*> (player->view ()); if (view->controlPanelMode () == KMPlayer::View::CP_Show) h += view->controlPanel()->height(); @@ -1116,21 +1116,21 @@ KDE_NO_CDTOR_EXPORT KMPlayerHRefSource::~KMPlayerHRefSource () { //kdDebug () << "KMPlayerHRefSource::~KMPlayerHRefSource" << endl; } -KDE_NO_EXPORT void KMPlayerHRefSource::init () { +TDE_NO_EXPORT void KMPlayerHRefSource::init () { Source::init (); setIdentified (); } -KDE_NO_EXPORT bool KMPlayerHRefSource::hasLength () { +TDE_NO_EXPORT bool KMPlayerHRefSource::hasLength () { return false; } -KDE_NO_EXPORT bool KMPlayerHRefSource::processOutput (const TQString & /*str*/) { +TDE_NO_EXPORT bool KMPlayerHRefSource::processOutput (const TQString & /*str*/) { //return Source::processOutput (str); return true; } -KDE_NO_EXPORT void KMPlayerHRefSource::setURL (const KURL & url) { +TDE_NO_EXPORT void KMPlayerHRefSource::setURL (const KURL & url) { m_url = url; m_identified = false; m_finished = false; @@ -1138,7 +1138,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::setURL (const KURL & url) { kdDebug () << "KMPlayerHRefSource::setURL " << m_url.url() << endl; } -KDE_NO_EXPORT void KMPlayerHRefSource::play () { +TDE_NO_EXPORT void KMPlayerHRefSource::play () { kdDebug () << "KMPlayerHRefSource::play " << m_url.url() << endl; Source * src = m_player->sources () ["urlsource"]; TQString target = src->document ()->document ()-> @@ -1150,7 +1150,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::play () { m_player->setSource (m_player->sources () ["urlsource"]); } -KDE_NO_EXPORT void KMPlayerHRefSource::activate () { +TDE_NO_EXPORT void KMPlayerHRefSource::activate () { m_player->stop (); if (m_finished) { TQTimer::singleShot (0, this, TQ_SLOT (finished ())); @@ -1167,18 +1167,18 @@ KDE_NO_EXPORT void KMPlayerHRefSource::activate () { } } -KDE_NO_EXPORT void KMPlayerHRefSource::clear () { +TDE_NO_EXPORT void KMPlayerHRefSource::clear () { setURL (KURL ()); } -KDE_NO_EXPORT void KMPlayerHRefSource::grabReady (const TQString & path) { +TDE_NO_EXPORT void KMPlayerHRefSource::grabReady (const TQString & path) { kdDebug () << "KMPlayerHRefSource::grabReady(" << path << ")" << endl; m_finished = true; m_grabfile = path; finished (); } -KDE_NO_EXPORT void KMPlayerHRefSource::finished () { +TDE_NO_EXPORT void KMPlayerHRefSource::finished () { kdDebug () << "KMPlayerHRefSource::finished()" << endl; KMPlayer::View * view = static_cast <KMPlayer::View*> (m_player->view ()); if (!view) return; @@ -1191,7 +1191,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::finished () { connect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ())); } -KDE_NO_EXPORT void KMPlayerHRefSource::deactivate () { +TDE_NO_EXPORT void KMPlayerHRefSource::deactivate () { kdDebug () << "KMPlayerHRefSource::deactivate()" << endl; KMPlayer::View * view = static_cast <KMPlayer::View*> (m_player->view ()); if (!view) return; @@ -1200,7 +1200,7 @@ KDE_NO_EXPORT void KMPlayerHRefSource::deactivate () { disconnect (view, TQ_SIGNAL (pictureClicked ()), this, TQ_SLOT (play ())); } -KDE_NO_EXPORT TQString KMPlayerHRefSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerHRefSource::prettyName () { return i18n ("WEB"); } diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h index aa05659..1d007d3 100644 --- a/src/kmplayer_part.h +++ b/src/kmplayer_part.h @@ -137,11 +137,11 @@ public: TQObject * parent, const char * name, const TQStringList &args); ~KMPlayerPart (); - KDE_NO_EXPORT KMPlayerBrowserExtension * browserextension() const + TDE_NO_EXPORT KMPlayerBrowserExtension * browserextension() const { return m_browserextension; } KMPlayerLiveConnectExtension * liveconnectextension () const { return m_liveconnectextension; } - KDE_NO_EXPORT bool hasFeature (int f) { return m_features & f; } + TDE_NO_EXPORT bool hasFeature (int f) { return m_features & f; } bool allowRedir (const KURL & url) const; void connectToPart (KMPlayerPart *); KMPlayerPart * master () const { return m_master; } diff --git a/src/kmplayer_rp.cpp b/src/kmplayer_rp.cpp index 36938b5..c8d8f97 100644 --- a/src/kmplayer_rp.cpp +++ b/src/kmplayer_rp.cpp @@ -39,7 +39,7 @@ KDE_NO_CDTOR_EXPORT RP::Imfl::Imfl (NodePtr & d) KDE_NO_CDTOR_EXPORT RP::Imfl::~Imfl () { } -KDE_NO_EXPORT void RP::Imfl::closed () { +TDE_NO_EXPORT void RP::Imfl::closed () { for (NodePtr n = firstChild (); n; n = n->nextSibling ()) if (RP::id_node_head == n->id) { AttributePtr a = convertNode <Element> (n)->attributes ()->first (); @@ -57,7 +57,7 @@ KDE_NO_EXPORT void RP::Imfl::closed () { } } -KDE_NO_EXPORT void RP::Imfl::defer () { +TDE_NO_EXPORT void RP::Imfl::defer () { kdDebug () << "RP::Imfl::defer " << endl; setState (state_deferred); for (Node * n = firstChild ().ptr (); n; n = n->nextSibling ().ptr ()) @@ -65,7 +65,7 @@ KDE_NO_EXPORT void RP::Imfl::defer () { n->activate (); } -KDE_NO_EXPORT void RP::Imfl::activate () { +TDE_NO_EXPORT void RP::Imfl::activate () { kdDebug () << "RP::Imfl::activate " << endl; resolved = true; setState (state_activated); @@ -92,7 +92,7 @@ KDE_NO_EXPORT void RP::Imfl::activate () { finish (); } -KDE_NO_EXPORT void RP::Imfl::finish () { +TDE_NO_EXPORT void RP::Imfl::finish () { kdDebug () << "RP::Imfl::finish " << endl; Mrl::finish (); if (duration_timer) { @@ -104,7 +104,7 @@ KDE_NO_EXPORT void RP::Imfl::finish () { n->finish (); } -KDE_NO_EXPORT void RP::Imfl::childDone (NodePtr) { +TDE_NO_EXPORT void RP::Imfl::childDone (NodePtr) { if (unfinished () && !duration_timer) { for (NodePtr n = firstChild (); n; n = n->nextSibling ()) switch (n->id) { @@ -119,7 +119,7 @@ KDE_NO_EXPORT void RP::Imfl::childDone (NodePtr) { } } -KDE_NO_EXPORT void RP::Imfl::deactivate () { +TDE_NO_EXPORT void RP::Imfl::deactivate () { kdDebug () << "RP::Imfl::deactivate " << endl; if (unfinished ()) finish (); @@ -132,7 +132,7 @@ KDE_NO_EXPORT void RP::Imfl::deactivate () { rp_surface = Mrl::getSurface (0L); } -KDE_NO_EXPORT bool RP::Imfl::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool RP::Imfl::handleEvent (EventPtr event) { if (event->id () == event_timer) { TimerEvent * te = static_cast <TimerEvent *> (event.ptr ()); if (te->timer_info == duration_timer) { @@ -145,11 +145,11 @@ KDE_NO_EXPORT bool RP::Imfl::handleEvent (EventPtr event) { return true; } -KDE_NO_EXPORT void RP::Imfl::accept (Visitor * v) { +TDE_NO_EXPORT void RP::Imfl::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT Surface *RP::Imfl::surface () { +TDE_NO_EXPORT Surface *RP::Imfl::surface () { if (!rp_surface) { rp_surface = Mrl::getSurface (this); if (rp_surface) { @@ -162,7 +162,7 @@ KDE_NO_EXPORT Surface *RP::Imfl::surface () { return rp_surface.ptr (); } -KDE_NO_EXPORT NodePtr RP::Imfl::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr RP::Imfl::childFromTag (const TQString & tag) { const char * ctag = tag.latin1 (); if (!strcmp (ctag, "head")) return new DarkNode (m_doc, "head", RP::id_node_head); @@ -183,7 +183,7 @@ KDE_NO_EXPORT NodePtr RP::Imfl::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void RP::Imfl::repaint () { +TDE_NO_EXPORT void RP::Imfl::repaint () { if (!active ()) kdWarning () << "Spurious Imfl repaint" << endl; else if (surface () && width > 0 && height > 0) @@ -197,11 +197,11 @@ KDE_NO_CDTOR_EXPORT RP::Image::Image (NodePtr & doc) KDE_NO_CDTOR_EXPORT RP::Image::~Image () { } -KDE_NO_EXPORT void RP::Image::closed () { +TDE_NO_EXPORT void RP::Image::closed () { src = getAttribute (StringPool::attr_name); } -KDE_NO_EXPORT void RP::Image::activate () { +TDE_NO_EXPORT void RP::Image::activate () { kdDebug () << "RP::Image::activate" << endl; setState (state_activated); isPlayable (); // update src attribute @@ -214,11 +214,11 @@ KDE_NO_EXPORT void RP::Image::activate () { } } -KDE_NO_EXPORT void RP::Image::begin () { +TDE_NO_EXPORT void RP::Image::begin () { Node::begin (); } -KDE_NO_EXPORT void RP::Image::deactivate () { +TDE_NO_EXPORT void RP::Image::deactivate () { cached_img.setUrl (TQString ()); if (img_surface) { img_surface->remove (); @@ -229,7 +229,7 @@ KDE_NO_EXPORT void RP::Image::deactivate () { } -KDE_NO_EXPORT void RP::Image::remoteReady (TQByteArray & data) { +TDE_NO_EXPORT void RP::Image::remoteReady (TQByteArray & data) { kdDebug () << "RP::Image::remoteReady" << endl; if (!data.isEmpty () && cached_img.isEmpty ()) { TQImage * img = new TQImage (data); @@ -244,13 +244,13 @@ KDE_NO_EXPORT void RP::Image::remoteReady (TQByteArray & data) { postpone_lock = 0L; } -KDE_NO_EXPORT bool RP::Image::isReady (bool postpone_if_not) { +TDE_NO_EXPORT bool RP::Image::isReady (bool postpone_if_not) { if (downloading () && postpone_if_not) postpone_lock = document ()->postpone (); return !downloading (); } -KDE_NO_EXPORT Surface *RP::Image::surface () { +TDE_NO_EXPORT Surface *RP::Image::surface () { if (!img_surface && !cached_img.isEmpty ()) { Node * p = parentNode ().ptr (); if (p && p->id == RP::id_node_imfl) { @@ -266,7 +266,7 @@ KDE_NO_EXPORT Surface *RP::Image::surface () { KDE_NO_CDTOR_EXPORT RP::TimingsBase::TimingsBase (NodePtr & d, const short i) : Element (d, i), x (0), y (0), w (0), h (0), start (0), duration (0) {} -KDE_NO_EXPORT void RP::TimingsBase::activate () { +TDE_NO_EXPORT void RP::TimingsBase::activate () { setState (state_activated); x = y = w = h = 0; srcx = srcy = srcw = srch = 0; @@ -305,13 +305,13 @@ KDE_NO_EXPORT void RP::TimingsBase::activate () { start_timer = document ()->setTimeout (this, start *100); } -KDE_NO_EXPORT void RP::TimingsBase::deactivate () { +TDE_NO_EXPORT void RP::TimingsBase::deactivate () { if (unfinished ()) finish (); setState (state_deactivated); } -KDE_NO_EXPORT bool RP::TimingsBase::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool RP::TimingsBase::handleEvent (EventPtr event) { if (event->id () == event_timer) { TimerEvent * te = static_cast <TimerEvent *> (event.ptr ()); if (te->timer_info == update_timer && duration > 0) { @@ -337,7 +337,7 @@ KDE_NO_EXPORT bool RP::TimingsBase::handleEvent (EventPtr event) { return false; } -KDE_NO_EXPORT void RP::TimingsBase::begin () { +TDE_NO_EXPORT void RP::TimingsBase::begin () { progress = 0; setState (state_began); if (target) @@ -349,14 +349,14 @@ KDE_NO_EXPORT void RP::TimingsBase::begin () { } } -KDE_NO_EXPORT void RP::TimingsBase::update (int percentage) { +TDE_NO_EXPORT void RP::TimingsBase::update (int percentage) { progress = percentage; Node * p = parentNode ().ptr (); if (p->id == RP::id_node_imfl) static_cast <RP::Imfl *> (p)->repaint (); } -KDE_NO_EXPORT void RP::TimingsBase::finish () { +TDE_NO_EXPORT void RP::TimingsBase::finish () { progress = 100; if (start_timer) { document ()->cancelTimer (start_timer); @@ -373,11 +373,11 @@ KDE_NO_EXPORT void RP::TimingsBase::finish () { Element::finish (); } -KDE_NO_EXPORT void RP::Crossfade::activate () { +TDE_NO_EXPORT void RP::Crossfade::activate () { TimingsBase::activate (); } -KDE_NO_EXPORT void RP::Crossfade::begin () { +TDE_NO_EXPORT void RP::Crossfade::begin () { //kdDebug () << "RP::Crossfade::begin" << endl; TimingsBase::begin (); if (target && target->id == id_node_image) { @@ -389,17 +389,17 @@ KDE_NO_EXPORT void RP::Crossfade::begin () { } } -KDE_NO_EXPORT void RP::Crossfade::accept (Visitor * v) { +TDE_NO_EXPORT void RP::Crossfade::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT void RP::Fadein::activate () { +TDE_NO_EXPORT void RP::Fadein::activate () { // pickup color from Fill that should be declared before this node from_color = 0; TimingsBase::activate (); } -KDE_NO_EXPORT void RP::Fadein::begin () { +TDE_NO_EXPORT void RP::Fadein::begin () { //kdDebug () << "RP::Fadein::begin" << endl; TimingsBase::begin (); if (target && target->id == id_node_image) { @@ -411,39 +411,39 @@ KDE_NO_EXPORT void RP::Fadein::begin () { } } -KDE_NO_EXPORT void RP::Fadein::accept (Visitor * v) { +TDE_NO_EXPORT void RP::Fadein::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT void RP::Fadeout::activate () { +TDE_NO_EXPORT void RP::Fadeout::activate () { to_color = TQColor (getAttribute ("color")).rgb (); TimingsBase::activate (); } -KDE_NO_EXPORT void RP::Fadeout::begin () { +TDE_NO_EXPORT void RP::Fadeout::begin () { //kdDebug () << "RP::Fadeout::begin" << endl; TimingsBase::begin (); } -KDE_NO_EXPORT void RP::Fadeout::accept (Visitor * v) { +TDE_NO_EXPORT void RP::Fadeout::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT void RP::Fill::activate () { +TDE_NO_EXPORT void RP::Fill::activate () { color = TQColor (getAttribute ("color")).rgb (); TimingsBase::activate (); } -KDE_NO_EXPORT void RP::Fill::begin () { +TDE_NO_EXPORT void RP::Fill::begin () { setState (state_began); update (0); } -KDE_NO_EXPORT void RP::Fill::accept (Visitor * v) { +TDE_NO_EXPORT void RP::Fill::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT void RP::Wipe::activate () { +TDE_NO_EXPORT void RP::Wipe::activate () { //TODO implement 'type="push"' TQString dir = getAttribute ("direction").lower (); direction = dir_right; @@ -456,7 +456,7 @@ KDE_NO_EXPORT void RP::Wipe::activate () { TimingsBase::activate (); } -KDE_NO_EXPORT void RP::Wipe::begin () { +TDE_NO_EXPORT void RP::Wipe::begin () { //kdDebug () << "RP::Wipe::begin" << endl; TimingsBase::begin (); if (target && target->id == id_node_image) { @@ -468,15 +468,15 @@ KDE_NO_EXPORT void RP::Wipe::begin () { } } -KDE_NO_EXPORT void RP::Wipe::accept (Visitor * v) { +TDE_NO_EXPORT void RP::Wipe::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT void RP::ViewChange::activate () { +TDE_NO_EXPORT void RP::ViewChange::activate () { TimingsBase::activate (); } -KDE_NO_EXPORT void RP::ViewChange::begin () { +TDE_NO_EXPORT void RP::ViewChange::begin () { kdDebug () << "RP::ViewChange::begin" << endl; setState (state_began); Node * p = parentNode ().ptr (); @@ -485,13 +485,13 @@ KDE_NO_EXPORT void RP::ViewChange::begin () { update (0); } -KDE_NO_EXPORT void RP::ViewChange::finish () { +TDE_NO_EXPORT void RP::ViewChange::finish () { Node * p = parentNode ().ptr (); if (p && p->id == RP::id_node_imfl) static_cast <RP::Imfl *> (p)->needs_scene_img--; TimingsBase::finish (); } -KDE_NO_EXPORT void RP::ViewChange::accept (Visitor * v) { +TDE_NO_EXPORT void RP::ViewChange::accept (Visitor * v) { v->visit (this); } diff --git a/src/kmplayer_rp.h b/src/kmplayer_rp.h index 29dad0c..4689aae 100644 --- a/src/kmplayer_rp.h +++ b/src/kmplayer_rp.h @@ -53,7 +53,7 @@ class KMPLAYER_NO_EXPORT Imfl : public Mrl { public: Imfl (NodePtr & d); ~Imfl (); - KDE_NO_EXPORT virtual const char * nodeName () const { return "imfl"; } + TDE_NO_EXPORT virtual const char * nodeName () const { return "imfl"; } virtual NodePtr childFromTag (const TQString & tag); virtual void closed (); virtual void defer (); // start loading the images if not yet done @@ -61,8 +61,8 @@ public: virtual void finish (); // end the timings virtual void deactivate (); // stop handling paint events virtual void childDone (NodePtr child); // for if no duration_timer set - KDE_NO_EXPORT virtual bool expose () const { return false; } - KDE_NO_EXPORT virtual PlayType playType () const { return play_type_image; } + TDE_NO_EXPORT virtual bool expose () const { return false; } + TDE_NO_EXPORT virtual PlayType playType () const { return play_type_image; } virtual bool handleEvent (EventPtr event); virtual void accept (Visitor *); Surface *surface (); @@ -83,7 +83,7 @@ public: virtual void finish (); // ?duration_timer has expired? virtual void deactivate (); // disabled virtual bool handleEvent (EventPtr event); - KDE_NO_EXPORT virtual bool expose () const { return false; } + TDE_NO_EXPORT virtual bool expose () const { return false; } int progress; Single x, y, w, h; Single srcx, srcy, srcw, srch; @@ -103,7 +103,7 @@ public: KDE_NO_CDTOR_EXPORT Crossfade (NodePtr & d) : TimingsBase (d, id_node_crossfade) {} KDE_NO_CDTOR_EXPORT ~Crossfade () {} - KDE_NO_EXPORT virtual const char * nodeName () const { return "crossfade"; } + TDE_NO_EXPORT virtual const char * nodeName () const { return "crossfade"; } virtual void activate (); virtual void begin (); virtual void accept (Visitor *); @@ -113,7 +113,7 @@ class KMPLAYER_NO_EXPORT Fadein : public TimingsBase { public: KDE_NO_CDTOR_EXPORT Fadein (NodePtr & d) : TimingsBase(d, id_node_fadein) {} KDE_NO_CDTOR_EXPORT ~Fadein () {} - KDE_NO_EXPORT virtual const char * nodeName () const { return "fadein"; } + TDE_NO_EXPORT virtual const char * nodeName () const { return "fadein"; } virtual void activate (); virtual void begin (); virtual void accept (Visitor *); @@ -124,7 +124,7 @@ class KMPLAYER_NO_EXPORT Fadeout : public TimingsBase { public: KDE_NO_CDTOR_EXPORT Fadeout(NodePtr &d) : TimingsBase(d, id_node_fadeout) {} KDE_NO_CDTOR_EXPORT ~Fadeout () {} - KDE_NO_EXPORT virtual const char * nodeName () const { return "fadeout"; } + TDE_NO_EXPORT virtual const char * nodeName () const { return "fadeout"; } virtual void activate (); virtual void begin (); virtual void accept (Visitor *); @@ -135,7 +135,7 @@ class KMPLAYER_NO_EXPORT Fill : public TimingsBase { public: KDE_NO_CDTOR_EXPORT Fill (NodePtr & d) : TimingsBase (d, id_node_fill) {} KDE_NO_CDTOR_EXPORT ~Fill () {} - KDE_NO_EXPORT virtual const char * nodeName () const { return "fill"; } + TDE_NO_EXPORT virtual const char * nodeName () const { return "fill"; } virtual void activate (); virtual void begin (); unsigned int fillColor () const { return color; } @@ -147,7 +147,7 @@ class KMPLAYER_NO_EXPORT Wipe : public TimingsBase { public: KDE_NO_CDTOR_EXPORT Wipe (NodePtr & d) : TimingsBase (d, id_node_wipe) {} KDE_NO_CDTOR_EXPORT ~Wipe () {} - KDE_NO_EXPORT virtual const char * nodeName () const { return "wipe"; } + TDE_NO_EXPORT virtual const char * nodeName () const { return "wipe"; } virtual void activate (); virtual void begin (); virtual void accept (Visitor *); @@ -159,7 +159,7 @@ public: KDE_NO_CDTOR_EXPORT ViewChange (NodePtr & d) : TimingsBase (d, id_node_viewchange) {} KDE_NO_CDTOR_EXPORT ~ViewChange () {} - KDE_NO_EXPORT virtual const char * nodeName() const { return "viewchange"; } + TDE_NO_EXPORT virtual const char * nodeName() const { return "viewchange"; } virtual void activate (); virtual void begin (); virtual void finish (); @@ -171,7 +171,7 @@ class KMPLAYER_NO_EXPORT Image : public RemoteObject, public Mrl { public: Image (NodePtr & d); ~Image (); - KDE_NO_EXPORT virtual const char * nodeName () const { return "image"; } + TDE_NO_EXPORT virtual const char * nodeName () const { return "image"; } virtual void activate (); virtual void begin (); virtual void deactivate (); diff --git a/src/kmplayer_rss.cpp b/src/kmplayer_rss.cpp index 174fe23..9833474 100644 --- a/src/kmplayer_rss.cpp +++ b/src/kmplayer_rss.cpp @@ -22,13 +22,13 @@ using namespace KMPlayer; -KDE_NO_EXPORT NodePtr RSS::Rss::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr RSS::Rss::childFromTag (const TQString & tag) { if (!strcmp (tag.latin1 (), "channel")) return new RSS::Channel (m_doc); return 0L; } -KDE_NO_EXPORT NodePtr RSS::Channel::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr RSS::Channel::childFromTag (const TQString & tag) { const char *ctag = tag.ascii (); if (!strcmp (ctag, "item")) return new RSS::Item (m_doc); @@ -37,7 +37,7 @@ KDE_NO_EXPORT NodePtr RSS::Channel::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void RSS::Channel::closed () { +TDE_NO_EXPORT void RSS::Channel::closed () { for (NodePtr c = firstChild (); c; c = c->nextSibling ()) if (c->id == id_node_title) { pretty_name = c->innerText ().simplifyWhiteSpace (); @@ -45,12 +45,12 @@ KDE_NO_EXPORT void RSS::Channel::closed () { } } -KDE_NO_EXPORT bool RSS::Channel::expose () const { +TDE_NO_EXPORT bool RSS::Channel::expose () const { return !pretty_name.isEmpty () || //return false if no title and only one previousSibling () || nextSibling (); } -KDE_NO_EXPORT NodePtr RSS::Item::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr RSS::Item::childFromTag (const TQString & tag) { const char *ctag = tag.ascii (); if (!strcmp (ctag, "enclosure")) return new RSS::Enclosure (m_doc); @@ -61,7 +61,7 @@ KDE_NO_EXPORT NodePtr RSS::Item::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void RSS::Item::closed () { +TDE_NO_EXPORT void RSS::Item::closed () { cached_play_type = play_type_none; for (NodePtr c = firstChild (); c; c = c->nextSibling ()) { switch (c->id) { @@ -81,13 +81,13 @@ KDE_NO_EXPORT void RSS::Item::closed () { cached_play_type = play_type_audio; } -KDE_NO_EXPORT Mrl * RSS::Item::linkNode () { +TDE_NO_EXPORT Mrl * RSS::Item::linkNode () { if (enclosure) return enclosure->mrl (); return Mrl::linkNode (); } -KDE_NO_EXPORT void RSS::Item::activate () { +TDE_NO_EXPORT void RSS::Item::activate () { PlayListNotify * n = document()->notify_listener; if (n) { for (NodePtr c = firstChild (); c; c = c->nextSibling ()) @@ -106,7 +106,7 @@ KDE_NO_EXPORT void RSS::Item::activate () { Mrl::activate (); } -KDE_NO_EXPORT void RSS::Item::deactivate () { +TDE_NO_EXPORT void RSS::Item::deactivate () { if (timer) { document ()->cancelTimer (timer); timer = 0L; @@ -117,7 +117,7 @@ KDE_NO_EXPORT void RSS::Item::deactivate () { Mrl::deactivate (); } -KDE_NO_EXPORT bool RSS::Item::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool RSS::Item::handleEvent (EventPtr event) { if (event->id () == event_timer) { timer = 0L; finish (); @@ -125,6 +125,6 @@ KDE_NO_EXPORT bool RSS::Item::handleEvent (EventPtr event) { return true; } -KDE_NO_EXPORT void RSS::Enclosure::closed () { +TDE_NO_EXPORT void RSS::Enclosure::closed () { src = getAttribute (StringPool::attr_url); } diff --git a/src/kmplayer_rss.h b/src/kmplayer_rss.h index 2a56781..8bb86d8 100644 --- a/src/kmplayer_rss.h +++ b/src/kmplayer_rss.h @@ -43,7 +43,7 @@ class KMPLAYER_NO_EXPORT Rss : public Mrl { public: KDE_NO_CDTOR_EXPORT Rss (NodePtr & d) : Mrl (d, id_node_rss) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "rss"; } + TDE_NO_EXPORT const char * nodeName () const { return "rss"; } bool expose () const { return false; } }; @@ -51,7 +51,7 @@ class KMPLAYER_NO_EXPORT Channel : public Mrl { public: KDE_NO_CDTOR_EXPORT Channel (NodePtr & d) : Mrl (d, id_node_channel) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "channel"; } + TDE_NO_EXPORT const char * nodeName () const { return "channel"; } PlayType playType () { return play_type_none; } void closed (); bool expose () const; @@ -61,7 +61,7 @@ class KMPLAYER_NO_EXPORT Item : public Mrl { public: KDE_NO_CDTOR_EXPORT Item (NodePtr & d) : Mrl (d, id_node_item) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "item"; } + TDE_NO_EXPORT const char * nodeName () const { return "item"; } PlayType playType () { return cached_play_type; } Mrl * linkNode (); void closed (); @@ -75,7 +75,7 @@ public: class KMPLAYER_NO_EXPORT Enclosure : public Mrl { public: KDE_NO_CDTOR_EXPORT Enclosure(NodePtr &d) : Mrl(d, id_node_enclosure) {} - KDE_NO_EXPORT const char * nodeName () const { return "enclosure"; } + TDE_NO_EXPORT const char * nodeName () const { return "enclosure"; } void closed (); bool expose () const { return false; } }; diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp index d8a0b79..54f6bf0 100644 --- a/src/kmplayer_smil.cpp +++ b/src/kmplayer_smil.cpp @@ -73,7 +73,7 @@ static const unsigned int trans_out_timer_id = (unsigned int) 7; */ //----------------------------------------------------------------------------- -KDE_NO_EXPORT bool KMPlayer::parseTime (const TQString & vl, int & dur) { +TDE_NO_EXPORT bool KMPlayer::parseTime (const TQString & vl, int & dur) { const char * cval = vl.ascii (); if (!cval) { dur = 0; @@ -197,7 +197,7 @@ KDE_NO_CDTOR_EXPORT Runtime::~Runtime () { reset (); } -KDE_NO_EXPORT void Runtime::reset () { +TDE_NO_EXPORT void Runtime::reset () { if (element) { if (start_timer) { element->document ()->cancelTimer (start_timer); @@ -222,7 +222,7 @@ KDE_NO_EXPORT void Runtime::reset () { endTime ().durval = dur_media; } -KDE_NO_EXPORT +TDE_NO_EXPORT void Runtime::setDurationItem (DurationTime item, const TQString & val) { int dur = -2; // also 0 for 'media' duration, so it will not update then TQString vs = val.stripWhiteSpace (); @@ -313,7 +313,7 @@ void Runtime::setDurationItem (DurationTime item, const TQString & val) { /** * start, or restart in case of re-use, the durations */ -KDE_NO_EXPORT void Runtime::begin () { +TDE_NO_EXPORT void Runtime::begin () { if (!element) { reset (); return; @@ -360,7 +360,7 @@ KDE_NO_EXPORT void Runtime::begin () { propagateStart (); } -KDE_NO_EXPORT void Runtime::beginAndStart () { +TDE_NO_EXPORT void Runtime::beginAndStart () { if (element) { if (start_timer || duration_timer) convertNode <SMIL::TimedMrl> (element)->init (); @@ -369,7 +369,7 @@ KDE_NO_EXPORT void Runtime::beginAndStart () { } } -KDE_NO_EXPORT +TDE_NO_EXPORT bool Runtime::parseParam (const TrieString & name, const TQString & val) { //kdDebug () << "Runtime::parseParam " << name << "=" << val << endl; if (name == StringPool::attr_begin) { @@ -419,7 +419,7 @@ bool Runtime::parseParam (const TrieString & name, const TQString & val) { return true; } -KDE_NO_EXPORT void Runtime::processEvent (unsigned int event) { +TDE_NO_EXPORT void Runtime::processEvent (unsigned int event) { SMIL::TimedMrl * tm = convertNode <SMIL::TimedMrl> (element); if (tm) { if (timingstate != timings_started && beginTime ().durval == event) { @@ -439,7 +439,7 @@ KDE_NO_EXPORT void Runtime::processEvent (unsigned int event) { reset (); } -KDE_NO_EXPORT void Runtime::propagateStop (bool forced) { +TDE_NO_EXPORT void Runtime::propagateStop (bool forced) { if (state() == timings_reset || state() == timings_stopped) return; // nothing to stop if (!forced && element) { @@ -478,7 +478,7 @@ KDE_NO_EXPORT void Runtime::propagateStop (bool forced) { } } -KDE_NO_EXPORT void Runtime::propagateStart () { +TDE_NO_EXPORT void Runtime::propagateStart () { SMIL::TimedMrl * tm = convertNode <SMIL::TimedMrl> (element); if (tm) { tm->propagateEvent (new ToBeStartedEvent (element)); @@ -494,7 +494,7 @@ KDE_NO_EXPORT void Runtime::propagateStart () { /** * start_timer timer expired */ -KDE_NO_EXPORT void Runtime::started () { +TDE_NO_EXPORT void Runtime::started () { //kdDebug () << "Runtime::started " << (element ? element->nodeName() : "-") << endl; NodePtr e = element; // element is weak SMIL::TimedMrl * tm = convertNode <SMIL::TimedMrl> (e); @@ -517,7 +517,7 @@ KDE_NO_EXPORT void Runtime::started () { /** * duration_timer timer expired or no duration set after started */ -KDE_NO_EXPORT void Runtime::stopped () { +TDE_NO_EXPORT void Runtime::stopped () { if (!element) { reset (); } else if (element->active ()) { @@ -627,7 +627,7 @@ IRect IRect::intersect (const IRect & r) const { //----------------------------------------------------------------------------- -KDE_NO_EXPORT void CalculatedSizer::resetSizes () { +TDE_NO_EXPORT void CalculatedSizer::resetSizes () { left.reset (); top.reset (); width.reset (); @@ -670,7 +670,7 @@ static bool regPoints (const TQString & str, Single & x, Single & y) { return true; } -KDE_NO_EXPORT +TDE_NO_EXPORT bool CalculatedSizer::applyRegPoints (Node * node, Single w, Single h, Single & xoff, Single & yoff, Single & w1, Single & h1) { if (reg_point.isEmpty ()) @@ -714,7 +714,7 @@ bool CalculatedSizer::applyRegPoints (Node * node, Single w, Single h, return true; // success getting sizes based on regPoint } -KDE_NO_EXPORT void CalculatedSizer::calcSizes (Node * node, Single w, Single h, +TDE_NO_EXPORT void CalculatedSizer::calcSizes (Node * node, Single w, Single h, Single & xoff, Single & yoff, Single & w1, Single & h1) { if (applyRegPoints (node, w, h, xoff, yoff, w1, h1)) return; @@ -754,7 +754,7 @@ KDE_NO_EXPORT void CalculatedSizer::calcSizes (Node * node, Single w, Single h, h1 = 0; } -KDE_NO_EXPORT +TDE_NO_EXPORT bool CalculatedSizer::setSizeParam(const TrieString &name, const TQString &val, bool &dim_changed) { dim_changed = true; if (name == StringPool::attr_left) { @@ -784,7 +784,7 @@ bool CalculatedSizer::setSizeParam(const TrieString &name, const TQString &val, return true; } -KDE_NO_EXPORT void +TDE_NO_EXPORT void CalculatedSizer::move (const SizeType &x, const SizeType &y) { if (left.isSet ()) { if (right.isSet ()) { @@ -832,19 +832,19 @@ bool AnimateGroupData::parseParam (const TrieString &name, const TQString &val) /** * animation finished */ -KDE_NO_EXPORT void AnimateGroupData::stopped () { +TDE_NO_EXPORT void AnimateGroupData::stopped () { //kdDebug () << "AnimateGroupData::stopped " << durTime ().durval << endl; if (!SMIL::TimedMrl::keepContent (element)) restoreModification (); Runtime::stopped (); } -KDE_NO_EXPORT void AnimateGroupData::reset () { +TDE_NO_EXPORT void AnimateGroupData::reset () { restoreModification (); Runtime::reset (); } -KDE_NO_EXPORT void AnimateGroupData::restoreModification () { +TDE_NO_EXPORT void AnimateGroupData::restoreModification () { if (modification_id > -1 && target_element && target_element->state > Node::state_init) { //kdDebug () << "AnimateGroupData(" << this << ")::restoreModificatio " <<modification_id << endl; @@ -859,7 +859,7 @@ KDE_NO_EXPORT void AnimateGroupData::restoreModification () { /** * start_timer timer expired, execute it */ -KDE_NO_EXPORT void SetData::started () { +TDE_NO_EXPORT void SetData::started () { restoreModification (); if (element) { if (target_element) { @@ -911,7 +911,7 @@ static Point2D PointOnCubicBezier (Point2D *cp, float t) { KDE_NO_CDTOR_EXPORT AnimateData::AnimateData (NodePtr e) : AnimateGroupData (e), change_by (0), steps (0) {} -KDE_NO_EXPORT void AnimateData::reset () { +TDE_NO_EXPORT void AnimateData::reset () { AnimateGroupData::reset (); if (element) { if (anim_timer) @@ -953,7 +953,7 @@ bool AnimateData::parseParam (const TrieString & name, const TQString & val) { /** * start_timer timer expired, execute it */ -KDE_NO_EXPORT void AnimateData::started () { +TDE_NO_EXPORT void AnimateData::started () { //kdDebug () << "AnimateData::started " << durTime ().durval << endl; restoreModification (); if (anim_timer) { @@ -1033,7 +1033,7 @@ KDE_NO_EXPORT void AnimateData::started () { /** * undo if necessary */ -KDE_NO_EXPORT void AnimateData::stopped () { +TDE_NO_EXPORT void AnimateData::stopped () { if (element) { if (anim_timer) // make sure timers are stopped element->document ()->cancelTimer (anim_timer); @@ -1049,7 +1049,7 @@ KDE_NO_EXPORT void AnimateData::stopped () { AnimateGroupData::stopped (); } -KDE_NO_EXPORT void AnimateData::applyStep () { +TDE_NO_EXPORT void AnimateData::applyStep () { Element * target = convertNode <Element> (target_element); if (target && calcMode == calc_linear) target->setParam (changed_attribute, TQString ("%1%2").arg ( @@ -1064,7 +1064,7 @@ KDE_NO_EXPORT void AnimateData::applyStep () { /** * for animations */ -KDE_NO_EXPORT bool AnimateData::timerTick () { +TDE_NO_EXPORT bool AnimateData::timerTick () { if (!anim_timer) { kdError () << "spurious anim timer tick" << endl; } else if (steps-- > 0) { @@ -1105,7 +1105,7 @@ bool AnimateMotionData::checkTarget (Node *n) { return true; } -KDE_NO_EXPORT void AnimateMotionData::reset () { +TDE_NO_EXPORT void AnimateMotionData::reset () { AnimateGroupData::reset (); if (element) { if (anim_timer) @@ -1237,7 +1237,7 @@ bool AnimateMotionData::setInterval () { return true; } -KDE_NO_EXPORT void AnimateMotionData::started () { +TDE_NO_EXPORT void AnimateMotionData::started () { //kdDebug () << "AnimateMotionData::started " << durTime ().durval << endl; Element *target = convertNode <Element> (target_element); if (!element || !checkTarget (target)) @@ -1293,7 +1293,7 @@ KDE_NO_EXPORT void AnimateMotionData::started () { } -KDE_NO_EXPORT void AnimateMotionData::stopped () { +TDE_NO_EXPORT void AnimateMotionData::stopped () { if (element) { if (anim_timer) // make sure timers are stopped element->document ()->cancelTimer (anim_timer); @@ -1313,7 +1313,7 @@ KDE_NO_EXPORT void AnimateMotionData::stopped () { AnimateGroupData::stopped (); } -KDE_NO_EXPORT void AnimateMotionData::applyStep () { +TDE_NO_EXPORT void AnimateMotionData::applyStep () { Node *target = target_element.ptr (); if (!checkTarget (target)) return; @@ -1332,7 +1332,7 @@ KDE_NO_EXPORT void AnimateMotionData::applyStep () { } } -KDE_NO_EXPORT bool AnimateMotionData::timerTick () { +TDE_NO_EXPORT bool AnimateMotionData::timerTick () { if (!anim_timer) { kdError () << "spurious animateMotion timer tick" << endl; } else if (cur_step++ < steps) { @@ -1396,7 +1396,7 @@ KDE_NO_CDTOR_EXPORT MediaTypeRuntime::~MediaTypeRuntime () { /** * re-implement for pending TDEIO::Job operations */ -KDE_NO_EXPORT void KMPlayer::MediaTypeRuntime::reset () { +TDE_NO_EXPORT void KMPlayer::MediaTypeRuntime::reset () { clear (); postpone_lock = 0L; Runtime::reset (); @@ -1405,7 +1405,7 @@ KDE_NO_EXPORT void KMPlayer::MediaTypeRuntime::reset () { /** * will request a repaint of attached region */ -KDE_NO_EXPORT void MediaTypeRuntime::stopped () { +TDE_NO_EXPORT void MediaTypeRuntime::stopped () { clipStop (); document_postponed = 0L; Node * e = element.ptr (); @@ -1417,7 +1417,7 @@ KDE_NO_EXPORT void MediaTypeRuntime::stopped () { Runtime::stopped (); } -KDE_NO_EXPORT void MediaTypeRuntime::clipStart () { +TDE_NO_EXPORT void MediaTypeRuntime::clipStart () { SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); SMIL::RegionBase *r =mt ? convertNode<SMIL::RegionBase>(mt->region_node):0L; if (r && r->surface ()) @@ -1430,7 +1430,7 @@ KDE_NO_EXPORT void MediaTypeRuntime::clipStart () { } } -KDE_NO_EXPORT void MediaTypeRuntime::clipStop () { +TDE_NO_EXPORT void MediaTypeRuntime::clipStop () { SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); if (mt) { mt->resetSurface (); @@ -1439,20 +1439,20 @@ KDE_NO_EXPORT void MediaTypeRuntime::clipStop () { } } -KDE_NO_EXPORT void MediaTypeRuntime::postpone (bool) { +TDE_NO_EXPORT void MediaTypeRuntime::postpone (bool) { } KDE_NO_CDTOR_EXPORT AudioVideoData::AudioVideoData (NodePtr e) : MediaTypeRuntime (e) {} -KDE_NO_EXPORT bool AudioVideoData::isAudioVideo () { +TDE_NO_EXPORT bool AudioVideoData::isAudioVideo () { return timingstate == timings_started; } /** * reimplement for request backend to play audio/video */ -KDE_NO_EXPORT void AudioVideoData::started () { +TDE_NO_EXPORT void AudioVideoData::started () { if (element && !element->mrl ()->resolved) { element->defer (); return; @@ -1469,7 +1469,7 @@ static void setSmilLinkNode (NodePtr n, NodePtr link) { s->current_av_media_type = link; } -KDE_NO_EXPORT void AudioVideoData::clipStart () { +TDE_NO_EXPORT void AudioVideoData::clipStart () { NodePtr element_protect = element; // note element is weak SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); PlayListNotify * n = mt ? mt->document ()->notify_listener : 0L; @@ -1484,14 +1484,14 @@ KDE_NO_EXPORT void AudioVideoData::clipStart () { MediaTypeRuntime::clipStart (); } -KDE_NO_EXPORT void AudioVideoData::clipStop () { +TDE_NO_EXPORT void AudioVideoData::clipStop () { if (durTime ().durval == dur_media) durTime ().durval = dur_timer;//reset to make this finish MediaTypeRuntime::clipStop (); setSmilLinkNode (element, 0L); } -KDE_NO_EXPORT +TDE_NO_EXPORT bool AudioVideoData::parseParam(const TrieString &name, const TQString &val) { //kdDebug () << "AudioVideoData::parseParam " << name << "=" << val << endl; if (name == StringPool::attr_src) { @@ -1512,7 +1512,7 @@ bool AudioVideoData::parseParam(const TrieString &name, const TQString &val) { return true; } -KDE_NO_EXPORT void AudioVideoData::postpone (bool b) { +TDE_NO_EXPORT void AudioVideoData::postpone (bool b) { kdDebug () << "AudioVideoData::postpone " << b << endl; if (element->unfinished () && b) element->setState (Node::state_deferred); @@ -1598,7 +1598,7 @@ static Element * fromContentControlGroup (NodePtr & d, const TQString & tag) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT NodePtr SMIL::Smil::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::Smil::childFromTag (const TQString & tag) { const char * ctag = tag.ascii (); if (!strcmp (ctag, "body")) return new SMIL::Body (m_doc); @@ -1607,7 +1607,7 @@ KDE_NO_EXPORT NodePtr SMIL::Smil::childFromTag (const TQString & tag) { return NodePtr (); } -KDE_NO_EXPORT void SMIL::Smil::activate () { +TDE_NO_EXPORT void SMIL::Smil::activate () { //kdDebug () << "Smil::activate" << endl; current_av_media_type = NodePtr (); resolved = true; @@ -1621,7 +1621,7 @@ KDE_NO_EXPORT void SMIL::Smil::activate () { Element::deactivate(); // some unfortunate reset in parent doc } -KDE_NO_EXPORT void SMIL::Smil::deactivate () { +TDE_NO_EXPORT void SMIL::Smil::deactivate () { if (layout_node) convertNode <SMIL::Layout> (layout_node)->repaint (); if (layout_node) @@ -1630,11 +1630,11 @@ KDE_NO_EXPORT void SMIL::Smil::deactivate () { Mrl::deactivate (); } -KDE_NO_EXPORT bool SMIL::Smil::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool SMIL::Smil::handleEvent (EventPtr event) { return layout_node ? layout_node->handleEvent (event) : false; } -KDE_NO_EXPORT void SMIL::Smil::closed () { +TDE_NO_EXPORT void SMIL::Smil::closed () { NodePtr head; for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (e->id == id_node_head) { @@ -1669,7 +1669,7 @@ KDE_NO_EXPORT void SMIL::Smil::closed () { } } -KDE_NO_EXPORT void SMIL::Smil::childDone (NodePtr child) { +TDE_NO_EXPORT void SMIL::Smil::childDone (NodePtr child) { if (unfinished ()) { if (child->nextSibling ()) child->nextSibling ()->activate (); @@ -1682,16 +1682,16 @@ KDE_NO_EXPORT void SMIL::Smil::childDone (NodePtr child) { } } -KDE_NO_EXPORT Mrl * SMIL::Smil::linkNode () { +TDE_NO_EXPORT Mrl * SMIL::Smil::linkNode () { return current_av_media_type ? current_av_media_type->mrl () : this; } -KDE_NO_EXPORT bool SMIL::Smil::expose () const { +TDE_NO_EXPORT bool SMIL::Smil::expose () const { return !pretty_name.isEmpty () || //return false if no title and only one previousSibling () || nextSibling (); } -KDE_NO_EXPORT void SMIL::Smil::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::Smil::accept (Visitor * v) { if (active () && layout_node) layout_node->accept( v ); } @@ -1736,7 +1736,7 @@ static void headChildDone (NodePtr node, NodePtr child) { } } -KDE_NO_EXPORT NodePtr SMIL::Head::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::Head::childFromTag (const TQString & tag) { const char * ctag = tag.ascii (); if (!strcmp (ctag, "layout")) return new SMIL::Layout (m_doc); @@ -1749,11 +1749,11 @@ KDE_NO_EXPORT NodePtr SMIL::Head::childFromTag (const TQString & tag) { return NodePtr (); } -KDE_NO_EXPORT bool SMIL::Head::expose () const { +TDE_NO_EXPORT bool SMIL::Head::expose () const { return false; } -KDE_NO_EXPORT void SMIL::Head::closed () { +TDE_NO_EXPORT void SMIL::Head::closed () { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (e->id == id_node_layout) return; @@ -1763,7 +1763,7 @@ KDE_NO_EXPORT void SMIL::Head::closed () { layout->closed (); // add root-layout and a region } -KDE_NO_EXPORT void SMIL::Head::childDone (NodePtr child) { +TDE_NO_EXPORT void SMIL::Head::childDone (NodePtr child) { headChildDone (this, child); } @@ -1772,7 +1772,7 @@ KDE_NO_EXPORT void SMIL::Head::childDone (NodePtr child) { KDE_NO_CDTOR_EXPORT SMIL::Layout::Layout (NodePtr & d) : RegionBase (d, id_node_layout) {} -KDE_NO_EXPORT NodePtr SMIL::Layout::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::Layout::childFromTag (const TQString & tag) { const char * ctag = tag.ascii (); if (!strcmp (ctag, "root-layout")) { NodePtr e = new SMIL::RootLayout (m_doc); @@ -1785,7 +1785,7 @@ KDE_NO_EXPORT NodePtr SMIL::Layout::childFromTag (const TQString & tag) { return NodePtr (); } -KDE_NO_EXPORT void SMIL::Layout::closed () { +TDE_NO_EXPORT void SMIL::Layout::closed () { SMIL::RegionBase * rl = convertNode <SMIL::RootLayout> (rootLayout); bool has_root (rl); if (!has_root) { // just add one if none there @@ -1829,7 +1829,7 @@ KDE_NO_EXPORT void SMIL::Layout::closed () { } } -KDE_NO_EXPORT void SMIL::Layout::activate () { +TDE_NO_EXPORT void SMIL::Layout::activate () { //kdDebug () << "SMIL::Layout::activate" << endl; RegionBase::activate (); if (surface ()) { @@ -1839,7 +1839,7 @@ KDE_NO_EXPORT void SMIL::Layout::activate () { finish (); // proceed and allow 'head' to finish } -KDE_NO_EXPORT void SMIL::Layout::updateDimensions () { +TDE_NO_EXPORT void SMIL::Layout::updateDimensions () { RegionBase * rb = static_cast <RegionBase *> (rootLayout.ptr ()); x = y = 0; w = rb->sizes.width.size (); @@ -1848,7 +1848,7 @@ KDE_NO_EXPORT void SMIL::Layout::updateDimensions () { SMIL::RegionBase::updateDimensions (); } -KDE_NO_EXPORT Surface *SMIL::Layout::surface () { +TDE_NO_EXPORT Surface *SMIL::Layout::surface () { if (!region_surface) { SMIL::Smil * s = Smil::findSmilNode (this); if (s) { @@ -1875,7 +1875,7 @@ KDE_NO_EXPORT Surface *SMIL::Layout::surface () { return region_surface.ptr (); } -KDE_NO_EXPORT void SMIL::Layout::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::Layout::accept (Visitor * v) { v->visit (this); } @@ -1891,7 +1891,7 @@ KDE_NO_CDTOR_EXPORT SMIL::RegionBase::~RegionBase () { region_surface->remove (); } -KDE_NO_EXPORT void SMIL::RegionBase::activate () { +TDE_NO_EXPORT void SMIL::RegionBase::activate () { show_background = ShowAlways; init (); setState (state_activated); @@ -1900,11 +1900,11 @@ KDE_NO_EXPORT void SMIL::RegionBase::activate () { r->activate (); } -KDE_NO_EXPORT void SMIL::RegionBase::childDone (NodePtr child) { +TDE_NO_EXPORT void SMIL::RegionBase::childDone (NodePtr child) { headChildDone (this, child); } -KDE_NO_EXPORT void SMIL::RegionBase::deactivate () { +TDE_NO_EXPORT void SMIL::RegionBase::deactivate () { background_color = 0; background_image.truncate (0); if (region_surface) @@ -1916,7 +1916,7 @@ KDE_NO_EXPORT void SMIL::RegionBase::deactivate () { Element::deactivate (); } -KDE_NO_EXPORT void SMIL::RegionBase::remoteReady (TQByteArray & data) { +TDE_NO_EXPORT void SMIL::RegionBase::remoteReady (TQByteArray & data) { TQImage *pix = new TQImage (data); if (!pix->isNull ()) { cached_img.data->image = pix; @@ -1928,17 +1928,17 @@ KDE_NO_EXPORT void SMIL::RegionBase::remoteReady (TQByteArray & data) { postpone_lock = 0L; } -KDE_NO_EXPORT void SMIL::RegionBase::repaint () { +TDE_NO_EXPORT void SMIL::RegionBase::repaint () { if (surface ()) region_surface->repaint (SRect (0, 0, w, h)); } -KDE_NO_EXPORT void SMIL::RegionBase::repaint (const SRect & rect) { +TDE_NO_EXPORT void SMIL::RegionBase::repaint (const SRect & rect) { if (surface ()) region_surface->repaint (SRect (0, 0, w, h).intersect (rect)); } -KDE_NO_EXPORT void SMIL::RegionBase::updateDimensions () { +TDE_NO_EXPORT void SMIL::RegionBase::updateDimensions () { if (surface () && active ()) for (NodePtr r = firstChild (); r; r = r->nextSibling ()) if (r->id == id_node_region) { @@ -1948,7 +1948,7 @@ KDE_NO_EXPORT void SMIL::RegionBase::updateDimensions () { } } -KDE_NO_EXPORT void SMIL::RegionBase::boundsUpdate () { +TDE_NO_EXPORT void SMIL::RegionBase::boundsUpdate () { // if there is a region_surface and it's moved, do a limit repaint NodePtr p = parentNode (); if (p && (p->id==SMIL::id_node_region || p->id==SMIL::id_node_layout) && @@ -1962,7 +1962,7 @@ KDE_NO_EXPORT void SMIL::RegionBase::boundsUpdate () { } } -KDE_NO_EXPORT Surface *SMIL::RegionBase::surface () { +TDE_NO_EXPORT Surface *SMIL::RegionBase::surface () { if (!region_surface) { Node *n = parentNode ().ptr (); if (n && @@ -1978,7 +1978,7 @@ KDE_NO_EXPORT Surface *SMIL::RegionBase::surface () { return region_surface.ptr (); } -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::RegionBase::parseParam (const TrieString & name, const TQString & val) { //kdDebug () << "RegionBase::parseParam " << getAttribute ("id") << " " << name << "=" << val << " active:" << active() << endl; bool need_repaint = false; @@ -2044,7 +2044,7 @@ KDE_NO_CDTOR_EXPORT SMIL::Region::Region (NodePtr & d) has_mouse (false), m_AttachedMediaTypes (new NodeRefList) {} -KDE_NO_EXPORT NodePtr SMIL::Region::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::Region::childFromTag (const TQString & tag) { if (!strcmp (tag.latin1 (), "region")) return new SMIL::Region (m_doc); return NodePtr (); @@ -2054,7 +2054,7 @@ KDE_NO_EXPORT NodePtr SMIL::Region::childFromTag (const TQString & tag) { * calculates dimensions of this regions with _w and _h as width and height * of parent Region (representing 100%) */ -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::Region::calculateBounds (Single pw, Single ph) { Single x1 (x), y1 (y), w1 (w), h1 (h); sizes.calcSizes (this, pw, ph, x, y, w, h); @@ -2074,13 +2074,13 @@ NodeRefListPtr SMIL::Region::listeners (unsigned int eid) { return RegionBase::listeners (eid); } -KDE_NO_EXPORT void SMIL::Region::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::Region::accept (Visitor * v) { v->visit (this); } //----------------------------------------------------------------------------- -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::RegPoint::parseParam (const TrieString & p, const TQString & v) { bool b; sizes.setSizeParam (p, v, b); // TODO: if dynamic, make sure to repaint @@ -2125,7 +2125,7 @@ KDE_NO_CDTOR_EXPORT SMIL::Transition::Transition (NodePtr & d) : Element (d, id_node_transition), type_info (NULL), direction (dir_forward), dur (10), fade_color (0) {} -KDE_NO_EXPORT void SMIL::Transition::activate () { +TDE_NO_EXPORT void SMIL::Transition::activate () { type = TransTypeNone; sub_type = SubTransTypeNone; start_progress = 0.0; @@ -2135,7 +2135,7 @@ KDE_NO_EXPORT void SMIL::Transition::activate () { Element::activate (); } -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::Transition::parseParam (const TrieString & para, const TQString & val) { if (para == StringPool::attr_type) { type_info = transInfoFromString (val.ascii ()); @@ -2183,7 +2183,7 @@ void SMIL::Transition::parseParam (const TrieString & para, const TQString & val } } -KDE_NO_EXPORT bool SMIL::Transition::supported () { +TDE_NO_EXPORT bool SMIL::Transition::supported () { switch (type) { case Fade: case BarWipe: @@ -2212,12 +2212,12 @@ KDE_NO_CDTOR_EXPORT SMIL::TimedMrl::~TimedMrl () { delete m_runtime; } -KDE_NO_EXPORT void SMIL::TimedMrl::closed () { +TDE_NO_EXPORT void SMIL::TimedMrl::closed () { pretty_name = getAttribute (StringPool::attr_title); Mrl::closed (); } -KDE_NO_EXPORT void SMIL::TimedMrl::init () { +TDE_NO_EXPORT void SMIL::TimedMrl::init () { runtime ()->reset (); begin_time = finish_time = 0; fill = fill_default; @@ -2226,7 +2226,7 @@ KDE_NO_EXPORT void SMIL::TimedMrl::init () { Mrl::init (); } -KDE_NO_EXPORT void SMIL::TimedMrl::activate () { +TDE_NO_EXPORT void SMIL::TimedMrl::activate () { //kdDebug () << "SMIL::TimedMrl(" << nodeName() << ")::activate" << endl; Runtime * rt = runtime (); init (); @@ -2237,13 +2237,13 @@ KDE_NO_EXPORT void SMIL::TimedMrl::activate () { deactivate (); } -KDE_NO_EXPORT void SMIL::TimedMrl::begin () { +TDE_NO_EXPORT void SMIL::TimedMrl::begin () { begin_time = document ()->last_event_time; Element::begin (); runtime ()->propagateStop (false); //see whether this node has a livetime or not } -KDE_NO_EXPORT void SMIL::TimedMrl::deactivate () { +TDE_NO_EXPORT void SMIL::TimedMrl::deactivate () { //kdDebug () << "SMIL::TimedMrl(" << nodeName() << ")::deactivate" << endl; if (unfinished ()) finish (); @@ -2255,7 +2255,7 @@ KDE_NO_EXPORT void SMIL::TimedMrl::deactivate () { Mrl::deactivate (); } -KDE_NO_EXPORT void SMIL::TimedMrl::finish () { +TDE_NO_EXPORT void SMIL::TimedMrl::finish () { if (m_runtime && (m_runtime->state () == Runtime::timings_started || m_runtime->state () == Runtime::timings_began)) { @@ -2267,14 +2267,14 @@ KDE_NO_EXPORT void SMIL::TimedMrl::finish () { } } -KDE_NO_EXPORT void SMIL::TimedMrl::reset () { +TDE_NO_EXPORT void SMIL::TimedMrl::reset () { //kdDebug () << "SMIL::TimedMrl::reset " << endl; Mrl::reset (); delete m_runtime; m_runtime = 0L; } -KDE_NO_EXPORT void SMIL::TimedMrl::childBegan (NodePtr) { +TDE_NO_EXPORT void SMIL::TimedMrl::childBegan (NodePtr) { if (state != state_began) begin (); } @@ -2284,7 +2284,7 @@ KDE_NO_EXPORT void SMIL::TimedMrl::childBegan (NodePtr) { * Bail out if Runtime is running. In case of dur_media, give Runtime * a hand with calling propagateStop(true) */ -KDE_NO_EXPORT void SMIL::TimedMrl::childDone (NodePtr c) { +TDE_NO_EXPORT void SMIL::TimedMrl::childDone (NodePtr c) { if (!active ()) return; // forced reset if (c->nextSibling ()) @@ -2300,7 +2300,7 @@ KDE_NO_EXPORT void SMIL::TimedMrl::childDone (NodePtr c) { } } -KDE_NO_EXPORT NodeRefListPtr SMIL::TimedMrl::listeners (unsigned int id) { +TDE_NO_EXPORT NodeRefListPtr SMIL::TimedMrl::listeners (unsigned int id) { if (id == event_stopped) return m_StoppedListeners; else if (id == event_started) @@ -2311,7 +2311,7 @@ KDE_NO_EXPORT NodeRefListPtr SMIL::TimedMrl::listeners (unsigned int id) { return NodeRefListPtr (); } -KDE_NO_EXPORT bool SMIL::TimedMrl::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool SMIL::TimedMrl::handleEvent (EventPtr event) { unsigned int id = event->id (); switch (id) { case event_timer: { @@ -2337,11 +2337,11 @@ KDE_NO_EXPORT bool SMIL::TimedMrl::handleEvent (EventPtr event) { return true; } -KDE_NO_EXPORT Runtime * SMIL::TimedMrl::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::TimedMrl::getNewRuntime () { return new Runtime (this); } -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::TimedMrl::parseParam (const TrieString ¶, const TQString &value) { if (para.startsWith (StringPool::attr_fill)) { Fill * f = &fill; @@ -2376,7 +2376,7 @@ void SMIL::TimedMrl::parseParam (const TrieString ¶, const TQString &value) } } -KDE_NO_EXPORT +TDE_NO_EXPORT Runtime::DurationItem * SMIL::TimedMrl::getDuration (NodePtr n) { if (!isTimedMrl (n) || !n->active ()) return 0L; @@ -2384,7 +2384,7 @@ Runtime::DurationItem * SMIL::TimedMrl::getDuration (NodePtr n) { return &tm->runtime ()->durations [Runtime::duration_time]; } -KDE_NO_EXPORT bool SMIL::TimedMrl::keepContent (Node *n) { +TDE_NO_EXPORT bool SMIL::TimedMrl::keepContent (Node *n) { if (isTimedMrl (n)) { TimedMrl * tm = convertNode <SMIL::TimedMrl> (n); if (tm->runtime ()->timingstate == Runtime::timings_started) @@ -2426,7 +2426,7 @@ KDE_NO_EXPORT bool SMIL::TimedMrl::keepContent (Node *n) { return true; } -KDE_NO_EXPORT SMIL::TimedMrl::Fill SMIL::TimedMrl::getDefaultFill (NodePtr n) { +TDE_NO_EXPORT SMIL::TimedMrl::Fill SMIL::TimedMrl::getDefaultFill (NodePtr n) { for (NodePtr p = n->parentNode (); p; p = p->parentNode ()) if (isTimedMrl (p)) { SMIL::TimedMrl * tm = convertNode<SMIL::TimedMrl>(p); @@ -2441,7 +2441,7 @@ KDE_NO_EXPORT SMIL::TimedMrl::Fill SMIL::TimedMrl::getDefaultFill (NodePtr n) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT NodePtr SMIL::GroupBase::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::GroupBase::childFromTag (const TQString & tag) { Element * elm = fromScheduleGroup (m_doc, tag); if (!elm) elm = fromMediaContentGroup (m_doc, tag); if (!elm) elm = fromContentControlGroup (m_doc, tag); @@ -2451,7 +2451,7 @@ KDE_NO_EXPORT NodePtr SMIL::GroupBase::childFromTag (const TQString & tag) { return NULL; } -KDE_NO_EXPORT void SMIL::GroupBase::finish () { +TDE_NO_EXPORT void SMIL::GroupBase::finish () { setState (state_finished); // avoid recurstion through childDone for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (keepContent (e)) { @@ -2462,7 +2462,7 @@ KDE_NO_EXPORT void SMIL::GroupBase::finish () { TimedMrl::finish (); } -KDE_NO_EXPORT void SMIL::GroupBase::deactivate () { +TDE_NO_EXPORT void SMIL::GroupBase::deactivate () { setState (state_deactivated); // avoid recurstion through childDone for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (e->active ()) @@ -2470,7 +2470,7 @@ KDE_NO_EXPORT void SMIL::GroupBase::deactivate () { TimedMrl::deactivate (); } -KDE_NO_EXPORT void SMIL::GroupBase::setJumpNode (NodePtr n) { +TDE_NO_EXPORT void SMIL::GroupBase::setJumpNode (NodePtr n) { NodePtr child = n; if (state > state_init) { for (NodePtr c = firstChild (); c; c = c->nextSibling ()) @@ -2496,20 +2496,20 @@ KDE_NO_EXPORT void SMIL::GroupBase::setJumpNode (NodePtr n) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT void SMIL::Par::begin () { +TDE_NO_EXPORT void SMIL::Par::begin () { jump_node = 0L; // TODO: adjust timings for (NodePtr e = firstChild (); e; e = e->nextSibling ()) e->activate (); GroupBase::begin (); } -KDE_NO_EXPORT void SMIL::Par::reset () { +TDE_NO_EXPORT void SMIL::Par::reset () { GroupBase::reset (); for (NodePtr e = firstChild (); e; e = e->nextSibling ()) e->reset (); } -KDE_NO_EXPORT void SMIL::Par::childDone (NodePtr) { +TDE_NO_EXPORT void SMIL::Par::childDone (NodePtr) { if (unfinished ()) { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { if (e->unfinished ()) @@ -2529,7 +2529,7 @@ KDE_NO_EXPORT void SMIL::Par::childDone (NodePtr) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT void SMIL::Seq::begin () { +TDE_NO_EXPORT void SMIL::Seq::begin () { if (jump_node) { for (NodePtr c = firstChild (); c; c = c->nextSibling ()) if (c == jump_node) { @@ -2547,7 +2547,7 @@ KDE_NO_EXPORT void SMIL::Seq::begin () { GroupBase::begin (); } -KDE_NO_EXPORT void SMIL::Seq::childDone (NodePtr child) { +TDE_NO_EXPORT void SMIL::Seq::childDone (NodePtr child) { if (unfinished ()) { if (state != state_deferred) { if (!keepContent (child) && child->active ()) @@ -2563,7 +2563,7 @@ KDE_NO_EXPORT void SMIL::Seq::childDone (NodePtr child) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT void SMIL::Excl::begin () { +TDE_NO_EXPORT void SMIL::Excl::begin () { //kdDebug () << "SMIL::Excl::begin" << endl; for (NodePtr e = firstChild (); e; e = e->nextSibling ()) e->activate (); @@ -2578,12 +2578,12 @@ KDE_NO_EXPORT void SMIL::Excl::begin () { GroupBase::begin (); } -KDE_NO_EXPORT void SMIL::Excl::deactivate () { +TDE_NO_EXPORT void SMIL::Excl::deactivate () { started_event_list.clear (); // auto disconnect on destruction of data items GroupBase::deactivate (); } -KDE_NO_EXPORT void SMIL::Excl::childDone (NodePtr /*child*/) { +TDE_NO_EXPORT void SMIL::Excl::childDone (NodePtr /*child*/) { // first check if somenode has taken over for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (isTimedMrl (e)) { @@ -2599,7 +2599,7 @@ KDE_NO_EXPORT void SMIL::Excl::childDone (NodePtr /*child*/) { finish (); // we're done } -KDE_NO_EXPORT bool SMIL::Excl::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool SMIL::Excl::handleEvent (EventPtr event) { if (event->id () == event_to_be_started) { ToBeStartedEvent * se = static_cast <ToBeStartedEvent *> (event.ptr ()); //kdDebug () << "Excl::handleEvent " << se->node->nodeName()<<endl; @@ -2617,7 +2617,7 @@ KDE_NO_EXPORT bool SMIL::Excl::handleEvent (EventPtr event) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT void SMIL::Switch::begin () { +TDE_NO_EXPORT void SMIL::Switch::begin () { //kdDebug () << "SMIL::Switch::activate" << endl; PlayListNotify * n = document()->notify_listener; int pref = 0, max = 0x7fffffff, currate = 0; @@ -2664,7 +2664,7 @@ KDE_NO_EXPORT void SMIL::Switch::begin () { GroupBase::begin (); } -KDE_NO_EXPORT void SMIL::Switch::deactivate () { +TDE_NO_EXPORT void SMIL::Switch::deactivate () { Element::deactivate (); for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (e->active ()) { @@ -2673,7 +2673,7 @@ KDE_NO_EXPORT void SMIL::Switch::deactivate () { } } -KDE_NO_EXPORT void SMIL::Switch::reset () { +TDE_NO_EXPORT void SMIL::Switch::reset () { Element::reset (); for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { if (e->state != state_init) @@ -2681,7 +2681,7 @@ KDE_NO_EXPORT void SMIL::Switch::reset () { } } -KDE_NO_EXPORT void SMIL::Switch::childDone (NodePtr child) { +TDE_NO_EXPORT void SMIL::Switch::childDone (NodePtr child) { if (child->state == state_finished) child->deactivate (); //kdDebug () << "SMIL::Switch::childDone" << endl; @@ -2693,13 +2693,13 @@ KDE_NO_EXPORT void SMIL::Switch::childDone (NodePtr child) { KDE_NO_CDTOR_EXPORT SMIL::LinkingBase::LinkingBase (NodePtr & d, short id) : Element(d, id), show (show_replace) {} -KDE_NO_EXPORT void SMIL::LinkingBase::deactivate () { +TDE_NO_EXPORT void SMIL::LinkingBase::deactivate () { mediatype_activated = 0L; mediatype_attach = 0L; Element::deactivate (); } -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::LinkingBase::parseParam(const TrieString ¶, const TQString &val) { if (para == StringPool::attr_href) { href = val; @@ -2711,7 +2711,7 @@ void SMIL::LinkingBase::parseParam(const TrieString ¶, const TQString &val) KDE_NO_CDTOR_EXPORT SMIL::Anchor::Anchor (NodePtr & d) : LinkingBase (d, id_node_anchor) {} -KDE_NO_EXPORT void SMIL::Anchor::activate () { +TDE_NO_EXPORT void SMIL::Anchor::activate () { init (); for (NodePtr c = firstChild(); c; c = c->nextSibling ()) if (c->id >=id_node_first_mediatype && c->id <=id_node_last_mediatype) { @@ -2722,7 +2722,7 @@ KDE_NO_EXPORT void SMIL::Anchor::activate () { Element::activate (); } -KDE_NO_EXPORT void SMIL::Anchor::childDone (NodePtr child) { +TDE_NO_EXPORT void SMIL::Anchor::childDone (NodePtr child) { if (unfinished ()) { if (child->nextSibling ()) child->nextSibling ()->activate (); @@ -2744,7 +2744,7 @@ KDE_NO_CDTOR_EXPORT SMIL::Area::~Area () { delete [] coords; } -KDE_NO_EXPORT void SMIL::Area::activate () { +TDE_NO_EXPORT void SMIL::Area::activate () { init (); if (parentNode () && parentNode ()->id >= id_node_first_mediatype && @@ -2755,7 +2755,7 @@ KDE_NO_EXPORT void SMIL::Area::activate () { Element::activate (); } -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::Area::parseParam (const TrieString & para, const TQString & val) { if (para == "coords") { delete [] coords; @@ -2768,7 +2768,7 @@ void SMIL::Area::parseParam (const TrieString & para, const TQString & val) { LinkingBase::parseParam (para, val); } -KDE_NO_EXPORT NodeRefListPtr SMIL::Area::listeners (unsigned int id) { +TDE_NO_EXPORT NodeRefListPtr SMIL::Area::listeners (unsigned int id) { NodeRefListPtr l = mouse_listeners.listeners (id); if (l) return l; @@ -2784,7 +2784,7 @@ KDE_NO_CDTOR_EXPORT SMIL::MediaType::MediaType (NodePtr &d, const TQString &t, s view_mode = Mrl::WindowMode; } -KDE_NO_EXPORT NodePtr SMIL::MediaType::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::MediaType::childFromTag (const TQString & tag) { Element * elm = fromContentControlGroup (m_doc, tag); if (!elm) elm = fromParamGroup (m_doc, tag); if (!elm) elm = fromAnimateGroup (m_doc, tag); @@ -2793,7 +2793,7 @@ KDE_NO_EXPORT NodePtr SMIL::MediaType::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void SMIL::MediaType::closed () { +TDE_NO_EXPORT void SMIL::MediaType::closed () { external_tree = findExternalTree (this); Mrl *mrl = external_tree ? external_tree->mrl () : NULL; if (mrl) { @@ -2803,7 +2803,7 @@ KDE_NO_EXPORT void SMIL::MediaType::closed () { TimedMrl::closed (); } -KDE_NO_EXPORT +TDE_NO_EXPORT void SMIL::MediaType::parseParam (const TrieString ¶, const TQString & val) { bool update_surface = true; if (para == "fit") { @@ -2863,7 +2863,7 @@ void SMIL::MediaType::parseParam (const TrieString ¶, const TQString & val) sub_surface->repaint (); } -KDE_NO_EXPORT void SMIL::MediaType::boundsUpdate () { +TDE_NO_EXPORT void SMIL::MediaType::boundsUpdate () { SMIL::RegionBase *rb = convertNode <SMIL::RegionBase> (region_node); if (rb && sub_surface) { SRect new_bounds = calculateBounds (); @@ -2873,7 +2873,7 @@ KDE_NO_EXPORT void SMIL::MediaType::boundsUpdate () { } } -KDE_NO_EXPORT void SMIL::MediaType::activate () { +TDE_NO_EXPORT void SMIL::MediaType::activate () { trans_out_active = false; fit = fit_hidden; opacity = 100; @@ -2888,7 +2888,7 @@ KDE_NO_EXPORT void SMIL::MediaType::activate () { runtime ()->begin (); } -KDE_NO_EXPORT void SMIL::MediaType::deactivate () { +TDE_NO_EXPORT void SMIL::MediaType::deactivate () { region_paint = 0L; region_mouse_enter = 0L; region_mouse_leave = 0L; @@ -2905,7 +2905,7 @@ KDE_NO_EXPORT void SMIL::MediaType::deactivate () { region_node = 0L; } -KDE_NO_EXPORT void SMIL::MediaType::begin () { +TDE_NO_EXPORT void SMIL::MediaType::begin () { SMIL::Smil * s = Smil::findSmilNode (parentNode ().ptr ()); SMIL::Region * r = s ? findRegion (s->layout_node, param (StringPool::attr_region)) : 0L; @@ -2949,7 +2949,7 @@ KDE_NO_EXPORT void SMIL::MediaType::begin () { TimedMrl::begin (); } -KDE_NO_EXPORT void SMIL::MediaType::finish () { +TDE_NO_EXPORT void SMIL::MediaType::finish () { if (trans_timer && !keepContent (this)) { document ()->cancelTimer (trans_timer); ASSERT(!trans_timer); @@ -2965,7 +2965,7 @@ KDE_NO_EXPORT void SMIL::MediaType::finish () { * param/set/animatie that should all be activate, but also other smil or imfl * documents, that should only be activated if the runtime has started */ -KDE_NO_EXPORT void SMIL::MediaType::childDone (NodePtr child) { +TDE_NO_EXPORT void SMIL::MediaType::childDone (NodePtr child) { bool child_doc = child->mrl () && child->mrl ()->opener.ptr () == this; if (child_doc) { child->deactivate (); // should only if fill not is freeze or hold @@ -2986,7 +2986,7 @@ KDE_NO_EXPORT void SMIL::MediaType::childDone (NodePtr child) { finish (); } -KDE_NO_EXPORT bool SMIL::MediaType::needsVideoWidget () { +TDE_NO_EXPORT bool SMIL::MediaType::needsVideoWidget () { MediaTypeRuntime * mtr = static_cast <MediaTypeRuntime *> (runtime ()); SMIL::Smil * s = SMIL::Smil::findSmilNode (this); Node * link = s ? s->current_av_media_type.ptr () : 0L; @@ -3005,7 +3005,7 @@ SurfacePtr SMIL::MediaType::getSurface (NodePtr node) { return s; } -KDE_NO_EXPORT Surface *SMIL::MediaType::surface () { +TDE_NO_EXPORT Surface *SMIL::MediaType::surface () { if (!keepContent (this)) { resetSurface (); return NULL; @@ -3025,13 +3025,13 @@ KDE_NO_EXPORT Surface *SMIL::MediaType::surface () { return sub_surface.ptr (); } -KDE_NO_EXPORT void SMIL::MediaType::resetSurface () { +TDE_NO_EXPORT void SMIL::MediaType::resetSurface () { if (sub_surface) sub_surface->remove (); sub_surface = NULL; } -KDE_NO_EXPORT SRect SMIL::MediaType::calculateBounds () { +TDE_NO_EXPORT SRect SMIL::MediaType::calculateBounds () { SMIL::RegionBase *rb = convertNode <SMIL::RegionBase> (region_node); if (rb && rb->surface ()) { SRect rr = rb->region_surface->bounds; @@ -3115,7 +3115,7 @@ bool SMIL::MediaType::handleEvent (EventPtr event) { } } -KDE_NO_EXPORT NodeRefListPtr SMIL::MediaType::listeners (unsigned int id) { +TDE_NO_EXPORT NodeRefListPtr SMIL::MediaType::listeners (unsigned int id) { NodeRefListPtr l = mouse_listeners.listeners (id); if (l) return l; @@ -3132,18 +3132,18 @@ KDE_NO_CDTOR_EXPORT SMIL::AVMediaType::AVMediaType (NodePtr & d, const TQString & t) : SMIL::MediaType (d, t, id_node_audio_video) {} -KDE_NO_EXPORT NodePtr SMIL::AVMediaType::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::AVMediaType::childFromTag (const TQString & tag) { return fromXMLDocumentTag (m_doc, tag); } -KDE_NO_EXPORT void SMIL::AVMediaType::defer () { +TDE_NO_EXPORT void SMIL::AVMediaType::defer () { setState (state_deferred); MediaTypeRuntime * mr = static_cast <MediaTypeRuntime *> (runtime ()); if (mr->state () == Runtime::timings_started) mr->postpone_lock = document ()->postpone (); } -KDE_NO_EXPORT void SMIL::AVMediaType::undefer () { +TDE_NO_EXPORT void SMIL::AVMediaType::undefer () { setState (state_activated); MediaTypeRuntime * mr = static_cast <MediaTypeRuntime *> (runtime ()); if (mr->state () == Runtime::timings_started) { @@ -3152,7 +3152,7 @@ KDE_NO_EXPORT void SMIL::AVMediaType::undefer () { } } -KDE_NO_EXPORT void SMIL::AVMediaType::endOfFile () { +TDE_NO_EXPORT void SMIL::AVMediaType::endOfFile () { if (!active()) return; // backend eof after a reset MediaTypeRuntime * mr = static_cast <MediaTypeRuntime *> (runtime ()); @@ -3160,15 +3160,15 @@ KDE_NO_EXPORT void SMIL::AVMediaType::endOfFile () { mr->propagateStop (true); } -KDE_NO_EXPORT Runtime * SMIL::AVMediaType::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::AVMediaType::getNewRuntime () { return new AudioVideoData (this); } -KDE_NO_EXPORT void SMIL::AVMediaType::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::AVMediaType::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT bool SMIL::AVMediaType::expose () const { +TDE_NO_EXPORT bool SMIL::AVMediaType::expose () const { return !src.isEmpty () && !external_tree; } @@ -3178,17 +3178,17 @@ KDE_NO_CDTOR_EXPORT SMIL::ImageMediaType::ImageMediaType (NodePtr & d) : SMIL::MediaType (d, "img", id_node_img) {} -KDE_NO_EXPORT Runtime * SMIL::ImageMediaType::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::ImageMediaType::getNewRuntime () { return new ImageRuntime (this); } -KDE_NO_EXPORT NodePtr SMIL::ImageMediaType::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr SMIL::ImageMediaType::childFromTag (const TQString & tag) { if (!strcmp (tag.latin1 (), "imfl")) return new RP::Imfl (m_doc); return SMIL::MediaType::childFromTag (tag); } -KDE_NO_EXPORT void SMIL::ImageMediaType::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::ImageMediaType::accept (Visitor * v) { v->visit (this); } @@ -3198,11 +3198,11 @@ KDE_NO_CDTOR_EXPORT SMIL::TextMediaType::TextMediaType (NodePtr & d) : SMIL::MediaType (d, "text", id_node_text) {} -KDE_NO_EXPORT Runtime * SMIL::TextMediaType::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::TextMediaType::getNewRuntime () { return new TextRuntime (this); } -KDE_NO_EXPORT void SMIL::TextMediaType::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::TextMediaType::accept (Visitor * v) { v->visit (this); } @@ -3212,11 +3212,11 @@ KDE_NO_CDTOR_EXPORT SMIL::RefMediaType::RefMediaType (NodePtr & d) : SMIL::MediaType (d, "ref", id_node_ref) {} -KDE_NO_EXPORT Runtime * SMIL::RefMediaType::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::RefMediaType::getNewRuntime () { return new AudioVideoData (this); // FIXME check mimetype first } -KDE_NO_EXPORT void SMIL::RefMediaType::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::RefMediaType::accept (Visitor * v) { v->visit (this); } @@ -3225,27 +3225,27 @@ KDE_NO_EXPORT void SMIL::RefMediaType::accept (Visitor * v) { KDE_NO_CDTOR_EXPORT SMIL::Brush::Brush (NodePtr & d) : SMIL::MediaType (d, "brush", id_node_brush) {} -KDE_NO_EXPORT void SMIL::Brush::accept (Visitor * v) { +TDE_NO_EXPORT void SMIL::Brush::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT Runtime * SMIL::Brush::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::Brush::getNewRuntime () { return new MediaTypeRuntime (this); } //----------------------------------------------------------------------------- -KDE_NO_EXPORT Runtime * SMIL::Set::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::Set::getNewRuntime () { return new SetData (this); } //----------------------------------------------------------------------------- -KDE_NO_EXPORT Runtime * SMIL::Animate::getNewRuntime () { +TDE_NO_EXPORT Runtime * SMIL::Animate::getNewRuntime () { return new AnimateData (this); } -KDE_NO_EXPORT bool SMIL::Animate::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool SMIL::Animate::handleEvent (EventPtr event) { if (event->id () == event_timer) { TimerEvent * te = static_cast <TimerEvent *> (event.ptr ()); if (te && te->timer_info && te->timer_info->event_id == anim_timer_id) { @@ -3260,11 +3260,11 @@ KDE_NO_EXPORT bool SMIL::Animate::handleEvent (EventPtr event) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT Runtime *SMIL::AnimateMotion::getNewRuntime () { +TDE_NO_EXPORT Runtime *SMIL::AnimateMotion::getNewRuntime () { return new AnimateMotionData (this); } -KDE_NO_EXPORT bool SMIL::AnimateMotion::handleEvent (EventPtr event) { +TDE_NO_EXPORT bool SMIL::AnimateMotion::handleEvent (EventPtr event) { if (event->id () == event_timer) { TimerEvent * te = static_cast <TimerEvent *> (event.ptr ()); if (te && te->timer_info && te->timer_info->event_id == anim_timer_id) { @@ -3279,7 +3279,7 @@ KDE_NO_EXPORT bool SMIL::AnimateMotion::handleEvent (EventPtr event) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT void SMIL::Param::activate () { +TDE_NO_EXPORT void SMIL::Param::activate () { setState (state_activated); TQString name = getAttribute (StringPool::attr_name); Node * parent = parentNode ().ptr (); @@ -3291,51 +3291,51 @@ KDE_NO_EXPORT void SMIL::Param::activate () { //----------------------------------------------------------------------------- -KDE_NO_EXPORT void Visitor::visit (SMIL::Region * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::Region * n) { visit (static_cast <SMIL::RegionBase *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::Layout * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::Layout * n) { visit (static_cast <SMIL::RegionBase *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::Transition * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::Transition * n) { visit (static_cast <Element *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::TimedMrl * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::TimedMrl * n) { visit (static_cast <Element *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::MediaType * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::MediaType * n) { visit (static_cast <SMIL::TimedMrl *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::ImageMediaType * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::ImageMediaType * n) { visit (static_cast <SMIL::MediaType *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::TextMediaType * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::TextMediaType * n) { visit (static_cast <SMIL::MediaType *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::RefMediaType * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::RefMediaType * n) { visit (static_cast <SMIL::MediaType *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::AVMediaType * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::AVMediaType * n) { visit (static_cast <SMIL::MediaType *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::Brush * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::Brush * n) { visit (static_cast <SMIL::MediaType *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::Anchor * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::Anchor * n) { visit (static_cast <SMIL::LinkingBase *> (n)); } -KDE_NO_EXPORT void Visitor::visit (SMIL::Area * n) { +TDE_NO_EXPORT void Visitor::visit (SMIL::Area * n) { visit (static_cast <SMIL::LinkingBase *> (n)); } @@ -3349,7 +3349,7 @@ KDE_NO_CDTOR_EXPORT ImageRuntime::~ImageRuntime () { delete img_movie; } -KDE_NO_EXPORT +TDE_NO_EXPORT bool ImageRuntime::parseParam (const TrieString & name, const TQString & val) { //kdDebug () << "ImageRuntime::param " << name << "=" << val << endl; if (name == StringPool::attr_src) { @@ -3379,7 +3379,7 @@ bool ImageRuntime::parseParam (const TrieString & name, const TQString & val) { /** * start_timer timer expired, repaint if we have an image */ -KDE_NO_EXPORT void ImageRuntime::started () { +TDE_NO_EXPORT void ImageRuntime::started () { if (element && downloading ()) { postpone_lock = element->document ()->postpone (); return; @@ -3387,7 +3387,7 @@ KDE_NO_EXPORT void ImageRuntime::started () { MediaTypeRuntime::started (); } -KDE_NO_EXPORT void ImageRuntime::clipStart () { +TDE_NO_EXPORT void ImageRuntime::clipStart () { if (img_movie) { img_movie->restart (); if (img_movie->paused ()) @@ -3396,13 +3396,13 @@ KDE_NO_EXPORT void ImageRuntime::clipStart () { MediaTypeRuntime::clipStart (); } -KDE_NO_EXPORT void ImageRuntime::clipStop () { +TDE_NO_EXPORT void ImageRuntime::clipStop () { if (img_movie && frame_nr) img_movie->pause (); MediaTypeRuntime::clipStop (); } -KDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) { +TDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) { NodePtr element_protect = element; // note element is weak SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); if (data.size () && mt) { @@ -3442,7 +3442,7 @@ KDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) { started (); } -KDE_NO_EXPORT void ImageRuntime::movieUpdated (const TQRect &) { +TDE_NO_EXPORT void ImageRuntime::movieUpdated (const TQRect &) { SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); if (mt && frame_nr++) { mt->resetSurface (); @@ -3457,7 +3457,7 @@ KDE_NO_EXPORT void ImageRuntime::movieUpdated (const TQRect &) { img_movie->pause (); } -KDE_NO_EXPORT void ImageRuntime::movieStatus (int s) { +TDE_NO_EXPORT void ImageRuntime::movieStatus (int s) { if (element && element->state >= Node::state_began && SMIL::TimedMrl::keepContent (element)) { if (s == TQMovie::EndOfMovie) { @@ -3466,14 +3466,14 @@ KDE_NO_EXPORT void ImageRuntime::movieStatus (int s) { } } -KDE_NO_EXPORT void ImageRuntime::movieResize (const TQSize &) { +TDE_NO_EXPORT void ImageRuntime::movieResize (const TQSize &) { SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); if (mt->surface ()) mt->sub_surface->repaint (); //kdDebug () << "movieResize" << endl; } -KDE_NO_EXPORT void ImageRuntime::postpone (bool b) { +TDE_NO_EXPORT void ImageRuntime::postpone (bool b) { kdDebug () << "ImageRuntime::postpone " << b << endl; if (img_movie) { if (!img_movie->paused () && b) @@ -3511,7 +3511,7 @@ KDE_NO_CDTOR_EXPORT TextRuntime::~TextRuntime () { delete d; } -KDE_NO_EXPORT void TextRuntime::reset () { +TDE_NO_EXPORT void TextRuntime::reset () { d->reset (); font_size = d->font.pointSize (); font_color = 0; @@ -3521,7 +3521,7 @@ KDE_NO_EXPORT void TextRuntime::reset () { MediaTypeRuntime::reset (); } -KDE_NO_EXPORT +TDE_NO_EXPORT bool TextRuntime::parseParam (const TrieString & name, const TQString & val) { //kdDebug () << "TextRuntime::parseParam " << name << "=" << val << endl; SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); @@ -3571,7 +3571,7 @@ bool TextRuntime::parseParam (const TrieString & name, const TQString & val) { /** * start_timer timer expired, repaint if we have text */ -KDE_NO_EXPORT void TextRuntime::started () { +TDE_NO_EXPORT void TextRuntime::started () { if (element && downloading ()) { postpone_lock = element->document ()->postpone (); return; @@ -3579,7 +3579,7 @@ KDE_NO_EXPORT void TextRuntime::started () { MediaTypeRuntime::started (); } -KDE_NO_EXPORT void TextRuntime::remoteReady (TQByteArray & data) { +TDE_NO_EXPORT void TextRuntime::remoteReady (TQByteArray & data) { TQString str (data); SMIL::MediaType * mt = convertNode <SMIL::MediaType> (element); if (mt && data.size ()) { diff --git a/src/kmplayer_smil.h b/src/kmplayer_smil.h index 4313224..ab536a6 100644 --- a/src/kmplayer_smil.h +++ b/src/kmplayer_smil.h @@ -152,9 +152,9 @@ public: } durations [(const int) durtime_last]; virtual void started (); virtual void stopped (); - KDE_NO_EXPORT DurationItem & beginTime () { return durations[begin_time]; } - KDE_NO_EXPORT DurationItem & durTime () { return durations[duration_time]; } - KDE_NO_EXPORT DurationItem & endTime () { return durations [end_time]; } + TDE_NO_EXPORT DurationItem & beginTime () { return durations[begin_time]; } + TDE_NO_EXPORT DurationItem & durTime () { return durations[duration_time]; } + TDE_NO_EXPORT DurationItem & endTime () { return durations [end_time]; } private: void setDurationItem (DurationTime item, const TQString & val); public: @@ -394,7 +394,7 @@ class Smil : public Mrl { public: KDE_NO_CDTOR_EXPORT Smil (NodePtr & d) : Mrl (d, id_node_smil) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "smil"; } + TDE_NO_EXPORT const char * nodeName () const { return "smil"; } PlayType playType () { return play_type_video; } void activate (); void deactivate (); @@ -422,7 +422,7 @@ class KMPLAYER_NO_EXPORT Head : public Element { public: KDE_NO_CDTOR_EXPORT Head (NodePtr & d) : Element (d, id_node_head) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "head"; } + TDE_NO_EXPORT const char * nodeName () const { return "head"; } void closed (); void childDone (NodePtr child); bool expose () const; @@ -477,7 +477,7 @@ class KMPLAYER_NO_EXPORT Layout : public RegionBase { public: Layout (NodePtr & d); NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "layout"; } + TDE_NO_EXPORT const char * nodeName () const { return "layout"; } void activate (); void closed (); virtual void accept (Visitor *); @@ -496,7 +496,7 @@ public: class KMPLAYER_NO_EXPORT Region : public RegionBase { public: Region (NodePtr & d); - KDE_NO_EXPORT const char * nodeName () const { return "region"; } + TDE_NO_EXPORT const char * nodeName () const { return "region"; } NodePtr childFromTag (const TQString & tag); void calculateBounds (Single w, Single h); virtual NodeRefListPtr listeners (unsigned int event_id); @@ -517,7 +517,7 @@ class KMPLAYER_NO_EXPORT RootLayout : public RegionBase { public: KDE_NO_CDTOR_EXPORT RootLayout (NodePtr & d) : RegionBase (d, id_node_root_layout) {} - KDE_NO_EXPORT const char * nodeName () const { return "root-layout"; } + TDE_NO_EXPORT const char * nodeName () const { return "root-layout"; } }; /** @@ -527,8 +527,8 @@ class KMPLAYER_NO_EXPORT RegPoint : public Element { public: KDE_NO_CDTOR_EXPORT RegPoint (NodePtr & d) : Element(d, id_node_regpoint) {} KDE_NO_CDTOR_EXPORT ~RegPoint () {} - KDE_NO_EXPORT const char * nodeName () const { return "regPoint"; } - KDE_NO_EXPORT bool expose () const { return false; } + TDE_NO_EXPORT const char * nodeName () const { return "regPoint"; } + TDE_NO_EXPORT bool expose () const { return false; } void parseParam (const TrieString & name, const TQString & value); CalculatedSizer sizes; }; @@ -569,10 +569,10 @@ public: Transition (NodePtr & d); KDE_NO_CDTOR_EXPORT ~Transition () {} void activate (); - KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } - KDE_NO_EXPORT const char * nodeName () const { return "transition"; } + TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } + TDE_NO_EXPORT const char * nodeName () const { return "transition"; } void parseParam (const TrieString & name, const TQString & value); - KDE_NO_EXPORT bool expose () const { return false; } + TDE_NO_EXPORT bool expose () const { return false; } bool supported (); TransType type; TransSubType sub_type; @@ -604,7 +604,7 @@ public: void childDone (NodePtr child); virtual bool handleEvent (EventPtr event); virtual NodeRefListPtr listeners (unsigned int event_id); - KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } + TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } void init (); virtual void parseParam (const TrieString &, const TQString &); Runtime * runtime (); @@ -627,13 +627,13 @@ protected: Runtime * m_runtime; }; -KDE_NO_EXPORT inline Runtime * TimedMrl::runtime () { +TDE_NO_EXPORT inline Runtime * TimedMrl::runtime () { if (!m_runtime) m_runtime = getNewRuntime (); return m_runtime; } -KDE_NO_EXPORT inline bool TimedMrl::isTimedMrl (const Node *n) { +TDE_NO_EXPORT inline bool TimedMrl::isTimedMrl (const Node *n) { return n && n->id >= id_node_first_timed_mrl && n->id <= id_node_last_timed_mrl; @@ -661,7 +661,7 @@ protected: class KMPLAYER_NO_EXPORT Par : public GroupBase { public: KDE_NO_CDTOR_EXPORT Par (NodePtr & d) : GroupBase (d, id_node_par) {} - KDE_NO_EXPORT const char * nodeName () const { return "par"; } + TDE_NO_EXPORT const char * nodeName () const { return "par"; } void begin (); void reset (); void childDone (NodePtr child); @@ -673,7 +673,7 @@ public: class KMPLAYER_NO_EXPORT Seq : public GroupBase { public: KDE_NO_CDTOR_EXPORT Seq (NodePtr & d) : GroupBase(d, id_node_seq) {} - KDE_NO_EXPORT const char * nodeName () const { return "seq"; } + TDE_NO_EXPORT const char * nodeName () const { return "seq"; } void begin (); void childDone (NodePtr child); protected: @@ -687,7 +687,7 @@ protected: class KMPLAYER_NO_EXPORT Body : public Seq { public: KDE_NO_CDTOR_EXPORT Body (NodePtr & d) : Seq (d, id_node_body) {} - KDE_NO_EXPORT const char * nodeName () const { return "body"; } + TDE_NO_EXPORT const char * nodeName () const { return "body"; } }; /** @@ -696,7 +696,7 @@ public: class KMPLAYER_NO_EXPORT Excl : public GroupBase { public: KDE_NO_CDTOR_EXPORT Excl (NodePtr & d) : GroupBase (d, id_node_excl) {} - KDE_NO_EXPORT const char * nodeName () const { return "excl"; } + TDE_NO_EXPORT const char * nodeName () const { return "excl"; } void begin (); void deactivate (); void childDone (NodePtr child); @@ -712,7 +712,7 @@ private: class KMPLAYER_NO_EXPORT Switch : public GroupBase { public: KDE_NO_CDTOR_EXPORT Switch (NodePtr &d) : GroupBase (d, id_node_switch) {} - KDE_NO_EXPORT const char * nodeName () const { return "switch"; } + TDE_NO_EXPORT const char * nodeName () const { return "switch"; } // Condition void begin (); void deactivate (); @@ -725,7 +725,7 @@ class KMPLAYER_NO_EXPORT LinkingBase : public Element { public: KDE_NO_CDTOR_EXPORT ~LinkingBase () {} void deactivate (); - KDE_NO_EXPORT bool expose () const { return false; } + TDE_NO_EXPORT bool expose () const { return false; } void parseParam (const TrieString & name, const TQString & value); ConnectionPtr mediatype_activated; ConnectionPtr mediatype_attach; @@ -741,9 +741,9 @@ public: KDE_NO_CDTOR_EXPORT ~Anchor () {} void activate (); void childDone (NodePtr child); - KDE_NO_EXPORT const char * nodeName () const { return "a"; } + TDE_NO_EXPORT const char * nodeName () const { return "a"; } NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } + TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } }; class KMPLAYER_NO_EXPORT Area : public LinkingBase { @@ -751,8 +751,8 @@ public: Area (NodePtr & d, const TQString & tag); ~Area (); void activate (); - KDE_NO_EXPORT const char * nodeName () const { return tag.ascii (); } - KDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } + TDE_NO_EXPORT const char * nodeName () const { return tag.ascii (); } + TDE_NO_EXPORT void accept (Visitor * v) { v->visit (this); } void parseParam (const TrieString & name, const TQString & value); NodeRefListPtr listeners (unsigned int event_id); SizeType * coords; @@ -768,7 +768,7 @@ class KMPLAYER_NO_EXPORT MediaType : public TimedMrl { public: MediaType (NodePtr & d, const TQString & t, short id); NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return m_type.latin1 (); } + TDE_NO_EXPORT const char * nodeName () const { return m_type.latin1 (); } void closed (); void activate (); void deactivate (); @@ -858,7 +858,7 @@ public: class KMPLAYER_NO_EXPORT Set : public TimedMrl { public: KDE_NO_CDTOR_EXPORT Set (NodePtr & d) : TimedMrl (d, id_node_set) {} - KDE_NO_EXPORT const char * nodeName () const { return "set"; } + TDE_NO_EXPORT const char * nodeName () const { return "set"; } virtual Runtime * getNewRuntime (); PlayType playType () { return play_type_none; } }; @@ -866,7 +866,7 @@ public: class KMPLAYER_NO_EXPORT Animate : public TimedMrl { public: KDE_NO_CDTOR_EXPORT Animate (NodePtr & d) : TimedMrl (d, id_node_animate) {} - KDE_NO_EXPORT const char * nodeName () const { return "animate"; } + TDE_NO_EXPORT const char * nodeName () const { return "animate"; } virtual Runtime * getNewRuntime (); PlayType playType () { return play_type_none; } bool handleEvent (EventPtr event); @@ -876,7 +876,7 @@ class KMPLAYER_NO_EXPORT AnimateMotion : public TimedMrl { public: KDE_NO_CDTOR_EXPORT AnimateMotion (NodePtr & d) : TimedMrl (d, id_node_animate) {} - KDE_NO_EXPORT const char * nodeName () const { return "animateMotion"; } + TDE_NO_EXPORT const char * nodeName () const { return "animateMotion"; } virtual Runtime *getNewRuntime (); PlayType playType () { return play_type_none; } bool handleEvent (EventPtr event); @@ -887,7 +887,7 @@ public: class KMPLAYER_NO_EXPORT Param : public Element { public: KDE_NO_CDTOR_EXPORT Param (NodePtr & d) : Element (d, id_node_param) {} - KDE_NO_EXPORT const char * nodeName () const { return "param"; } + TDE_NO_EXPORT const char * nodeName () const { return "param"; } void activate (); bool expose () const { return false; } }; diff --git a/src/kmplayer_xspf.cpp b/src/kmplayer_xspf.cpp index c8c4470..65e0460 100644 --- a/src/kmplayer_xspf.cpp +++ b/src/kmplayer_xspf.cpp @@ -25,7 +25,7 @@ using namespace KMPlayer; -KDE_NO_EXPORT NodePtr XSPF::Playlist::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr XSPF::Playlist::childFromTag (const TQString & tag) { const char * name = tag.latin1 (); if (!strcasecmp (name, "tracklist")) return new Tracklist (m_doc); @@ -58,7 +58,7 @@ KDE_NO_EXPORT NodePtr XSPF::Playlist::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void XSPF::Playlist::closed () { +TDE_NO_EXPORT void XSPF::Playlist::closed () { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { if (e->id == id_node_title) pretty_name = e->innerText ().simplifyWhiteSpace (); @@ -69,7 +69,7 @@ KDE_NO_EXPORT void XSPF::Playlist::closed () { //----------------------------------------------------------------------------- -KDE_NO_EXPORT NodePtr XSPF::Tracklist::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr XSPF::Tracklist::childFromTag (const TQString & tag) { const char * name = tag.latin1 (); if (!strcasecmp (name, "track")) return new XSPF::Track (m_doc); @@ -78,7 +78,7 @@ KDE_NO_EXPORT NodePtr XSPF::Tracklist::childFromTag (const TQString & tag) { //----------------------------------------------------------------------------- -KDE_NO_EXPORT NodePtr XSPF::Track::childFromTag (const TQString & tag) { +TDE_NO_EXPORT NodePtr XSPF::Track::childFromTag (const TQString & tag) { const char * name = tag.latin1 (); if (!strcasecmp (name, "location")) return new Location (m_doc); @@ -109,7 +109,7 @@ KDE_NO_EXPORT NodePtr XSPF::Track::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void XSPF::Track::closed () { +TDE_NO_EXPORT void XSPF::Track::closed () { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) { switch (e->id) { case id_node_title: @@ -123,7 +123,7 @@ KDE_NO_EXPORT void XSPF::Track::closed () { } } -KDE_NO_EXPORT void XSPF::Track::activate () { +TDE_NO_EXPORT void XSPF::Track::activate () { for (NodePtr e = firstChild (); e; e = e->nextSibling ()) if (e->id == id_node_annotation) { PlayListNotify * n = document ()->notify_listener; @@ -134,13 +134,13 @@ KDE_NO_EXPORT void XSPF::Track::activate () { Mrl::activate (); } -KDE_NO_EXPORT Node::PlayType XSPF::Track::playType () { +TDE_NO_EXPORT Node::PlayType XSPF::Track::playType () { if (location) return location->playType (); return Mrl::playType (); } -KDE_NO_EXPORT Mrl * XSPF::Track::linkNode () { +TDE_NO_EXPORT Mrl * XSPF::Track::linkNode () { if (location) return location->mrl (); return Mrl::linkNode (); diff --git a/src/kmplayer_xspf.h b/src/kmplayer_xspf.h index 47cf745..2938f2a 100644 --- a/src/kmplayer_xspf.h +++ b/src/kmplayer_xspf.h @@ -53,7 +53,7 @@ class KMPLAYER_NO_EXPORT Playlist : public Mrl { public: KDE_NO_CDTOR_EXPORT Playlist (NodePtr & d) : Mrl (d, id_node_playlist) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "playlist"; } + TDE_NO_EXPORT const char * nodeName () const { return "playlist"; } bool expose () const { return !pretty_name.isEmpty (); } void closed (); }; @@ -62,7 +62,7 @@ class KMPLAYER_NO_EXPORT Tracklist : public Element { public: KDE_NO_CDTOR_EXPORT Tracklist (NodePtr & d) : Element (d, id_node_tracklist) {} NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "tracklist"; } + TDE_NO_EXPORT const char * nodeName () const { return "tracklist"; } bool expose () const { return false; } }; @@ -73,7 +73,7 @@ public: void activate (); PlayType playType (); Mrl * linkNode (); - KDE_NO_EXPORT const char * nodeName () const { return "track"; } + TDE_NO_EXPORT const char * nodeName () const { return "track"; } NodePtr childFromTag (const TQString & tag); NodePtrW location; }; @@ -81,7 +81,7 @@ public: class KMPLAYER_NO_EXPORT Location : public Mrl { public: KDE_NO_CDTOR_EXPORT Location (NodePtr &d) : Mrl (d, id_node_location) {} - KDE_NO_EXPORT const char * nodeName () const { return "location"; } + TDE_NO_EXPORT const char * nodeName () const { return "location"; } void closed (); bool expose () const { return false; } }; diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 00bcf66..414ac08 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -110,7 +110,7 @@ public: void activate (); void childDone (KMPlayer::NodePtr); KMPlayer::NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "playlist"; } + TDE_NO_EXPORT const char * nodeName () const { return "playlist"; } KMPlayerApp * app; }; @@ -119,7 +119,7 @@ public: Recent (KMPlayer::NodePtr & doc, KMPlayerApp *a, const TQString &url = TQString()); void activate (); void closed (); - KDE_NO_EXPORT const char * nodeName () const { return "item"; } + TDE_NO_EXPORT const char * nodeName () const { return "item"; } KMPlayerApp * app; }; @@ -129,7 +129,7 @@ public: KMPlayer::NodePtr childFromTag (const TQString & tag); void defer () {} // TODO lazy loading of largish sub trees void closed (); - KDE_NO_EXPORT const char * nodeName () const { return "group"; } + TDE_NO_EXPORT const char * nodeName () const { return "group"; } KMPlayerApp * app; }; @@ -140,7 +140,7 @@ public: void defer (); void activate (); KMPlayer::NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "playlist"; } + TDE_NO_EXPORT const char * nodeName () const { return "playlist"; } KMPlayerApp * app; bool playmode; }; @@ -161,7 +161,7 @@ public: void begin (); PlayType playType () { return play_type_unknown; } void setNodeName (const TQString &); - const char * nodeName () const KDE_NO_EXPORT { return "item"; } + const char * nodeName () const TDE_NO_EXPORT { return "item"; } }; class KMPLAYER_NO_EXPORT PlaylistGroup : public KMPlayer::Mrl { @@ -171,7 +171,7 @@ public: KMPlayer::NodePtr childFromTag (const TQString & tag); void closed (); void setNodeName (const TQString &); - KDE_NO_EXPORT const char * nodeName () const { return "group"; } + TDE_NO_EXPORT const char * nodeName () const { return "group"; } KMPlayerApp * app; bool playmode; }; @@ -182,21 +182,21 @@ public: void activate (); void closed (); KMPlayer::NodePtr childFromTag (const TQString & tag); - const char * nodeName () const KDE_NO_EXPORT { return "object"; } + const char * nodeName () const TDE_NO_EXPORT { return "object"; } }; -KDE_NO_EXPORT void ListsSource::jump (KMPlayer::NodePtr e) { +TDE_NO_EXPORT void ListsSource::jump (KMPlayer::NodePtr e) { if (e->document()->firstChild ()) Source::jump (e); else e->activate (); } -KDE_NO_EXPORT void ListsSource::activate () { +TDE_NO_EXPORT void ListsSource::activate () { playCurrent (); } -KDE_NO_EXPORT void ListsSource::setDocument (KMPlayer::NodePtr doc, KMPlayer::NodePtr cur) { +TDE_NO_EXPORT void ListsSource::setDocument (KMPlayer::NodePtr doc, KMPlayer::NodePtr cur) { if (m_document) m_document->document()->dispose (); m_document = doc; @@ -209,7 +209,7 @@ KDE_NO_CDTOR_EXPORT FileDocument::FileDocument (short i, const TQString &s, KMPl id = i; } -KDE_NO_EXPORT KMPlayer::NodePtr FileDocument::childFromTag(const TQString &tag) { +TDE_NO_EXPORT KMPlayer::NodePtr FileDocument::childFromTag(const TQString &tag) { if (tag == TQString::fromLatin1 (nodeName ())) return this; return 0L; @@ -240,19 +240,19 @@ KDE_NO_CDTOR_EXPORT Recents::Recents (KMPlayerApp *a) pretty_name = i18n ("Most Recent"); } -KDE_NO_EXPORT void Recents::activate () { +TDE_NO_EXPORT void Recents::activate () { if (!resolved) defer (); } -KDE_NO_EXPORT void Recents::defer () { +TDE_NO_EXPORT void Recents::defer () { if (!resolved) { resolved = true; readFromFile (locateLocal ("data", "kmplayer/recent.xml")); } } -KDE_NO_EXPORT KMPlayer::NodePtr Recents::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr Recents::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; if (tag == TQString::fromLatin1 ("item")) return new Recent (m_doc, app); @@ -261,7 +261,7 @@ KDE_NO_EXPORT KMPlayer::NodePtr Recents::childFromTag (const TQString & tag) { return FileDocument::childFromTag (tag); } -KDE_NO_EXPORT void Recents::childDone (KMPlayer::NodePtr) { +TDE_NO_EXPORT void Recents::childDone (KMPlayer::NodePtr) { finish (); } @@ -272,12 +272,12 @@ Recent::Recent (KMPlayer::NodePtr & doc, KMPlayerApp * a, const TQString &url) setAttribute (KMPlayer::StringPool::attr_url, url); } -KDE_NO_EXPORT void Recent::closed () { +TDE_NO_EXPORT void Recent::closed () { if (src.isEmpty ()) src = getAttribute (KMPlayer::StringPool::attr_url); } -KDE_NO_EXPORT void Recent::activate () { +TDE_NO_EXPORT void Recent::activate () { app->openDocumentFile (KURL (src)); } @@ -289,7 +289,7 @@ Group::Group (KMPlayer::NodePtr & doc, KMPlayerApp * a, const TQString & pn) setAttribute (KMPlayer::StringPool::attr_title, pn); } -KDE_NO_EXPORT KMPlayer::NodePtr Group::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr Group::childFromTag (const TQString & tag) { if (tag == TQString::fromLatin1 ("item")) return new Recent (m_doc, app); else if (tag == TQString::fromLatin1 ("group")) @@ -297,12 +297,12 @@ KDE_NO_EXPORT KMPlayer::NodePtr Group::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void Group::closed () { +TDE_NO_EXPORT void Group::closed () { if (pretty_name.isEmpty ()) pretty_name = getAttribute (KMPlayer::StringPool::attr_title); } -KDE_NO_EXPORT void Playlist::defer () { +TDE_NO_EXPORT void Playlist::defer () { if (playmode) KMPlayer::Document::defer (); else if (!resolved) { @@ -311,7 +311,7 @@ KDE_NO_EXPORT void Playlist::defer () { } } -KDE_NO_EXPORT void Playlist::activate () { +TDE_NO_EXPORT void Playlist::activate () { if (playmode) KMPlayer::Document::activate (); else if (!resolved) @@ -325,7 +325,7 @@ KDE_NO_CDTOR_EXPORT Playlist::Playlist (KMPlayerApp *a, KMPlayer::PlayListNotify pretty_name = i18n ("Persistent Playlists"); } -KDE_NO_EXPORT KMPlayer::NodePtr Playlist::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr Playlist::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; const char * name = tag.ascii (); if (!strcmp (name, "item")) @@ -337,7 +337,7 @@ KDE_NO_EXPORT KMPlayer::NodePtr Playlist::childFromTag (const TQString & tag) { return FileDocument::childFromTag (tag); } -KDE_NO_EXPORT void Playlist::childDone (KMPlayer::NodePtr c) { +TDE_NO_EXPORT void Playlist::childDone (KMPlayer::NodePtr c) { if (!playmode) finish (); else @@ -349,7 +349,7 @@ PlaylistItemBase::PlaylistItemBase (KMPlayer::NodePtr &d, short i, KMPlayerApp * : KMPlayer::Mrl (d, i), app (a), playmode (pm) { } -KDE_NO_EXPORT void PlaylistItemBase::activate () { +TDE_NO_EXPORT void PlaylistItemBase::activate () { if (playmode) { Mrl::activate (); } else { @@ -402,20 +402,20 @@ PlaylistItem::PlaylistItem (KMPlayer::NodePtr & doc, KMPlayerApp *a, bool pm, co setAttribute (KMPlayer::StringPool::attr_url, url); } -KDE_NO_EXPORT void PlaylistItem::closed () { +TDE_NO_EXPORT void PlaylistItem::closed () { if (src.isEmpty ()) src = getAttribute (KMPlayer::StringPool::attr_url); PlaylistItemBase::closed (); } -KDE_NO_EXPORT void PlaylistItem::begin () { +TDE_NO_EXPORT void PlaylistItem::begin () { if (playmode && firstChild ()) firstChild ()->activate (); else Mrl::begin (); } -KDE_NO_EXPORT void PlaylistItem::setNodeName (const TQString & s) { +TDE_NO_EXPORT void PlaylistItem::setNodeName (const TQString & s) { src = s; setAttribute (KMPlayer::StringPool::attr_url, s); } @@ -433,7 +433,7 @@ PlaylistGroup::PlaylistGroup (KMPlayer::NodePtr & doc, KMPlayerApp * a, bool lm) : KMPlayer::Mrl (doc, KMPlayer::id_node_group_node), app (a), playmode (lm) { } -KDE_NO_EXPORT KMPlayer::NodePtr PlaylistGroup::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr PlaylistGroup::childFromTag (const TQString & tag) { const char * name = tag.ascii (); if (!strcmp (name, "item")) return new PlaylistItem (m_doc, app, playmode); @@ -444,12 +444,12 @@ KDE_NO_EXPORT KMPlayer::NodePtr PlaylistGroup::childFromTag (const TQString & ta return 0L; } -KDE_NO_EXPORT void PlaylistGroup::closed () { +TDE_NO_EXPORT void PlaylistGroup::closed () { if (pretty_name.isEmpty ()) pretty_name = getAttribute (KMPlayer::StringPool::attr_title); } -KDE_NO_EXPORT void PlaylistGroup::setNodeName (const TQString & t) { +TDE_NO_EXPORT void PlaylistGroup::setNodeName (const TQString & t) { pretty_name = t; setAttribute (KMPlayer::StringPool::attr_title, t); } @@ -458,14 +458,14 @@ KDE_NO_CDTOR_EXPORT HtmlObject::HtmlObject (KMPlayer::NodePtr &doc, KMPlayerApp *a, bool pm) : PlaylistItemBase (doc, KMPlayer::id_node_html_object, a, pm) {} -KDE_NO_EXPORT void HtmlObject::activate () { +TDE_NO_EXPORT void HtmlObject::activate () { if (playmode) KMPlayer::Mrl::activate (); else PlaylistItemBase::activate (); } -KDE_NO_EXPORT void HtmlObject::closed () { +TDE_NO_EXPORT void HtmlObject::closed () { for (Node *n = firstChild ().ptr (); n; n = n->nextSibling ().ptr ()) { if (n->id == KMPlayer::id_node_param) { KMPlayer::Element *e = static_cast <KMPlayer::Element *> (n); @@ -487,7 +487,7 @@ KDE_NO_EXPORT void HtmlObject::closed () { PlaylistItemBase::closed (); } -KDE_NO_EXPORT KMPlayer::NodePtr HtmlObject::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr HtmlObject::childFromTag (const TQString & tag) { const char *name = tag.ascii (); if (!strcasecmp (name, "param")) return new KMPlayer::DarkNode (m_doc, name, KMPlayer::id_node_param); @@ -572,7 +572,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::~KMPlayerApp () { } -KDE_NO_EXPORT void KMPlayerApp::initActions () { +TDE_NO_EXPORT void KMPlayerApp::initActions () { TDEActionCollection * ac = actionCollection (); fileNewWindow = new TDEAction(i18n("New &Window"), 0, 0, this, TQ_SLOT(slotFileNewWindow()), ac, "new_window"); fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), ac, "open"); @@ -629,13 +629,13 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () { KStdAction::configureToolbars (this, TQ_SLOT (slotConfigureToolbars ()), ac, "configtoolbars"); } -KDE_NO_EXPORT void KMPlayerApp::initStatusBar () { +TDE_NO_EXPORT void KMPlayerApp::initStatusBar () { KStatusBar *sb = statusBar (); sb->insertItem (i18n ("Ready."), id_status_msg); sb->insertItem (TQString ("--:--"), id_status_timer, 0, true); } -KDE_NO_EXPORT void KMPlayerApp::initMenu () { +TDE_NO_EXPORT void KMPlayerApp::initMenu () { createGUI (); // first build the one from the kmplayerui.rc TQPopupMenu * bookmarkmenu = m_view->controlPanel()->bookmarkMenu (); m_view->controlPanel()->popupMenu ()->removeItem (KMPlayer::ControlPanel::menu_bookmark); @@ -660,7 +660,7 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () { m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), this, TQ_SLOT(openAudioCD ()), 0,-1, 1); } -KDE_NO_EXPORT void KMPlayerApp::initView () { +TDE_NO_EXPORT void KMPlayerApp::initView () { //m_view->docArea ()->readDockConfig (config, TQString ("Window Layout")); m_player->connectPanel (m_view->controlPanel ()); initMenu (); @@ -738,14 +738,14 @@ void KMPlayerApp::slotFakeKeyEvent() } -KDE_NO_EXPORT void KMPlayerApp::loadingProgress (int perc) { +TDE_NO_EXPORT void KMPlayerApp::loadingProgress (int perc) { if (perc < 100) statusBar ()->changeItem (TQString ("%1%").arg (perc), id_status_timer); else statusBar ()->changeItem (TQString ("--:--"), id_status_timer); } -KDE_NO_EXPORT void KMPlayerApp::positioned (int pos, int length) { +TDE_NO_EXPORT void KMPlayerApp::positioned (int pos, int length) { int left = (length - pos) / 10; if (left != last_time_left) { last_time_left = left; @@ -763,7 +763,7 @@ KDE_NO_EXPORT void KMPlayerApp::positioned (int pos, int length) { } } -KDE_NO_EXPORT void KMPlayerApp::windowVideoConsoleToggled (int wt) { +TDE_NO_EXPORT void KMPlayerApp::windowVideoConsoleToggled (int wt) { if (wt == int (KMPlayer::View::WT_Video)) { toggleView->setText (i18n ("C&onsole")); toggleView->setIcon (TQString ("konsole")); @@ -773,7 +773,7 @@ KDE_NO_EXPORT void KMPlayerApp::windowVideoConsoleToggled (int wt) { } } -KDE_NO_EXPORT void KMPlayerApp::playerStarted () { +TDE_NO_EXPORT void KMPlayerApp::playerStarted () { KMPlayer::Source * source = m_player->source (); if (!strcmp (source->name (), "urlsource")) { KURL url = source->url (); @@ -832,7 +832,7 @@ KDE_NO_EXPORT void KMPlayerApp::playerStarted () { } } -KDE_NO_EXPORT void KMPlayerApp::slotSourceChanged (KMPlayer::Source *olds, KMPlayer::Source * news) { +TDE_NO_EXPORT void KMPlayerApp::slotSourceChanged (KMPlayer::Source *olds, KMPlayer::Source * news) { if (olds) { disconnect (olds, TQ_SIGNAL (titleChanged (const TQString &)), this, TQ_SLOT (setCaption (const TQString &))); @@ -850,28 +850,28 @@ KDE_NO_EXPORT void KMPlayerApp::slotSourceChanged (KMPlayer::Source *olds, KMPla } } -KDE_NO_EXPORT void KMPlayerApp::dvdNav () { +TDE_NO_EXPORT void KMPlayerApp::dvdNav () { slotStatusMsg(i18n("DVD Navigation...")); m_player->setSource (m_player->sources () ["dvdnavsource"]); slotStatusMsg(i18n("Ready")); } -KDE_NO_EXPORT void KMPlayerApp::openDVD () { +TDE_NO_EXPORT void KMPlayerApp::openDVD () { slotStatusMsg(i18n("Opening DVD...")); m_player->setSource (m_player->sources () ["dvdsource"]); } -KDE_NO_EXPORT void KMPlayerApp::openVCD () { +TDE_NO_EXPORT void KMPlayerApp::openVCD () { slotStatusMsg(i18n("Opening VCD...")); m_player->setSource (m_player->sources () ["vcdsource"]); } -KDE_NO_EXPORT void KMPlayerApp::openAudioCD () { +TDE_NO_EXPORT void KMPlayerApp::openAudioCD () { slotStatusMsg(i18n("Opening Audio CD...")); m_player->setSource (m_player->sources () ["audiocdsource"]); } -KDE_NO_EXPORT void KMPlayerApp::openPipe () { +TDE_NO_EXPORT void KMPlayerApp::openPipe () { slotStatusMsg(i18n("Opening pipe...")); bool ok; TQString cmd = KLineEditDlg::getText (i18n("Read From Pipe"), @@ -884,7 +884,7 @@ KDE_NO_EXPORT void KMPlayerApp::openPipe () { m_player->setSource (m_player->sources () ["pipesource"]); } -KDE_NO_EXPORT void KMPlayerApp::openVDR () { +TDE_NO_EXPORT void KMPlayerApp::openVDR () { slotStatusMsg(i18n("Opening VDR...")); if (!strcmp (m_player->source ()->name (), "vdrsource") && m_player->process ()->playing ()) static_cast<KMPlayerVDRSource *>(m_player->source())->toggleConnected(); @@ -897,9 +897,9 @@ struct IntroSource : public KMPlayer::Source { KMPlayerApp * m_app; IntroSource (KMPlayer::PartBase *p, KMPlayerApp * a) : KMPlayer::Source (i18n ("Intro"), p, "introsource"), m_app (a) {} - KDE_NO_EXPORT bool hasLength () { return false; } - KDE_NO_EXPORT bool isSeekable () { return false; } - KDE_NO_EXPORT TQString prettyName () { return i18n ("Intro"); } + TDE_NO_EXPORT bool hasLength () { return false; } + TDE_NO_EXPORT bool isSeekable () { return false; } + TDE_NO_EXPORT TQString prettyName () { return i18n ("Intro"); } void activate (); void deactivate (); void stateElementChanged (KMPlayer::Node * node, KMPlayer::Node::State os, KMPlayer::Node::State ns); @@ -907,7 +907,7 @@ struct IntroSource : public KMPlayer::Source { bool finished; }; -KDE_NO_EXPORT void IntroSource::activate () { +TDE_NO_EXPORT void IntroSource::activate () { if (m_player->settings ()->autoresize) m_app->disconnect(m_player, TQ_SIGNAL(sourceDimensionChanged()),m_app,TQ_SLOT(zoom100())); m_document = new KMPlayer::Document (TQString (""), this); @@ -955,7 +955,7 @@ KDE_NO_EXPORT void IntroSource::activate () { deactivated = finished = false; } -KDE_NO_EXPORT void IntroSource::stateElementChanged (KMPlayer::Node * node, KMPlayer::Node::State, KMPlayer::Node::State new_state) { +TDE_NO_EXPORT void IntroSource::stateElementChanged (KMPlayer::Node * node, KMPlayer::Node::State, KMPlayer::Node::State new_state) { if (new_state == KMPlayer::Node::state_deactivated && m_document == node) { m_document->reset (); @@ -968,7 +968,7 @@ KDE_NO_EXPORT void IntroSource::stateElementChanged (KMPlayer::Node * node, KMPl } } -KDE_NO_EXPORT void IntroSource::deactivate () { +TDE_NO_EXPORT void IntroSource::deactivate () { deactivated = true; if (m_player->settings ()->autoresize) m_app->connect(m_player, TQ_SIGNAL(sourceDimensionChanged()),m_app,TQ_SLOT(zoom100())); @@ -977,7 +977,7 @@ KDE_NO_EXPORT void IntroSource::deactivate () { } #endif -KDE_NO_EXPORT void KMPlayerApp::restoreFromConfig () { +TDE_NO_EXPORT void KMPlayerApp::restoreFromConfig () { if (m_player->view ()) { m_view->docArea ()->hide (); m_view->docArea ()->readDockConfig (m_player->config (), TQString ("Window Layout")); @@ -986,7 +986,7 @@ KDE_NO_EXPORT void KMPlayerApp::restoreFromConfig () { } } -KDE_NO_EXPORT void KMPlayerApp::openDocumentFile (const KURL& url) +TDE_NO_EXPORT void KMPlayerApp::openDocumentFile (const KURL& url) { if (!m_played_intro) { m_played_intro = true; @@ -1021,26 +1021,26 @@ KDE_NO_EXPORT void KMPlayerApp::openDocumentFile (const KURL& url) slotStatusMsg (i18n ("Ready.")); } -KDE_NO_EXPORT void KMPlayerApp::addURL (const KURL& url) { +TDE_NO_EXPORT void KMPlayerApp::addURL (const KURL& url) { KMPlayer::Source * src = m_player->sources () ["urlsource"]; KMPlayer::NodePtr d = src->document (); if (d) d->appendChild (new KMPlayer::GenericURL (d, url.url ())); } -KDE_NO_EXPORT void KMPlayerApp::saveProperties (TDEConfig * config) { +TDE_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 (TDEConfig * config) { +TDE_NO_EXPORT void KMPlayerApp::readProperties (TDEConfig * config) { KURL url (config->readEntry ("URL", TQString ())); openDocumentFile (url); if (!config->readBoolEntry ("Visible", true) && m_systray) hide (); } -KDE_NO_EXPORT void KMPlayerApp::resizePlayer (int percentage) { +TDE_NO_EXPORT void KMPlayerApp::resizePlayer (int percentage) { KMPlayer::Source * source = m_player->source (); if (!source) return; @@ -1069,27 +1069,27 @@ KDE_NO_EXPORT void KMPlayerApp::resizePlayer (int percentage) { } } -KDE_NO_EXPORT void KMPlayerApp::zoom50 () { +TDE_NO_EXPORT void KMPlayerApp::zoom50 () { resizePlayer (50); } -KDE_NO_EXPORT void KMPlayerApp::zoom100 () { +TDE_NO_EXPORT void KMPlayerApp::zoom100 () { resizePlayer (100); } -KDE_NO_EXPORT void KMPlayerApp::zoom150 () { +TDE_NO_EXPORT void KMPlayerApp::zoom150 () { resizePlayer (150); } -KDE_NO_EXPORT void KMPlayerApp::zoom200 () { +TDE_NO_EXPORT void KMPlayerApp::zoom200 () { resizePlayer (200); } -KDE_NO_EXPORT void KMPlayerApp::zoom300 () { +TDE_NO_EXPORT void KMPlayerApp::zoom300 () { resizePlayer (300); } -KDE_NO_EXPORT void KMPlayerApp::editMode () { +TDE_NO_EXPORT void KMPlayerApp::editMode () { m_view->docArea ()->hide (); bool editmode = !m_view->editMode (); KMPlayer::PlayListItem * pi = m_view->playList ()->currentPlayListItem (); @@ -1112,7 +1112,7 @@ KDE_NO_EXPORT void KMPlayerApp::editMode () { } } -KDE_NO_EXPORT void KMPlayerApp::syncEditMode () { +TDE_NO_EXPORT void KMPlayerApp::syncEditMode () { if (edit_tree_id > -1) { KMPlayer::PlayListItem *si = m_view->playList()->selectedPlayListItem(); if (si && si->node) { @@ -1126,17 +1126,17 @@ KDE_NO_EXPORT void KMPlayerApp::syncEditMode () { m_player->openURL (m_player->source ()->url ()); } -KDE_NO_EXPORT void KMPlayerApp::showBroadcastConfig () { +TDE_NO_EXPORT void KMPlayerApp::showBroadcastConfig () { m_player->settings ()->addPage (m_broadcastconfig); m_player->settings ()->addPage (m_ffserverconfig); } -KDE_NO_EXPORT void KMPlayerApp::hideBroadcastConfig () { +TDE_NO_EXPORT void KMPlayerApp::hideBroadcastConfig () { m_player->settings ()->removePage (m_broadcastconfig); m_player->settings ()->removePage (m_ffserverconfig); } -KDE_NO_EXPORT void KMPlayerApp::broadcastClicked () { +TDE_NO_EXPORT void KMPlayerApp::broadcastClicked () { if (m_broadcastconfig->broadcasting ()) m_broadcastconfig->stopServer (); else { @@ -1145,12 +1145,12 @@ KDE_NO_EXPORT void KMPlayerApp::broadcastClicked () { } } -KDE_NO_EXPORT void KMPlayerApp::broadcastStarted () { +TDE_NO_EXPORT void KMPlayerApp::broadcastStarted () { if (!m_view->controlPanel()->broadcastButton ()->isOn ()) m_view->controlPanel()->broadcastButton ()->toggle (); } -KDE_NO_EXPORT void KMPlayerApp::broadcastStopped () { +TDE_NO_EXPORT void KMPlayerApp::broadcastStopped () { if (m_view->controlPanel()->broadcastButton ()->isOn ()) m_view->controlPanel()->broadcastButton ()->toggle (); if (m_player->source () != m_player->sources () ["tvsource"]) @@ -1158,11 +1158,11 @@ KDE_NO_EXPORT void KMPlayerApp::broadcastStopped () { setCursor (TQCursor (TQt::ArrowCursor)); } -KDE_NO_EXPORT bool KMPlayerApp::broadcasting () const { +TDE_NO_EXPORT bool KMPlayerApp::broadcasting () const { return m_broadcastconfig->broadcasting (); } -KDE_NO_EXPORT void KMPlayerApp::saveOptions() +TDE_NO_EXPORT void KMPlayerApp::saveOptions() { config->setGroup ("General Options"); if (m_player->settings ()->remembersize) @@ -1188,7 +1188,7 @@ KDE_NO_EXPORT void KMPlayerApp::saveOptions() } -KDE_NO_EXPORT void KMPlayerApp::readOptions() { +TDE_NO_EXPORT void KMPlayerApp::readOptions() { config->setGroup("General Options"); @@ -1232,7 +1232,7 @@ KDE_NO_EXPORT void KMPlayerApp::readOptions() { #undef Unsorted #undef Bool -KDE_NO_EXPORT void KMPlayerApp::minimalMode (bool by_user) { +TDE_NO_EXPORT void KMPlayerApp::minimalMode (bool by_user) { unsigned long props = NET::WMWindowType; NETWinInfo winfo (tqt_xdisplay (), winId (), tqt_xrootwin (), props); if (m_minimal_mode) { @@ -1252,7 +1252,7 @@ KDE_NO_EXPORT void KMPlayerApp::minimalMode (bool by_user) { m_minimal_mode = !m_minimal_mode; } -KDE_NO_EXPORT void KMPlayerApp::slotMinimalMode () { +TDE_NO_EXPORT void KMPlayerApp::slotMinimalMode () { minimalMode (true); } @@ -1260,15 +1260,15 @@ KDE_NO_EXPORT void KMPlayerApp::slotMinimalMode () { struct ExitSource : public KMPlayer::Source { KDE_NO_CDTOR_EXPORT ExitSource (KMPlayer::PartBase *p) : KMPlayer::Source (i18n ("Exit"), p, "exitsource") {} - KDE_NO_EXPORT TQString prettyName () { return i18n ("Exit"); } - KDE_NO_EXPORT bool hasLength () { return false; } - KDE_NO_EXPORT bool isSeekable () { return false; } + TDE_NO_EXPORT TQString prettyName () { return i18n ("Exit"); } + TDE_NO_EXPORT bool hasLength () { return false; } + TDE_NO_EXPORT bool isSeekable () { return false; } void activate (); - KDE_NO_EXPORT void deactivate () {} + TDE_NO_EXPORT void deactivate () {} void stateElementChanged (KMPlayer::Node * node, KMPlayer::Node::State os, KMPlayer::Node::State ns); }; -KDE_NO_EXPORT void ExitSource::activate () { +TDE_NO_EXPORT void ExitSource::activate () { m_document = new KMPlayer::Document (TQString (""), this); TQString exitfile = locate ("data", "kmplayer/exit.xml"); TQFile file (exitfile); @@ -1306,7 +1306,7 @@ KDE_NO_EXPORT void ExitSource::activate () { tqApp->quit (); } -KDE_NO_EXPORT void ExitSource::stateElementChanged (KMPlayer::Node * node, KMPlayer::Node::State, KMPlayer::Node::State new_state) { +TDE_NO_EXPORT void ExitSource::stateElementChanged (KMPlayer::Node * node, KMPlayer::Node::State, KMPlayer::Node::State new_state) { if (new_state == KMPlayer::Node::state_deactivated && m_document == node && m_player->view ()) @@ -1314,7 +1314,7 @@ KDE_NO_EXPORT void ExitSource::stateElementChanged (KMPlayer::Node * node, KMPla } #endif -KDE_NO_EXPORT bool KMPlayerApp::queryClose () { +TDE_NO_EXPORT bool KMPlayerApp::queryClose () { // KMPlayerVDRSource has to wait for pending commands like mute and quit m_player->stop (); static_cast <KMPlayerVDRSource *> (m_player->sources () ["vdrsource"])->waitForConnectionClose (); @@ -1339,7 +1339,7 @@ KDE_NO_EXPORT bool KMPlayerApp::queryClose () { #endif } -KDE_NO_EXPORT bool KMPlayerApp::queryExit() +TDE_NO_EXPORT bool KMPlayerApp::queryExit() { if (!m_minimal_mode) saveOptions(); @@ -1349,7 +1349,7 @@ KDE_NO_EXPORT bool KMPlayerApp::queryExit() return true; } -KDE_NO_EXPORT void KMPlayerApp::slotFileNewWindow() +TDE_NO_EXPORT void KMPlayerApp::slotFileNewWindow() { slotStatusMsg(i18n("Opening a new application window...")); @@ -1359,7 +1359,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotFileNewWindow() slotStatusMsg(i18n("Ready.")); } -KDE_NO_EXPORT void KMPlayerApp::slotFileOpen () { +TDE_NO_EXPORT void KMPlayerApp::slotFileOpen () { KURL::List urls = KFileDialog::getOpenURLs (TQString (), i18n ("*|All Files"), this, i18n ("Open File")); if (urls.size () == 1) { openDocumentFile (urls [0]); @@ -1370,7 +1370,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotFileOpen () { } } -KDE_NO_EXPORT void KMPlayerApp::slotFileOpenRecent(const KURL& url) +TDE_NO_EXPORT void KMPlayerApp::slotFileOpenRecent(const KURL& url) { slotStatusMsg(i18n("Opening file...")); @@ -1378,7 +1378,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotFileOpenRecent(const KURL& url) } -KDE_NO_EXPORT void KMPlayerApp::slotSaveAs () { +TDE_NO_EXPORT void KMPlayerApp::slotSaveAs () { TQString url = KFileDialog::getSaveFileName (TQString (), TQString (), this, i18n ("Save File")); if (!url.isEmpty ()) { TQFile file (url); @@ -1402,7 +1402,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotSaveAs () { } } -KDE_NO_EXPORT void KMPlayerApp::slotClearHistory () { +TDE_NO_EXPORT void KMPlayerApp::slotClearHistory () { //fileOpenRecent->clearURLList (); int mi = fileOpenRecent->maxItems (); fileOpenRecent->setMaxItems (0); @@ -1416,7 +1416,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotClearHistory () { } } -KDE_NO_EXPORT void KMPlayerApp::slotFileClose() +TDE_NO_EXPORT void KMPlayerApp::slotFileClose() { slotStatusMsg(i18n("Closing file...")); @@ -1425,7 +1425,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotFileClose() slotStatusMsg(i18n("Ready.")); } -KDE_NO_EXPORT void KMPlayerApp::slotFileQuit() +TDE_NO_EXPORT void KMPlayerApp::slotFileQuit() { slotStatusMsg(i18n("Exiting...")); @@ -1449,21 +1449,21 @@ KDE_NO_EXPORT void KMPlayerApp::slotFileQuit() }*/ } -KDE_NO_EXPORT void KMPlayerApp::slotPreferences () { +TDE_NO_EXPORT void KMPlayerApp::slotPreferences () { m_player->showConfigDialog (); } -KDE_NO_EXPORT void KMPlayerApp::slotConfigureKeys () { +TDE_NO_EXPORT void KMPlayerApp::slotConfigureKeys () { KKeyDialog::configure( actionCollection(), this ); } -KDE_NO_EXPORT void KMPlayerApp::slotConfigureToolbars () { +TDE_NO_EXPORT void KMPlayerApp::slotConfigureToolbars () { KEditToolbar dlg (actionCollection ()); if (dlg.exec ()) initMenu (); // also add custom popups //createGUI (); } -KDE_NO_EXPORT void KMPlayerApp::slotViewToolBar() { +TDE_NO_EXPORT void KMPlayerApp::slotViewToolBar() { m_showToolbar = viewToolBar->isChecked(); if(m_showToolbar) toolBar("mainToolBar")->show(); @@ -1471,7 +1471,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotViewToolBar() { toolBar("mainToolBar")->hide(); } -KDE_NO_EXPORT void KMPlayerApp::slotViewStatusBar() { +TDE_NO_EXPORT void KMPlayerApp::slotViewStatusBar() { m_showStatusbar = viewStatusBar->isChecked(); if(m_showStatusbar) statusBar()->show(); @@ -1479,7 +1479,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotViewStatusBar() { statusBar()->hide(); } -KDE_NO_EXPORT void KMPlayerApp::slotViewMenuBar() { +TDE_NO_EXPORT void KMPlayerApp::slotViewMenuBar() { m_showMenubar = viewMenuBar->isChecked(); if (m_showMenubar) { menuBar()->show(); @@ -1494,13 +1494,13 @@ KDE_NO_EXPORT void KMPlayerApp::slotViewMenuBar() { } } -KDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) { +TDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) { KStatusBar * sb = statusBar (); sb->clear (); sb->changeItem (text, id_status_msg); } -KDE_NO_EXPORT void KMPlayerApp::fullScreen () { +TDE_NO_EXPORT void KMPlayerApp::fullScreen () { if (sender()->inherits("TDEAction")) m_view->fullScreen(); #if KDE_IS_VERSION(3,1,90) @@ -1514,7 +1514,7 @@ KDE_NO_EXPORT void KMPlayerApp::fullScreen () { } } -KDE_NO_EXPORT void KMPlayerApp::playListItemSelected (TQListViewItem * item) { +TDE_NO_EXPORT void KMPlayerApp::playListItemSelected (TQListViewItem * item) { KMPlayer::PlayListItem * vi = static_cast <KMPlayer::PlayListItem *> (item); if (edit_tree_id > -1) { if (vi->playListView ()->rootItem (item)->id != edit_tree_id) @@ -1524,7 +1524,7 @@ KDE_NO_EXPORT void KMPlayerApp::playListItemSelected (TQListViewItem * item) { viewEditMode->setEnabled (vi->playListView ()->rootItem (item)->flags & KMPlayer::PlayListView::TreeEdit); } -KDE_NO_EXPORT +TDE_NO_EXPORT void KMPlayerApp::playListItemDropped (TQDropEvent * de, TQListViewItem * after) { if (!after) { // could still be a descendent after = m_view->playList()->itemAt (m_view->playList()->contentsToViewport (de->pos ())); @@ -1566,7 +1566,7 @@ void KMPlayerApp::playListItemDropped (TQDropEvent * de, TQListViewItem * after) m_dropmenu->exec (m_view->playList ()->mapToGlobal (m_view->playList ()->contentsToViewport (de->pos ()))); } -KDE_NO_EXPORT void KMPlayerApp::menuDropInList () { +TDE_NO_EXPORT void KMPlayerApp::menuDropInList () { KMPlayer::NodePtr n = static_cast<KMPlayer::PlayListItem*>(m_drop_after)->node; KMPlayer::NodePtr pi; for (int i = m_drop_list.size (); n && (i > 0 || manip_node); i--) { @@ -1584,7 +1584,7 @@ KDE_NO_EXPORT void KMPlayerApp::menuDropInList () { m_view->playList()->updateTree (playlist_id, playlist, pi, true, false); } -KDE_NO_EXPORT void KMPlayerApp::menuDropInGroup () { +TDE_NO_EXPORT void KMPlayerApp::menuDropInGroup () { KMPlayer::NodePtr n = static_cast<KMPlayer::PlayListItem*>(m_drop_after)->node; if (!n) return; @@ -1606,7 +1606,7 @@ KDE_NO_EXPORT void KMPlayerApp::menuDropInGroup () { m_view->playList()->updateTree (playlist_id, playlist, pi, true, false); } -KDE_NO_EXPORT void KMPlayerApp::menuCopyDrop () { +TDE_NO_EXPORT void KMPlayerApp::menuCopyDrop () { KMPlayer::NodePtr n = static_cast<KMPlayer::PlayListItem*>(m_drop_after)->node; if (n && manip_node) { KMPlayer::NodePtr pi = new PlaylistItem (playlist, this, false, manip_node->mrl ()->src); @@ -1618,7 +1618,7 @@ KDE_NO_EXPORT void KMPlayerApp::menuCopyDrop () { } } -KDE_NO_EXPORT void KMPlayerApp::menuDeleteNode () { +TDE_NO_EXPORT void KMPlayerApp::menuDeleteNode () { KMPlayer::NodePtr n; if (manip_node && manip_node->parentNode ()) { n = manip_node->previousSibling() ? manip_node->previousSibling() : manip_node->parentNode (); @@ -1627,7 +1627,7 @@ KDE_NO_EXPORT void KMPlayerApp::menuDeleteNode () { m_view->playList()->updateTree (manip_tree_id, 0L, n, true, false); } -KDE_NO_EXPORT void KMPlayerApp::menuMoveUpNode () { +TDE_NO_EXPORT void KMPlayerApp::menuMoveUpNode () { KMPlayer::NodePtr n = manip_node; if (n && n->parentNode () && n->previousSibling ()) { KMPlayer::NodePtr prev = n->previousSibling (); @@ -1637,7 +1637,7 @@ KDE_NO_EXPORT void KMPlayerApp::menuMoveUpNode () { m_view->playList()->updateTree (manip_tree_id, 0L, n, true, false); } -KDE_NO_EXPORT void KMPlayerApp::menuMoveDownNode () { +TDE_NO_EXPORT void KMPlayerApp::menuMoveDownNode () { KMPlayer::NodePtr n = manip_node; if (n && n->parentNode () && n->nextSibling ()) { KMPlayer::NodePtr next = n->nextSibling (); @@ -1647,7 +1647,7 @@ KDE_NO_EXPORT void KMPlayerApp::menuMoveDownNode () { m_view->playList()->updateTree (manip_tree_id, 0L, n, true, false); } -KDE_NO_EXPORT void KMPlayerApp::playListItemMoved () { +TDE_NO_EXPORT void KMPlayerApp::playListItemMoved () { KMPlayer::PlayListItem * si = m_view->playList ()->selectedPlayListItem (); KMPlayer::RootPlayListItem * ri = m_view->playList ()->rootItem (si); kdDebug() << "playListItemMoved " << (ri->id == playlist_id) << !! si->node << endl; @@ -1660,7 +1660,7 @@ KDE_NO_EXPORT void KMPlayerApp::playListItemMoved () { } } -KDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu (KMPlayer::PlayListItem * item, TQPopupMenu * pm) { +TDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu (KMPlayer::PlayListItem * item, TQPopupMenu * pm) { KMPlayer::RootPlayListItem * ri = m_view->playList ()->rootItem (item); if (item->node && ri->flags & (KMPlayer::PlayListView::Moveable | KMPlayer::PlayListView::Deleteable)) { @@ -1679,7 +1679,7 @@ KDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu (KMPlayer::PlayListItem * it } -KDE_NO_EXPORT void KMPlayerApp::startArtsControl () { +TDE_NO_EXPORT void KMPlayerApp::startArtsControl () { TQCString fApp, fObj; TQByteArray data, replydata; QCStringList apps = kapp->dcopClient ()->registeredApplications(); @@ -1701,7 +1701,7 @@ KDE_NO_EXPORT void KMPlayerApp::startArtsControl () { } } -KDE_NO_EXPORT void KMPlayerApp::configChanged () { +TDE_NO_EXPORT void KMPlayerApp::configChanged () { viewKeepRatio->setChecked (m_player->settings ()->sizeratio); if (m_player->settings ()->docksystray && !m_systray) { m_systray = new KSystemTray (this); @@ -1719,7 +1719,7 @@ KDE_NO_EXPORT void KMPlayerApp::configChanged () { static_cast <KMPlayerTVSource *> (m_player->sources () ["tvsource"])->buildMenu (); } -KDE_NO_EXPORT void KMPlayerApp::keepSizeRatio () { +TDE_NO_EXPORT void KMPlayerApp::keepSizeRatio () { m_view->setKeepSizeRatio (!m_view->keepSizeRatio ()); m_player->settings ()->sizeratio = m_view->keepSizeRatio (); viewKeepRatio->setChecked (m_view->keepSizeRatio ()); @@ -1734,7 +1734,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerMenuSource::KMPlayerMenuSource (const TQString & n, KDE_NO_CDTOR_EXPORT KMPlayerMenuSource::~KMPlayerMenuSource () { } -KDE_NO_EXPORT void KMPlayerMenuSource::menuItemClicked (TQPopupMenu * menu, int id) { +TDE_NO_EXPORT void KMPlayerMenuSource::menuItemClicked (TQPopupMenu * menu, int id) { int unsetmenuid = -1; for (unsigned i = 0; i < menu->count(); i++) { int menuid = menu->idAt (i); @@ -1787,7 +1787,7 @@ KDE_NO_CDTOR_EXPORT Disks::Disks (KMPlayerApp * a) pretty_name = i18n ("Optical Disks"); } -KDE_NO_EXPORT void Disks::childDone (KMPlayer::NodePtr) { +TDE_NO_EXPORT void Disks::childDone (KMPlayer::NodePtr) { finish (); } @@ -1797,7 +1797,7 @@ KDE_NO_CDTOR_EXPORT Disk::Disk (KMPlayer::NodePtr & doc, KMPlayerApp * a, const pretty_name = pn; } -KDE_NO_EXPORT void Disk::activate () { +TDE_NO_EXPORT void Disk::activate () { const char * sn; if (src.startsWith ("cdda")) sn = "audiocdsource"; @@ -1834,7 +1834,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerDVDSource::~KMPlayerDVDSource () { disks->document ()->dispose (); } -KDE_NO_EXPORT bool KMPlayerDVDSource::processOutput (const TQString & str) { +TDE_NO_EXPORT bool KMPlayerDVDSource::processOutput (const TQString & str) { if (KMPlayer::Source::processOutput (str)) return true; if (m_identified) @@ -1879,7 +1879,7 @@ KDE_NO_EXPORT bool KMPlayerDVDSource::processOutput (const TQString & str) { return true; } -KDE_NO_EXPORT void KMPlayerDVDSource::activate () { +TDE_NO_EXPORT void KMPlayerDVDSource::activate () { m_start_play = m_auto_play; m_current_title = -1; setURL (KURL ("dvd://")); @@ -1902,7 +1902,7 @@ KDE_NO_EXPORT void KMPlayerDVDSource::activate () { TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } -KDE_NO_EXPORT void KMPlayerDVDSource::setIdentified (bool b) { +TDE_NO_EXPORT void KMPlayerDVDSource::setIdentified (bool b) { KMPlayer::Source::setIdentified (b); m_start_play = true; if (m_current_title < 0 || m_current_title >= int (m_dvdtitlemenu->count())) @@ -1919,7 +1919,7 @@ KDE_NO_EXPORT void KMPlayerDVDSource::setIdentified (bool b) { m_app->slotStatusMsg (i18n ("Ready.")); } -KDE_NO_EXPORT void KMPlayerDVDSource::deactivate () { +TDE_NO_EXPORT void KMPlayerDVDSource::deactivate () { if (m_player->view ()) { m_dvdtitlemenu->clear (); m_dvdsubtitlemenu->clear (); @@ -1942,7 +1942,7 @@ KDE_NO_EXPORT void KMPlayerDVDSource::deactivate () { } } -KDE_NO_EXPORT void KMPlayerDVDSource::buildArguments () { +TDE_NO_EXPORT void KMPlayerDVDSource::buildArguments () { TQString url ("dvd://"); if (m_document) { if (m_current_title > 0) @@ -1967,14 +1967,14 @@ KDE_NO_EXPORT void KMPlayerDVDSource::buildArguments () { m_recordcmd = m_options + TQString (" -vf scale -zoom"); } -KDE_NO_EXPORT TQString KMPlayerDVDSource::filterOptions () { +TDE_NO_EXPORT TQString KMPlayerDVDSource::filterOptions () { KMPlayer::Settings * settings = m_player->settings (); if (!settings->disableppauto) return KMPlayer::Source::filterOptions (); return TQString (""); } -KDE_NO_EXPORT void KMPlayerDVDSource::titleMenuClicked (int id) { +TDE_NO_EXPORT void KMPlayerDVDSource::titleMenuClicked (int id) { if (m_current_title != id) { m_player->stop (); m_current_title = id; @@ -1989,7 +1989,7 @@ KDE_NO_EXPORT void KMPlayerDVDSource::titleMenuClicked (int id) { } } -KDE_NO_EXPORT void KMPlayerDVDSource::play () { +TDE_NO_EXPORT void KMPlayerDVDSource::play () { buildArguments (); if (m_start_play) { m_player->stop (); @@ -1997,38 +1997,38 @@ KDE_NO_EXPORT void KMPlayerDVDSource::play () { } } -KDE_NO_EXPORT void KMPlayerDVDSource::subtitleMenuClicked (int id) { +TDE_NO_EXPORT void KMPlayerDVDSource::subtitleMenuClicked (int id) { menuItemClicked (m_dvdsubtitlemenu, id); play (); } -KDE_NO_EXPORT void KMPlayerDVDSource::languageMenuClicked (int id) { +TDE_NO_EXPORT void KMPlayerDVDSource::languageMenuClicked (int id) { menuItemClicked (m_dvdlanguagemenu, id); play (); } -KDE_NO_EXPORT void KMPlayerDVDSource::chapterMenuClicked (int id) { +TDE_NO_EXPORT void KMPlayerDVDSource::chapterMenuClicked (int id) { menuItemClicked (m_dvdchaptermenu, id); play (); } -KDE_NO_EXPORT TQString KMPlayerDVDSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerDVDSource::prettyName () { return i18n ("DVD"); } static const char * strPlayDVD = "Immediately Play DVD"; -KDE_NO_EXPORT void KMPlayerDVDSource::write (TDEConfig * config) { +TDE_NO_EXPORT void KMPlayerDVDSource::write (TDEConfig * config) { config->setGroup (strMPlayerGroup); config->writeEntry (strPlayDVD, m_auto_play); } -KDE_NO_EXPORT void KMPlayerDVDSource::read (TDEConfig * config) { +TDE_NO_EXPORT void KMPlayerDVDSource::read (TDEConfig * config) { config->setGroup (strMPlayerGroup); m_auto_play = config->readBoolEntry (strPlayDVD, true); } -KDE_NO_EXPORT void KMPlayerDVDSource::sync (bool fromUI) { +TDE_NO_EXPORT void KMPlayerDVDSource::sync (bool fromUI) { if (fromUI) { m_auto_play = m_configpage->autoPlayDVD->isChecked (); m_player->settings ()->dvddevice = m_configpage->dvddevice->lineEdit()->text (); @@ -2038,13 +2038,13 @@ KDE_NO_EXPORT void KMPlayerDVDSource::sync (bool fromUI) { } } -KDE_NO_EXPORT void KMPlayerDVDSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void KMPlayerDVDSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); icon = TQString ("text-x-src"); tab = i18n ("DVD"); } -KDE_NO_EXPORT TQFrame * KMPlayerDVDSource::prefPage (TQWidget * parent) { +TDE_NO_EXPORT TQFrame * KMPlayerDVDSource::prefPage (TQWidget * parent) { m_configpage = new KMPlayerPrefSourcePageDVD (parent); return m_configpage; } @@ -2059,15 +2059,15 @@ KDE_NO_CDTOR_EXPORT KMPlayerDVDNavSource::KMPlayerDVDNavSource (KMPlayerApp * ap KDE_NO_CDTOR_EXPORT KMPlayerDVDNavSource::~KMPlayerDVDNavSource () {} -KDE_NO_EXPORT void KMPlayerDVDNavSource::activate () { +TDE_NO_EXPORT void KMPlayerDVDNavSource::activate () { setURL (KURL ("dvd://")); play (); } -KDE_NO_EXPORT void KMPlayerDVDNavSource::deactivate () { +TDE_NO_EXPORT void KMPlayerDVDNavSource::deactivate () { } -KDE_NO_EXPORT void KMPlayerDVDNavSource::play () { +TDE_NO_EXPORT void KMPlayerDVDNavSource::play () { if (!m_menu->findItem (DVDNav_previous)) { m_menu->insertItem (i18n ("&Previous"), this, TQ_SLOT (navMenuClicked (int)), 0, DVDNav_previous); m_menu->insertItem (i18n ("&Next"), this, TQ_SLOT (navMenuClicked (int)), 0, DVDNav_next); @@ -2078,7 +2078,7 @@ KDE_NO_EXPORT void KMPlayerDVDNavSource::play () { connect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT(finished ())); } -KDE_NO_EXPORT void KMPlayerDVDNavSource::finished () { +TDE_NO_EXPORT void KMPlayerDVDNavSource::finished () { disconnect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT(finished ())); m_menu->removeItem (DVDNav_previous); m_menu->removeItem (DVDNav_next); @@ -2086,7 +2086,7 @@ KDE_NO_EXPORT void KMPlayerDVDNavSource::finished () { m_menu->removeItem (DVDNav_up); } -KDE_NO_EXPORT void KMPlayerDVDNavSource::navMenuClicked (int id) { +TDE_NO_EXPORT void KMPlayerDVDNavSource::navMenuClicked (int id) { switch (id) { case DVDNav_start: break; @@ -2105,7 +2105,7 @@ KDE_NO_EXPORT void KMPlayerDVDNavSource::navMenuClicked (int id) { } } -KDE_NO_EXPORT TQString KMPlayerDVDNavSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerDVDNavSource::prettyName () { return i18n ("DVD"); } @@ -2137,7 +2137,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerVCDSource::KMPlayerVCDSource (KMPlayerApp * a, TQPop KDE_NO_CDTOR_EXPORT KMPlayerVCDSource::~KMPlayerVCDSource () { } -KDE_NO_EXPORT bool KMPlayerVCDSource::processOutput (const TQString & str) { +TDE_NO_EXPORT bool KMPlayerVCDSource::processOutput (const TQString & str) { if (KMPlayer::Source::processOutput (str)) return true; if (m_identified) @@ -2154,7 +2154,7 @@ KDE_NO_EXPORT bool KMPlayerVCDSource::processOutput (const TQString & str) { return false; } -KDE_NO_EXPORT void KMPlayerVCDSource::activate () { +TDE_NO_EXPORT void KMPlayerVCDSource::activate () { m_player->stop (); init (); m_start_play = m_auto_play; @@ -2164,10 +2164,10 @@ KDE_NO_EXPORT void KMPlayerVCDSource::activate () { TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } -KDE_NO_EXPORT void KMPlayerVCDSource::deactivate () { +TDE_NO_EXPORT void KMPlayerVCDSource::deactivate () { } -KDE_NO_EXPORT void KMPlayerVCDSource::setIdentified (bool b) { +TDE_NO_EXPORT void KMPlayerVCDSource::setIdentified (bool b) { KMPlayer::Source::setIdentified (b); if (!m_current || !m_document->hasChildNodes ()) m_current = m_document; @@ -2178,7 +2178,7 @@ KDE_NO_EXPORT void KMPlayerVCDSource::setIdentified (bool b) { m_app->slotStatusMsg (i18n ("Ready.")); } -KDE_NO_EXPORT void KMPlayerVCDSource::buildArguments () { +TDE_NO_EXPORT void KMPlayerVCDSource::buildArguments () { TQString url ("vcd://"); if (m_current && m_current != m_document) url += m_current->mrl ()->src; @@ -2188,23 +2188,23 @@ KDE_NO_EXPORT void KMPlayerVCDSource::buildArguments () { m_recordcmd = m_options; } -KDE_NO_EXPORT TQString KMPlayerVCDSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerVCDSource::prettyName () { return i18n ("VCD"); } static const char * strPlayVCD = "Immediately Play VCD"; -KDE_NO_EXPORT void KMPlayerVCDSource::write (TDEConfig * config) { +TDE_NO_EXPORT void KMPlayerVCDSource::write (TDEConfig * config) { config->setGroup (strMPlayerGroup); config->writeEntry (strPlayVCD, m_auto_play); } -KDE_NO_EXPORT void KMPlayerVCDSource::read (TDEConfig * config) { +TDE_NO_EXPORT void KMPlayerVCDSource::read (TDEConfig * config) { config->setGroup (strMPlayerGroup); m_auto_play = config->readBoolEntry (strPlayVCD, true); } -KDE_NO_EXPORT void KMPlayerVCDSource::sync (bool fromUI) { +TDE_NO_EXPORT void KMPlayerVCDSource::sync (bool fromUI) { if (fromUI) { m_auto_play = m_configpage->autoPlayVCD->isChecked (); m_player->settings ()->vcddevice = m_configpage->vcddevice->lineEdit()->text (); @@ -2214,13 +2214,13 @@ KDE_NO_EXPORT void KMPlayerVCDSource::sync (bool fromUI) { } } -KDE_NO_EXPORT void KMPlayerVCDSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void KMPlayerVCDSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); icon = TQString ("text-x-src"); tab = i18n ("VCD"); } -KDE_NO_EXPORT TQFrame * KMPlayerVCDSource::prefPage (TQWidget * parent) { +TDE_NO_EXPORT TQFrame * KMPlayerVCDSource::prefPage (TQWidget * parent) { m_configpage = new KMPlayerPrefSourcePageVCD (parent); return m_configpage; } @@ -2235,7 +2235,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerAudioCDSource::KMPlayerAudioCDSource (KMPlayerApp * KDE_NO_CDTOR_EXPORT KMPlayerAudioCDSource::~KMPlayerAudioCDSource () { } -KDE_NO_EXPORT bool KMPlayerAudioCDSource::processOutput (const TQString & str) { +TDE_NO_EXPORT bool KMPlayerAudioCDSource::processOutput (const TQString & str) { if (KMPlayer::Source::processOutput (str)) return true; if (m_identified) @@ -2255,7 +2255,7 @@ KDE_NO_EXPORT bool KMPlayerAudioCDSource::processOutput (const TQString & str) { return false; } -KDE_NO_EXPORT void KMPlayerAudioCDSource::activate () { +TDE_NO_EXPORT void KMPlayerAudioCDSource::activate () { m_player->stop (); init (); //m_start_play = m_auto_play; @@ -2265,10 +2265,10 @@ KDE_NO_EXPORT void KMPlayerAudioCDSource::activate () { TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } -KDE_NO_EXPORT void KMPlayerAudioCDSource::deactivate () { +TDE_NO_EXPORT void KMPlayerAudioCDSource::deactivate () { } -KDE_NO_EXPORT void KMPlayerAudioCDSource::setIdentified (bool b) { +TDE_NO_EXPORT void KMPlayerAudioCDSource::setIdentified (bool b) { KMPlayer::Source::setIdentified (b); if (!m_current || !m_document->hasChildNodes ()) m_current = m_document; @@ -2283,7 +2283,7 @@ KDE_NO_EXPORT void KMPlayerAudioCDSource::setIdentified (bool b) { m_app->slotStatusMsg (i18n ("Ready.")); } -KDE_NO_EXPORT void KMPlayerAudioCDSource::buildArguments () { +TDE_NO_EXPORT void KMPlayerAudioCDSource::buildArguments () { TQString url ("cdda://"); if (m_current && m_current != m_document) url += m_current->mrl ()->src; @@ -2293,7 +2293,7 @@ KDE_NO_EXPORT void KMPlayerAudioCDSource::buildArguments () { m_recordcmd = m_options; } -KDE_NO_EXPORT TQString KMPlayerAudioCDSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerAudioCDSource::prettyName () { return i18n ("Audio CD"); } @@ -2306,15 +2306,15 @@ KDE_NO_CDTOR_EXPORT KMPlayerPipeSource::KMPlayerPipeSource (KMPlayerApp * a) KDE_NO_CDTOR_EXPORT KMPlayerPipeSource::~KMPlayerPipeSource () { } -KDE_NO_EXPORT bool KMPlayerPipeSource::hasLength () { +TDE_NO_EXPORT bool KMPlayerPipeSource::hasLength () { return false; } -KDE_NO_EXPORT bool KMPlayerPipeSource::isSeekable () { +TDE_NO_EXPORT bool KMPlayerPipeSource::isSeekable () { return false; } -KDE_NO_EXPORT void KMPlayerPipeSource::activate () { +TDE_NO_EXPORT void KMPlayerPipeSource::activate () { // dangerous !! if (!m_url.protocol ().compare ("kmplayer")) // m_pipecmd = KURL::decode_string (m_url.path ()).mid (1); setURL (KURL ("stdin://")); @@ -2328,14 +2328,14 @@ KDE_NO_EXPORT void KMPlayerPipeSource::activate () { m_app->slotStatusMsg (i18n ("Ready.")); } -KDE_NO_EXPORT void KMPlayerPipeSource::deactivate () { +TDE_NO_EXPORT void KMPlayerPipeSource::deactivate () { } -KDE_NO_EXPORT TQString KMPlayerPipeSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerPipeSource::prettyName () { return i18n ("Pipe - %1").arg (m_pipecmd); } -KDE_NO_EXPORT void KMPlayerPipeSource::setCommand (const TQString & cmd) { +TDE_NO_EXPORT void KMPlayerPipeSource::setCommand (const TQString & cmd) { m_pipecmd = cmd; if (m_document) m_document->mrl ()->pretty_name = cmd; diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp index 95ecb4c..d13b40a 100644 --- a/src/kmplayerbroadcast.cpp +++ b/src/kmplayerbroadcast.cpp @@ -70,7 +70,7 @@ KDE_NO_CDTOR_EXPORT FFServerSetting::FFServerSetting (int i, const TQString & n, width (w > 0 ? TQString::number (w) : TQString ()), height (h > 0 ? TQString::number (h) : TQString ()) {} -KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const FFServerSetting & fs) { +TDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const FFServerSetting & fs) { format = fs.format; audiocodec = fs.audiocodec; audiobitrate = fs.audiobitrate; @@ -85,7 +85,7 @@ KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const FFServerSetti return *this; } -KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const TQStringList & sl) { +TDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const TQStringList & sl) { if (sl.count () < 11) { return *this; } @@ -108,7 +108,7 @@ KDE_NO_EXPORT FFServerSetting & FFServerSetting::operator = (const TQStringList return *this; } -KDE_NO_EXPORT TQString & FFServerSetting::ffconfig (TQString & buf) { +TDE_NO_EXPORT TQString & FFServerSetting::ffconfig (TQString & buf) { TQString nl ("\n"); buf = TQString ("Format ") + format + nl; if (!audiocodec.isEmpty ()) @@ -132,7 +132,7 @@ KDE_NO_EXPORT TQString & FFServerSetting::ffconfig (TQString & buf) { return buf; } -KDE_NO_EXPORT const TQStringList FFServerSetting::list () { +TDE_NO_EXPORT const TQStringList FFServerSetting::list () { TQStringList sl; sl.push_back (format); sl.push_back (audiocodec); @@ -282,7 +282,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormat #undef ADDPROPERTY -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::setSettings (const FFServerSetting & fs) { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::setSettings (const FFServerSetting & fs) { if (!fs.format.isEmpty ()) format->setCurrentText (fs.format); audiocodec->setText (fs.audiocodec); @@ -303,7 +303,7 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::setSettings (const FFServerS accesslist->setItem (i, 0, new TQTableItem (accesslist, TQTableItem::Always, *it)); } -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::getSettings (FFServerSetting & fs) { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::getSettings (FFServerSetting & fs) { fs.format = format->currentText (); fs.audiocodec = audiocodec->text (); fs.audiobitrate = audiobitrate->text (); @@ -322,17 +322,17 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::getSettings (FFServerSetting } } -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotIndexChanged (int index) { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotIndexChanged (int index) { slotItemHighlighted (index); if (index >= 0 && index < (int) profiles.size ()) setSettings (*profiles[index]); } -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotTextChanged (const TQString & txt) { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotTextChanged (const TQString & txt) { save->setEnabled (txt.length ()); } -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotItemHighlighted (int index) { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotItemHighlighted (int index) { if (index < 0 || index >= (int) profiles.size ()) { load->setEnabled (false); del->setEnabled (false); @@ -344,7 +344,7 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotItemHighlighted (int ind } } -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotSave () { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotSave () { for (int i = 0; i < (int) profiles.size (); ++i) if (profiles[i]->name == profile->text ()) { getSettings (*profiles[i]); @@ -357,11 +357,11 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotSave () { profilelist->insertItem (fs->name); } -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotLoad () { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotLoad () { setSettings (*profiles[profilelist->currentItem ()]); } -KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotDelete () { +TDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotDelete () { FFServerSettingList::iterator it = profiles.begin(); for (int i = 0; i < profilelist->currentItem (); i++) ++it; @@ -412,7 +412,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerBroadcastConfig::~KMPlayerBroadcastConfig () { stopServer (); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::write (TDEConfig * config) { +TDE_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 (TDEConfig * config) { config->writeEntry (strFFServerProfiles, sl, ';'); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::read (TDEConfig * config) { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::read (TDEConfig * config) { std::for_each (ffserversettingprofiles.begin (), ffserversettingprofiles.end (), KMPlayer::Deleter<FFServerSetting>()); ffserversettingprofiles.clear (); config->setGroup (strBroadcast); @@ -441,7 +441,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::read (TDEConfig * config) { } } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::sync (bool fromUI) { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::sync (bool fromUI) { if (fromUI) { m_configpage->getSettings(ffserversettings); } else { @@ -450,7 +450,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::sync (bool fromUI) { } } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Broadcasting"); icon = TQString ("share"); tab = i18n ("Profiles"); @@ -467,7 +467,7 @@ TQFrame * KMPlayerBroadcastConfig::prefPage (TQWidget * parent) { return m_configpage; } -KDE_NO_EXPORT bool KMPlayerBroadcastConfig::broadcasting () const { +TDE_NO_EXPORT bool KMPlayerBroadcastConfig::broadcasting () const { return m_ffserver_process && m_ffserver_process->isRunning (); } #include <tdeglobal.h> @@ -480,7 +480,7 @@ static const char ffserverconf[] = "<Stream video.%s>\nFeed kmplayer.ffm\n%s\n%s%s\n</Stream>\n" "<Stream stat.html>\nFormat status\nACL allow localhost\n</Stream>\n"; -KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () { if (broadcasting ()) { stopServer (); return; @@ -523,7 +523,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () { TQTimer::singleShot (500, this, TQ_SLOT (startFeed ())); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () { m_endserver = true; if (m_ffmpeg_process) m_ffmpeg_process->stop (); @@ -531,12 +531,12 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () { KMessageBox::error (m_configpage, i18n ("Failed to end ffserver process."), i18n ("Error")); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::processOutput (TDEProcess * p, char * s, int) { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::processOutput (TDEProcess * p, char * s, int) { if (p == m_ffserver_process) m_ffserver_out += TQString (s); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::startFeed () { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::startFeed () { if (!m_configpage) { stopServer (); return; @@ -573,7 +573,7 @@ bail_out: m_configpage->setCursor (TQCursor (TQt::ArrowCursor)); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::State old, KMPlayer::Process::State state) { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::State old, KMPlayer::Process::State state) { if (state < KMPlayer::Process::Buffering && old >KMPlayer::Process::Ready) { if (m_configpage) m_configpage->feedled->setState (KLed::Off); @@ -590,7 +590,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::Stat } } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (TDEProcess *) { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (TDEProcess *) { kdDebug () << "ffserver process stopped" << endl; if (m_configpage) { m_configpage->serverled->setState (KLed::Off); @@ -603,7 +603,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (TDEProcess *) { emit broadcastStopped (); } -KDE_NO_EXPORT void KMPlayerBroadcastConfig::sourceChanged (KMPlayer::Source *, KMPlayer::Source * source) { +TDE_NO_EXPORT void KMPlayerBroadcastConfig::sourceChanged (KMPlayer::Source *, KMPlayer::Source * source) { if (m_configpage) m_configpage->startbutton->setEnabled (broadcasting () || (source && !source->videoDevice ().isEmpty ())); } @@ -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 (TDEConfig * config) { +TDE_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 (TDEConfig * config) { config->writeEntry (strFeedFileSize, feedfilesize); } -KDE_NO_EXPORT void KMPlayerFFServerConfig::read (TDEConfig * config) { +TDE_NO_EXPORT void KMPlayerFFServerConfig::read (TDEConfig * config) { config->setGroup (strBroadcast); bindaddress = config->readEntry (strBindAddress, "0.0.0.0"); ffserverport = config->readNumEntry (strFFServerPort, 8090); @@ -632,7 +632,7 @@ KDE_NO_EXPORT void KMPlayerFFServerConfig::read (TDEConfig * config) { feedfilesize = config->readNumEntry (strFeedFileSize, 512); } -KDE_NO_EXPORT void KMPlayerFFServerConfig::sync (bool fromUI) { +TDE_NO_EXPORT void KMPlayerFFServerConfig::sync (bool fromUI) { if (fromUI) { bindaddress = m_configpage->bindaddress->text (); ffserverport = m_configpage->port->text ().toInt (); @@ -650,13 +650,13 @@ KDE_NO_EXPORT void KMPlayerFFServerConfig::sync (bool fromUI) { } } -KDE_NO_EXPORT void KMPlayerFFServerConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void KMPlayerFFServerConfig::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Broadcasting"); icon = TQString ("share"); tab = i18n ("FFServer"); } -KDE_NO_EXPORT TQFrame *KMPlayerFFServerConfig::prefPage (TQWidget * parent) { +TDE_NO_EXPORT TQFrame *KMPlayerFFServerConfig::prefPage (TQWidget * parent) { if (!m_configpage) m_configpage = new KMPlayerPrefBroadcastPage (parent); return m_configpage; diff --git a/src/kmplayerbroadcast.h b/src/kmplayerbroadcast.h index 8ddfb24..80248e0 100644 --- a/src/kmplayerbroadcast.h +++ b/src/kmplayerbroadcast.h @@ -168,7 +168,7 @@ public: bool broadcasting () const; void stopServer (); - KDE_NO_EXPORT const TQString & serverURL () const { return m_ffserver_url; } + TDE_NO_EXPORT const TQString & serverURL () const { return m_ffserver_url; } FFServerSetting ffserversettings; FFServerSettingList ffserversettingprofiles; diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp index 20911e5..7467fde 100644 --- a/src/kmplayerconfig.cpp +++ b/src/kmplayerconfig.cpp @@ -128,7 +128,7 @@ KDE_NO_CDTOR_EXPORT Settings::~Settings () { //delete configdialog; } -KDE_EXPORT const char * strMPlayerGroup = "MPlayer"; +TDE_EXPORT const char * strMPlayerGroup = "MPlayer"; const char * strGeneralGroup = "General Options"; static const char * strKeepSizeRatio = "Keep Size Ratio"; static const char * strRememberSize = "Remember Size"; @@ -206,7 +206,7 @@ static const char * strAutoPlayAfterRecording = "Auto Play After Recording"; static const char * strAutoPlayAfterTime = "Auto Play After Recording Time"; static const char * strRecordingCopy = "Recording Is Copy"; -KDE_NO_EXPORT void Settings::applyColorSetting (bool only_changed_ones) { +TDE_NO_EXPORT void Settings::applyColorSetting (bool only_changed_ones) { View *view = static_cast <View *> (m_player->view ()); if (!view) return; for (int i = 0; i < int (ColorSetting::last_target); i++) @@ -265,7 +265,7 @@ View * Settings::defaultView () { return static_cast <View *> (m_player->view ()); } -KDE_NO_EXPORT void Settings::readConfig () { +TDE_NO_EXPORT void Settings::readConfig () { m_config->setGroup (strGeneralGroup); no_intro = m_config->readBoolEntry (strNoIntro, false); urllist = m_config->readListEntry (strURLList, ';'); @@ -355,7 +355,7 @@ KDE_NO_EXPORT void Settings::readConfig () { emit configChanged (); } -KDE_NO_EXPORT bool Settings::createDialog () { +TDE_NO_EXPORT bool Settings::createDialog () { if (configdialog) return false; configdialog = new Preferences (m_player, this); int id = 0; @@ -733,7 +733,7 @@ void Settings::okPressed () { } } -KDE_NO_EXPORT void Settings::getHelp () { +TDE_NO_EXPORT void Settings::getHelp () { TDEApplication::kApplication()->invokeBrowser ("man:/mplayer"); } diff --git a/src/kmplayerconfig.h b/src/kmplayerconfig.h index b4b21fc..55c7244 100644 --- a/src/kmplayerconfig.h +++ b/src/kmplayerconfig.h @@ -99,7 +99,7 @@ class KMPLAYER_EXPORT Settings : public TQObject { public: Settings (PartBase *, TDEConfig * part); ~Settings (); - bool createDialog () KDE_NO_EXPORT; + bool createDialog () TDE_NO_EXPORT; void show (const char * pagename = 0L); void addPage (PreferencesPage *); void removePage (PreferencesPage *); @@ -189,7 +189,7 @@ public: signals: void configChanged (); public slots: - void readConfig () KDE_NO_EXPORT; + void readConfig () TDE_NO_EXPORT; void writeConfig (); private slots: void okPressed (); diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp index ac3fe82..08222fc 100644 --- a/src/kmplayercontrolpanel.cpp +++ b/src/kmplayercontrolpanel.cpp @@ -275,7 +275,7 @@ KMPlayerMenuButton::KMPlayerMenuButton (TQWidget * parent, TQBoxLayout * l, cons l->addWidget (this); } -KDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) { +TDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) { emit mouseEntered (); } @@ -284,7 +284,7 @@ KDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) { KDE_NO_CDTOR_EXPORT KMPlayerPopupMenu::KMPlayerPopupMenu (TQWidget * parent) : TDEPopupMenu (parent, "kde_kmplayer_popupmenu") {} -KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) { +TDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) { emit mouseLeft (); } @@ -440,7 +440,7 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view) connect (m_audioMenu, TQ_SIGNAL (mouseLeft ()), this, TQ_SLOT (menuMouseLeft ())); } -KDE_NO_EXPORT void ControlPanel::setPalette (const TQPalette & pal) { +TDE_NO_EXPORT void ControlPanel::setPalette (const TQPalette & pal) { TQWidget::setPalette (pal); TQColor c = paletteForegroundColor (); strncpy (xpm_fg_color, TQString(TQString().sprintf(". c #%02x%02x%02x", c.red(), c.green(),c.blue())).ascii(), 31); @@ -461,7 +461,7 @@ KDE_NO_EXPORT void ControlPanel::setPalette (const TQPalette & pal) { m_buttons[button_blue]->setIconSet (TQIconSet (TQPixmap (blue_xpm))); } -KDE_NO_EXPORT void ControlPanel::timerEvent (TQTimerEvent * e) { +TDE_NO_EXPORT void ControlPanel::timerEvent (TQTimerEvent * e) { if (e->timerId () == m_popup_timer) { m_popup_timer = 0; if (m_button_monitored == button_config) { @@ -519,12 +519,12 @@ void ControlPanel::setAutoControls (bool b) { m_view->updateLayout (); } -KDE_NO_EXPORT void ControlPanel::showPopupMenu () { +TDE_NO_EXPORT void ControlPanel::showPopupMenu () { m_view->updateVolume (); m_popupMenu->exec (m_buttons [button_config]->mapToGlobal (TQPoint (0, maximumSize ().height ()))); } -KDE_NO_EXPORT void ControlPanel::showLanguageMenu () { +TDE_NO_EXPORT void ControlPanel::showLanguageMenu () { m_languageMenu->exec (m_buttons [button_language]->mapToGlobal (TQPoint (0, maximumSize ().height ()))); } @@ -536,7 +536,7 @@ void ControlPanel::showPositionSlider (bool show) { m_view->updateLayout (); } -KDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) { +TDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) { int h = show ? button_height_with_slider : button_height_only_buttons; m_posSlider->setEnabled (false); m_posSlider->setValue (0); @@ -558,7 +558,7 @@ KDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) { setMaximumSize (2500, h + (show ? 8 : 2 )); } -KDE_NO_EXPORT int ControlPanel::preferedHeight () { +TDE_NO_EXPORT int ControlPanel::preferedHeight () { return m_posSlider->isVisible () ? button_height_with_slider + 8 : button_height_only_buttons + 2; } @@ -593,12 +593,12 @@ void ControlPanel::setPlaying (bool play) { } } -KDE_NO_EXPORT void ControlPanel::setRecording (bool record) { +TDE_NO_EXPORT void ControlPanel::setRecording (bool record) { if (record != m_buttons[button_record]->isOn ()) m_buttons[button_record]->toggle (); } -KDE_NO_EXPORT void ControlPanel::setPlayingProgress (int pos, int len) { +TDE_NO_EXPORT void ControlPanel::setPlayingProgress (int pos, int len) { m_posSlider->setEnabled (false); m_progress_length = len; showPositionSlider (len > 0); @@ -616,7 +616,7 @@ KDE_NO_EXPORT void ControlPanel::setPlayingProgress (int pos, int len) { m_posSlider->setEnabled (true); } -KDE_NO_EXPORT void ControlPanel::setLoadingProgress (int pos) { +TDE_NO_EXPORT void ControlPanel::setLoadingProgress (int pos) { if (pos > 0 && pos < 100 && !m_posSlider->isVisible ()) showPositionSlider (true); m_posSlider->setEnabled (false); @@ -627,7 +627,7 @@ KDE_NO_EXPORT void ControlPanel::setLoadingProgress (int pos) { m_posSlider->setValue (pos); } -KDE_NO_EXPORT void ControlPanel::buttonClicked () { +TDE_NO_EXPORT void ControlPanel::buttonClicked () { if (m_popup_timer) { killTimer (m_popup_timer); m_popup_timer = 0; @@ -639,7 +639,7 @@ KDE_NO_EXPORT void ControlPanel::buttonClicked () { showPopupMenu (); } -KDE_NO_EXPORT void ControlPanel::buttonMouseEntered () { +TDE_NO_EXPORT void ControlPanel::buttonMouseEntered () { if (!m_popup_timer) { if (sender () == m_buttons [button_config]) { if (!m_popupMenu->isVisible ()) { @@ -655,12 +655,12 @@ KDE_NO_EXPORT void ControlPanel::buttonMouseEntered () { } } -KDE_NO_EXPORT void ControlPanel::menuMouseLeft () { +TDE_NO_EXPORT void ControlPanel::menuMouseLeft () { if (!m_popdown_timer && !m_popup_clicked) m_popdown_timer = startTimer (400); } -KDE_NO_EXPORT void ControlPanel::setLanguages (const TQStringList & alang, const TQStringList & slang) { +TDE_NO_EXPORT void ControlPanel::setLanguages (const TQStringList & alang, const TQStringList & slang) { int sz = (int) alang.size (); bool showbutton = (sz > 0); m_audioMenu->clear (); @@ -677,7 +677,7 @@ KDE_NO_EXPORT void ControlPanel::setLanguages (const TQStringList & alang, const m_buttons [button_language]->hide (); } -KDE_NO_EXPORT void ControlPanel::selectSubtitle (int id) { +TDE_NO_EXPORT void ControlPanel::selectSubtitle (int id) { if (m_subtitleMenu->isItemChecked (id)) return; int size = m_subtitleMenu->count (); @@ -689,7 +689,7 @@ KDE_NO_EXPORT void ControlPanel::selectSubtitle (int id) { m_subtitleMenu->setItemChecked (id, true); } -KDE_NO_EXPORT void ControlPanel::selectAudioLanguage (int id) { +TDE_NO_EXPORT void ControlPanel::selectAudioLanguage (int id) { kdDebug () << "ControlPanel::selectAudioLanguage " << id << endl; if (m_audioMenu->isItemChecked (id)) return; diff --git a/src/kmplayercontrolpanel.h b/src/kmplayercontrolpanel.h index 48804ee..04f6ca5 100644 --- a/src/kmplayercontrolpanel.h +++ b/src/kmplayercontrolpanel.h @@ -77,7 +77,7 @@ class KMPLAYER_EXPORT VolumeBar : public TQWidget { public: VolumeBar (TQWidget * parent, View * view); ~VolumeBar (); - KDE_NO_EXPORT int value () const { return m_value; } + TDE_NO_EXPORT int value () const { return m_value; } void setValue (int v); signals: void volumeChanged (int); // 0 - 100 @@ -122,23 +122,23 @@ public: void setAutoControls (bool b); void setPalette (const TQPalette &); int preferedHeight (); - KDE_NO_EXPORT bool autoControls () const { return m_auto_controls; } - KDE_NO_EXPORT TQSlider * positionSlider () const { return m_posSlider; } - KDE_NO_EXPORT TQSlider * contrastSlider () const { return m_contrastSlider; } - KDE_NO_EXPORT TQSlider * brightnessSlider () const { return m_brightnessSlider; } - KDE_NO_EXPORT TQSlider * hueSlider () const { return m_hueSlider; } - KDE_NO_EXPORT TQSlider * saturationSlider () const { return m_saturationSlider; } + TDE_NO_EXPORT bool autoControls () const { return m_auto_controls; } + TDE_NO_EXPORT TQSlider * positionSlider () const { return m_posSlider; } + TDE_NO_EXPORT TQSlider * contrastSlider () const { return m_contrastSlider; } + TDE_NO_EXPORT TQSlider * brightnessSlider () const { return m_brightnessSlider; } + TDE_NO_EXPORT TQSlider * hueSlider () const { return m_hueSlider; } + TDE_NO_EXPORT TQSlider * saturationSlider () const { return m_saturationSlider; } TQPushButton * button (Button b) const { return m_buttons [(int) b]; } - KDE_NO_EXPORT TQPushButton * broadcastButton () const { return m_buttons[button_broadcast]; } - KDE_NO_EXPORT VolumeBar * volumeBar () const { return m_volume; } - KDE_NO_EXPORT KMPlayerPopupMenu * popupMenu () const { return m_popupMenu; } - KDE_NO_EXPORT TDEPopupMenu * bookmarkMenu () const { return m_bookmarkMenu; } - KDE_NO_EXPORT TQPopupMenu * zoomMenu () const { return m_zoomMenu; } - KDE_NO_EXPORT TQPopupMenu * playerMenu () const { return m_playerMenu; } - KDE_NO_EXPORT TQPopupMenu * colorMenu () const { return m_colorMenu; } - KDE_NO_EXPORT TQPopupMenu * audioMenu () const { return m_audioMenu; } - KDE_NO_EXPORT TQPopupMenu * subtitleMenu () const { return m_subtitleMenu; } - KDE_NO_EXPORT View * view () const { return m_view; } + TDE_NO_EXPORT TQPushButton * broadcastButton () const { return m_buttons[button_broadcast]; } + TDE_NO_EXPORT VolumeBar * volumeBar () const { return m_volume; } + TDE_NO_EXPORT KMPlayerPopupMenu * popupMenu () const { return m_popupMenu; } + TDE_NO_EXPORT TDEPopupMenu * bookmarkMenu () const { return m_bookmarkMenu; } + TDE_NO_EXPORT TQPopupMenu * zoomMenu () const { return m_zoomMenu; } + TDE_NO_EXPORT TQPopupMenu * playerMenu () const { return m_playerMenu; } + TDE_NO_EXPORT TQPopupMenu * colorMenu () const { return m_colorMenu; } + TDE_NO_EXPORT TQPopupMenu * audioMenu () const { return m_audioMenu; } + TDE_NO_EXPORT TQPopupMenu * subtitleMenu () const { return m_subtitleMenu; } + TDE_NO_EXPORT View * view () const { return m_view; } public slots: void setLanguages (const TQStringList & al, const TQStringList & sl); void selectSubtitle (int id); diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp index f12427a..feaeca5 100644 --- a/src/kmplayerpartbase.cpp +++ b/src/kmplayerpartbase.cpp @@ -87,15 +87,15 @@ using namespace KMPlayer; KDE_NO_CDTOR_EXPORT BookmarkOwner::BookmarkOwner (PartBase * player) : m_player (player) {} -KDE_NO_EXPORT void BookmarkOwner::openBookmarkURL (const TQString & url) { +TDE_NO_EXPORT void BookmarkOwner::openBookmarkURL (const TQString & url) { m_player->openURL (KURL (url)); } -KDE_NO_EXPORT TQString BookmarkOwner::currentTitle () const { +TDE_NO_EXPORT TQString BookmarkOwner::currentTitle () const { return m_player->source ()->prettyName (); } -KDE_NO_EXPORT TQString BookmarkOwner::currentURL () const { +TDE_NO_EXPORT TQString BookmarkOwner::currentURL () const { return m_player->source ()->url ().url (); } @@ -149,7 +149,7 @@ void PartBase::showConfigDialog () { m_settings->show ("URLPage"); } -KDE_NO_EXPORT void PartBase::showPlayListWindow () { +TDE_NO_EXPORT void PartBase::showPlayListWindow () { // note, this is also the slot of application's view_playlist action, but // anyhow, actions don't work for the fullscreen out-of-the-box, so ... if (m_view->viewArea ()->isFullScreen ()) @@ -160,7 +160,7 @@ KDE_NO_EXPORT void PartBase::showPlayListWindow () { m_view->toggleShowPlaylist (); } -KDE_NO_EXPORT void PartBase::addBookMark (const TQString & t, const TQString & url) { +TDE_NO_EXPORT void PartBase::addBookMark (const TQString & t, const TQString & url) { KBookmarkGroup b = m_bookmark_manager->root (); b.addBookmark (m_bookmark_manager, t, KURL (url)); m_bookmark_manager->emitChanged (b); @@ -360,7 +360,7 @@ void PartBase::setRecorder (const char * name) { m_recorder = recorder; } -KDE_NO_EXPORT void PartBase::slotPlayerMenu (int id) { +TDE_NO_EXPORT void PartBase::slotPlayerMenu (int id) { bool playing = m_process->playing (); const char * srcname = m_source->name (); TQPopupMenu * menu = m_view->controlPanel ()->playerMenu (); @@ -468,7 +468,7 @@ void PartBase::setSource (Source * _source) { emit sourceChanged (old_source, m_source); } -KDE_NO_EXPORT void PartBase::changeURL (const TQString & url) { +TDE_NO_EXPORT void PartBase::changeURL (const TQString & url) { emit urlChanged (url); } @@ -586,7 +586,7 @@ void PartBase::playingStopped () { m_bPosSliderPressed = false; } -KDE_NO_EXPORT void PartBase::setPosition (int position, int length) { +TDE_NO_EXPORT void PartBase::setPosition (int position, int length) { if (m_view && !m_bPosSliderPressed) emit positioned (position, length); } @@ -617,7 +617,7 @@ void PartBase::forward () { m_source->forward (); } -KDE_NO_EXPORT void PartBase::playListItemClicked (TQListViewItem * item) { +TDE_NO_EXPORT void PartBase::playListItemClicked (TQListViewItem * item) { if (!item) return; PlayListItem * vi = static_cast <PlayListItem *> (item); @@ -636,7 +636,7 @@ KDE_NO_EXPORT void PartBase::playListItemClicked (TQListViewItem * item) { updateTree (); // items already deleted } -KDE_NO_EXPORT void PartBase::playListItemExecuted (TQListViewItem * item) { +TDE_NO_EXPORT void PartBase::playListItemExecuted (TQListViewItem * item) { if (m_in_update_tree) return; if (m_view->editMode ()) return; PlayListItem * vi = static_cast <PlayListItem *> (item); @@ -712,11 +712,11 @@ void PartBase::setLanguages (const TQStringList & al, const TQStringList & sl) { emit languagesUpdated (al, sl); } -KDE_NO_EXPORT void PartBase::audioSelected (int id) { +TDE_NO_EXPORT void PartBase::audioSelected (int id) { emit audioIsSelected (id); } -KDE_NO_EXPORT void PartBase::subtitleSelected (int id) { +TDE_NO_EXPORT void PartBase::subtitleSelected (int id) { emit subtitleIsSelected (id); } @@ -810,45 +810,45 @@ void PartBase::decreaseVolume () { m_view->controlPanel ()->volumeBar ()->setValue (m_view->controlPanel ()->volumeBar ()->value () - 2); } -KDE_NO_EXPORT void PartBase::posSliderPressed () { +TDE_NO_EXPORT void PartBase::posSliderPressed () { m_bPosSliderPressed=true; } -KDE_NO_EXPORT void PartBase::posSliderReleased () { +TDE_NO_EXPORT void PartBase::posSliderReleased () { m_bPosSliderPressed=false; const TQSlider * posSlider = ::tqt_cast<const TQSlider *> (sender ()); if (posSlider) m_process->seek (posSlider->value(), true); } -KDE_NO_EXPORT void PartBase::volumeChanged (int val) { +TDE_NO_EXPORT void PartBase::volumeChanged (int val) { if (m_process) { m_settings->volume = val; m_process->volume (val, true); } } -KDE_NO_EXPORT void PartBase::contrastValueChanged (int val) { +TDE_NO_EXPORT void PartBase::contrastValueChanged (int val) { m_settings->contrast = val; m_process->contrast (val, true); } -KDE_NO_EXPORT void PartBase::brightnessValueChanged (int val) { +TDE_NO_EXPORT void PartBase::brightnessValueChanged (int val) { m_settings->brightness = val; m_process->brightness (val, true); } -KDE_NO_EXPORT void PartBase::hueValueChanged (int val) { +TDE_NO_EXPORT void PartBase::hueValueChanged (int val) { m_settings->hue = val; m_process->hue (val, true); } -KDE_NO_EXPORT void PartBase::saturationValueChanged (int val) { +TDE_NO_EXPORT void PartBase::saturationValueChanged (int val) { m_settings->saturation = val; m_process->saturation (val, true); } -KDE_NO_EXPORT void PartBase::sourceHasChangedAspects () { +TDE_NO_EXPORT void PartBase::sourceHasChangedAspects () { if (m_view && m_source) { //kdDebug () << "sourceHasChangedAspects " << m_source->aspect () << endl; m_view->viewer ()->setAspect (m_source->aspect ()); @@ -857,30 +857,30 @@ KDE_NO_EXPORT void PartBase::sourceHasChangedAspects () { emit sourceDimensionChanged (); } -KDE_NO_EXPORT void PartBase::positionValueChanged (int pos) { +TDE_NO_EXPORT void PartBase::positionValueChanged (int pos) { TQSlider * slider = ::tqt_cast <TQSlider *> (sender ()); if (slider && slider->isEnabled ()) m_process->seek (pos, true); } -KDE_NO_EXPORT void PartBase::fullScreen () { +TDE_NO_EXPORT void PartBase::fullScreen () { if (m_view) m_view->fullScreen (); } -KDE_NO_EXPORT void PartBase::toggleFullScreen () { +TDE_NO_EXPORT void PartBase::toggleFullScreen () { m_view->fullScreen (); } -KDE_NO_EXPORT void PartBase::minimalMode () { +TDE_NO_EXPORT void PartBase::minimalMode () { emit toggleMinimalMode (); } -KDE_NO_EXPORT bool PartBase::isPlaying () { +TDE_NO_EXPORT bool PartBase::isPlaying () { return playing (); } -KDE_NO_EXPORT bool PartBase::isPaused () { +TDE_NO_EXPORT bool PartBase::isPaused () { NodePtr doc = m_source ? m_source->document () : 0L; return doc && doc->state == Node::state_deferred; } @@ -917,7 +917,7 @@ void Source::init () { m_recordcmd.truncate (0); } -KDE_NO_EXPORT void Source::setLanguages (const TQStringList & alang, const TQStringList & slang) { +TDE_NO_EXPORT void Source::setLanguages (const TQStringList & alang, const TQStringList & slang) { m_player->setLanguages (alang, slang); } @@ -968,12 +968,12 @@ void Source::setLength (NodePtr, int len) { m_player->setPosition (m_position, m_length); } -KDE_NO_EXPORT void Source::setPosition (int pos) { +TDE_NO_EXPORT void Source::setPosition (int pos) { m_position = pos; m_player->setPosition (pos, m_length); } -KDE_NO_EXPORT void Source::setLoading (int percentage) { +TDE_NO_EXPORT void Source::setLoading (int percentage) { m_player->setLoaded (percentage); } @@ -1012,13 +1012,13 @@ void Source::setTitle (const TQString & title) { emit titleChanged (title); } -KDE_NO_EXPORT void Source::setAudioLang (int id) { +TDE_NO_EXPORT void Source::setAudioLang (int id) { View * v = static_cast <View *> (m_player->view()); if (v && m_player->process ()) m_player->process ()->setAudioLang (id, v->controlPanel ()->audioMenu ()->text (id)); } -KDE_NO_EXPORT void Source::setSubtitle (int id) { +TDE_NO_EXPORT void Source::setSubtitle (int id) { View * v = static_cast <View *> (m_player->view()); if (v && m_player->process ()) m_player->process ()->setSubtitle (id, v->controlPanel ()->subtitleMenu ()->text (id)); @@ -1496,7 +1496,7 @@ bool URLSource::hasLength () { return !!length (); } -KDE_NO_EXPORT void URLSource::activate () { +TDE_NO_EXPORT void URLSource::activate () { if (activated) return; activated = true; @@ -1508,7 +1508,7 @@ KDE_NO_EXPORT void URLSource::activate () { play (); } -KDE_NO_EXPORT void URLSource::stopResolving () { +TDE_NO_EXPORT void URLSource::stopResolving () { if (m_resolve_info) { for (SharedPtr <ResolveInfo> ri = m_resolve_info; ri; ri = ri->next) ri->job->kill (); @@ -1602,7 +1602,7 @@ static bool isPlayListMime (const TQString & mime) { !strcmp (mimestr, "application/x-mplayer2")); } -KDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) { +TDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) { TQString line; do { line = textstream.readLine (); @@ -1679,7 +1679,7 @@ KDE_NO_EXPORT void URLSource::read (NodePtr root, TQTextStream & textstream) { } } -KDE_NO_EXPORT void URLSource::kioData (TDEIO::Job * job, const TQByteArray & d) { +TDE_NO_EXPORT void URLSource::kioData (TDEIO::Job * job, const TQByteArray & d) { SharedPtr <ResolveInfo> rinfo = m_resolve_info; while (rinfo && rinfo->job != job) rinfo = rinfo->next; @@ -1711,7 +1711,7 @@ KDE_NO_EXPORT void URLSource::kioData (TDEIO::Job * job, const TQByteArray & d) } } -KDE_NO_EXPORT void URLSource::kioMimetype (TDEIO::Job * job, const TQString & mimestr) { +TDE_NO_EXPORT void URLSource::kioMimetype (TDEIO::Job * job, const TQString & mimestr) { SharedPtr <ResolveInfo> rinfo = m_resolve_info; while (rinfo && rinfo->job != job) rinfo = rinfo->next; @@ -1725,7 +1725,7 @@ KDE_NO_EXPORT void URLSource::kioMimetype (TDEIO::Job * job, const TQString & mi job->kill (false); } -KDE_NO_EXPORT void URLSource::kioResult (TDEIO::Job * job) { +TDE_NO_EXPORT void URLSource::kioResult (TDEIO::Job * job) { SharedPtr <ResolveInfo> previnfo, rinfo = m_resolve_info; while (rinfo && rinfo->job != job) { previnfo = rinfo; @@ -1925,7 +1925,7 @@ RemoteObjectPrivate::~RemoteObjectPrivate () { clear (); } -KDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) { +TDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) { url = str; KURL kurl (str); if (kurl.isLocalFile ()) { @@ -1960,7 +1960,7 @@ KDE_NO_EXPORT bool RemoteObjectPrivate::download (const TQString & str) { return false; } -KDE_NO_EXPORT void RemoteObjectPrivate::clear () { +TDE_NO_EXPORT void RemoteObjectPrivate::clear () { if (job) { job->kill (); // quiet, no result signal job = 0L; @@ -1972,7 +1972,7 @@ KDE_NO_EXPORT void RemoteObjectPrivate::clear () { } } -KDE_NO_EXPORT void RemoteObjectPrivate::slotResult (TDEIO::Job * kjob) { +TDE_NO_EXPORT void RemoteObjectPrivate::slotResult (TDEIO::Job * kjob) { if (!kjob->error ()) memory_cache->add (url, data); else @@ -1981,7 +1981,7 @@ KDE_NO_EXPORT void RemoteObjectPrivate::slotResult (TDEIO::Job * kjob) { remote_object->remoteReady (data); } -KDE_NO_EXPORT +TDE_NO_EXPORT void RemoteObjectPrivate::cachePreserveRemoved (const TQString & str) { if (str == url && !memory_cache->isPreserved (str)) { preserve_wait = false; @@ -1991,7 +1991,7 @@ void RemoteObjectPrivate::cachePreserveRemoved (const TQString & str) { } } -KDE_NO_EXPORT +TDE_NO_EXPORT void RemoteObjectPrivate::slotData (TDEIO::Job*, const TQByteArray& qb) { if (qb.size ()) { int old_size = data.size (); @@ -2000,7 +2000,7 @@ void RemoteObjectPrivate::slotData (TDEIO::Job*, const TQByteArray& qb) { } } -KDE_NO_EXPORT +TDE_NO_EXPORT void RemoteObjectPrivate::slotMimetype (TDEIO::Job *, const TQString & m) { mime = m; } @@ -2015,19 +2015,19 @@ KDE_NO_CDTOR_EXPORT RemoteObject::~RemoteObject () { /** * abort previous wget job */ -KDE_NO_EXPORT void RemoteObject::killWGet () { +TDE_NO_EXPORT void RemoteObject::killWGet () { d->clear (); // assume data is invalid } /** * Gets contents from url and puts it in m_data */ -KDE_NO_EXPORT bool RemoteObject::wget (const TQString & url) { +TDE_NO_EXPORT bool RemoteObject::wget (const TQString & url) { clear (); return d->download (url); } -KDE_NO_EXPORT TQString RemoteObject::mimetype () { +TDE_NO_EXPORT TQString RemoteObject::mimetype () { if (d->data.size () > 0 && d->mime.isEmpty ()) { int accuraty; KMimeType::Ptr mime = KMimeType::findByContent (d->data, &accuraty); @@ -2037,14 +2037,14 @@ KDE_NO_EXPORT TQString RemoteObject::mimetype () { return d->mime; } -KDE_NO_EXPORT void RemoteObject::clear () { +TDE_NO_EXPORT void RemoteObject::clear () { killWGet (); d->url.truncate (0); d->mime.truncate (0); d->data.resize (0); } -KDE_NO_EXPORT bool RemoteObject::downloading () const { +TDE_NO_EXPORT bool RemoteObject::downloading () const { return !!d->job; } diff --git a/src/kmplayerplaylist.cpp b/src/kmplayerplaylist.cpp index dab53a4..270f65e 100644 --- a/src/kmplayerplaylist.cpp +++ b/src/kmplayerplaylist.cpp @@ -104,7 +104,7 @@ Connection::Connection (NodeRefListPtr ls, NodePtr node, NodePtr inv) } } -KDE_NO_EXPORT void Connection::disconnect () { +TDE_NO_EXPORT void Connection::disconnect () { if (listen_item && listeners) listeners->remove (listen_item); listen_item = 0L; @@ -336,7 +336,7 @@ void Node::removeChild (NodePtr c) { TreeNode <Node>::removeChild (c); } -KDE_NO_EXPORT void Node::replaceChild (NodePtr _new, NodePtr old) { +TDE_NO_EXPORT void Node::replaceChild (NodePtr _new, NodePtr old) { document()->m_tree_version++; if (old->m_prev) { old->m_prev->m_next = _new; @@ -362,7 +362,7 @@ NodePtr Node::childFromTag (const TQString &) { return NodePtr (); } -KDE_NO_EXPORT void Node::characterData (const TQString & s) { +TDE_NO_EXPORT void Node::characterData (const TQString & s) { document()->m_tree_version++; if (!m_last_child || m_last_child->id != id_node_text) appendChild (new TextNode (m_doc, s)); @@ -455,7 +455,7 @@ NodeRefListPtr Node::listeners (unsigned int /*event_id*/) { bool Node::handleEvent (EventPtr /*event*/) { return false; } -KDE_NO_EXPORT void Node::propagateEvent (EventPtr event) { +TDE_NO_EXPORT void Node::propagateEvent (EventPtr event) { NodeRefListPtr nl = listeners (event->id ()); if (nl) for (NodeRefItemPtr c = nl->first(); c; c = c->nextSibling ()) @@ -467,7 +467,7 @@ void Node::accept (Visitor * v) { v->visit (this); } -KDE_NO_EXPORT +TDE_NO_EXPORT ConnectionPtr Node::connectTo (NodePtr node, unsigned int evt_id) { NodeRefListPtr nl = listeners (evt_id); if (nl) @@ -516,7 +516,7 @@ namespace KMPlayer { }; } -KDE_NO_EXPORT TQString ParamValue::value () { +TDE_NO_EXPORT TQString ParamValue::value () { return modifications && modifications->size () ? modifications->back () : val; } @@ -525,7 +525,7 @@ KDE_NO_CDTOR_EXPORT ElementPrivate::~ElementPrivate () { clear (); } -KDE_NO_EXPORT void ElementPrivate::clear () { +TDE_NO_EXPORT void ElementPrivate::clear () { const ParamMap::iterator e = params.end (); for (ParamMap::iterator i = params.begin (); i != e; ++i) delete i.data (); @@ -1077,7 +1077,7 @@ TQString TextNode::nodeValue () const { return text; } -KDE_NO_EXPORT bool TextNode::expose () const { +TDE_NO_EXPORT bool TextNode::expose () const { return false; } @@ -1096,7 +1096,7 @@ NodePtr DarkNode::childFromTag (const TQString & tag) { return new DarkNode (m_doc, tag); } -KDE_NO_EXPORT bool DarkNode::expose () const { +TDE_NO_EXPORT bool DarkNode::expose () const { return false; } @@ -1110,7 +1110,7 @@ GenericURL::GenericURL (NodePtr & d, const TQString & s, const TQString & name) pretty_name = name; } -KDE_NO_EXPORT void GenericURL::closed () { +TDE_NO_EXPORT void GenericURL::closed () { if (src.isEmpty ()) src = getAttribute (StringPool::attr_src); } diff --git a/src/kmplayerplaylist.h b/src/kmplayerplaylist.h index 3371e70..2166fab 100644 --- a/src/kmplayerplaylist.h +++ b/src/kmplayerplaylist.h @@ -224,7 +224,7 @@ class KMPLAYER_EXPORT Event : public Item <Event> { public: KDE_NO_CDTOR_EXPORT Event (unsigned int event_id) : m_event_id (event_id) {} KDE_NO_CDTOR_EXPORT virtual ~Event () {} - KDE_NO_EXPORT unsigned int id () const { return m_event_id; } + TDE_NO_EXPORT unsigned int id () const { return m_event_id; } protected: unsigned int m_event_id; }; @@ -431,9 +431,9 @@ public: * Get rid of whitespace only text nodes */ void normalize (); - KDE_NO_EXPORT bool isDocument () const { return m_doc == m_self; } + TDE_NO_EXPORT bool isDocument () const { return m_doc == m_self; } - KDE_NO_EXPORT NodeListPtr childNodes () const; + TDE_NO_EXPORT NodeListPtr childNodes () const; void setState (State nstate); /* * Open tag is found by parser, attributes are set @@ -477,7 +477,7 @@ public: void setAttributes (AttributeListPtr attrs); void setAttribute (const TrieString & name, const TQString & value); TQString getAttribute (const TrieString & name); - KDE_NO_EXPORT AttributeListPtr attributes () const { return m_attributes; } + TDE_NO_EXPORT AttributeListPtr attributes () const { return m_attributes; } virtual void init (); virtual void reset (); virtual void clear (); @@ -516,7 +516,7 @@ protected: }; template <class T> -inline KDE_NO_EXPORT T * convertNode (NodePtr e) { +inline TDE_NO_EXPORT T * convertNode (NodePtr e) { return static_cast <T *> (e.ptr ()); } @@ -618,7 +618,7 @@ public: void clear (); TQString mimetype (); protected: - KDE_NO_EXPORT virtual void remoteReady (TQByteArray &) {} + TDE_NO_EXPORT virtual void remoteReady (TQByteArray &) {} bool downloading () const; private: RemoteObjectPrivate *d; @@ -719,7 +719,7 @@ public: * */ void dispose (); virtual NodePtr childFromTag (const TQString & tag); - KDE_NO_EXPORT const char * nodeName () const { return "document"; } + TDE_NO_EXPORT const char * nodeName () const { return "document"; } virtual void activate (); virtual void defer (); virtual void undefer (); @@ -861,7 +861,7 @@ public: class KMPLAYER_EXPORT GenericURL : public Mrl { public: GenericURL(NodePtr &d, const TQString &s, const TQString &n=TQString ()); - KDE_NO_EXPORT const char * nodeName () const { return "url"; } + TDE_NO_EXPORT const char * nodeName () const { return "url"; } void closed (); }; @@ -872,7 +872,7 @@ class KMPLAYER_EXPORT GenericMrl : public Mrl { public: KDE_NO_CDTOR_EXPORT GenericMrl (NodePtr & d) : Mrl (d), node_name ("mrl") {} GenericMrl(NodePtr &d, const TQString &s, const TQString & name=TQString (), const TQString &tag=TQString ("mrl")); - KDE_NO_EXPORT const char * nodeName () const { return node_name.ascii (); } + TDE_NO_EXPORT const char * nodeName () const { return node_name.ascii (); } void closed (); bool expose () const; TQString node_name; @@ -970,7 +970,7 @@ inline void TreeNode<T>::removeChild (typename Item<T>::SharedType c) { c->m_parent = 0L; } -inline KDE_NO_EXPORT NodeListPtr Node::childNodes () const { +inline TDE_NO_EXPORT NodeListPtr Node::childNodes () const { return new NodeList (m_first_child, m_last_child); } diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp index eb33c79..8e7f894 100644 --- a/src/kmplayerprocess.cpp +++ b/src/kmplayerprocess.cpp @@ -195,7 +195,7 @@ void Process::setState (State newstate) { } } -KDE_NO_EXPORT void Process::rescheduledStateChanged () { +TDE_NO_EXPORT void Process::rescheduledStateChanged () { State old_state = m_old_state; m_old_state = m_state; m_source->stateChange (this, old_state, m_state); @@ -273,7 +273,7 @@ KDE_NO_CDTOR_EXPORT MPlayerBase::MPlayerBase (TQObject * parent, Settings * sett KDE_NO_CDTOR_EXPORT MPlayerBase::~MPlayerBase () { } -KDE_NO_EXPORT void MPlayerBase::initProcess (Viewer * viewer) { +TDE_NO_EXPORT void MPlayerBase::initProcess (Viewer * viewer) { Process::initProcess (viewer); const KURL & url (m_source->url ()); if (!url.isEmpty ()) { @@ -287,7 +287,7 @@ KDE_NO_EXPORT void MPlayerBase::initProcess (Viewer * viewer) { this, TQ_SLOT (processStopped (TDEProcess *))); } -KDE_NO_EXPORT bool MPlayerBase::sendCommand (const TQString & cmd) { +TDE_NO_EXPORT bool MPlayerBase::sendCommand (const TQString & cmd) { if (playing () && m_use_slave) { commands.push_front (cmd + '\n'); fprintf (stderr, "eval %s", commands.last ().latin1 ()); @@ -299,14 +299,14 @@ KDE_NO_EXPORT bool MPlayerBase::sendCommand (const TQString & cmd) { return false; } -KDE_NO_EXPORT bool MPlayerBase::stop () { +TDE_NO_EXPORT bool MPlayerBase::stop () { terminateJobs (); if (!m_source || !m_process || !m_process->isRunning ()) return true; return true; } -KDE_NO_EXPORT bool MPlayerBase::quit () { +TDE_NO_EXPORT bool MPlayerBase::quit () { if (playing ()) { stop (); disconnect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), @@ -333,7 +333,7 @@ KDE_NO_EXPORT bool MPlayerBase::quit () { return Process::quit (); } -KDE_NO_EXPORT void MPlayerBase::dataWritten (TDEProcess *) { +TDE_NO_EXPORT void MPlayerBase::dataWritten (TDEProcess *) { if (!commands.size ()) return; kdDebug() << "eval done " << commands.last () << endl; commands.pop_back (); @@ -342,7 +342,7 @@ KDE_NO_EXPORT void MPlayerBase::dataWritten (TDEProcess *) { commands.last ().length ()); } -KDE_NO_EXPORT void MPlayerBase::processStopped (TDEProcess *) { +TDE_NO_EXPORT void MPlayerBase::processStopped (TDEProcess *) { kdDebug() << "process stopped" << endl; commands.clear (); setState (Ready); @@ -370,24 +370,24 @@ KDE_NO_CDTOR_EXPORT MPlayer::~MPlayer () { delete m_configpage; } -KDE_NO_EXPORT void MPlayer::init () { +TDE_NO_EXPORT void MPlayer::init () { } TQString MPlayer::menuName () const { return i18n ("&MPlayer"); } -KDE_NO_EXPORT WId MPlayer::widget () { +TDE_NO_EXPORT WId MPlayer::widget () { return viewer ()->embeddedWinId (); } -KDE_NO_EXPORT bool MPlayer::ready (Viewer * viewer) { +TDE_NO_EXPORT bool MPlayer::ready (Viewer * viewer) { Process::ready (viewer); viewer->changeProtocol (QXEmbed::XPLAIN); return false; } -KDE_NO_EXPORT bool MPlayer::deMediafiedPlay () { +TDE_NO_EXPORT bool MPlayer::deMediafiedPlay () { if (playing ()) return sendCommand (TQString ("gui_play")); if (!m_needs_restarted && playing ()) @@ -448,7 +448,7 @@ KDE_NO_EXPORT bool MPlayer::deMediafiedPlay () { return run (args.ascii (), m_source->pipeCmd ().ascii ()); } -KDE_NO_EXPORT bool MPlayer::stop () { +TDE_NO_EXPORT bool MPlayer::stop () { terminateJobs (); if (!m_source || !m_process || !m_process->isRunning ()) return true; if (m_use_slave) @@ -456,11 +456,11 @@ KDE_NO_EXPORT bool MPlayer::stop () { return MPlayerBase::stop (); } -KDE_NO_EXPORT bool MPlayer::pause () { +TDE_NO_EXPORT bool MPlayer::pause () { return sendCommand (TQString ("pause")); } -KDE_NO_EXPORT bool MPlayer::seek (int pos, bool absolute) { +TDE_NO_EXPORT bool MPlayer::seek (int pos, bool absolute) { if (!m_source || !m_source->hasLength () || (absolute && m_source->position () == pos)) return false; @@ -487,7 +487,7 @@ KDE_NO_EXPORT bool MPlayer::seek (int pos, bool absolute) { return sendCommand (cmd); } -KDE_NO_EXPORT bool MPlayer::volume (int incdec, bool absolute) { +TDE_NO_EXPORT bool MPlayer::volume (int incdec, bool absolute) { if (absolute) incdec -= old_volume; if (incdec == 0) @@ -496,25 +496,25 @@ KDE_NO_EXPORT bool MPlayer::volume (int incdec, bool absolute) { return sendCommand (TQString ("volume ") + TQString::number (incdec)); } -KDE_NO_EXPORT bool MPlayer::saturation (int val, bool absolute) { +TDE_NO_EXPORT bool MPlayer::saturation (int val, bool absolute) { TQString cmd; cmd.sprintf ("saturation %d %d", val, absolute ? 1 : 0); return sendCommand (cmd); } -KDE_NO_EXPORT bool MPlayer::hue (int val, bool absolute) { +TDE_NO_EXPORT bool MPlayer::hue (int val, bool absolute) { TQString cmd; cmd.sprintf ("hue %d %d", val, absolute ? 1 : 0); return sendCommand (cmd); } -KDE_NO_EXPORT bool MPlayer::contrast (int val, bool /*absolute*/) { +TDE_NO_EXPORT bool MPlayer::contrast (int val, bool /*absolute*/) { TQString cmd; cmd.sprintf ("contrast %d 1", val); return sendCommand (cmd); } -KDE_NO_EXPORT bool MPlayer::brightness (int val, bool /*absolute*/) { +TDE_NO_EXPORT bool MPlayer::brightness (int val, bool /*absolute*/) { TQString cmd; cmd.sprintf ("brightness %d 1", val); return sendCommand (cmd); @@ -629,7 +629,7 @@ bool MPlayer::run (const char * args, const char * pipe) { return false; } -KDE_NO_EXPORT bool MPlayer::grabPicture (const KURL & url, int pos) { +TDE_NO_EXPORT bool MPlayer::grabPicture (const KURL & url, int pos) { stop (); initProcess (viewer ()); TQString outdir = locateLocal ("data", "kmplayer/"); @@ -652,7 +652,7 @@ KDE_NO_EXPORT bool MPlayer::grabPicture (const KURL & url, int pos) { return m_process->isRunning (); } -KDE_NO_EXPORT void MPlayer::processOutput (TDEProcess *, char * str, int slen) { +TDE_NO_EXPORT void MPlayer::processOutput (TDEProcess *, char * str, int slen) { if (!viewer () || slen <= 0) return; View * v = viewer ()->view (); @@ -809,7 +809,7 @@ KDE_NO_EXPORT void MPlayer::processOutput (TDEProcess *, char * str, int slen) { } while (slen > 0); } -KDE_NO_EXPORT void MPlayer::processStopped (TDEProcess * p) { +TDE_NO_EXPORT void MPlayer::processStopped (TDEProcess * p) { if (p && !m_grabfile.isEmpty ()) { emit grabReady (m_grabfile); m_grabfile.truncate (0); @@ -926,7 +926,7 @@ KDE_NO_CDTOR_EXPORT MPlayerPreferencesPage::MPlayerPreferencesPage (MPlayer * p) : m_process (p), m_configframe (0L) { } -KDE_NO_EXPORT void MPlayerPreferencesPage::write (TDEConfig * config) { +TDE_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 (TDEConfig * config) { config->writeEntry (strAlwaysBuildIndex, alwaysbuildindex); } -KDE_NO_EXPORT void MPlayerPreferencesPage::read (TDEConfig * config) { +TDE_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 @@ -950,7 +950,7 @@ KDE_NO_EXPORT void MPlayerPreferencesPage::read (TDEConfig * config) { alwaysbuildindex = config->readBoolEntry (strAlwaysBuildIndex, false); } -KDE_NO_EXPORT void MPlayerPreferencesPage::sync (bool fromUI) { +TDE_NO_EXPORT void MPlayerPreferencesPage::sync (bool fromUI) { TQTable * table = m_configframe->table; TQSpinBox * cacheSize = static_cast<TQSpinBox *>(table->cellWidget (2, 1)); TQCheckBox * buildIndex = static_cast<TQCheckBox *>(table->cellWidget (3, 1)); @@ -972,13 +972,13 @@ KDE_NO_EXPORT void MPlayerPreferencesPage::sync (bool fromUI) { } } -KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("General Options"); icon = TQString ("kmplayer"); tab = i18n ("MPlayer"); } -KDE_NO_EXPORT TQFrame * MPlayerPreferencesPage::prefPage (TQWidget * parent) { +TDE_NO_EXPORT TQFrame * MPlayerPreferencesPage::prefPage (TQWidget * parent) { m_configframe = new MPlayerPreferencesFrame (parent); return m_configframe; } @@ -997,7 +997,7 @@ KDE_NO_CDTOR_EXPORT MEncoder::MEncoder (TQObject * parent, Settings * settings) KDE_NO_CDTOR_EXPORT MEncoder::~MEncoder () { } -KDE_NO_EXPORT void MEncoder::init () { +TDE_NO_EXPORT void MEncoder::init () { } bool MEncoder::deMediafiedPlay () { @@ -1038,7 +1038,7 @@ bool MEncoder::deMediafiedPlay () { return success; } -KDE_NO_EXPORT bool MEncoder::stop () { +TDE_NO_EXPORT bool MEncoder::stop () { terminateJobs (); if (!m_source || !m_process || !m_process->isRunning ()) return true; kdDebug () << "MEncoder::stop ()" << endl; @@ -1062,7 +1062,7 @@ MPlayerDumpstream::MPlayerDumpstream (TQObject * parent, Settings * settings) KDE_NO_CDTOR_EXPORT MPlayerDumpstream::~MPlayerDumpstream () { } -KDE_NO_EXPORT void MPlayerDumpstream::init () { +TDE_NO_EXPORT void MPlayerDumpstream::init () { } bool MPlayerDumpstream::deMediafiedPlay () { @@ -1100,7 +1100,7 @@ bool MPlayerDumpstream::deMediafiedPlay () { return success; } -KDE_NO_EXPORT bool MPlayerDumpstream::stop () { +TDE_NO_EXPORT bool MPlayerDumpstream::stop () { terminateJobs (); if (!m_source || !m_process || !m_process->isRunning ()) return true; kdDebug () << "MPlayerDumpstream::stop ()" << endl; @@ -1435,12 +1435,12 @@ void CallbackProcess::initProcess (Viewer * viewer) { this, TQ_SLOT (processOutput (TDEProcess *, char *, int))); } -KDE_NO_EXPORT void CallbackProcess::processOutput (TDEProcess *, char * str, int slen) { +TDE_NO_EXPORT void CallbackProcess::processOutput (TDEProcess *, char * str, int slen) { if (viewer () && slen > 0) viewer ()->view ()->addText (TQString::fromLocal8Bit (str, slen)); } -KDE_NO_EXPORT void CallbackProcess::processStopped (TDEProcess *) { +TDE_NO_EXPORT void CallbackProcess::processStopped (TDEProcess *) { if (m_source) ((PlayListNotify *) m_source)->setInfoMessage (TQString ()); delete m_backend; @@ -1584,18 +1584,18 @@ KDE_NO_CDTOR_EXPORT XMLPreferencesPage::XMLPreferencesPage (CallbackProcess * p) KDE_NO_CDTOR_EXPORT XMLPreferencesPage::~XMLPreferencesPage () { } -KDE_NO_EXPORT void XMLPreferencesFrame::showEvent (TQShowEvent *) { +TDE_NO_EXPORT void XMLPreferencesFrame::showEvent (TQShowEvent *) { if (!m_process->haveConfig ()) m_process->getConfigData (); } -KDE_NO_EXPORT void XMLPreferencesPage::write (TDEConfig *) { +TDE_NO_EXPORT void XMLPreferencesPage::write (TDEConfig *) { } -KDE_NO_EXPORT void XMLPreferencesPage::read (TDEConfig *) { +TDE_NO_EXPORT void XMLPreferencesPage::read (TDEConfig *) { } -KDE_NO_EXPORT void XMLPreferencesPage::sync (bool fromUI) { +TDE_NO_EXPORT void XMLPreferencesPage::sync (bool fromUI) { if (!m_configframe) return; TQTable * table = m_configframe->table; int row = 0; @@ -1663,13 +1663,13 @@ KDE_NO_EXPORT void XMLPreferencesPage::sync (bool fromUI) { } } -KDE_NO_EXPORT void XMLPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void XMLPreferencesPage::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("General Options"); icon = TQString ("kmplayer"); tab = m_process->menuName (); } -KDE_NO_EXPORT TQFrame * XMLPreferencesPage::prefPage (TQWidget * parent) { +TDE_NO_EXPORT TQFrame * XMLPreferencesPage::prefPage (TQWidget * parent) { m_configframe = new XMLPreferencesFrame (parent, m_process); return m_configframe; } @@ -1766,7 +1766,7 @@ KDE_NO_CDTOR_EXPORT GStreamer::GStreamer (TQObject * parent, Settings * settings KDE_NO_CDTOR_EXPORT GStreamer::~GStreamer () {} -KDE_NO_EXPORT bool GStreamer::ready (Viewer * viewer) { +TDE_NO_EXPORT bool GStreamer::ready (Viewer * viewer) { initProcess (viewer); viewer->changeProtocol (QXEmbed::XPLAIN); m_request_seek = -1; @@ -1816,7 +1816,7 @@ FFMpeg::FFMpeg (TQObject * parent, Settings * settings) KDE_NO_CDTOR_EXPORT FFMpeg::~FFMpeg () { } -KDE_NO_EXPORT void FFMpeg::init () { +TDE_NO_EXPORT void FFMpeg::init () { } bool FFMpeg::deMediafiedPlay () { @@ -1867,7 +1867,7 @@ bool FFMpeg::deMediafiedPlay () { return m_process->isRunning (); } -KDE_NO_EXPORT bool FFMpeg::stop () { +TDE_NO_EXPORT bool FFMpeg::stop () { terminateJobs (); if (!playing ()) return true; kdDebug () << "FFMpeg::stop" << endl; @@ -1875,7 +1875,7 @@ KDE_NO_EXPORT bool FFMpeg::stop () { return true; } -KDE_NO_EXPORT bool FFMpeg::quit () { +TDE_NO_EXPORT bool FFMpeg::quit () { stop (); if (!playing ()) return true; TQTime t; @@ -1886,7 +1886,7 @@ KDE_NO_EXPORT bool FFMpeg::quit () { return Process::quit (); } -KDE_NO_EXPORT void FFMpeg::processStopped (TDEProcess *) { +TDE_NO_EXPORT void FFMpeg::processStopped (TDEProcess *) { setState (NotRunning); } @@ -2014,7 +2014,7 @@ KDE_NO_CDTOR_EXPORT NpStream::~NpStream () { close (); } -KDE_NO_EXPORT void NpStream::open () { +TDE_NO_EXPORT void NpStream::open () { kdDebug () << "NpStream " << stream_id << " open " << url.url () << endl; if (url.url().startsWith ("javascript:")) { NpPlayer *npp = static_cast <NpPlayer *> (parent ()); @@ -2046,7 +2046,7 @@ KDE_NO_EXPORT void NpStream::open () { } } -KDE_NO_EXPORT void NpStream::close () { +TDE_NO_EXPORT void NpStream::close () { if (job) { job->kill (); // quiet, no result signal job = 0L; @@ -2055,14 +2055,14 @@ KDE_NO_EXPORT void NpStream::close () { } } -KDE_NO_EXPORT void NpStream::slotResult (TDEIO::Job *jb) { +TDE_NO_EXPORT void NpStream::slotResult (TDEIO::Job *jb) { kdDebug() << "slotResult " << bytes << " err:" << jb->error () << endl; finish_reason = jb->error () ? BecauseError : BecauseDone; job = 0L; // signal TDEIO::Job::result deletes itself emit stateChanged (); } -KDE_NO_EXPORT void NpStream::slotData (TDEIO::Job*, const TQByteArray& qb) { +TDE_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,7 +2071,7 @@ KDE_NO_EXPORT void NpStream::slotData (TDEIO::Job*, const TQByteArray& qb) { } } -KDE_NO_EXPORT void NpStream::redirection (TDEIO::Job *, const KURL &u) { +TDE_NO_EXPORT void NpStream::redirection (TDEIO::Job *, const KURL &u) { url = u; emit redirected (stream_id, url); } @@ -2111,10 +2111,10 @@ KDE_NO_CDTOR_EXPORT NpPlayer::~NpPlayer () { } } -KDE_NO_EXPORT void NpPlayer::init () { +TDE_NO_EXPORT void NpPlayer::init () { } -KDE_NO_EXPORT void NpPlayer::initProcess (Viewer * viewer) { +TDE_NO_EXPORT void NpPlayer::initProcess (Viewer * viewer) { Process::initProcess (viewer); connect (m_process, TQ_SIGNAL (processExited (TDEProcess *)), this, TQ_SLOT (processStopped (TDEProcess *))); @@ -2165,7 +2165,7 @@ KDE_NO_EXPORT void NpPlayer::initProcess (Viewer * viewer) { } } -KDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { +TDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { kdDebug() << "NpPlayer::play '" << m_url << "'" << endl; // if we change from XPLAIN to XEMBED, the DestroyNotify may come later viewer ()->changeProtocol (QXEmbed::XEMBED); @@ -2249,7 +2249,7 @@ KDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { return false; } -KDE_NO_EXPORT bool NpPlayer::ready (Viewer * viewer) { +TDE_NO_EXPORT bool NpPlayer::ready (Viewer * viewer) { if (playing ()) return true; // wait for callback initProcess (viewer); @@ -2267,13 +2267,13 @@ KDE_NO_EXPORT bool NpPlayer::ready (Viewer * viewer) { return m_process->isRunning (); } -KDE_NO_EXPORT void NpPlayer::setStarted (const TQString & srv) { +TDE_NO_EXPORT void NpPlayer::setStarted (const TQString & srv) { remote_service = srv; kdDebug () << "NpPlayer::setStarted " << srv << endl; setState (Ready); } -KDE_NO_EXPORT TQString NpPlayer::evaluateScript (const TQString & script) { +TDE_NO_EXPORT TQString NpPlayer::evaluateScript (const TQString & script) { TQString result; emit evaluate (script, result); //kdDebug () << "evaluateScript " << script << " => " << result << endl; @@ -2295,7 +2295,7 @@ static int getStreamId (const TQString &path) { return sid; } -KDE_NO_EXPORT +TDE_NO_EXPORT void NpPlayer::requestStream (const TQString &path, const TQString & url, const TQString & target) { KURL uri (m_base_url.isEmpty () ? m_url : m_base_url, url); kdDebug () << "NpPlayer::request " << path << " '" << uri << "'" << endl; @@ -2327,7 +2327,7 @@ void NpPlayer::requestStream (const TQString &path, const TQString & url, const } } -KDE_NO_EXPORT void NpPlayer::destroyStream (const TQString &s) { +TDE_NO_EXPORT void NpPlayer::destroyStream (const TQString &s) { int sid = getStreamId (s); if (sid >= 0 && streams.contains ((TQ_UINT32) sid)) { NpStream *ns = streams[(TQ_UINT32) sid]; @@ -2339,7 +2339,7 @@ KDE_NO_EXPORT void NpPlayer::destroyStream (const TQString &s) { } } -KDE_NO_EXPORT +TDE_NO_EXPORT void NpPlayer::sendFinish (TQ_UINT32 sid, TQ_UINT32 bytes, NpStream::Reason because) { if (playing () && dbus_static->dbus_connnection) { TQ_UINT32 reason = (int) because; @@ -2360,7 +2360,7 @@ void NpPlayer::sendFinish (TQ_UINT32 sid, TQ_UINT32 bytes, NpStream::Reason beca } } -KDE_NO_EXPORT void NpPlayer::terminateJobs () { +TDE_NO_EXPORT void NpPlayer::terminateJobs () { Process::terminateJobs (); const StreamMap::iterator e = streams.end (); for (StreamMap::iterator i = streams.begin (); i != e; ++i) @@ -2368,7 +2368,7 @@ KDE_NO_EXPORT void NpPlayer::terminateJobs () { streams.clear (); } -KDE_NO_EXPORT bool NpPlayer::stop () { +TDE_NO_EXPORT bool NpPlayer::stop () { terminateJobs (); if (!playing ()) return true; kdDebug () << "NpPlayer::stop " << endl; @@ -2386,7 +2386,7 @@ KDE_NO_EXPORT bool NpPlayer::stop () { return true; } -KDE_NO_EXPORT bool NpPlayer::quit () { +TDE_NO_EXPORT bool NpPlayer::quit () { if (playing ()) { stop (); TQTime t; @@ -2399,25 +2399,25 @@ KDE_NO_EXPORT bool NpPlayer::quit () { return true; } -KDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char * str, int slen) { +TDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char * str, int slen) { if (viewer () && slen > 0) viewer ()->view ()->addText (TQString::fromLocal8Bit (str, slen)); } -KDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) { +TDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) { terminateJobs (); if (m_source) ((PlayListNotify *) m_source)->setInfoMessage (TQString ()); setState (NotRunning); } -KDE_NO_EXPORT void NpPlayer::streamStateChanged () { +TDE_NO_EXPORT void NpPlayer::streamStateChanged () { setState (Playing); // hmm, this doesn't really fit in current states if (!write_in_progress) processStreams (); } -KDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32 sid, const KURL &u) { +TDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32 sid, const KURL &u) { if (playing () && dbus_static->dbus_connnection) { kdDebug() << "redirected " << sid << " to " << u.url() << endl; char *cu = strdup (u.url ().local8Bit().data ()); @@ -2436,7 +2436,7 @@ KDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32 sid, const KURL &u) { } } -KDE_NO_EXPORT void NpPlayer::processStreams () { +TDE_NO_EXPORT void NpPlayer::processStreams () { NpStream *stream = 0L; TQ_UINT32 stream_id; timeval tv = { 0x7fffffff, 0 }; @@ -2520,13 +2520,13 @@ KDE_NO_EXPORT void NpPlayer::processStreams () { } } -KDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) { +TDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) { write_in_progress = false; if (playing ()) processStreams (); } -KDE_NO_EXPORT TQString NpPlayer::menuName () const { +TDE_NO_EXPORT TQString NpPlayer::menuName () const { return i18n ("&Ice Ape"); } @@ -2547,20 +2547,20 @@ KDE_NO_CDTOR_EXPORT NpPlayer::NpPlayer (TQObject * parent, Settings * settings, const TQString &) : Process (parent, settings, "npp") {} KDE_NO_CDTOR_EXPORT NpPlayer::~NpPlayer () {} -KDE_NO_EXPORT void NpPlayer::init () {} -KDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { return false; } -KDE_NO_EXPORT void NpPlayer::initProcess (Viewer *) {} -KDE_NO_EXPORT TQString NpPlayer::menuName () const { return TQString (); } -KDE_NO_EXPORT void NpPlayer::setStarted (const TQString &) {} -KDE_NO_EXPORT bool NpPlayer::stop () { return false; } -KDE_NO_EXPORT bool NpPlayer::quit () { return false; } -KDE_NO_EXPORT bool NpPlayer::ready (Viewer *) { return false; } -KDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char *, int) {} -KDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) {} -KDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) {} -KDE_NO_EXPORT void NpPlayer::streamStateChanged () {} -KDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32, const KURL &) {} -KDE_NO_EXPORT void NpPlayer::terminateJobs () {} +TDE_NO_EXPORT void NpPlayer::init () {} +TDE_NO_EXPORT bool NpPlayer::deMediafiedPlay () { return false; } +TDE_NO_EXPORT void NpPlayer::initProcess (Viewer *) {} +TDE_NO_EXPORT TQString NpPlayer::menuName () const { return TQString (); } +TDE_NO_EXPORT void NpPlayer::setStarted (const TQString &) {} +TDE_NO_EXPORT bool NpPlayer::stop () { return false; } +TDE_NO_EXPORT bool NpPlayer::quit () { return false; } +TDE_NO_EXPORT bool NpPlayer::ready (Viewer *) { return false; } +TDE_NO_EXPORT void NpPlayer::processOutput (TDEProcess *, char *, int) {} +TDE_NO_EXPORT void NpPlayer::processStopped (TDEProcess *) {} +TDE_NO_EXPORT void NpPlayer::wroteStdin (TDEProcess *) {} +TDE_NO_EXPORT void NpPlayer::streamStateChanged () {} +TDE_NO_EXPORT void NpPlayer::streamRedirected (TQ_UINT32, const KURL &) {} +TDE_NO_EXPORT void NpPlayer::terminateJobs () {} #endif diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h index d420e02..317a869 100644 --- a/src/kmplayerprocess.h +++ b/src/kmplayerprocess.h @@ -68,8 +68,8 @@ public: virtual void setAudioLang (int, const TQString &); virtual void setSubtitle (int, const TQString &); bool playing () const; - KDE_NO_EXPORT TDEProcess * process () const { return m_process; } - KDE_NO_EXPORT Source * source () const { return m_source; } + TDE_NO_EXPORT TDEProcess * process () const { return m_process; } + TDE_NO_EXPORT Source * source () const { return m_source; } virtual WId widget (); Viewer * viewer () const; void setSource (Source * src) { m_source = src; } @@ -144,7 +144,7 @@ class MPlayerPreferencesFrame; /* * MPlayer process */ -class KDE_EXPORT MPlayer : public MPlayerBase { +class TDE_EXPORT MPlayer : public MPlayerBase { TQ_OBJECT public: @@ -226,8 +226,8 @@ private: */ class KMPLAYER_EXPORT Recorder { public: - KDE_NO_EXPORT const KURL & recordURL () const { return m_recordurl; } - KDE_NO_EXPORT void setURL (const KURL & url) { m_recordurl = url; } + TDE_NO_EXPORT const KURL & recordURL () const { return m_recordurl; } + TDE_NO_EXPORT void setURL (const KURL & url) { m_recordurl = url; } protected: KURL m_recordurl; }; @@ -288,8 +288,8 @@ public: virtual void setSubtitle (int, const TQString &); virtual TQString menuName () const; virtual WId widget (); - KDE_NO_EXPORT TQByteArray & configData () { return m_configdata; } - KDE_NO_EXPORT bool haveConfig () { return m_have_config == config_yes; } + TDE_NO_EXPORT TQByteArray & configData () { return m_configdata; } + TDE_NO_EXPORT bool haveConfig () { return m_have_config == config_yes; } bool getConfigData (); void setChangedData (const TQByteArray &); TQString dcopName (); @@ -471,9 +471,9 @@ public: void requestStream (const TQString & path, const TQString & url, const TQString & target); void destroyStream (const TQString & path); - KDE_NO_EXPORT const TQString & destination () const { return service; } - KDE_NO_EXPORT const TQString & interface () const { return iface; } - KDE_NO_EXPORT TQString objectPath () const { return path; } + TDE_NO_EXPORT const TQString & destination () const { return service; } + TDE_NO_EXPORT const TQString & interface () const { return iface; } + TDE_NO_EXPORT TQString objectPath () const { return path; } TQString evaluateScript (const TQString & scr); signals: void evaluate (const TQString & scr, TQString & result); diff --git a/src/kmplayersource.h b/src/kmplayersource.h index ead5649..bc727eb 100644 --- a/src/kmplayersource.h +++ b/src/kmplayersource.h @@ -52,31 +52,31 @@ public: virtual bool hasLength (); virtual bool isSeekable (); - KDE_NO_EXPORT int width () const { return m_width; } - KDE_NO_EXPORT int height () const { return m_height; } + TDE_NO_EXPORT int width () const { return m_width; } + TDE_NO_EXPORT int height () const { return m_height; } virtual void dimensions (int & w, int & h) { w = m_width; h = m_height; } /* length () returns length in deci-seconds */ - KDE_NO_EXPORT int length () const { return m_length; } + TDE_NO_EXPORT int length () const { return m_length; } /* position () returns position in deci-seconds */ - KDE_NO_EXPORT int position () const { return m_position; } - KDE_NO_EXPORT float aspect () const { return m_aspect; } - KDE_NO_EXPORT const KURL & url () const { return m_url; } - KDE_NO_EXPORT const KURL & subUrl () const { return m_sub_url; } + TDE_NO_EXPORT int position () const { return m_position; } + TDE_NO_EXPORT float aspect () const { return m_aspect; } + TDE_NO_EXPORT const KURL & url () const { return m_url; } + TDE_NO_EXPORT const KURL & subUrl () const { return m_sub_url; } PartBase * player () { return m_player; } virtual void reset (); TQString currentMrl (); - KDE_NO_EXPORT const TQString & audioDevice () const { return m_audiodevice; } - KDE_NO_EXPORT const TQString & videoDevice () const { return m_videodevice; } - KDE_NO_EXPORT const TQString & videoNorm () const { return m_videonorm; } + TDE_NO_EXPORT const TQString & audioDevice () const { return m_audiodevice; } + TDE_NO_EXPORT const TQString & videoDevice () const { return m_videodevice; } + TDE_NO_EXPORT const TQString & videoNorm () const { return m_videonorm; } /* frequency() if set, returns frequency in kHz */ - KDE_NO_EXPORT int frequency () const { return m_frequency; } - KDE_NO_EXPORT int xvPort () const { return m_xvport; } - KDE_NO_EXPORT int xvEncoding () const { return m_xvencoding; } - KDE_NO_EXPORT const TQString & pipeCmd () const { return m_pipecmd; } - KDE_NO_EXPORT const TQString & options () const { return m_options; } - KDE_NO_EXPORT const TQString & recordCmd () const { return m_recordcmd; } - KDE_NO_EXPORT const TQString & tuner () const { return m_tuner; } - KDE_NO_EXPORT NodePtr current () const { return m_current; } + TDE_NO_EXPORT int frequency () const { return m_frequency; } + TDE_NO_EXPORT int xvPort () const { return m_xvport; } + TDE_NO_EXPORT int xvEncoding () const { return m_xvencoding; } + TDE_NO_EXPORT const TQString & pipeCmd () const { return m_pipecmd; } + TDE_NO_EXPORT const TQString & options () const { return m_options; } + TDE_NO_EXPORT const TQString & recordCmd () const { return m_recordcmd; } + TDE_NO_EXPORT const TQString & tuner () const { return m_tuner; } + TDE_NO_EXPORT NodePtr current () const { return m_current; } TQString plugin (const TQString &mime) const; virtual NodePtr document (); virtual NodePtr root (); @@ -84,10 +84,10 @@ public: virtual void setURL (const KURL & url); void insertURL (NodePtr mrl, const TQString & url, const TQString & title=TQString()); - KDE_NO_EXPORT void setSubURL (const KURL & url) { m_sub_url = url; } + TDE_NO_EXPORT void setSubURL (const KURL & url) { m_sub_url = url; } void setLanguages (const TQStringList & alang, const TQStringList & slang); - KDE_NO_EXPORT void setWidth (int w) { m_width = w; } - KDE_NO_EXPORT void setHeight (int h) { m_height = h; } + TDE_NO_EXPORT void setWidth (int w) { m_width = w; } + TDE_NO_EXPORT void setHeight (int h) { m_height = h; } virtual void setDimensions (NodePtr, int w, int h); virtual void setAspect (NodePtr, float a); /* setLength (len) set length in deci-seconds */ @@ -97,8 +97,8 @@ public: virtual void setIdentified (bool b = true); // backend process state changed virtual void stateChange (Process *, Process::State os, Process::State ns); - KDE_NO_EXPORT void setAutoPlay (bool b) { m_auto_play = b; } - KDE_NO_EXPORT bool autoPlay () const { return m_auto_play; } + TDE_NO_EXPORT void setAutoPlay (bool b) { m_auto_play = b; } + TDE_NO_EXPORT bool autoPlay () const { return m_auto_play; } void setTitle (const TQString & title); void setLoading (int percentage); bool setCurrent (NodePtr mrl); diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp index 0bf1644..2faf123 100644 --- a/src/kmplayertvsource.cpp +++ b/src/kmplayertvsource.cpp @@ -135,7 +135,7 @@ KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *parent, KMPlayer::Node layout->addLayout (buttonlayout); } -KDE_NO_EXPORT void TVDevicePage::slotDelete () { +TDE_NO_EXPORT void TVDevicePage::slotDelete () { if (KMessageBox::warningYesNo (this, i18n ("You are about to remove this device from the Source menu.\nContinue?"), i18n ("Confirm")) == KMessageBox::Yes) emit deleted (this); } @@ -170,7 +170,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageTV::KMPlayerPrefSourcePageTV (TQWidget notebook->insertTab (general, i18n ("General")); } -KDE_NO_EXPORT void KMPlayerPrefSourcePageTV::showEvent (TQShowEvent *) { +TDE_NO_EXPORT void KMPlayerPrefSourcePageTV::showEvent (TQShowEvent *) { m_tvsource->readXML (); } @@ -181,7 +181,7 @@ KDE_NO_CDTOR_EXPORT TVNode::TVNode (KMPlayer::NodePtr &d, const TQString & s, co editable = true; } -KDE_NO_EXPORT void TVNode::setNodeName (const TQString & nn) { +TDE_NO_EXPORT void TVNode::setNodeName (const TQString & nn) { pretty_name = nn; setAttribute (KMPlayer::StringPool::attr_name, nn); } @@ -196,7 +196,7 @@ KDE_NO_CDTOR_EXPORT TVChannel::TVChannel (KMPlayer::NodePtr & d, const TQString KDE_NO_CDTOR_EXPORT TVChannel::TVChannel (KMPlayer::NodePtr & d) : TVNode (d, TQString ("tv://"), "channel", id_node_tv_channel) { } -KDE_NO_EXPORT void TVChannel::closed () { +TDE_NO_EXPORT void TVChannel::closed () { pretty_name = getAttribute (KMPlayer::StringPool::attr_name); } @@ -211,7 +211,7 @@ TVInput::TVInput (KMPlayer::NodePtr & d, const TQString & n, int id) KDE_NO_CDTOR_EXPORT TVInput::TVInput (KMPlayer::NodePtr & d) : TVNode (d, TQString ("tv://"), "input", id_node_tv_input) { } -KDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; if (tag == TQString::fromLatin1 ("channel")) { return new TVChannel (m_doc); @@ -219,11 +219,11 @@ KDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) { return 0L; } -KDE_NO_EXPORT void TVInput::closed () { +TDE_NO_EXPORT void TVInput::closed () { //pretty_name = getAttribute (KMPlayer::StringPool::attr_name); } -KDE_NO_EXPORT void TVInput::setNodeName (const TQString & name) { +TDE_NO_EXPORT void TVInput::setNodeName (const TQString & name) { Node * p = parentNode ().ptr (); TQString nm (name); if (p && p->id == id_node_tv_device) { @@ -250,27 +250,27 @@ KDE_NO_CDTOR_EXPORT TVDevice::~TVDevice () { device_page->deleteLater (); } -KDE_NO_EXPORT KMPlayer::NodePtr TVDevice::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr TVDevice::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; if (tag == TQString::fromLatin1 ("input")) return new TVInput (m_doc); return 0L; } -KDE_NO_EXPORT void TVDevice::closed () { +TDE_NO_EXPORT void TVDevice::closed () { updateNodeName (); } -KDE_NO_EXPORT void TVDevice::childDone (KMPlayer::NodePtr) { +TDE_NO_EXPORT void TVDevice::childDone (KMPlayer::NodePtr) { finish (); } -KDE_NO_EXPORT void TVDevice::setNodeName (const TQString & name) { +TDE_NO_EXPORT void TVDevice::setNodeName (const TQString & name) { TVNode::setNodeName (name); updateNodeName (); } -KDE_NO_EXPORT void TVDevice::updateNodeName () { +TDE_NO_EXPORT void TVDevice::updateNodeName () { pretty_name = getAttribute (KMPlayer::StringPool::attr_name); src = getAttribute ("path"); for (KMPlayer::NodePtr c = firstChild (); c; c = c->nextSibling ()) @@ -281,7 +281,7 @@ KDE_NO_EXPORT void TVDevice::updateNodeName () { } } -KDE_NO_EXPORT void TVDevice::updateDevicePage () { +TDE_NO_EXPORT void TVDevice::updateDevicePage () { if (!device_page) return; pretty_name = device_page->name->text (); @@ -321,18 +321,18 @@ TVDocument::TVDocument (KMPlayerTVSource * source) pretty_name = i18n ("Television"); } -KDE_NO_EXPORT KMPlayer::NodePtr TVDocument::childFromTag (const TQString & tag) { +TDE_NO_EXPORT KMPlayer::NodePtr TVDocument::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; if (tag == TQString::fromLatin1 ("device")) return new TVDevice (m_doc); return FileDocument::childFromTag (tag); } -KDE_NO_EXPORT void TVDocument::childDone (KMPlayer::NodePtr) { +TDE_NO_EXPORT void TVDocument::childDone (KMPlayer::NodePtr) { finish (); } -KDE_NO_EXPORT void TVDocument::defer () { +TDE_NO_EXPORT void TVDocument::defer () { if (!resolved) { resolved = true; readFromFile (locateLocal ("data", "kmplayer/tv.xml")); @@ -354,7 +354,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerTVSource::KMPlayerTVSource (KMPlayerApp * a, TQPopup KDE_NO_CDTOR_EXPORT KMPlayerTVSource::~KMPlayerTVSource () { } -KDE_NO_EXPORT void KMPlayerTVSource::activate () { +TDE_NO_EXPORT void KMPlayerTVSource::activate () { m_identified = true; if (m_player->settings ()->showbroadcastbutton) m_app->view()->controlPanel()->broadcastButton ()->show (); @@ -386,13 +386,13 @@ KDE_NO_EXPORT void KMPlayerTVSource::activate () { * ffmpeg -vd /dev/video0 -r 25 -s 768x576 -f rawvideo - |mplayer -nocache -ao arts -rawvideo on:w=768:h=576:fps=25 -quiet - */ -KDE_NO_EXPORT void KMPlayerTVSource::deactivate () { +TDE_NO_EXPORT void KMPlayerTVSource::deactivate () { if (m_player->view () && !m_app->view ()->controlPanel()->broadcastButton ()->isOn ()) m_app->view ()->controlPanel()->broadcastButton ()->hide (); reset (); } -KDE_NO_EXPORT void KMPlayerTVSource::buildMenu () { +TDE_NO_EXPORT void KMPlayerTVSource::buildMenu () { m_menu->clear (); int counter = 0; for (KMPlayer::NodePtr dp = m_document->firstChild (); dp; dp = dp->nextSibling ()) @@ -400,7 +400,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::buildMenu () { m_menu->insertItem (KMPlayer::convertNode <TVDevice> (dp)->pretty_name, this, TQ_SLOT (menuClicked (int)), 0, counter++); } -KDE_NO_EXPORT void KMPlayerTVSource::menuAboutToShow () { +TDE_NO_EXPORT void KMPlayerTVSource::menuAboutToShow () { readXML (); } @@ -426,11 +426,11 @@ void KMPlayerTVSource::jump (KMPlayer::NodePtr e) { } } -KDE_NO_EXPORT KMPlayer::NodePtr KMPlayerTVSource::root () { +TDE_NO_EXPORT KMPlayer::NodePtr KMPlayerTVSource::root () { return m_cur_tvinput; } -KDE_NO_EXPORT void KMPlayerTVSource::buildArguments () { +TDE_NO_EXPORT void KMPlayerTVSource::buildArguments () { TVChannel * channel = 0L; TVInput * input = 0L; KMPlayer::NodePtr elm = m_current; @@ -483,7 +483,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::buildArguments () { m_recordcmd.sprintf ("-tv on:%s:driver=%s:%s:width=%d:height=%d", m_audiodevice.isEmpty () ? "noaudio" : (TQString ("forceaudio:adevice=") + m_audiodevice).ascii(), tvdriver.ascii (), command.ascii (), width (), height ()); } -KDE_NO_EXPORT void KMPlayerTVSource::playCurrent () { +TDE_NO_EXPORT void KMPlayerTVSource::playCurrent () { buildArguments (); if (m_app->broadcasting ()) TQTimer::singleShot (0, m_app->broadcastConfig (), TQ_SLOT (startFeed ())); @@ -491,7 +491,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::playCurrent () { KMPlayer::Source::playCurrent (); } -KDE_NO_EXPORT void KMPlayerTVSource::menuClicked (int id) { +TDE_NO_EXPORT void KMPlayerTVSource::menuClicked (int id) { KMPlayer::NodePtr elm = m_document->firstChild (); for (; id > 0; --id, elm = elm->nextSibling ()) ; @@ -501,28 +501,28 @@ KDE_NO_EXPORT void KMPlayerTVSource::menuClicked (int id) { m_player->setSource (this); } -KDE_NO_EXPORT TQString KMPlayerTVSource::filterOptions () { +TDE_NO_EXPORT TQString KMPlayerTVSource::filterOptions () { if (! m_player->settings ()->disableppauto) return KMPlayer::Source::filterOptions (); return TQString ("-vf pp=lb"); } -KDE_NO_EXPORT bool KMPlayerTVSource::hasLength () { +TDE_NO_EXPORT bool KMPlayerTVSource::hasLength () { return false; } -KDE_NO_EXPORT bool KMPlayerTVSource::isSeekable () { +TDE_NO_EXPORT bool KMPlayerTVSource::isSeekable () { return true; } -KDE_NO_EXPORT TQString KMPlayerTVSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerTVSource::prettyName () { TQString name (i18n ("TV")); //if (m_tvsource) // name += ' ' + m_tvsource->title; return name; } -KDE_NO_EXPORT void KMPlayerTVSource::write (TDEConfig * m_config) { +TDE_NO_EXPORT void KMPlayerTVSource::write (TDEConfig * m_config) { if (!config_read) return; m_config->setGroup (strTV); m_config->writeEntry (strTVDriver, tvdriver); @@ -531,7 +531,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::write (TDEConfig * m_config) { kdDebug () << "KMPlayerTVSource::write XML" << endl; } -KDE_NO_EXPORT void KMPlayerTVSource::readXML () { +TDE_NO_EXPORT void KMPlayerTVSource::readXML () { if (config_read) return; config_read = true; kdDebug () << "KMPlayerTVSource::readXML" << endl; @@ -541,12 +541,12 @@ KDE_NO_EXPORT void KMPlayerTVSource::readXML () { sync (false); } -KDE_NO_EXPORT void KMPlayerTVSource::read (TDEConfig * m_config) { +TDE_NO_EXPORT void KMPlayerTVSource::read (TDEConfig * m_config) { m_config->setGroup (strTV); tvdriver = m_config->readEntry (strTVDriver, "v4l"); } -KDE_NO_EXPORT void KMPlayerTVSource::sync (bool fromUI) { +TDE_NO_EXPORT void KMPlayerTVSource::sync (bool fromUI) { if (!m_configpage) return; if (m_document && m_document->hasChildNodes ()) m_app->showBroadcastConfig (); @@ -565,13 +565,13 @@ KDE_NO_EXPORT void KMPlayerTVSource::sync (bool fromUI) { } } -KDE_NO_EXPORT void KMPlayerTVSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void KMPlayerTVSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); icon = TQString ("text-x-src"); tab = i18n ("TV"); } -KDE_NO_EXPORT TQFrame * KMPlayerTVSource::prefPage (TQWidget * parent) { +TDE_NO_EXPORT TQFrame * KMPlayerTVSource::prefPage (TQWidget * parent) { if (!m_configpage) { m_configpage = new KMPlayerPrefSourcePageTV (parent, this); scanner = new TVDeviceScannerSource (this); @@ -588,7 +588,7 @@ static bool hasTVDevice (KMPlayer::NodePtr doc, const TQString & devstr) { return false; } -KDE_NO_EXPORT void KMPlayerTVSource::slotScan () { +TDE_NO_EXPORT void KMPlayerTVSource::slotScan () { TQString devstr = m_configpage->device->lineEdit()->text (); if (!hasTVDevice(m_document, devstr)) { scanner->scan (devstr, m_configpage->driver->text()); @@ -599,7 +599,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::slotScan () { i18n ("Error")); } -KDE_NO_EXPORT void KMPlayerTVSource::slotScanFinished (TVDevice * tvdevice) { +TDE_NO_EXPORT void KMPlayerTVSource::slotScanFinished (TVDevice * tvdevice) { disconnect (scanner, TQ_SIGNAL (scanFinished (TVDevice *)), this, TQ_SLOT (slotScanFinished (TVDevice *))); if (tvdevice) { @@ -609,7 +609,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::slotScanFinished (TVDevice * tvdevice) { KMessageBox::error(m_configpage,i18n("No device found."),i18n("Error")); } -KDE_NO_EXPORT void KMPlayerTVSource::addTVDevicePage(TVDevice *dev, bool show) { +TDE_NO_EXPORT void KMPlayerTVSource::addTVDevicePage(TVDevice *dev, bool show) { if (dev->device_page) dev->device_page->deleteLater (); dev->device_page = new TVDevicePage (m_configpage->notebook, dev); @@ -620,7 +620,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::addTVDevicePage(TVDevice *dev, bool show) { m_configpage->notebook->setCurrentPage (m_configpage->notebook->count ()-1); } -KDE_NO_EXPORT void KMPlayerTVSource::slotDeviceDeleted (TVDevicePage *devpage) { +TDE_NO_EXPORT void KMPlayerTVSource::slotDeviceDeleted (TVDevicePage *devpage) { m_document->removeChild (devpage->device_doc); m_configpage->notebook->setCurrentPage (0); } @@ -631,10 +631,10 @@ KDE_NO_CDTOR_EXPORT TVDeviceScannerSource::TVDeviceScannerSource (KMPlayerTVSour : KMPlayer::Source (i18n ("TVScanner"), src->player (), "tvscanner"), m_tvsource (src), m_tvdevice (0L) { } -KDE_NO_EXPORT void TVDeviceScannerSource::init () { +TDE_NO_EXPORT void TVDeviceScannerSource::init () { } -KDE_NO_EXPORT bool TVDeviceScannerSource::processOutput (const TQString & line) { +TDE_NO_EXPORT bool TVDeviceScannerSource::processOutput (const TQString & line) { if (m_nameRegExp.search (line) > -1) { m_tvdevice->pretty_name = m_nameRegExp.cap (1); m_tvdevice->setAttribute(KMPlayer::StringPool::attr_name,m_tvdevice->pretty_name); @@ -661,19 +661,19 @@ KDE_NO_EXPORT bool TVDeviceScannerSource::processOutput (const TQString & line) return true; } -KDE_NO_EXPORT TQString TVDeviceScannerSource::filterOptions () { +TDE_NO_EXPORT TQString TVDeviceScannerSource::filterOptions () { return TQString (""); } -KDE_NO_EXPORT bool TVDeviceScannerSource::hasLength () { +TDE_NO_EXPORT bool TVDeviceScannerSource::hasLength () { return false; } -KDE_NO_EXPORT bool TVDeviceScannerSource::isSeekable () { +TDE_NO_EXPORT bool TVDeviceScannerSource::isSeekable () { return false; } -KDE_NO_EXPORT bool TVDeviceScannerSource::scan (const TQString & dev, const TQString & dri) { +TDE_NO_EXPORT bool TVDeviceScannerSource::scan (const TQString & dev, const TQString & dri) { if (m_tvdevice) return false; setURL (KURL ("tv://")); @@ -689,13 +689,13 @@ KDE_NO_EXPORT bool TVDeviceScannerSource::scan (const TQString & dev, const TQSt return true; } -KDE_NO_EXPORT void TVDeviceScannerSource::activate () { +TDE_NO_EXPORT void TVDeviceScannerSource::activate () { m_nameRegExp.setPattern ("Selected device:\\s*([^\\s].*)"); m_sizesRegExp.setPattern ("Supported sizes:\\s*([0-9]+)x([0-9]+) => ([0-9]+)x([0-9]+)"); m_inputRegExp.setPattern ("\\s*([0-9]+):\\s*([^:]+):[^\\(]*\\(tuner:([01]),\\s*norm:([^\\)]+)\\)"); } -KDE_NO_EXPORT void TVDeviceScannerSource::deactivate () { +TDE_NO_EXPORT void TVDeviceScannerSource::deactivate () { kdDebug () << "TVDeviceScannerSource::deactivate" << endl; if (m_tvdevice) { if (m_tvdevice->parentNode ()) @@ -705,7 +705,7 @@ KDE_NO_EXPORT void TVDeviceScannerSource::deactivate () { } } -KDE_NO_EXPORT void TVDeviceScannerSource::play () { +TDE_NO_EXPORT void TVDeviceScannerSource::play () { if (!m_tvdevice) return; TQString args; @@ -718,7 +718,7 @@ KDE_NO_EXPORT void TVDeviceScannerSource::play () { deactivate (); } -KDE_NO_EXPORT void TVDeviceScannerSource::stateChange (KMPlayer::Process * p, KMPlayer::Process::State os, KMPlayer::Process::State ns) { +TDE_NO_EXPORT void TVDeviceScannerSource::stateChange (KMPlayer::Process * p, KMPlayer::Process::State os, KMPlayer::Process::State ns) { if (m_tvdevice && // can be deactivated ns == KMPlayer::Process::Ready && os > KMPlayer::Process::Ready) { TVDevice * dev = 0L; diff --git a/src/kmplayertvsource.h b/src/kmplayertvsource.h index 85d2842..09aba96 100644 --- a/src/kmplayertvsource.h +++ b/src/kmplayertvsource.h @@ -137,7 +137,7 @@ public: TVDocument (KMPlayerTVSource *); KMPlayer::NodePtr childFromTag (const TQString &); void defer (); - KDE_NO_EXPORT const char * nodeName () const { return "tvdevices"; } + TDE_NO_EXPORT const char * nodeName () const { return "tvdevices"; } void childDone (KMPlayer::NodePtr child); }; diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp index bcf23d4..56c6f38 100644 --- a/src/kmplayervdr.cpp +++ b/src/kmplayervdr.cpp @@ -107,7 +107,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidg KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::~KMPlayerPrefSourcePageVDR () {} -KDE_NO_EXPORT void KMPlayerPrefSourcePageVDR::showEvent (TQShowEvent *) { +TDE_NO_EXPORT void KMPlayerPrefSourcePageVDR::showEvent (TQShowEvent *) { XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]); if (!xvideo->configDocument ()) xvideo->getConfigData (); @@ -160,19 +160,19 @@ KDE_NO_CDTOR_EXPORT void KMPlayerVDRSource::waitForConnectionClose () { } } -KDE_NO_EXPORT bool KMPlayerVDRSource::hasLength () { +TDE_NO_EXPORT bool KMPlayerVDRSource::hasLength () { return false; } -KDE_NO_EXPORT bool KMPlayerVDRSource::isSeekable () { +TDE_NO_EXPORT bool KMPlayerVDRSource::isSeekable () { return true; } -KDE_NO_EXPORT TQString KMPlayerVDRSource::prettyName () { +TDE_NO_EXPORT TQString KMPlayerVDRSource::prettyName () { return i18n ("VDR"); } -KDE_NO_EXPORT void KMPlayerVDRSource::activate () { +TDE_NO_EXPORT void KMPlayerVDRSource::activate () { last_channel = 0; connect (this, TQ_SIGNAL (startPlaying ()), this, TQ_SLOT (processStarted())); connect (this, TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT (processStopped ())); @@ -195,7 +195,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::activate () { TQTimer::singleShot (0, m_player, TQ_SLOT (play ())); } -KDE_NO_EXPORT void KMPlayerVDRSource::deactivate () { +TDE_NO_EXPORT void KMPlayerVDRSource::deactivate () { disconnect (m_socket, TQ_SIGNAL (error (int)), this, TQ_SLOT (socketError (int))); if (m_player->view ()) { disconnect (this, TQ_SIGNAL(startPlaying()), this, TQ_SLOT(processStarted())); @@ -211,19 +211,19 @@ KDE_NO_EXPORT void KMPlayerVDRSource::deactivate () { m_request_jump.truncate (0); } -KDE_NO_EXPORT void KMPlayerVDRSource::playCurrent () { +TDE_NO_EXPORT void KMPlayerVDRSource::playCurrent () { if (m_player->process ()) m_player->process ()->play (this, current ()); // FIXME HACK } -KDE_NO_EXPORT void KMPlayerVDRSource::processStopped () { +TDE_NO_EXPORT void KMPlayerVDRSource::processStopped () { if (m_socket->state () == TQSocket::Connected) { queueCommand (TQString ("VOLU %1\n").arg (m_stored_volume).ascii ()); queueCommand ("QUIT\n"); } } -KDE_NO_EXPORT void KMPlayerVDRSource::processStarted () { +TDE_NO_EXPORT void KMPlayerVDRSource::processStarted () { m_socket->connectToHost ("127.0.0.1", tcp_port); commands = new VDRCommand ("connect", commands); } @@ -232,7 +232,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::processStarted () { m_actions [i] = new TDEAction (text, TQString (pix), TDEShortcut (scut), this, slot, m_app->actionCollection (), name); \ m_fullscreen_actions [i] = new TDEAction (text, TDEShortcut (scut), this, slot, m_app->view ()->viewArea ()->actionCollection (), name) -KDE_NO_EXPORT void KMPlayerVDRSource::connected () { +TDE_NO_EXPORT void KMPlayerVDRSource::connected () { queueCommand (cmd_list_channels); queueCommand (cmd_volume_query); killTimer (channel_timer); @@ -272,7 +272,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::connected () { #undef DEF_ACT -KDE_NO_EXPORT void KMPlayerVDRSource::disconnected () { +TDE_NO_EXPORT void KMPlayerVDRSource::disconnected () { kdDebug() << "disconnected " << commands << endl; if (finish_timer) { deleteCommands (); @@ -295,7 +295,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::disconnected () { m_app->initMenu (); } -KDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () { +TDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () { if (m_socket->state () == TQSocket::Connected) { queueCommand ("QUIT\n"); killTimer (channel_timer); @@ -306,7 +306,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::toggleConnected () { } } -KDE_NO_EXPORT void KMPlayerVDRSource::volumeChanged (int val) { +TDE_NO_EXPORT void KMPlayerVDRSource::volumeChanged (int val) { queueCommand (TQString ("VOLU %1\n").arg (int (sqrt (255 * 255 * val / 100))).ascii ()); } @@ -317,7 +317,7 @@ static struct ReadBuf { KDE_NO_CDTOR_EXPORT ~ReadBuf () { clear (); } - KDE_NO_EXPORT void operator += (const char * s) { + TDE_NO_EXPORT void operator += (const char * s) { int l = strlen (s); char * b = new char [length + l + 1]; if (length) @@ -327,21 +327,21 @@ static struct ReadBuf { delete buf; buf = b; } - KDE_NO_EXPORT TQCString mid (int p) { + TDE_NO_EXPORT TQCString mid (int p) { return TQCString (buf + p); } - KDE_NO_EXPORT TQCString left (int p) { + TDE_NO_EXPORT TQCString left (int p) { return TQCString (buf, p); } - KDE_NO_EXPORT TQCString getReadLine (); - KDE_NO_EXPORT void clear () { + TDE_NO_EXPORT TQCString getReadLine (); + TDE_NO_EXPORT void clear () { delete [] buf; buf = 0; length = 0; } } readbuf; -KDE_NO_EXPORT TQCString ReadBuf::getReadLine () { +TDE_NO_EXPORT TQCString ReadBuf::getReadLine () { TQCString out; if (!length) return out; @@ -356,7 +356,7 @@ KDE_NO_EXPORT TQCString ReadBuf::getReadLine () { return out; } -KDE_NO_EXPORT void KMPlayerVDRSource::readyRead () { +TDE_NO_EXPORT void KMPlayerVDRSource::readyRead () { KMPlayer::View * v = finish_timer ? 0L : static_cast <KMPlayer::View *> (m_player->view ()); long nr = m_socket->bytesAvailable(); char * data = new char [nr + 1]; @@ -445,7 +445,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::readyRead () { delete [] data; } -KDE_NO_EXPORT void KMPlayerVDRSource::socketError (int code) { +TDE_NO_EXPORT void KMPlayerVDRSource::socketError (int code) { if (code == TQSocket::ErrHostNotFound) { KMessageBox::error (m_configpage, i18n ("Host not found"), i18n ("Error")); } else if (code == TQSocket::ErrConnectionRefused) { @@ -453,7 +453,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::socketError (int code) { } } -KDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd) { +TDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd) { if (m_player->source () != this) return; if (!commands) { @@ -475,13 +475,13 @@ KDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd) { } } -KDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd, int t) { +TDE_NO_EXPORT void KMPlayerVDRSource::queueCommand (const char * cmd, int t) { queueCommand (cmd); killTimer (channel_timer); channel_timer = startTimer (t); } -KDE_NO_EXPORT void KMPlayerVDRSource::sendCommand () { +TDE_NO_EXPORT void KMPlayerVDRSource::sendCommand () { //kdDebug () << "sendCommand " << commands->command << endl; m_socket->writeBlock (commands->command, strlen(commands->command)); m_socket->flush (); @@ -489,7 +489,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::sendCommand () { timeout_timer = startTimer (30000); } -KDE_NO_EXPORT void KMPlayerVDRSource::customCmd () { +TDE_NO_EXPORT void KMPlayerVDRSource::customCmd () { #if KDE_IS_VERSION(3, 1, 90) TQString cmd = KInputDialog::getText (i18n ("Custom VDR command"), i18n ("You can pass commands to VDR.\nEnter 'HELP' to see a list of available commands.\nYou can see VDR response in the console window.\n\nVDR Command:"), TQString(), 0, m_player->view ()); if (!cmd.isEmpty ()) @@ -497,7 +497,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::customCmd () { #endif } -KDE_NO_EXPORT void KMPlayerVDRSource::timerEvent (TQTimerEvent * e) { +TDE_NO_EXPORT void KMPlayerVDRSource::timerEvent (TQTimerEvent * e) { if (e->timerId () == timeout_timer || e->timerId () == finish_timer) { deleteCommands (); } else if (e->timerId () == channel_timer) { @@ -507,7 +507,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::timerEvent (TQTimerEvent * e) { } } -KDE_NO_EXPORT void KMPlayerVDRSource::deleteCommands () { +TDE_NO_EXPORT void KMPlayerVDRSource::deleteCommands () { killTimer (timeout_timer); timeout_timer = 0; killTimer (channel_timer); @@ -523,13 +523,13 @@ KDE_NO_EXPORT void KMPlayerVDRSource::deleteCommands () { } } -KDE_NO_EXPORT void KMPlayerVDRSource::jump (KMPlayer::NodePtr e) { +TDE_NO_EXPORT void KMPlayerVDRSource::jump (KMPlayer::NodePtr e) { if (!e->isPlayable ()) return; m_current = e; jump (e->mrl ()->pretty_name); } -KDE_NO_EXPORT void KMPlayerVDRSource::jump (const TQString & channel) { +TDE_NO_EXPORT void KMPlayerVDRSource::jump (const TQString & channel) { TQCString c ("CHAN "); TQCString ch = channel.local8Bit (); int p = ch.find (' '); @@ -541,99 +541,99 @@ KDE_NO_EXPORT void KMPlayerVDRSource::jump (const TQString & channel) { queueCommand (c); } -KDE_NO_EXPORT void KMPlayerVDRSource::forward () { +TDE_NO_EXPORT void KMPlayerVDRSource::forward () { queueCommand ("CHAN +\n", 1000); } -KDE_NO_EXPORT void KMPlayerVDRSource::backward () { +TDE_NO_EXPORT void KMPlayerVDRSource::backward () { queueCommand ("CHAN -\n", 1000); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyUp () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyUp () { queueCommand ("HITK UP\n", 1000); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyDown () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyDown () { queueCommand ("HITK DOWN\n", 1000); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyBack () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyBack () { queueCommand ("HITK BACK\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyOk () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyOk () { queueCommand ("HITK OK\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::keySetup () { +TDE_NO_EXPORT void KMPlayerVDRSource::keySetup () { queueCommand ("HITK SETUP\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyChannels () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyChannels () { queueCommand ("HITK CHANNELS\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyMenu () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyMenu () { queueCommand ("HITK MENU\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::key0 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key0 () { queueCommand ("HITK 0\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key1 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key1 () { queueCommand ("HITK 1\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key2 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key2 () { queueCommand ("HITK 2\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key3 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key3 () { queueCommand ("HITK 3\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key4 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key4 () { queueCommand ("HITK 4\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key5 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key5 () { queueCommand ("HITK 5\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key6 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key6 () { queueCommand ("HITK 6\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key7 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key7 () { queueCommand ("HITK 7\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key8 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key8 () { queueCommand ("HITK 8\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::key9 () { +TDE_NO_EXPORT void KMPlayerVDRSource::key9 () { queueCommand ("HITK 9\n", 2000); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyRed () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyRed () { queueCommand ("HITK RED\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyGreen () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyGreen () { queueCommand ("HITK GREEN\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyYellow () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyYellow () { queueCommand ("HITK YELLOW\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::keyBlue () { +TDE_NO_EXPORT void KMPlayerVDRSource::keyBlue () { queueCommand ("HITK BLUE\n"); } -KDE_NO_EXPORT void KMPlayerVDRSource::write (TDEConfig * m_config) { +TDE_NO_EXPORT void KMPlayerVDRSource::write (TDEConfig * m_config) { m_config->setGroup (strVDR); m_config->writeEntry (strVDRPort, tcp_port); m_config->writeEntry (strXVPort, m_xvport); @@ -641,7 +641,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::write (TDEConfig * m_config) { m_config->writeEntry (strXVScale, scale); } -KDE_NO_EXPORT void KMPlayerVDRSource::read (TDEConfig * m_config) { +TDE_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); @@ -656,7 +656,7 @@ struct XVTreeItem : public TQListViewItem { int encoding; }; -KDE_NO_EXPORT void KMPlayerVDRSource::sync (bool fromUI) { +TDE_NO_EXPORT void KMPlayerVDRSource::sync (bool fromUI) { XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]); if (fromUI) { tcp_port = m_configpage->tcp_port->text ().toInt (); @@ -714,29 +714,29 @@ KDE_NO_EXPORT void KMPlayerVDRSource::sync (bool fromUI) { } } -KDE_NO_EXPORT void KMPlayerVDRSource::configReceived () { +TDE_NO_EXPORT void KMPlayerVDRSource::configReceived () { XVideo * xvideo = static_cast<XVideo *>(m_player->players()["xvideo"]); disconnect (xvideo, TQ_SIGNAL (configReceived()), this, TQ_SLOT (configReceived())); sync (false); } -KDE_NO_EXPORT void KMPlayerVDRSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { +TDE_NO_EXPORT void KMPlayerVDRSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); icon = TQString ("text-x-src"); tab = i18n ("VDR"); } -KDE_NO_EXPORT TQFrame * KMPlayerVDRSource::prefPage (TQWidget * parent) { +TDE_NO_EXPORT TQFrame * KMPlayerVDRSource::prefPage (TQWidget * parent) { if (!m_configpage) m_configpage = new KMPlayerPrefSourcePageVDR (parent, m_player); return m_configpage; } -KDE_NO_EXPORT bool KMPlayerVDRSource::requestPlayURL (KMPlayer::NodePtr) { +TDE_NO_EXPORT bool KMPlayerVDRSource::requestPlayURL (KMPlayer::NodePtr) { return true; } -KDE_NO_EXPORT void KMPlayerVDRSource::stateElementChanged (KMPlayer::Node *, KMPlayer::Node::State, KMPlayer::Node::State) { +TDE_NO_EXPORT void KMPlayerVDRSource::stateElementChanged (KMPlayer::Node *, KMPlayer::Node::State, KMPlayer::Node::State) { } //----------------------------------------------------------------------------- @@ -753,7 +753,7 @@ KDE_NO_CDTOR_EXPORT XVideo::XVideo (TQObject * parent, Settings * settings) KDE_NO_CDTOR_EXPORT XVideo::~XVideo () {} -KDE_NO_EXPORT bool XVideo::ready (KMPlayer::Viewer * v) { +TDE_NO_EXPORT bool XVideo::ready (KMPlayer::Viewer * v) { if (playing ()) { return true; } diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp index ecad4bb..92c017a 100644 --- a/src/kmplayerview.cpp +++ b/src/kmplayerview.cpp @@ -97,7 +97,7 @@ protected: } // namespace -KDE_NO_EXPORT void KMPlayerPictureWidget::mousePressEvent (TQMouseEvent *) { +TDE_NO_EXPORT void KMPlayerPictureWidget::mousePressEvent (TQMouseEvent *) { m_view->emitPictureClicked (); } @@ -109,7 +109,7 @@ KDE_NO_CDTOR_EXPORT TextEdit::TextEdit (TQWidget * parent, View * view) : TQText setColor (TQColor (0xB2, 0xB2, 0xB2)); } -KDE_NO_EXPORT void TextEdit::contextMenuEvent (TQContextMenuEvent * e) { +TDE_NO_EXPORT void TextEdit::contextMenuEvent (TQContextMenuEvent * e) { m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); } @@ -120,7 +120,7 @@ KDE_NO_CDTOR_EXPORT InfoWindow::InfoWindow (TQWidget * parent, View * view) : TQ setLinkUnderline (false); } -KDE_NO_EXPORT void InfoWindow::contextMenuEvent (TQContextMenuEvent * e) { +TDE_NO_EXPORT void InfoWindow::contextMenuEvent (TQContextMenuEvent * e) { m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); } @@ -148,7 +148,7 @@ KDE_NO_CDTOR_EXPORT View::View (TQWidget *parent, const char *name) m_edit_mode (false) {} -KDE_NO_EXPORT void View::dropEvent (TQDropEvent * de) { +TDE_NO_EXPORT void View::dropEvent (TQDropEvent * de) { KURL::List sl; if (KURLDrag::canDecode (de)) { KURLDrag::decode (de, sl); @@ -166,12 +166,12 @@ KDE_NO_EXPORT void View::dropEvent (TQDropEvent * de) { } } -KDE_NO_EXPORT void View::dragEnterEvent (TQDragEnterEvent* dee) { +TDE_NO_EXPORT void View::dragEnterEvent (TQDragEnterEvent* dee) { if (isDragValid (dee)) dee->accept (); } -KDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) { +TDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) { setBackgroundMode(TQt::NoBackground); // prevents flashing //m_dockarea->setEraseColor (TQColor (0, 0, 0)); TQPalette pal (TQColor (64, 64,64), TQColor (32, 32, 32)); @@ -232,7 +232,7 @@ KDE_NO_CDTOR_EXPORT View::~View () { delete m_view_area; } -KDE_NO_EXPORT void View::setEraseColor (const TQColor & color) { +TDE_NO_EXPORT void View::setEraseColor (const TQColor & color) { KMediaPlayer::View::setEraseColor (color); if (statusBar ()) { statusBar ()->setEraseColor (color); @@ -342,7 +342,7 @@ bool View::setPicture (const TQString & path) { return m_image; } -KDE_NO_EXPORT void View::updateVolume () { +TDE_NO_EXPORT void View::updateVolume () { if (m_mixer_init && !m_volume_slider) return; TQByteArray data, replydata; @@ -434,7 +434,7 @@ void View::setStatusBarMode (StatusBarMode m) { m_view_area->resizeEvent (0L); } -KDE_NO_EXPORT void View::delayedShowButtons (bool show) { +TDE_NO_EXPORT void View::delayedShowButtons (bool show) { if ((show && m_control_panel->isVisible ()) || (!show && !m_control_panel->isVisible ())) { if (controlbar_timer) { @@ -452,7 +452,7 @@ KDE_NO_EXPORT void View::delayedShowButtons (bool show) { } } -KDE_NO_EXPORT void View::setVolume (int vol) { +TDE_NO_EXPORT void View::setVolume (int vol) { if (m_inVolumeUpdate) return; TQByteArray data; TQDataStream arg( data, IO_WriteOnly ); @@ -461,7 +461,7 @@ KDE_NO_EXPORT void View::setVolume (int vol) { kdWarning() << "Failed to update volume" << endl; } -KDE_NO_EXPORT void View::updateLayout () { +TDE_NO_EXPORT void View::updateLayout () { if (m_controlpanel_mode == CP_Only) m_control_panel->setMaximumSize (2500, height ()); m_view_area->resizeEvent (0L); @@ -475,7 +475,7 @@ void View::setKeepSizeRatio (bool b) { } } -KDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) { +TDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) { if (e->timerId () == controlbar_timer) { controlbar_timer = 0; if (m_playing || @@ -541,7 +541,7 @@ void View::addText (const TQString & str, bool eol) { printpainter.end (); }*/ -KDE_NO_EXPORT void View::videoStart () { +TDE_NO_EXPORT void View::videoStart () { if (m_dockarea->getMainDockWidget () != m_dock_video) { // restore from an info or playlist only setting KDockWidget * dw = m_dockarea->getMainDockWidget (); @@ -557,7 +557,7 @@ KDE_NO_EXPORT void View::videoStart () { } } -KDE_NO_EXPORT void View::playingStart () { +TDE_NO_EXPORT void View::playingStart () { if (m_playing) return; //FIXME: make symetric with playingStop if (m_widgetstack->visibleWidget () == m_widgettypes[WT_Picture]) m_widgetstack->raiseWidget (m_viewer); @@ -566,7 +566,7 @@ KDE_NO_EXPORT void View::playingStart () { setControlPanelMode (m_old_controlpanel_mode); } -KDE_NO_EXPORT void View::playingStop () { +TDE_NO_EXPORT void View::playingStop () { if (m_controlpanel_mode == CP_AutoHide && m_widgetstack->visibleWidget () != m_widgettypes[WT_Picture]) { m_control_panel->show (); @@ -581,11 +581,11 @@ KDE_NO_EXPORT void View::playingStop () { m_view_area->resizeEvent (0L); } -KDE_NO_EXPORT void View::leaveEvent (TQEvent *) { +TDE_NO_EXPORT void View::leaveEvent (TQEvent *) { delayedShowButtons (false); } -KDE_NO_EXPORT void View::reset () { +TDE_NO_EXPORT void View::reset () { if (m_revert_fullscreen && isFullScreen()) m_control_panel->popupMenu ()->activateItemAt (m_control_panel->popupMenu ()->indexOf (ControlPanel::menu_fullscreen)); //m_view_area->fullScreen (); @@ -612,7 +612,7 @@ void View::fullScreen () { emit fullScreenChanged (); } -KDE_NO_EXPORT int View::statusBarHeight () const { +TDE_NO_EXPORT int View::statusBarHeight () const { if (statusBar()->isVisible () && !viewArea()->isFullScreen ()) { if (statusBarMode () == SB_Only) return height (); @@ -690,7 +690,7 @@ KDE_NO_CDTOR_EXPORT Viewer::Viewer (TQWidget *parent, View * view) KDE_NO_CDTOR_EXPORT Viewer::~Viewer () { } -KDE_NO_EXPORT void Viewer::changeProtocol (QXEmbed::Protocol p) { +TDE_NO_EXPORT void Viewer::changeProtocol (QXEmbed::Protocol p) { kdDebug () << "changeProtocol " << (int)protocol () << "->" << p << endl; if (!embeddedWinId () || p != protocol ()) { if (p == QXEmbed::XPLAIN) { @@ -719,7 +719,7 @@ KDE_NO_EXPORT void Viewer::changeProtocol (QXEmbed::Protocol p) { } } -KDE_NO_EXPORT void Viewer::windowChanged (WId w) { +TDE_NO_EXPORT void Viewer::windowChanged (WId w) { kdDebug () << "windowChanged " << (int)w << endl; if (w /*&& m_plain_window*/) XSelectInput (tqt_xdisplay (), w, @@ -732,7 +732,7 @@ KDE_NO_EXPORT void Viewer::windowChanged (WId w) { PointerMotionMask); } -KDE_NO_EXPORT void Viewer::mouseMoveEvent (TQMouseEvent * e) { +TDE_NO_EXPORT void Viewer::mouseMoveEvent (TQMouseEvent * e) { if (e->state () == TQt::NoButton) { int cp_height = m_view->controlPanel ()->maximumSize ().height (); m_view->delayedShowButtons (e->y () > height () - cp_height); @@ -744,17 +744,17 @@ void Viewer::setAspect (float a) { m_aspect = a; } -KDE_NO_EXPORT int Viewer::heightForWidth (int w) const { +TDE_NO_EXPORT int Viewer::heightForWidth (int w) const { if (m_aspect <= 0.01) return 0; return int (w/m_aspect); } -KDE_NO_EXPORT void Viewer::dropEvent (TQDropEvent * de) { +TDE_NO_EXPORT void Viewer::dropEvent (TQDropEvent * de) { m_view->dropEvent (de); } -KDE_NO_EXPORT void Viewer::dragEnterEvent (TQDragEnterEvent* dee) { +TDE_NO_EXPORT void Viewer::dragEnterEvent (TQDragEnterEvent* dee) { m_view->dragEnterEvent (dee); } /* @@ -775,7 +775,7 @@ void Viewer::sendKeyEvent (int key) { } } -KDE_NO_EXPORT void Viewer::sendConfigureEvent () { +TDE_NO_EXPORT void Viewer::sendConfigureEvent () { WId w = embeddedWinId (); if (w) { XConfigureEvent c = { @@ -789,22 +789,22 @@ KDE_NO_EXPORT void Viewer::sendConfigureEvent () { } } -KDE_NO_EXPORT void Viewer::contextMenuEvent (TQContextMenuEvent * e) { +TDE_NO_EXPORT void Viewer::contextMenuEvent (TQContextMenuEvent * e) { m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); } -KDE_NO_EXPORT void Viewer::setBackgroundColor (const TQColor & c) { +TDE_NO_EXPORT void Viewer::setBackgroundColor (const TQColor & c) { if (m_bgcolor != c.rgb ()) { m_bgcolor = c.rgb (); setCurrentBackgroundColor (c); } } -KDE_NO_EXPORT void Viewer::resetBackgroundColor () { +TDE_NO_EXPORT void Viewer::resetBackgroundColor () { setCurrentBackgroundColor (m_bgcolor); } -KDE_NO_EXPORT void Viewer::setCurrentBackgroundColor (const TQColor & c) { +TDE_NO_EXPORT void Viewer::setCurrentBackgroundColor (const TQColor & c) { setPaletteBackgroundColor (c); WId w = embeddedWinId (); if (w) { diff --git a/src/kmplayerview.h b/src/kmplayerview.h index 1a2a6fc..a28dd71 100644 --- a/src/kmplayerview.h +++ b/src/kmplayerview.h @@ -78,7 +78,7 @@ private: class InfoWindow : public TQTextEdit { public: InfoWindow (TQWidget * parent, View * view); - KDE_NO_EXPORT View * view () const { return m_view; } + TDE_NO_EXPORT View * view () const { return m_view; } protected: void contextMenuEvent (TQContextMenuEvent * e); private: @@ -111,28 +111,28 @@ public: //void print(TQPrinter *pPrinter); TextEdit * console () const { return m_multiedit; } - KDE_NO_EXPORT Viewer * viewer () const { return m_viewer; } - KDE_NO_EXPORT ControlPanel * controlPanel () const {return m_control_panel;} - KDE_NO_EXPORT StatusBar * statusBar () const {return m_status_bar;} - KDE_NO_EXPORT PlayListView * playList () const { return m_playlist; } - KDE_NO_EXPORT InfoWindow * infoPanel () const { return m_infopanel; } - KDE_NO_EXPORT TQWidgetStack * widgetStack () const { return m_widgetstack; } - KDE_NO_EXPORT KDockArea * docArea () const { return m_dockarea; } - KDE_NO_EXPORT ViewArea * viewArea () const { return m_view_area; } - KDE_NO_EXPORT bool keepSizeRatio () const { return m_keepsizeratio; } + TDE_NO_EXPORT Viewer * viewer () const { return m_viewer; } + TDE_NO_EXPORT ControlPanel * controlPanel () const {return m_control_panel;} + TDE_NO_EXPORT StatusBar * statusBar () const {return m_status_bar;} + TDE_NO_EXPORT PlayListView * playList () const { return m_playlist; } + TDE_NO_EXPORT InfoWindow * infoPanel () const { return m_infopanel; } + TDE_NO_EXPORT TQWidgetStack * widgetStack () const { return m_widgetstack; } + TDE_NO_EXPORT KDockArea * docArea () const { return m_dockarea; } + TDE_NO_EXPORT ViewArea * viewArea () const { return m_view_area; } + TDE_NO_EXPORT bool keepSizeRatio () const { return m_keepsizeratio; } void setKeepSizeRatio (bool b); void showWidget (WidgetType w); void setControlPanelMode (ControlPanelMode m); void setStatusBarMode (StatusBarMode m); void setEraseColor (const TQColor &); - KDE_NO_EXPORT ControlPanelMode controlPanelMode () const { return m_controlpanel_mode; } - KDE_NO_EXPORT StatusBarMode statusBarMode () const { return m_statusbar_mode; } + TDE_NO_EXPORT ControlPanelMode controlPanelMode () const { return m_controlpanel_mode; } + TDE_NO_EXPORT StatusBarMode statusBarMode () const { return m_statusbar_mode; } void delayedShowButtons (bool show); bool isFullScreen () const; int statusBarHeight () const; - KDE_NO_EXPORT bool editMode () const { return m_edit_mode; } + TDE_NO_EXPORT bool editMode () const { return m_edit_mode; } bool setPicture (const TQString & path); - KDE_NO_EXPORT TQPixmap * image () const { return m_image; } + TDE_NO_EXPORT TQPixmap * image () const { return m_image; } void setNoInfoMessages (bool b) { m_no_info = b; } void setViewOnly (); void setInfoPanelOnly (); @@ -140,7 +140,7 @@ public: void setEditMode (RootPlayListItem *, bool enable=true); void dragEnterEvent (TQDragEnterEvent *); void dropEvent (TQDropEvent *); - KDE_NO_EXPORT void emitPictureClicked () { emit pictureClicked (); } + TDE_NO_EXPORT void emitPictureClicked () { emit pictureClicked (); } /* raise video widget, might (auto) hides panel */ void videoStart (); void playingStart (); @@ -161,9 +161,9 @@ signals: void fullScreenChanged (); void windowVideoConsoleToggled (int wt); protected: - void leaveEvent (TQEvent *) KDE_NO_EXPORT; - void timerEvent (TQTimerEvent *) KDE_NO_EXPORT; - bool x11Event (XEvent *) KDE_NO_EXPORT; + void leaveEvent (TQEvent *) TDE_NO_EXPORT; + void timerEvent (TQTimerEvent *) TDE_NO_EXPORT; + bool x11Event (XEvent *) TDE_NO_EXPORT; private: // widget for player's output Viewer * m_viewer; @@ -222,7 +222,7 @@ public: void setBackgroundColor (const TQColor & c); void resetBackgroundColor (); void setCurrentBackgroundColor (const TQColor & c); - KDE_NO_EXPORT View * view () const { return m_view; } + TDE_NO_EXPORT View * view () const { return m_view; } void changeProtocol (QXEmbed::Protocol p); public slots: void sendConfigureEvent (); diff --git a/src/main.cpp b/src/main.cpp index 73854b8..1fcac51 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,7 +41,7 @@ static TDECmdLineOptions options[] = extern "C" { - KDE_EXPORT int kdemain (int argc, char *argv[]) + TDE_EXPORT int kdemain (int argc, char *argv[]) { setsid (); diff --git a/src/playlistview.cpp b/src/playlistview.cpp index 95b0c85..c310491 100644 --- a/src/playlistview.cpp +++ b/src/playlistview.cpp @@ -48,7 +48,7 @@ using namespace KMPlayer; namespace KMPlayer { - KDE_NO_EXPORT bool isDragValid (TQDropEvent * de) { + TDE_NO_EXPORT bool isDragValid (TQDropEvent * de) { if (KURLDrag::canDecode (de)) return true; if (TQTextDrag::canDecode (de)) { @@ -163,7 +163,7 @@ int PlayListView::addTree (NodePtr root, const TQString & source, const TQString return last_id; } -KDE_NO_EXPORT PlayListItem * PlayListView::populate +TDE_NO_EXPORT PlayListItem * PlayListView::populate (NodePtr e, NodePtr focus, RootPlayListItem *root, PlayListItem * pitem, PlayListItem ** curitem) { root->have_dark_nodes |= !e->expose (); if (pitem && !root->show_all_nodes && !e->expose ()) { @@ -280,7 +280,7 @@ void PlayListView::updateTree (int id, NodePtr root, NodePtr active, TQTimer::singleShot (0, this, TQ_SLOT (updateTrees ())); } -KDE_NO_EXPORT void PlayListView::updateTrees () { +TDE_NO_EXPORT void PlayListView::updateTrees () { for (; tree_update; tree_update = tree_update->next) { updateTree (tree_update->root_item, tree_update->node, tree_update->select); if (tree_update->open) // FIXME for non-root nodes lazy loading @@ -319,7 +319,7 @@ void PlayListView::selectItem (const TQString & txt) { } } -KDE_NO_EXPORT TQDragObject * PlayListView::dragObject () { +TDE_NO_EXPORT TQDragObject * PlayListView::dragObject () { PlayListItem * item = static_cast <PlayListItem *> (selectedItem ()); if (item && item->node) { TQString txt = item->node->isPlayable () @@ -335,12 +335,12 @@ KDE_NO_EXPORT TQDragObject * PlayListView::dragObject () { return 0; } -KDE_NO_EXPORT void PlayListView::setFont (const TQFont & fnt) { +TDE_NO_EXPORT void PlayListView::setFont (const TQFont & fnt) { setTreeStepSize (TQFontMetrics (fnt).boundingRect ('m').width ()); TDEListView::setFont (fnt); } -KDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQPoint & p, int) { +TDE_NO_EXPORT void PlayListView::contextMenuItem (TQListViewItem * vi, const TQPoint & p, int) { if (vi) { PlayListItem * item = static_cast <PlayListItem *> (vi); if (item->node || item->m_attr) { @@ -430,7 +430,7 @@ void PlayListView::toggleShowAllNodes () { } } -KDE_NO_EXPORT void PlayListView::showAllNodes(RootPlayListItem *ri, bool show) { +TDE_NO_EXPORT void PlayListView::showAllNodes(RootPlayListItem *ri, bool show) { if (ri && ri->show_all_nodes != show) { PlayListItem * cur_item = currentPlayListItem (); ri->show_all_nodes = show; @@ -445,7 +445,7 @@ KDE_NO_EXPORT void PlayListView::showAllNodes(RootPlayListItem *ri, bool show) { } } -KDE_NO_EXPORT bool PlayListView::acceptDrag (TQDropEvent * de) const { +TDE_NO_EXPORT bool PlayListView::acceptDrag (TQDropEvent * de) const { TQListViewItem * item = itemAt (contentsToViewport (de->pos ())); if (item && (de->source () == this || isDragValid (de))) { RootPlayListItem * ritem = rootItem (item); @@ -454,7 +454,7 @@ KDE_NO_EXPORT bool PlayListView::acceptDrag (TQDropEvent * de) const { return false; } -KDE_NO_EXPORT void PlayListView::itemDropped (TQDropEvent * de, TQListViewItem *after) { +TDE_NO_EXPORT void PlayListView::itemDropped (TQDropEvent * de, TQListViewItem *after) { if (!after) { // could still be a descendent after = itemAt (contentsToViewport (de->pos ())); if (after) @@ -494,7 +494,7 @@ KDE_NO_EXPORT void PlayListView::itemDropped (TQDropEvent * de, TQListViewItem * m_view->dropEvent (de); } -KDE_NO_EXPORT void PlayListView::itemIsRenamed (TQListViewItem * qitem) { +TDE_NO_EXPORT void PlayListView::itemIsRenamed (TQListViewItem * qitem) { PlayListItem * item = static_cast <PlayListItem *> (qitem); if (item->node) { RootPlayListItem * ri = rootItem (qitem); @@ -520,12 +520,12 @@ KDE_NO_EXPORT void PlayListView::itemIsRenamed (TQListViewItem * qitem) { } } -KDE_NO_EXPORT void PlayListView::itemIsSelected (TQListViewItem * qitem) { +TDE_NO_EXPORT void PlayListView::itemIsSelected (TQListViewItem * qitem) { RootPlayListItem * ri = rootItem (qitem); setItemsRenameable (ri && (ri->flags & TreeEdit) && ri != qitem); } -KDE_NO_EXPORT void PlayListView::rename (TQListViewItem * qitem, int c) { +TDE_NO_EXPORT void PlayListView::rename (TQListViewItem * qitem, int c) { PlayListItem * item = static_cast <PlayListItem *> (qitem); if (rootItem (qitem)->show_all_nodes && item && item->m_attr) { PlayListItem * pi = static_cast <PlayListItem *> (qitem->parent ()); @@ -541,7 +541,7 @@ KDE_NO_EXPORT void PlayListView::rename (TQListViewItem * qitem, int c) { } } -KDE_NO_EXPORT void PlayListView::editCurrent () { +TDE_NO_EXPORT void PlayListView::editCurrent () { TQListViewItem * qitem = selectedItem (); if (qitem) { RootPlayListItem * ri = rootItem (qitem); @@ -550,7 +550,7 @@ KDE_NO_EXPORT void PlayListView::editCurrent () { } } -KDE_NO_EXPORT void PlayListView::slotFind () { +TDE_NO_EXPORT void PlayListView::slotFind () { m_current_find_elm = 0L; if (!m_find_dialog) { m_find_dialog = new KFindDialog (false, this, "kde_kmplayer_find", KFindDialog::CaseSensitive); @@ -578,7 +578,7 @@ static TQListViewItem * findNodeInTree (NodePtr n, TQListViewItem * item) { } -KDE_NO_EXPORT void PlayListView::slotFindOk () { +TDE_NO_EXPORT void PlayListView::slotFindOk () { if (!m_find_dialog) return; m_find_dialog->hide (); @@ -610,7 +610,7 @@ KDE_NO_EXPORT void PlayListView::slotFindOk () { /* A bit tricky, but between the find's PlayListItems might be gone, so * try to match on the generated tree following the source's document tree */ -KDE_NO_EXPORT void PlayListView::slotFindNext () { +TDE_NO_EXPORT void PlayListView::slotFindNext () { if (!m_find_dialog) return; TQString str = m_find_dialog->pattern(); diff --git a/src/playlistview.h b/src/playlistview.h index c757aa4..f2909ff 100644 --- a/src/playlistview.h +++ b/src/playlistview.h @@ -158,15 +158,15 @@ private: bool m_ignore_expanded; }; -KDE_NO_EXPORT inline PlayListView * PlayListItem::playListView () const { +TDE_NO_EXPORT inline PlayListView * PlayListItem::playListView () const { return static_cast <PlayListView *> (listView ()); } -KDE_NO_EXPORT inline PlayListItem * PlayListView::currentPlayListItem () const { +TDE_NO_EXPORT inline PlayListItem * PlayListView::currentPlayListItem () const { return static_cast <PlayListItem *> (currentItem ()); } -KDE_NO_EXPORT inline PlayListItem * PlayListView::selectedPlayListItem() const { +TDE_NO_EXPORT inline PlayListItem * PlayListView::selectedPlayListItem() const { return static_cast <PlayListItem *> (selectedItem ()); } diff --git a/src/pref.cpp b/src/pref.cpp index fd030e6..4e28e3a 100644 --- a/src/pref.cpp +++ b/src/pref.cpp @@ -135,7 +135,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti connect (this, TQ_SIGNAL (defaultClicked ()), TQ_SLOT (confirmDefaults ())); } -KDE_NO_EXPORT void Preferences::setPage (const char * name) { +TDE_NO_EXPORT void Preferences::setPage (const char * name) { TQObject * o = child (name, "TQFrame"); if (!o) return; TQFrame * page = static_cast <TQFrame *>(o); @@ -150,7 +150,7 @@ KDE_NO_EXPORT void Preferences::setPage (const char * name) { showPage (pageIndex (t->parentWidget ())); } -KDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) { +TDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) { TQString item, subitem, icon; TQFrame * frame; TQTabWidget * tab; @@ -171,7 +171,7 @@ KDE_NO_EXPORT void Preferences::addPrefPage (PreferencesPage * page) { tab->insertTab (frame, subitem); } -KDE_NO_EXPORT void Preferences::removePrefPage(PreferencesPage * page) { +TDE_NO_EXPORT void Preferences::removePrefPage(PreferencesPage * page) { TQString item, subitem, icon; page->prefLocation (item, icon, subitem); if (item.isEmpty ()) @@ -301,22 +301,22 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageLooks::PrefGeneralPageLooks (TQWidget *parent layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); } -KDE_NO_EXPORT void PrefGeneralPageLooks::colorItemChanged (int c) { +TDE_NO_EXPORT void PrefGeneralPageLooks::colorItemChanged (int c) { if (c < int (ColorSetting::last_target)) colorbutton->setColor (colors[c].newcolor); } -KDE_NO_EXPORT void PrefGeneralPageLooks::colorCanged (const TQColor & c) { +TDE_NO_EXPORT void PrefGeneralPageLooks::colorCanged (const TQColor & c) { if (colorscombo->currentItem () < int (ColorSetting::last_target)) colors[colorscombo->currentItem ()].newcolor = c; } -KDE_NO_EXPORT void PrefGeneralPageLooks::fontItemChanged (int f) { +TDE_NO_EXPORT void PrefGeneralPageLooks::fontItemChanged (int f) { if (f < int (FontSetting::last_target)) fontbutton->setFont (fonts[f].newfont); } -KDE_NO_EXPORT void PrefGeneralPageLooks::fontClicked () { +TDE_NO_EXPORT void PrefGeneralPageLooks::fontClicked () { if (fontscombo->currentItem () < int (FontSetting::last_target)) { TQFont myfont = fonts [fontscombo->currentItem ()].newfont; int res = TDEFontDialog::getFont (myfont, false, this); @@ -387,10 +387,10 @@ KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent) this, TQ_SLOT (slotTextChanged (const TQString &))); } -KDE_NO_EXPORT void PrefSourcePageURL::slotBrowse () { +TDE_NO_EXPORT void PrefSourcePageURL::slotBrowse () { } -KDE_NO_EXPORT void PrefSourcePageURL::slotTextChanged (const TQString &) { +TDE_NO_EXPORT void PrefSourcePageURL::slotTextChanged (const TQString &) { changed = true; } @@ -439,19 +439,19 @@ KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase * connect (replay, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (replayClicked (int))); } -KDE_NO_EXPORT void PrefRecordPage::recordingStarted () { +TDE_NO_EXPORT void PrefRecordPage::recordingStarted () { recordButton->setText (i18n ("Stop Recording")); url->setEnabled (false); topLevelWidget ()->hide (); } -KDE_NO_EXPORT void PrefRecordPage::recordingFinished () { +TDE_NO_EXPORT void PrefRecordPage::recordingFinished () { recordButton->setText (i18n ("Start Recording")); url->setEnabled (true); TQTimer::singleShot (0, m_player, TQ_SLOT(recordingStopped())); // removed from PartBase::setSource because PartBase::recordingStopped calls openURL and that will call PartBase::setSource and TQt doesn't like disconnecting/connecting a signal that is current } -KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) { +TDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) { int id = 0; int nr_recs = 0; if (olds) { @@ -472,7 +472,7 @@ KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) { recordButton->setEnabled (nr_recs > 0); } -KDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) { +TDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) { bool b = false; TQButton *recBtn = recorder->find(id); if (recBtn) @@ -485,11 +485,11 @@ KDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) { } -KDE_NO_EXPORT void PrefRecordPage::replayClicked (int id) { +TDE_NO_EXPORT void PrefRecordPage::replayClicked (int id) { replaytime->setEnabled (id == Settings::ReplayAfter); } -KDE_NO_EXPORT void PrefRecordPage::slotRecord () { +TDE_NO_EXPORT void PrefRecordPage::slotRecord () { connect (m_player->source (), TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT (playingStopped ())); if (m_player->process () && m_player->process ()->playing ()) @@ -498,7 +498,7 @@ KDE_NO_EXPORT void PrefRecordPage::slotRecord () { playingStopped (); } -KDE_NO_EXPORT void PrefRecordPage::playingStopped () { +TDE_NO_EXPORT void PrefRecordPage::playingStopped () { disconnect (m_player->source (), TQ_SIGNAL (stopPlaying ()), this, TQ_SLOT (playingStopped ())); if (!url->lineEdit()->text().isEmpty()) { @@ -524,7 +524,7 @@ KDE_NO_EXPORT void PrefRecordPage::playingStopped () { KDE_NO_CDTOR_EXPORT RecorderPage::RecorderPage (TQWidget *parent, PartBase * player) : TQFrame (parent), next (0L), m_player (player) {} -KDE_NO_EXPORT void RecorderPage::record () { +TDE_NO_EXPORT void RecorderPage::record () { Process * proc = m_player->recorders () [recorderName ()]; m_player->setRecorder (recorderName ()); Recorder * rec = dynamic_cast <Recorder *> (proc); @@ -556,11 +556,11 @@ KDE_NO_CDTOR_EXPORT PrefMEncoderPage::PrefMEncoderPage (TQWidget *parent, PartBa connect (format, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (formatClicked (int))); } -KDE_NO_EXPORT void PrefMEncoderPage::formatClicked (int id) { +TDE_NO_EXPORT void PrefMEncoderPage::formatClicked (int id) { arguments->setEnabled (!!id); } -KDE_NO_EXPORT void PrefMEncoderPage::record () { +TDE_NO_EXPORT void PrefMEncoderPage::record () { #if KDE_IS_VERSION(3,1,90) m_player->settings ()->recordcopy = !format->selectedId (); #else @@ -570,7 +570,7 @@ KDE_NO_EXPORT void PrefMEncoderPage::record () { RecorderPage::record (); } -KDE_NO_EXPORT TQString PrefMEncoderPage::name () { +TDE_NO_EXPORT TQString PrefMEncoderPage::name () { return i18n ("&MEncoder"); } @@ -578,7 +578,7 @@ KDE_NO_CDTOR_EXPORT PrefMPlayerDumpstreamPage::PrefMPlayerDumpstreamPage (TQWidg hide(); } -KDE_NO_EXPORT TQString PrefMPlayerDumpstreamPage::name () { +TDE_NO_EXPORT TQString PrefMPlayerDumpstreamPage::name () { return i18n ("MPlayer -&dumpstream"); } @@ -593,12 +593,12 @@ KDE_NO_CDTOR_EXPORT PrefFFMpegPage::PrefFFMpegPage (TQWidget *parent, PartBase * layout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); } -KDE_NO_EXPORT void PrefFFMpegPage::record () { +TDE_NO_EXPORT void PrefFFMpegPage::record () { m_player->settings ()->ffmpegarguments = arguments->text (); RecorderPage::record (); } -KDE_NO_EXPORT TQString PrefFFMpegPage::name () { +TDE_NO_EXPORT TQString PrefFFMpegPage::name () { return i18n ("&FFMpeg"); } @@ -607,7 +607,7 @@ KDE_NO_CDTOR_EXPORT PrefXinePage::PrefXinePage (TQWidget *parent, PartBase * pla hide(); } -KDE_NO_EXPORT TQString PrefXinePage::name () { +TDE_NO_EXPORT TQString PrefXinePage::name () { return i18n ("&Xine"); } #endif @@ -834,7 +834,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T PostprocessingOptions->adjustSize(); } -KDE_NO_EXPORT void Preferences::confirmDefaults() { +TDE_NO_EXPORT void Preferences::confirmDefaults() { // TODO: Switch to KMessageBox switch( TQMessageBox::warning( this, i18n("Reset Settings?"), i18n("You are about to have all your settings overwritten with defaults.\nPlease confirm.\n"), @@ -846,7 +846,7 @@ KDE_NO_EXPORT void Preferences::confirmDefaults() { } -KDE_NO_EXPORT void Preferences::setDefaults() { +TDE_NO_EXPORT void Preferences::setDefaults() { m_GeneralPageGeneral->keepSizeRatio->setChecked(true); m_GeneralPageGeneral->loop->setChecked(false); m_GeneralPageGeneral->seekTime->setValue(10); diff --git a/src/triestring.cpp b/src/triestring.cpp index e07f8a7..93255ab 100644 --- a/src/triestring.cpp +++ b/src/triestring.cpp @@ -20,7 +20,7 @@ #ifdef TEST_TRIE # define KMPLAYER_NO_EXPORT # define KMPLAYER_EXPORT -# define KDE_NO_EXPORT +# define TDE_NO_EXPORT # define KDE_NO_CDTOR_EXPORT #else # include <config.h> @@ -79,12 +79,12 @@ KDE_NO_CDTOR_EXPORT TrieNode::~TrieNode () { free (str); } -KDE_NO_EXPORT void TrieNode::unref () { +TDE_NO_EXPORT void TrieNode::unref () { if (--ref_count <= 0 && !first_child) parent->removeChild (this); } -KDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) { +TDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) { if (node == first_child) { first_child = node->next_sibling; } else { diff --git a/src/viewarea.cpp b/src/viewarea.cpp index c76af9b..8a5c1f9 100644 --- a/src/viewarea.cpp +++ b/src/viewarea.cpp @@ -173,7 +173,7 @@ SurfacePtr ViewSurface::createSurface (NodePtr owner, const SRect & rect) { return surface; } -KDE_NO_EXPORT void ViewSurface::resize (const SRect &r) { +TDE_NO_EXPORT void ViewSurface::resize (const SRect &r) { bounds = r; #ifdef HAVE_CAIRO if (surface) @@ -185,7 +185,7 @@ KDE_NO_EXPORT void ViewSurface::resize (const SRect &r) { rect = nrect;*/ } -KDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single h) { +TDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single h) { Matrix matrix (0, 0, xscale, yscale); matrix.translate (bounds.x (), bounds.y ()); for (SurfacePtr s = parentNode(); s; s = s->parentNode()) { @@ -196,20 +196,20 @@ KDE_NO_EXPORT IRect ViewSurface::toScreen (Single x, Single y, Single w, Single return IRect (x, y, w, h); } -KDE_NO_EXPORT +TDE_NO_EXPORT void ViewSurface::repaint (const SRect &r) { markDirty (); view_widget->scheduleRepaint (toScreen (r.x (), r.y (), r.width (), r.height ())); //kdDebug() << "Surface::repaint x:" << (int)x << " y:" << (int)y << " w:" << (int)w << " h:" << (int)h << endl; } -KDE_NO_EXPORT +TDE_NO_EXPORT void ViewSurface::repaint () { markDirty (); view_widget->scheduleRepaint (toScreen (0, 0, bounds.width (), bounds.height ())); } -KDE_NO_EXPORT void ViewSurface::video () { +TDE_NO_EXPORT void ViewSurface::video () { view_widget->setAudioVideoNode (node); kdDebug() << "Surface::video:" << background_color << " " << (background_color & 0xff000000) << endl; xscale = yscale = 1; // either scale width/heigt or use bounds @@ -315,11 +315,11 @@ KDE_NO_CDTOR_EXPORT CairoPaintVisitor::~CairoPaintVisitor () { cairo_destroy (cr); } -KDE_NO_EXPORT void CairoPaintVisitor::visit (Node * n) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (Node * n) { kdWarning() << "Paint called on " << n->nodeName() << endl; } -KDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) { +TDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) { // next visit listeners NodeRefListPtr nl = reg->listeners (mediatype_attached); if (nl) { @@ -346,7 +346,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::traverseRegion (SMIL::RegionBase * reg) { r->data->accept (this); } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Layout * reg) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Layout * reg) { //kdDebug() << "Visit " << reg->nodeName() << endl; SMIL::RegionBase *rb = convertNode <SMIL::RegionBase> (reg->rootLayout); if (reg->surface () && rb) { @@ -382,7 +382,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Layout * reg) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Region * reg) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Region * reg) { Surface *s = reg->surface (); if (s) { SRect rect = s->bounds; @@ -441,7 +441,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Region * reg) { cairo_set_source (cr, pat); \ } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Transition *trans) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Transition *trans) { float perc = trans->start_progress + (trans->end_progress - trans->start_progress)*cur_media->trans_step / cur_media->trans_steps; if (cur_media->trans_out_active) perc = 1.0 - perc; @@ -588,7 +588,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Transition *trans) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::RefMediaType *ref) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::RefMediaType *ref) { Surface *s = ref->surface (); if (s) { if (ref->external_tree) @@ -598,7 +598,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::RefMediaType *ref) { } } -KDE_NO_EXPORT void CairoPaintVisitor::paint (SMIL::MediaType *mt, Surface *s, +TDE_NO_EXPORT void CairoPaintVisitor::paint (SMIL::MediaType *mt, Surface *s, int x, int y, const IRect &rect) { cairo_save (cr); opacity = 1.0; @@ -628,7 +628,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::paint (SMIL::MediaType *mt, Surface *s, cairo_restore (cr); } -KDE_NO_EXPORT +TDE_NO_EXPORT void CairoPaintVisitor::updateExternal (SMIL::MediaType *av, SurfacePtr s) { SRect rect = s->bounds; Single x = rect.x (); @@ -656,7 +656,7 @@ void CairoPaintVisitor::updateExternal (SMIL::MediaType *av, SurfacePtr s) { paint (av, s.ptr (), x, y, clip_rect); } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::AVMediaType *av) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::AVMediaType *av) { Surface *s = av->surface (); if (s) { if (av->external_tree) @@ -666,7 +666,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::AVMediaType *av) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::ImageMediaType * img) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::ImageMediaType * img) { //kdDebug() << "Visit " << img->nodeName() << " " << img->src << endl; Surface *s = img->surface (); if (!s) @@ -696,7 +696,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::ImageMediaType * img) { s->dirty = false; } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::TextMediaType * txt) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::TextMediaType * txt) { TextRuntime * td = static_cast <TextRuntime *> (txt->runtime ()); Surface *s = txt->surface (); //kdDebug() << "Visit " << txt->nodeName() << " " << td->text << endl; @@ -844,7 +844,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::TextMediaType * txt) { s->dirty = false; } -KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Brush * brush) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Brush * brush) { //kdDebug() << "Visit " << brush->nodeName() << endl; Surface *s = brush->surface (); if (s) { @@ -876,7 +876,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (SMIL::Brush * brush) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Imfl * imfl) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Imfl * imfl) { if (imfl->surface ()) { cairo_save (cr); Matrix m = matrix; @@ -926,7 +926,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Imfl * imfl) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fill * fi) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fill * fi) { //kdDebug() << "Visit " << fi->nodeName() << endl; CAIRO_SET_SOURCE_RGB (cr, fi->color); if ((int)fi->w && (int)fi->h) { @@ -935,7 +935,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fill * fi) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadein * fi) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadein * fi) { //kdDebug() << "Visit " << fi->nodeName() << endl; if (fi->target && fi->target->id == RP::id_node_image) { RP::Image *img = convertNode <RP::Image> (fi->target); @@ -971,7 +971,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadein * fi) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadeout * fo) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadeout * fo) { //kdDebug() << "Visit " << fo->nodeName() << endl; if (fo->progress > 0) { CAIRO_SET_SOURCE_RGB (cr, fo->to_color); @@ -985,7 +985,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Fadeout * fo) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Crossfade * cf) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Crossfade * cf) { //kdDebug() << "Visit " << cf->nodeName() << endl; if (cf->target && cf->target->id == RP::id_node_image) { RP::Image *img = convertNode <RP::Image> (cf->target); @@ -1021,7 +1021,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Crossfade * cf) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Wipe * wipe) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Wipe * wipe) { //kdDebug() << "Visit " << wipe->nodeName() << endl; if (wipe->target && wipe->target->id == RP::id_node_image) { RP::Image *img = convertNode <RP::Image> (wipe->target); @@ -1077,7 +1077,7 @@ KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::Wipe * wipe) { } } -KDE_NO_EXPORT void CairoPaintVisitor::visit (RP::ViewChange * vc) { +TDE_NO_EXPORT void CairoPaintVisitor::visit (RP::ViewChange * vc) { //kdDebug() << "Visit " << vc->nodeName() << endl; if (vc->unfinished () || vc->progress < 100) { cairo_pattern_t * pat = cairo_pop_group (cr); // from imfl @@ -1139,11 +1139,11 @@ MouseVisitor::MouseVisitor (unsigned int evt, int a, int b) : event (evt), x (a), y (b), handled (false), bubble_up (false) { } -KDE_NO_EXPORT void MouseVisitor::visit (Node * n) { +TDE_NO_EXPORT void MouseVisitor::visit (Node * n) { kdDebug () << "Mouse event ignored for " << n->nodeName () << endl; } -KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) { +TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) { if (layout->surface ()) { Matrix m = matrix; SRect rect = layout->region_surface->bounds; @@ -1165,7 +1165,7 @@ KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Layout * layout) { } } -KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Region * region) { +TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Region * region) { if (region->surface ()) { SRect rect = region->region_surface->bounds; Single rx = rect.x(), ry = rect.y(), rw = rect.width(), rh = rect.height(); @@ -1243,14 +1243,14 @@ static void followLink (SMIL::LinkingBase * link) { } } -KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Anchor * anchor) { +TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Anchor * anchor) { if (event == event_pointer_moved) cursor.setShape (TQt::PointingHandCursor); else if (event == event_pointer_clicked) followLink (anchor); } -KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Area * area) { +TDE_NO_EXPORT void MouseVisitor::visit (SMIL::Area * area) { NodePtr n = area->parentNode (); if (n->id >= SMIL::id_node_first_mediatype && n->id < SMIL::id_node_last_mediatype) { @@ -1293,11 +1293,11 @@ KDE_NO_EXPORT void MouseVisitor::visit (SMIL::Area * area) { } } -KDE_NO_EXPORT void MouseVisitor::visit (SMIL::TimedMrl * timedmrl) { +TDE_NO_EXPORT void MouseVisitor::visit (SMIL::TimedMrl * timedmrl) { timedmrl->runtime ()->processEvent (event); } -KDE_NO_EXPORT void MouseVisitor::visit (SMIL::MediaType * mediatype) { +TDE_NO_EXPORT void MouseVisitor::visit (SMIL::MediaType * mediatype) { if (mediatype->sensitivity == SMIL::MediaType::sens_transparent) { bubble_up = true; return; @@ -1362,7 +1362,7 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * parent, View * view) KDE_NO_CDTOR_EXPORT ViewArea::~ViewArea () { } -KDE_NO_EXPORT void ViewArea::fullScreen () { +TDE_NO_EXPORT void ViewArea::fullScreen () { this->killTimers (); m_mouse_invisible_timer = m_repaint_timer = 0; if (m_fullscreen) { @@ -1428,11 +1428,11 @@ void ViewArea::minimalMode () { m_topwindow_rect = topLevelWidget ()->geometry (); } -KDE_NO_EXPORT void ViewArea::accelActivated () { +TDE_NO_EXPORT void ViewArea::accelActivated () { m_view->controlPanel()->popupMenu ()->activateItemAt (m_view->controlPanel()->popupMenu ()->indexOf (ControlPanel::menu_fullscreen)); } -KDE_NO_EXPORT void ViewArea::mousePressEvent (TQMouseEvent * e) { +TDE_NO_EXPORT void ViewArea::mousePressEvent (TQMouseEvent * e) { if (surface->node) { MouseVisitor visitor (event_pointer_clicked, e->x(), e->y()); surface->node->accept (&visitor); @@ -1440,11 +1440,11 @@ KDE_NO_EXPORT void ViewArea::mousePressEvent (TQMouseEvent * e) { e->accept (); } -KDE_NO_EXPORT void ViewArea::mouseDoubleClickEvent (TQMouseEvent *) { +TDE_NO_EXPORT void ViewArea::mouseDoubleClickEvent (TQMouseEvent *) { m_view->fullScreen (); // screensaver stuff } -KDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) { +TDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) { if (e->state () == TQt::NoButton) { int vert_buttons_pos = height () - m_view->statusBarHeight (); int cp_height = m_view->controlPanel ()->maximumSize ().height (); @@ -1460,7 +1460,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) { mouseMoved (); // for m_mouse_invisible_timer } -KDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) { +TDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) { #ifdef HAVE_CAIRO int ex = rect.x; if (ex > 0) @@ -1490,7 +1490,7 @@ KDE_NO_EXPORT void ViewArea::syncVisual (const IRect & rect) { //XFlush (tqt_xdisplay ()); } -KDE_NO_EXPORT void ViewArea::paintEvent (TQPaintEvent * pe) { +TDE_NO_EXPORT void ViewArea::paintEvent (TQPaintEvent * pe) { #ifdef HAVE_CAIRO if (surface->node) scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ())); @@ -1499,12 +1499,12 @@ KDE_NO_EXPORT void ViewArea::paintEvent (TQPaintEvent * pe) { TQWidget::paintEvent (pe); } -KDE_NO_EXPORT void ViewArea::scale (int val) { +TDE_NO_EXPORT void ViewArea::scale (int val) { m_fullscreen_scale = val; resizeEvent (0L); } -KDE_NO_EXPORT void ViewArea::updateSurfaceBounds () { +TDE_NO_EXPORT void ViewArea::updateSurfaceBounds () { Single x, y, w = width (), h = height (); h -= m_view->statusBarHeight (); h -= m_view->controlPanel ()->isVisible () @@ -1538,7 +1538,7 @@ KDE_NO_EXPORT void ViewArea::updateSurfaceBounds () { scheduleRepaint (IRect (0, 0, width (), height ())); } -KDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) { +TDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) { if (!m_view->controlPanel ()) return; Single x, y, w = width (), h = height (); Single hsb = m_view->statusBarHeight (); @@ -1576,7 +1576,7 @@ KDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) { setAudioVideoGeometry (IRect (x, y, wws, hws), 0L); } -KDE_NO_EXPORT +TDE_NO_EXPORT void ViewArea::setAudioVideoGeometry (const IRect &rect, unsigned int * bg_color) { int x = rect.x, y = rect.y, w = rect.w, h = rect.h; if (m_view->controlPanelMode() == View::CP_Only) { @@ -1609,11 +1609,11 @@ void ViewArea::setAudioVideoGeometry (const IRect &rect, unsigned int * bg_color } } -KDE_NO_EXPORT void ViewArea::setAudioVideoNode (NodePtr n) { +TDE_NO_EXPORT void ViewArea::setAudioVideoNode (NodePtr n) { video_node = n; } -KDE_NO_EXPORT SurfacePtr ViewArea::getSurface (NodePtr node) { +TDE_NO_EXPORT SurfacePtr ViewArea::getSurface (NodePtr node) { static_cast <ViewSurface *> (surface.ptr ())->clear (); surface->node = node; m_view->viewer()->resetBackgroundColor (); @@ -1625,23 +1625,23 @@ KDE_NO_EXPORT SurfacePtr ViewArea::getSurface (NodePtr node) { return 0L; } -KDE_NO_EXPORT void ViewArea::showEvent (TQShowEvent *) { +TDE_NO_EXPORT void ViewArea::showEvent (TQShowEvent *) { resizeEvent (0L); } -KDE_NO_EXPORT void ViewArea::dropEvent (TQDropEvent * de) { +TDE_NO_EXPORT void ViewArea::dropEvent (TQDropEvent * de) { m_view->dropEvent (de); } -KDE_NO_EXPORT void ViewArea::dragEnterEvent (TQDragEnterEvent* dee) { +TDE_NO_EXPORT void ViewArea::dragEnterEvent (TQDragEnterEvent* dee) { m_view->dragEnterEvent (dee); } -KDE_NO_EXPORT void ViewArea::contextMenuEvent (TQContextMenuEvent * e) { +TDE_NO_EXPORT void ViewArea::contextMenuEvent (TQContextMenuEvent * e) { m_view->controlPanel ()->popupMenu ()->exec (e->globalPos ()); } -KDE_NO_EXPORT void ViewArea::mouseMoved () { +TDE_NO_EXPORT void ViewArea::mouseMoved () { if (m_fullscreen) { if (m_mouse_invisible_timer) killTimer (m_mouse_invisible_timer); @@ -1650,7 +1650,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoved () { } } -KDE_NO_EXPORT void ViewArea::scheduleRepaint (const IRect &rect) { +TDE_NO_EXPORT void ViewArea::scheduleRepaint (const IRect &rect) { if (m_repaint_timer) { m_repaint_rect = m_repaint_rect.unite (rect); } else { @@ -1659,7 +1659,7 @@ KDE_NO_EXPORT void ViewArea::scheduleRepaint (const IRect &rect) { } } -KDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) { +TDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) { if (e->timerId () == m_mouse_invisible_timer) { killTimer (m_mouse_invisible_timer); m_mouse_invisible_timer = 0; @@ -1676,7 +1676,7 @@ KDE_NO_EXPORT void ViewArea::timerEvent (TQTimerEvent * e) { } } -KDE_NO_EXPORT void ViewArea::closeEvent (TQCloseEvent * e) { +TDE_NO_EXPORT void ViewArea::closeEvent (TQCloseEvent * e) { //kdDebug () << "closeEvent" << endl; if (m_fullscreen) { fullScreen (); diff --git a/src/viewarea.h b/src/viewarea.h index 34c1e97..502d7d0 100644 --- a/src/viewarea.h +++ b/src/viewarea.h @@ -38,10 +38,10 @@ class KMPLAYER_EXPORT ViewArea : public TQWidget { public: ViewArea (TQWidget * parent, View * view); ~ViewArea (); - KDE_NO_EXPORT bool isFullScreen () const { return m_fullscreen; } - KDE_NO_EXPORT bool isMinimalMode () const { return m_minimal; } - KDE_NO_EXPORT TDEActionCollection * actionCollection () const { return m_collection; } - KDE_NO_EXPORT TQRect topWindowRect () const { return m_topwindow_rect; } + TDE_NO_EXPORT bool isFullScreen () const { return m_fullscreen; } + TDE_NO_EXPORT bool isMinimalMode () const { return m_minimal; } + TDE_NO_EXPORT TDEActionCollection * actionCollection () const { return m_collection; } + TDE_NO_EXPORT TQRect topWindowRect () const { return m_topwindow_rect; } SurfacePtr getSurface (NodePtr node); void setAudioVideoGeometry (const IRect &rect, unsigned int * bg); void setAudioVideoNode (NodePtr n); |