TDE
/
kmplayer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmplayer
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmplayer@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 63c4fb318b
commit cdbd0571ba
33 changed files with 279 additions and 279 deletions
Show Stats Download Patch File Download Diff File

18
src/gstplayer.cpp
Unescape View File

@ -75,7 +75,7 @@ static const char *dvd_device;
static const char *vcd_device;
static GstElement *gst_elm_play;
static GstBus *gst_bus;
static unsigned int /*GstMessageType*/ ignore_messages_tqmask;
static unsigned int /*GstMessageType*/ ignore_messages_mask;
static GstXOverlay *xoverlay;
static GstColorBalance *color_balance;
static gulong gst_bus_sync;
@ -217,7 +217,7 @@ static void gstTag (const GstTagList *, const gchar *tag, gpointer) {
static void gstBusMessage (GstBus *, GstMessage * message, gpointer) {
GstMessageType msg_type = GST_MESSAGE_TYPE (message);
/* somebody else is handling the message, probably in gstPolForStateChange*/
if (ignore_messages_tqmask & msg_type)
if (ignore_messages_mask & msg_type)
return;
switch (msg_type) {
case GST_MESSAGE_ERROR:
@ -310,14 +310,14 @@ static bool gstPollForStateChange (GstElement *element, GstState state, gint64 t
GError **error = 0L;
events = GST_MESSAGE_STATE_CHANGED | GST_MESSAGE_ERROR | GST_MESSAGE_EOS;
saved_events = ignore_messages_tqmask;
saved_events = ignore_messages_mask;
if (element && element == gst_elm_play) {
/* we do want the main handler to process state changed messages for
* playbin as well, otherwise it won't hook up the timeout etc. */
ignore_messages_tqmask |= (events ^ GST_MESSAGE_STATE_CHANGED);
ignore_messages_mask |= (events ^ GST_MESSAGE_STATE_CHANGED);
} else {
ignore_messages_tqmask |= events;
ignore_messages_mask |= events;
}
while (true) {
@ -367,14 +367,14 @@ static bool gstPollForStateChange (GstElement *element, GstState state, gint64 t
success:
/* state change succeeded */
fprintf (stderr, "state change to %s succeeded\n", gst_element_state_get_name (state));
ignore_messages_tqmask = saved_events;
ignore_messages_mask = saved_events;
return true;
timed_out:
/* it's taking a long time to open -- just tell totem it was ok, this allows
* the user to stop the loading process with the normal stop button */
fprintf (stderr, "state change to %s timed out, returning success and handling errors asynchroneously\n", gst_element_state_get_name (state));
ignore_messages_tqmask = saved_events;
ignore_messages_mask = saved_events;
return true;
error:
@ -382,7 +382,7 @@ error:
gst_element_state_get_name (state),
(error && *error) ? (*error)->message : "unknown");
/* already set *error */
ignore_messages_tqmask = saved_events;
ignore_messages_mask = saved_events;
TQApplication::postEvent (gstapp, new TQEvent ((TQEvent::Type) event_error));
return false;
}
@ -573,7 +573,7 @@ void KGStreamerPlayer::play (int repeat) {
fprintf (stderr, "couldn't create playbin\n");
goto fail;
}
ignore_messages_tqmask = 0;
ignore_messages_mask = 0;
gst_bus = gst_element_get_bus (gst_elm_play);
gst_bus_add_signal_watch (gst_bus);

2
src/kmplayer.h
Unescape View File

@ -61,7 +61,7 @@ class KMPlayerApp : public KMainWindow
TQ_OBJECT
public:
KMPlayerApp (TQWidget* tqparent=0, const char* name=0);
KMPlayerApp (TQWidget* parent=0, const char* name=0);
~KMPlayerApp ();
void openDocumentFile (const KURL& url=KURL());
void addURL (const KURL& url);

26
src/kmplayer_koffice_part.cpp
Unescape View File

@ -60,7 +60,7 @@ public:
KMPlayerFactory ();
virtual ~KMPlayerFactory ();
virtual KParts::Part *createPartObject
(TQWidget *wtqparent, const char *wname, TQObject *tqparent, const char *name,
(TQWidget *wparent, const char *wname, TQObject *parent, const char *name,
const char *className, const TQStringList &args);
static KInstance * instance () { return s_instance; }
private:
@ -80,19 +80,19 @@ KMPlayerFactory::~KMPlayerFactory () {
}
KParts::Part *KMPlayerFactory::createPartObject
(TQWidget *wtqparent, const char *wname,
TQObject *tqparent, const char * name,
(TQWidget *wparent, const char *wname,
TQObject *parent, const char * name,
const char * cls, const TQStringList & args) {
if (strstr (cls, "KoDocument"))
return new KOfficeMPlayer (wtqparent, wname, tqparent, name);
return new KOfficeMPlayer (wparent, wname, parent, name);
return 0L;
}
//-----------------------------------------------------------------------------
KOfficeMPlayer::KOfficeMPlayer (TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode)
: KoDocument (parentWidget, widgetName, tqparent, name, singleViewMode),
KOfficeMPlayer::KOfficeMPlayer (TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode)
: KoDocument (parentWidget, widgetName, parent, name, singleViewMode),
m_config (new KConfig ("kmplayerrc")),
m_player (new KMPlayer (parentWidget, 0L, 0L, 0L, m_config))
{
@ -144,16 +144,16 @@ TQDomDocument KOfficeMPlayer::saveXML() {
return doc;
}
KoView* KOfficeMPlayer::createViewInstance (TQWidget* tqparent, const char* name) {
KoView* KOfficeMPlayer::createViewInstance (TQWidget* parent, const char* name) {
kdDebug() << "KOfficeMPlayer::createViewInstance" << endl;
return new KOfficeMPlayerView (this, tqparent);
return new KOfficeMPlayerView (this, parent);
}
KOfficeMPlayerView::KOfficeMPlayerView (KOfficeMPlayer* part, TQWidget* tqparent, const char* name)
: KoView (part, tqparent, name),
KOfficeMPlayerView::KOfficeMPlayerView (KOfficeMPlayer* part, TQWidget* parent, const char* name)
: KoView (part, parent, name),
m_view (static_cast <KMPlayer::View*> (part->player ()->view ())) {
kdDebug() << "KOfficeMPlayerView::KOfficeMPlayerView this:" << this << " tqparent:" << tqparent << endl;
m_oldtqparent = static_cast <TQWidget*> (m_view->tqparent());
kdDebug() << "KOfficeMPlayerView::KOfficeMPlayerView this:" << this << " parent:" << parent << endl;
m_oldparent = static_cast <TQWidget*> (m_view->parent());
m_view->reparent (this, TQPoint (0, 0));
TQVBoxLayout * box = new TQVBoxLayout (this, 0, 0);
box->addWidget (m_view);
@ -161,7 +161,7 @@ KOfficeMPlayerView::KOfficeMPlayerView (KOfficeMPlayer* part, TQWidget* tqparent
KOfficeMPlayerView::~KOfficeMPlayerView () {
kdDebug() << "KOfficeMPlayerView::~KOfficeMPlayerView this:" << this << endl;
m_view->reparent (m_oldtqparent, TQPoint (0, 0));
m_view->reparent (m_oldparent, TQPoint (0, 0));
}
#include "kmplayer_koffice_part.moc"

8
src/kmplayer_koffice_part.h
Unescape View File

@ -51,19 +51,19 @@ class KOfficeMPlayerView : public KoView {
Q_OBJECT
TQ_OBJECT
public:
KOfficeMPlayerView (KOfficeMPlayer* part, TQWidget* tqparent, const char* name = 0 );
KOfficeMPlayerView (KOfficeMPlayer* part, TQWidget* parent, const char* name = 0 );
~KOfficeMPlayerView ();
void updateReadWrite(bool) {}
private:
KMPlayer::View * m_view;
TQGuardedPtr <TQWidget> m_oldtqparent;
TQGuardedPtr <TQWidget> m_oldparent;
};
class KOfficeMPlayer : public KoDocument {
Q_OBJECT
TQ_OBJECT
public:
KOfficeMPlayer (TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false);
KOfficeMPlayer (TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false);
~KOfficeMPlayer ();
virtual void paintContent (TQPainter& painter, const TQRect& rect,
@ -76,7 +76,7 @@ public:
KMPlayer * player () const { return m_player; }
protected:
virtual KoView* createViewInstance (TQWidget* tqparent, const char* name);
virtual KoView* createViewInstance (TQWidget* parent, const char* name);
private:
KConfig * m_config;
KMPlayer * m_player;

30
src/kmplayer_part.cpp
Unescape View File

@ -97,8 +97,8 @@ public:
KMPlayerFactory ();
virtual ~KMPlayerFactory ();
virtual KParts::Part *createPartObject
(TQWidget *wtqparent, const char *wname,
TQObject *tqparent, const char *name,
(TQWidget *wparent, const char *wname,
TQObject *parent, const char *name,
const char *className, const TQStringList &args);
static KInstance * instance () { return s_instance; }
private:
@ -118,11 +118,11 @@ KDE_NO_CDTOR_EXPORT KMPlayerFactory::~KMPlayerFactory () {
}
KDE_NO_EXPORT KParts::Part *KMPlayerFactory::createPartObject
(TQWidget *wtqparent, const char *wname,
TQObject *tqparent, const char * name,
(TQWidget *wparent, const char *wname,
TQObject *parent, const char * name,
const char * cls, const TQStringList & args) {
kdDebug() << "KMPlayerFactory::createPartObject " << cls << endl;
return new KMPlayerPart (wtqparent, wname, tqparent, name, args);
return new KMPlayerPart (wparent, wname, parent, name, args);
}
//-----------------------------------------------------------------------------
@ -136,9 +136,9 @@ static bool getBoolValue (const TQString & value) {
#define SET_FEAT_ON(f) { m_features |= f; turned_off_features &= ~f; }
#define SET_FEAT_OFF(f) { m_features &= ~f; turned_off_features |= f; }
KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wtqparent, const char *wname,
TQObject * tqparent, const char *name, const TQStringList &args)
: PartBase (wtqparent, wname, tqparent, name, new KConfig ("kmplayerrc")),
KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *wname,
TQObject * parent, const char *name, const TQStringList &args)
: PartBase (wparent, wname, parent, name, new KConfig ("kmplayerrc")),
m_master (0L),
m_browserextension (new KMPlayerBrowserExtension (this)),
m_liveconnectextension (new KMPlayerLiveConnectExtension (this)),
@ -647,8 +647,8 @@ KDE_NO_EXPORT void KMPlayerPart::statusPosition (int pos, int length) {
//---------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT KMPlayerBrowserExtension::KMPlayerBrowserExtension (KMPlayerPart * tqparent)
: KParts::BrowserExtension (tqparent, "KMPlayer Browser Extension") {
KDE_NO_CDTOR_EXPORT KMPlayerBrowserExtension::KMPlayerBrowserExtension (KMPlayerPart * parent)
: KParts::BrowserExtension (parent, "KMPlayer Browser Extension") {
}
KDE_NO_EXPORT void KMPlayerBrowserExtension::urlChanged (const TQString & url) {
@ -660,13 +660,13 @@ KDE_NO_EXPORT void KMPlayerBrowserExtension::setLoadingProgress (int percentage)
}
KDE_NO_EXPORT void KMPlayerBrowserExtension::saveState (TQDataStream & stream) {
stream << static_cast <PartBase *> (tqparent ())->url ().url ();
stream << static_cast <PartBase *> (parent ())->url ().url ();
}
KDE_NO_EXPORT void KMPlayerBrowserExtension::restoreState (TQDataStream & stream) {
TQString url;
stream >> url;
static_cast <PartBase *> (tqparent ())->openURL (KURL(url));
static_cast <PartBase *> (parent ())->openURL (KURL(url));
}
KDE_NO_EXPORT void KMPlayerBrowserExtension::requestOpenURL (const KURL & url, const TQString & target, const TQString & service) {
@ -847,13 +847,13 @@ static const JSCommandEntry * getJSCommandEntry (const char * name, int start =
return &JSCommandList[mid];
}
KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::KMPlayerLiveConnectExtension (KMPlayerPart * tqparent)
: KParts::LiveConnectExtension (tqparent), player (tqparent),
KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::KMPlayerLiveConnectExtension (KMPlayerPart * parent)
: KParts::LiveConnectExtension (parent), player (parent),
lastJSCommandEntry (0L),
m_started (false),
m_enablefinish (false),
m_evaluating (false) {
connect (tqparent, TQT_SIGNAL (started (KIO::Job *)), this, TQT_SLOT (started ()));
connect (parent, TQT_SIGNAL (started (KIO::Job *)), this, TQT_SLOT (started ()));
}
KDE_NO_CDTOR_EXPORT KMPlayerLiveConnectExtension::~KMPlayerLiveConnectExtension() {

8
src/kmplayer_part.h
Unescape View File

@ -65,7 +65,7 @@ class KMPLAYER_NO_EXPORT KMPlayerBrowserExtension : public KParts::BrowserExtens
Q_OBJECT
TQ_OBJECT
public:
KMPlayerBrowserExtension(KMPlayerPart *tqparent);
KMPlayerBrowserExtension(KMPlayerPart *parent);
KDE_NO_CDTOR_EXPORT ~KMPlayerBrowserExtension () {}
void urlChanged (const TQString & url);
void setLoadingProgress (int percentage);
@ -84,7 +84,7 @@ class KMPLAYER_NO_EXPORT KMPlayerLiveConnectExtension : public KParts::LiveConne
Q_OBJECT
TQ_OBJECT
public:
KMPlayerLiveConnectExtension (KMPlayerPart * tqparent);
KMPlayerLiveConnectExtension (KMPlayerPart * parent);
~KMPlayerLiveConnectExtension ();
// LiveConnect interface
@ -133,8 +133,8 @@ public:
Feat_InfoPanel = 0x10, Feat_VolumeSlider = 0x20, Feat_PlayList = 0x40,
Feat_ImageWindow = 0x80, Feat_All = 0xff
};
KMPlayerPart (TQWidget * wtqparent, const char * wname,
TQObject * tqparent, const char * name, const TQStringList &args);
KMPlayerPart (TQWidget * wparent, const char * wname,
TQObject * parent, const char * name, const TQStringList &args);
~KMPlayerPart ();
KDE_NO_EXPORT KMPlayerBrowserExtension * browserextension() const

20
src/kmplayer_smil.cpp
Unescape View File

@ -1618,7 +1618,7 @@ KDE_NO_EXPORT void SMIL::Smil::activate () {
if (tqlayout)
Element::activate ();
else
Element::deactivate(); // some unfortunate reset in tqparent doc
Element::deactivate(); // some unfortunate reset in parent doc
}
KDE_NO_EXPORT void SMIL::Smil::deactivate () {
@ -2052,7 +2052,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 tqparent Region (representing 100%)
* of parent Region (representing 100%)
*/
KDE_NO_EXPORT
void SMIL::Region::calculateBounds (Single pw, Single ph) {
@ -2060,7 +2060,7 @@ void SMIL::Region::calculateBounds (Single pw, Single ph) {
sizes.calcSizes (this, pw, ph, x, y, w, h);
if (surface ())
region_surface->bounds = SRect (x, y, w, h);
//kdDebug () << "Region::calculateBounds tqparent:" << pw << "x" << ph << " this:" << x << "," << y << " " << w << "x" << h << endl;
//kdDebug () << "Region::calculateBounds parent:" << pw << "x" << ph << " this:" << x << "," << y << " " << w << "x" << h << endl;
}
NodeRefListPtr SMIL::Region::listeners (unsigned int eid) {
@ -2398,9 +2398,9 @@ KDE_NO_EXPORT bool SMIL::TimedMrl::keepContent (Node *n) {
if (tm->m_runtime && p && p->active ()) {
if (tm->runtime ()->timingstate == Runtime::timings_stopped)
switch (tm->fill_active) {
case fill_hold: // keep while tqparent active
case fill_hold: // keep while parent active
return true;
case fill_freeze: // keep in tqparent duration
case fill_freeze: // keep in parent duration
if (p->unfinished() &&
(p->id == SMIL::id_node_par ||
p->id == SMIL::id_node_excl ||
@ -2409,7 +2409,7 @@ KDE_NO_EXPORT bool SMIL::TimedMrl::keepContent (Node *n) {
return true;
// else fall through
case fill_default: // as freeze when no duration is set
case fill_auto: // or when tqparent finished w/o duration
case fill_auto: // or when parent finished w/o duration
return keepContent (p) &&
(p->id == SMIL::id_node_par ||
p->id == SMIL::id_node_excl ||
@ -2433,7 +2433,7 @@ KDE_NO_EXPORT SMIL::TimedMrl::Fill SMIL::TimedMrl::getDefaultFill (NodePtr n) {
if (tm->fill_def != fill_inherit)
return tm->fill_def;
else if (tm->fill == fill_default)
return tm->fill_active; // assume tqparent figured out this
return tm->fill_active; // assume parent figured out this
} else if (p->id == SMIL::id_node_smil)
break;
return fill_auto;
@ -3282,9 +3282,9 @@ KDE_NO_EXPORT bool SMIL::AnimateMotion::handleEvent (EventPtr event) {
KDE_NO_EXPORT void SMIL::Param::activate () {
setState (state_activated);
TQString name = getAttribute (StringPool::attr_name);
Node * tqparent = parentNode ().ptr ();
if (!name.isEmpty () && tqparent && tqparent->isElementNode ())
static_cast<Element*>(tqparent)->setParam (name,
Node * parent = parentNode ().ptr ();
if (!name.isEmpty () && parent && parent->isElementNode ())
static_cast<Element*>(parent)->setParam (name,
getAttribute (StringPool::attr_value));
Element::activate (); //finish (); // no livetime of itself, will deactivate
}

18
src/kmplayerapp.cpp
Unescape View File

@ -1483,7 +1483,7 @@ void KMPlayerApp::playListItemDropped (TQDropEvent * de, TQListViewItem * after)
if (after) {
TQListViewItem * p = after->itemAbove ();
if (p && p->nextSibling () != after)
after = after->tqparent ();
after = after->parent ();
}
}
if (!after)
@ -1702,8 +1702,8 @@ KDE_NO_EXPORT void KMPlayerMenuSource::menuItemClicked (TQPopupMenu * menu, int
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageDVD::KMPlayerPrefSourcePageDVD (TQWidget * tqparent)
: TQFrame(tqparent) {
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageDVD::KMPlayerPrefSourcePageDVD (TQWidget * parent)
: TQFrame(parent) {
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
autoPlayDVD = new TQCheckBox (i18n ("Auto play after opening DVD"), this, 0);
TQWhatsThis::add(autoPlayDVD, i18n ("Start playing DVD right after opening DVD"));
@ -1996,8 +1996,8 @@ KDE_NO_EXPORT void KMPlayerDVDSource::prefLocation (TQString & item, TQString &
tab = i18n ("DVD");
}
KDE_NO_EXPORT TQFrame * KMPlayerDVDSource::prefPage (TQWidget * tqparent) {
m_configpage = new KMPlayerPrefSourcePageDVD (tqparent);
KDE_NO_EXPORT TQFrame * KMPlayerDVDSource::prefPage (TQWidget * parent) {
m_configpage = new KMPlayerPrefSourcePageDVD (parent);
return m_configpage;
}
@ -2063,8 +2063,8 @@ KDE_NO_EXPORT TQString KMPlayerDVDNavSource::prettyName () {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVCD::KMPlayerPrefSourcePageVCD (TQWidget * tqparent)
: TQFrame (tqparent) {
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVCD::KMPlayerPrefSourcePageVCD (TQWidget * parent)
: TQFrame (parent) {
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
autoPlayVCD = new TQCheckBox (i18n ("Auto play after opening a VCD"), this, 0);
TQWhatsThis::add(autoPlayVCD, i18n ("Start playing VCD right after opening VCD"));
@ -2172,8 +2172,8 @@ KDE_NO_EXPORT void KMPlayerVCDSource::prefLocation (TQString & item, TQString &
tab = i18n ("VCD");
}
KDE_NO_EXPORT TQFrame * KMPlayerVCDSource::prefPage (TQWidget * tqparent) {
m_configpage = new KMPlayerPrefSourcePageVCD (tqparent);
KDE_NO_EXPORT TQFrame * KMPlayerVCDSource::prefPage (TQWidget * parent) {
m_configpage = new KMPlayerPrefSourcePageVCD (parent);
return m_configpage;
}

8
src/kmplayerappsource.h
Unescape View File

@ -62,7 +62,7 @@ class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageDVD : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
KMPlayerPrefSourcePageDVD (TQWidget * tqparent);
KMPlayerPrefSourcePageDVD (TQWidget * parent);
~KMPlayerPrefSourcePageDVD () {}
TQCheckBox * autoPlayDVD;
@ -86,7 +86,7 @@ public:
virtual void read (KConfig *);
virtual void sync (bool);
virtual void prefLocation (TQString & item, TQString & icon, TQString & tab);
virtual TQFrame * prefPage (TQWidget * tqparent);
virtual TQFrame * prefPage (TQWidget * parent);
public slots:
virtual void activate ();
virtual void deactivate ();
@ -136,7 +136,7 @@ class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageVCD : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
KMPlayerPrefSourcePageVCD (TQWidget * tqparent);
KMPlayerPrefSourcePageVCD (TQWidget * parent);
~KMPlayerPrefSourcePageVCD () {}
KURLRequester * vcddevice;
TQCheckBox *autoPlayVCD;
@ -159,7 +159,7 @@ public:
virtual void read (KConfig *);
virtual void sync (bool);
virtual void prefLocation (TQString & item, TQString & icon, TQString & tab);
virtual TQFrame * prefPage (TQWidget * tqparent);
virtual TQFrame * prefPage (TQWidget * parent);
public slots:
virtual void activate ();
virtual void deactivate ();

18
src/kmplayerbroadcast.cpp
Unescape View File

@ -154,7 +154,7 @@ KDE_NO_EXPORT const TQStringList FFServerSetting::list () {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastPage::KMPlayerPrefBroadcastPage (TQWidget *tqparent) : TQFrame (tqparent) {
KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastPage::KMPlayerPrefBroadcastPage (TQWidget *parent) : TQFrame (parent) {
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5);
TQGridLayout *gridtqlayout = new TQGridLayout (tqlayout, 6, 2, 2);
TQLabel *label = new TQLabel (i18n ("Bind address:"), this);
@ -188,12 +188,12 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastPage::KMPlayerPrefBroadcastPage (TQWidg
//-----------------------------------------------------------------------------
#undef ADDPROPERTY
#define ADDPROPERTY(label,qedit,gridtqlayout,row,tqparent) \
qedit = new TQLineEdit ("", tqparent); \
gridtqlayout->addWidget (new TQLabel (qedit, label, tqparent), row, 0); \
#define ADDPROPERTY(label,qedit,gridtqlayout,row,parent) \
qedit = new TQLineEdit ("", parent); \
gridtqlayout->addWidget (new TQLabel (qedit, label, parent), row, 0); \
gridtqlayout->addWidget (qedit, row, 1);
KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormatPage (TQWidget *tqparent, FFServerSettingList & ffs) : TQFrame (tqparent, "BroadcastPage"), profiles (ffs)
KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormatPage (TQWidget *parent, FFServerSettingList & ffs) : TQFrame (parent, "BroadcastPage"), profiles (ffs)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout (this, 5);
TQGridLayout *formattqlayout = new TQGridLayout (11, 2, 2);
@ -456,9 +456,9 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::prefLocation (TQString & item, TQStr
tab = i18n ("Profiles");
}
TQFrame * KMPlayerBroadcastConfig::prefPage (TQWidget * tqparent) {
TQFrame * KMPlayerBroadcastConfig::prefPage (TQWidget * parent) {
if (!m_configpage) {
m_configpage = new KMPlayerPrefBroadcastFormatPage (tqparent, ffserversettingprofiles);
m_configpage = new KMPlayerPrefBroadcastFormatPage (parent, ffserversettingprofiles);
connect (m_configpage->startbutton, TQT_SIGNAL (clicked ()), this, TQT_SLOT (startServer ()));
connect (m_player, TQT_SIGNAL (sourceChanged (KMPlayer::Source *, KMPlayer::Source *)), this, TQT_SLOT (sourceChanged (KMPlayer::Source *,KMPlayer::Source *)));
m_configpage->startbutton->setEnabled
@ -656,9 +656,9 @@ KDE_NO_EXPORT void KMPlayerFFServerConfig::prefLocation (TQString & item, TQStri
tab = i18n ("FFServer");
}
KDE_NO_EXPORT TQFrame *KMPlayerFFServerConfig::prefPage (TQWidget * tqparent) {
KDE_NO_EXPORT TQFrame *KMPlayerFFServerConfig::prefPage (TQWidget * parent) {
if (!m_configpage)
m_configpage = new KMPlayerPrefBroadcastPage (tqparent);
m_configpage = new KMPlayerPrefBroadcastPage (parent);
return m_configpage;
}

8
src/kmplayerbroadcast.h
Unescape View File

@ -76,7 +76,7 @@ class KMPLAYER_NO_EXPORT KMPlayerPrefBroadcastPage : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
KMPlayerPrefBroadcastPage (TQWidget * tqparent);
KMPlayerPrefBroadcastPage (TQWidget * parent);
KDE_NO_CDTOR_EXPORT ~KMPlayerPrefBroadcastPage () {}
TQLineEdit * bindaddress;
@ -91,7 +91,7 @@ class KMPLAYER_NO_EXPORT KMPlayerPrefBroadcastFormatPage : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
KMPlayerPrefBroadcastFormatPage (TQWidget * tqparent, FFServerSettingList &);
KMPlayerPrefBroadcastFormatPage (TQWidget * parent, FFServerSettingList &);
KDE_NO_CDTOR_EXPORT ~KMPlayerPrefBroadcastFormatPage () {}
TQListBox * profilelist;
@ -139,7 +139,7 @@ public:
virtual void read (KConfig *);
virtual void sync (bool fromUI);
virtual void prefLocation (TQString & item, TQString & icon, TQString & tab);
virtual TQFrame * prefPage (TQWidget * tqparent);
virtual TQFrame * prefPage (TQWidget * parent);
int ffserverport;
int maxclients;
int maxbandwidth;
@ -164,7 +164,7 @@ public:
virtual void read (KConfig *);
virtual void sync (bool fromUI);
virtual void prefLocation (TQString & item, TQString & icon, TQString & tab);
virtual TQFrame * prefPage (TQWidget * tqparent);
virtual TQFrame * prefPage (TQWidget * parent);
bool broadcasting () const;
void stopServer ();

2
src/kmplayerconfig.h
Unescape View File

@ -86,7 +86,7 @@ public:
virtual void read (KConfig *) = 0;
virtual void sync (bool fromUI) = 0;
virtual void prefLocation (TQString & item, TQString & icon, TQString & tab) = 0;
virtual TQFrame * prefPage (TQWidget * tqparent) = 0;
virtual TQFrame * prefPage (TQWidget * parent) = 0;
PreferencesPage * next;
};

16
src/kmplayercontrolpanel.cpp
Unescape View File

@ -266,8 +266,8 @@ static TQPushButton * ctrlButton (TQWidget * w, TQBoxLayout * l, const char ** p
}
KDE_NO_CDTOR_EXPORT
KMPlayerMenuButton::KMPlayerMenuButton (TQWidget * tqparent, TQBoxLayout * l, const char ** p, int key)
: TQPushButton (TQIconSet (TQPixmap(p)), TQString (), tqparent, "kde_kmplayer_control_button") {
KMPlayerMenuButton::KMPlayerMenuButton (TQWidget * parent, TQBoxLayout * l, const char ** p, int key)
: TQPushButton (TQIconSet (TQPixmap(p)), TQString (), parent, "kde_kmplayer_control_button") {
setFocusPolicy (TQ_NoFocus);
setFlat (true);
if (key)
@ -281,8 +281,8 @@ KDE_NO_EXPORT void KMPlayerMenuButton::enterEvent (TQEvent *) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT KMPlayerPopupMenu::KMPlayerPopupMenu (TQWidget * tqparent)
: KPopupMenu (tqparent, "kde_kmplayer_popupmenu") {}
KDE_NO_CDTOR_EXPORT KMPlayerPopupMenu::KMPlayerPopupMenu (TQWidget * parent)
: KPopupMenu (parent, "kde_kmplayer_popupmenu") {}
KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) {
emit mouseLeft ();
@ -290,8 +290,8 @@ KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT VolumeBar::VolumeBar (TQWidget * tqparent, View * view)
: TQWidget (tqparent), m_view (view), m_value (100) {
KDE_NO_CDTOR_EXPORT VolumeBar::VolumeBar (TQWidget * parent, View * view)
: TQWidget (parent), m_view (view), m_value (100) {
tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
setMinimumSize (TQSize (51, button_height_only_buttons + 2));
TQToolTip::add (this, i18n ("Volume is %1").arg (m_value));
@ -341,8 +341,8 @@ void VolumeBar::mouseMoveEvent (TQMouseEvent * e) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * tqparent, View * view)
: TQWidget (tqparent),
KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view)
: TQWidget (parent),
m_progress_mode (progress_playing),
m_progress_length (0),
m_popup_timer (0),

4
src/kmplayercontrolpanel.h
Unescape View File

@ -75,7 +75,7 @@ class KMPLAYER_EXPORT VolumeBar : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
VolumeBar (TQWidget * tqparent, View * view);
VolumeBar (TQWidget * parent, View * view);
~VolumeBar ();
KDE_NO_EXPORT int value () const { return m_value; }
void setValue (int v);
@ -111,7 +111,7 @@ public:
button_red, button_green, button_yellow, button_blue,
button_last
};
ControlPanel (TQWidget * tqparent, View * view);
ControlPanel (TQWidget * parent, View * view);
KDE_NO_CDTOR_EXPORT ~ControlPanel () {}
void showPositionSlider (bool show);
void enableSeekButtons (bool enable);

14
src/kmplayerpartbase.cpp
Unescape View File

@ -105,11 +105,11 @@ inline BookmarkManager::BookmarkManager(const TQString & bmfile)
//-----------------------------------------------------------------------------
PartBase::PartBase (TQWidget * wtqparent, const char *wname,
TQObject * tqparent, const char *name, KConfig * config)
: KMediaPlayer::Player (wtqparent, wname ? wname : "kde_kmplayer_view", tqparent, name ? name : "kde_kmplayer_part"),
PartBase::PartBase (TQWidget * wparent, const char *wname,
TQObject * parent, const char *name, KConfig * config)
: KMediaPlayer::Player (wparent, wname ? wname : "kde_kmplayer_view", parent, name ? name : "kde_kmplayer_part"),
m_config (config),
m_view (new View (wtqparent, wname ? wname : "kde_kmplayer_view")),
m_view (new View (wparent, wname ? wname : "kde_kmplayer_view")),
m_settings (new Settings (this, config)),
m_recorder (0L),
m_source (0L),
@ -659,7 +659,7 @@ KDE_NO_EXPORT void PartBase::playListItemExecuted (TQListViewItem * item) {
vi->m_attr->name () == "data") {
TQString src (vi->m_attr->value ());
if (!src.isEmpty ()) {
PlayListItem * pi = static_cast <PlayListItem*>(item->tqparent());
PlayListItem * pi = static_cast <PlayListItem*>(item->parent());
if (pi) {
for (NodePtr e = pi->node; e; e = e->parentNode ()) {
Mrl * mrl = e->mrl ();
@ -744,8 +744,8 @@ void PartBase::play () {
PlayListItem * lvi = m_view->playList ()->currentPlayListItem ();
if (lvi) { // make sure it's in the first tree
TQListViewItem * pitem = lvi;
while (pitem->tqparent())
pitem = pitem->tqparent();
while (pitem->parent())
pitem = pitem->parent();
if (pitem != m_view->playList ()->firstChild ())
lvi = 0L;
}

2
src/kmplayerpartbase.h
Unescape View File

@ -118,7 +118,7 @@ class KMPLAYER_EXPORT PartBase : public KMediaPlayer::Player {
K_DCOP
public:
typedef TQMap <TQString, Process *> ProcessMap;
PartBase (TQWidget * tqparent, const char * wname,TQObject * objectParent, const char * name, KConfig *);
PartBase (TQWidget * parent, const char * wname,TQObject * objectParent, const char * name, KConfig *);
~PartBase ();
void init (KActionCollection * = 0L);
virtual KMediaPlayer::View* view ();

12
src/kmplayerplaylist.h
Unescape View File

@ -164,7 +164,7 @@ public:
};
/*
* Base class for double linked tree nodes having tqparent/siblings/tqchildren.
* Base class for double linked tree nodes having parent/siblings/tqchildren.
* The linkage is a shared firstChild and weak parentNode.
*/
template <class T>
@ -397,7 +397,7 @@ public:
virtual void begin ();
/**
* Sets state to state_finish when >= state_activated.
* Notifies tqparent with a childDone call.
* Notifies parent with a childDone call.
*/
virtual void finish ();
/**
@ -553,7 +553,7 @@ public:
/**
* If this Mrl is top node of external document, opener has the
* location in SCR. Typically that's the tqparent of this node.
* location in SCR. Typically that's the parent of this node.
*/
NodePtrW opener; //if this node is top node of external document,
TQString src;
@ -635,11 +635,11 @@ public:
virtual void tqrepaint () = 0;
virtual void tqrepaint (const SRect &rect) = 0;
virtual void video () = 0;
void remove (); // remove from tqparent, mark ancestors dirty
void remove (); // remove from parent, mark ancestors dirty
void markDirty (); // mark this and ancestors dirty
NodePtrW node;
SRect bounds; // bounds in in tqparent coord.
SRect bounds; // bounds in in parent coord.
float xscale, yscale; // internal scaling
unsigned int background_color; // rgba background color
bool dirty; // a decendant is removed
@ -787,7 +787,7 @@ public:
};
/**
* Unrecognized tag by tqparent element or just some auxiliary node
* Unrecognized tag by parent element or just some auxiliary node
*/
class KMPLAYER_EXPORT DarkNode : public Element {
public:

78
src/kmplayerprocess.cpp
Unescape View File

@ -79,8 +79,8 @@ static TQString getPath (const KURL & url) {
return p;
}
Process::Process (TQObject * tqparent, Settings * settings, const char * n)
: TQObject (tqparent, n), m_source (0L), m_settings (settings),
Process::Process (TQObject * parent, Settings * settings, const char * n)
: TQObject (parent, n), m_source (0L), m_settings (settings),
m_state (NotRunning), m_old_state (NotRunning), m_process (0L), m_job(0L),
m_supported_sources (default_supported), m_viewer (0L) {}
@ -265,8 +265,8 @@ static bool proxyForURL (const KURL& url, TQString& proxy) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT MPlayerBase::MPlayerBase (TQObject * tqparent, Settings * settings, const char * n)
: Process (tqparent, settings, n), m_use_slave (true) {
KDE_NO_CDTOR_EXPORT MPlayerBase::MPlayerBase (TQObject * parent, Settings * settings, const char * n)
: Process (parent, settings, n), m_use_slave (true) {
m_process = new KProcess;
}
@ -354,8 +354,8 @@ static const char * mplayer_supports [] = {
"dvdsource", "exitsource", "hrefsource", "introsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", "audiocdsource", 0L
};
KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (TQObject * tqparent, Settings * settings)
: MPlayerBase (tqparent, settings, "mplayer"),
KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (TQObject * parent, Settings * settings)
: MPlayerBase (parent, settings, "mplayer"),
m_widget (0L),
m_configpage (new MPlayerPreferencesPage (this)),
aid (-1), sid (-1),
@ -365,7 +365,7 @@ KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (TQObject * tqparent, Settings * settings)
}
KDE_NO_CDTOR_EXPORT MPlayer::~MPlayer () {
if (m_widget && !m_widget->tqparent ())
if (m_widget && !m_widget->parent ())
delete m_widget;
delete m_configpage;
}
@ -886,14 +886,14 @@ namespace KMPlayer {
class KMPLAYER_NO_EXPORT MPlayerPreferencesFrame : public TQFrame {
public:
MPlayerPreferencesFrame (TQWidget * tqparent);
MPlayerPreferencesFrame (TQWidget * parent);
TQTable * table;
};
} // namespace
KDE_NO_CDTOR_EXPORT MPlayerPreferencesFrame::MPlayerPreferencesFrame (TQWidget * tqparent)
: TQFrame (tqparent) {
KDE_NO_CDTOR_EXPORT MPlayerPreferencesFrame::MPlayerPreferencesFrame (TQWidget * parent)
: TQFrame (parent) {
TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
table = new TQTable (int (MPlayerPreferencesPage::pat_last)+non_patterns, 2, this);
table->verticalHeader ()->hide ();
@ -978,8 +978,8 @@ KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (TQString & item, TQStri
tab = i18n ("MPlayer");
}
KDE_NO_EXPORT TQFrame * MPlayerPreferencesPage::prefPage (TQWidget * tqparent) {
m_configframe = new MPlayerPreferencesFrame (tqparent);
KDE_NO_EXPORT TQFrame * MPlayerPreferencesPage::prefPage (TQWidget * parent) {
m_configframe = new MPlayerPreferencesFrame (parent);
return m_configframe;
}
@ -989,8 +989,8 @@ static const char * mencoder_supports [] = {
"dvdsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", "audiocdsource", 0L
};
KDE_NO_CDTOR_EXPORT MEncoder::MEncoder (TQObject * tqparent, Settings * settings)
: MPlayerBase (tqparent, settings, "mencoder") {
KDE_NO_CDTOR_EXPORT MEncoder::MEncoder (TQObject * parent, Settings * settings)
: MPlayerBase (parent, settings, "mencoder") {
m_supported_sources = mencoder_supports;
}
@ -1054,8 +1054,8 @@ static const char * mplayerdump_supports [] = {
};
KDE_NO_CDTOR_EXPORT
MPlayerDumpstream::MPlayerDumpstream (TQObject * tqparent, Settings * settings)
: MPlayerBase (tqparent, settings, "mplayerdumpstream") {
MPlayerDumpstream::MPlayerDumpstream (TQObject * parent, Settings * settings)
: MPlayerBase (parent, settings, "mplayerdumpstream") {
m_supported_sources = mplayerdump_supports;
}
@ -1178,8 +1178,8 @@ void Callback::toggleFullScreen () {
//-----------------------------------------------------------------------------
CallbackProcess::CallbackProcess (TQObject * tqparent, Settings * settings, const char * n, const TQString & menuname)
: Process (tqparent, settings, n),
CallbackProcess::CallbackProcess (TQObject * parent, Settings * settings, const char * n, const TQString & menuname)
: Process (parent, settings, n),
m_callback (new Callback (this)),
m_backend (0L),
m_menuname (menuname),
@ -1501,22 +1501,22 @@ NodePtr SomeNode::childFromTag (const TQString & t) {
return new SomeNode (m_doc, t);
}
TQWidget * TypeNode::createWidget (TQWidget * tqparent) {
TQWidget * TypeNode::createWidget (TQWidget * parent) {
TQString type_attr = getAttribute (StringPool::attr_type);
const char * ctype = type_attr.ascii ();
TQString value = getAttribute (StringPool::attr_value);
if (!strcmp (ctype, "range")) {
w = new TQSlider (getAttribute (TQString ("START")).toInt (),
getAttribute (StringPool::attr_end).toInt (),
1, value.toInt (), Qt::Horizontal, tqparent);
1, value.toInt (), Qt::Horizontal, parent);
} else if (!strcmp (ctype, "num") || !strcmp (ctype, "string")) {
w = new TQLineEdit (value, tqparent);
w = new TQLineEdit (value, parent);
} else if (!strcmp (ctype, "bool")) {
TQCheckBox * checkbox = new TQCheckBox (tqparent);
TQCheckBox * checkbox = new TQCheckBox (parent);
checkbox->setChecked (value.toInt ());
w = checkbox;
} else if (!strcmp (ctype, "enum")) {
TQComboBox * combo = new TQComboBox (tqparent);
TQComboBox * combo = new TQComboBox (parent);
for (NodePtr e = firstChild (); e; e = e->nextSibling ())
if (e->isElementNode () && !strcmp (e->nodeName (), "item"))
combo->insertItem (convertNode <Element> (e)->getAttribute (StringPool::attr_value));
@ -1558,7 +1558,7 @@ namespace KMPlayer {
class KMPLAYER_NO_EXPORT XMLPreferencesFrame : public TQFrame {
public:
XMLPreferencesFrame (TQWidget * tqparent, CallbackProcess *);
XMLPreferencesFrame (TQWidget * parent, CallbackProcess *);
KDE_NO_CDTOR_EXPORT ~XMLPreferencesFrame () {}
TQTable * table;
protected:
@ -1570,8 +1570,8 @@ private:
} // namespace
KDE_NO_CDTOR_EXPORT XMLPreferencesFrame::XMLPreferencesFrame
(TQWidget * tqparent, CallbackProcess * p)
: TQFrame (tqparent), m_process (p){
(TQWidget * parent, CallbackProcess * p)
: TQFrame (parent), m_process (p){
TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
table = new TQTable (this);
tqlayout->addWidget (table);
@ -1669,8 +1669,8 @@ KDE_NO_EXPORT void XMLPreferencesPage::prefLocation (TQString & item, TQString &
tab = m_process->menuName ();
}
KDE_NO_EXPORT TQFrame * XMLPreferencesPage::prefPage (TQWidget * tqparent) {
m_configframe = new XMLPreferencesFrame (tqparent, m_process);
KDE_NO_EXPORT TQFrame * XMLPreferencesPage::prefPage (TQWidget * parent) {
m_configframe = new XMLPreferencesFrame (parent, m_process);
return m_configframe;
}
@ -1681,8 +1681,8 @@ static const char * xine_supported [] = {
"tvsource", "urlsource", "vcdsource", "audiocdsource", 0L
};
KDE_NO_CDTOR_EXPORT Xine::Xine (TQObject * tqparent, Settings * settings)
: CallbackProcess (tqparent, settings, "xine", i18n ("&Xine")) {
KDE_NO_CDTOR_EXPORT Xine::Xine (TQObject * parent, Settings * settings)
: CallbackProcess (parent, settings, "xine", i18n ("&Xine")) {
#ifdef HAVE_XINE
m_supported_sources = xine_supported;
m_settings->addPage (m_configpage);
@ -1757,8 +1757,8 @@ static const char * gst_supported [] = {
"exitsource", "introsource", "urlsource", "vcdsource", "audiocdsource", 0L
};
KDE_NO_CDTOR_EXPORT GStreamer::GStreamer (TQObject * tqparent, Settings * settings)
: CallbackProcess (tqparent, settings, "gstreamer", i18n ("&GStreamer")) {
KDE_NO_CDTOR_EXPORT GStreamer::GStreamer (TQObject * parent, Settings * settings)
: CallbackProcess (parent, settings, "gstreamer", i18n ("&GStreamer")) {
#ifdef HAVE_GSTREAMER
m_supported_sources = gst_supported;
#endif
@ -1808,8 +1808,8 @@ static const char * ffmpeg_supports [] = {
"tvsource", "urlsource", 0L
};
FFMpeg::FFMpeg (TQObject * tqparent, Settings * settings)
: Process (tqparent, settings, "ffmpeg") {
FFMpeg::FFMpeg (TQObject * parent, Settings * settings)
: Process (parent, settings, "ffmpeg") {
m_supported_sources = ffmpeg_supports;
}
@ -2017,7 +2017,7 @@ KDE_NO_CDTOR_EXPORT NpStream::~NpStream () {
KDE_NO_EXPORT void NpStream::open () {
kdDebug () << "NpStream " << stream_id << " open " << url.url () << endl;
if (url.url().startsWith ("javascript:")) {
NpPlayer *npp = static_cast <NpPlayer *> (tqparent ());
NpPlayer *npp = static_cast <NpPlayer *> (parent ());
TQString result = npp->evaluateScript (url.url().mid (11));
if (!result.isEmpty ()) {
TQCString cr = result.local8Bit ();
@ -2089,8 +2089,8 @@ static const char * npplayer_supports [] = {
};
KDE_NO_CDTOR_EXPORT
NpPlayer::NpPlayer (TQObject * tqparent, Settings * settings, const TQString & srv)
: Process (tqparent, settings, "npp"),
NpPlayer::NpPlayer (TQObject * parent, Settings * settings, const TQString & srv)
: Process (parent, settings, "npp"),
service (srv),
write_in_progress (false) {
m_supported_sources = npplayer_supports;
@ -2544,8 +2544,8 @@ void NpStream::slotMimetype (KIO::Job *, const TQString &) {}
void NpStream::slotTotalSize (KIO::Job *, KIO::filesize_t) {}
KDE_NO_CDTOR_EXPORT
NpPlayer::NpPlayer (TQObject * tqparent, Settings * settings, const TQString &)
: Process (tqparent, settings, "npp") {}
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; }

28
src/kmplayerprocess.h
Unescape View File

@ -60,7 +60,7 @@ public:
enum State {
NotRunning = 0, Ready, Buffering, Playing
};
Process (TQObject * tqparent, Settings * settings, const char * n);
Process (TQObject * parent, Settings * settings, const char * n);
virtual ~Process ();
virtual void init ();
virtual void initProcess (Viewer *);
@ -122,7 +122,7 @@ class MPlayerBase : public Process {
Q_OBJECT
TQ_OBJECT
public:
MPlayerBase (TQObject * tqparent, Settings * settings, const char * n);
MPlayerBase (TQObject * parent, Settings * settings, const char * n);
~MPlayerBase ();
void initProcess (Viewer *);
public slots:
@ -148,7 +148,7 @@ class KDE_EXPORT MPlayer : public MPlayerBase {
Q_OBJECT
TQ_OBJECT
public:
MPlayer (TQObject * tqparent, Settings * settings);
MPlayer (TQObject * parent, Settings * settings);
~MPlayer ();
virtual void init ();
virtual TQString menuName () const;
@ -210,7 +210,7 @@ public:
void read (KConfig *);
void sync (bool fromUI);
void prefLocation (TQString & item, TQString & icon, TQString & tab);
TQFrame * prefPage (TQWidget * tqparent);
TQFrame * prefPage (TQWidget * parent);
TQRegExp m_patterns[pat_last];
int cachesize;
TQString mplayer_path;
@ -239,7 +239,7 @@ class MEncoder : public MPlayerBase, public Recorder {
Q_OBJECT
TQ_OBJECT
public:
MEncoder (TQObject * tqparent, Settings * settings);
MEncoder (TQObject * parent, Settings * settings);
~MEncoder ();
virtual void init ();
virtual bool deMediafiedPlay ();
@ -255,7 +255,7 @@ class KMPLAYER_NO_EXPORT MPlayerDumpstream
Q_OBJECT
TQ_OBJECT
public:
MPlayerDumpstream (TQObject * tqparent, Settings * settings);
MPlayerDumpstream (TQObject * parent, Settings * settings);
~MPlayerDumpstream ();
virtual void init ();
virtual bool deMediafiedPlay ();
@ -274,7 +274,7 @@ class KMPLAYER_EXPORT CallbackProcess : public Process {
TQ_OBJECT
friend class Callback;
public:
CallbackProcess (TQObject * tqparent, Settings * settings, const char * n, const TQString & menu);
CallbackProcess (TQObject * parent, Settings * settings, const char * n, const TQString & menu);
~CallbackProcess ();
virtual void setStatusMessage (const TQString & msg);
virtual void setErrorMessage (int code, const TQString & msg);
@ -351,7 +351,7 @@ struct KMPLAYER_NO_EXPORT TypeNode : public ConfigNode {
KDE_NO_CDTOR_EXPORT ~TypeNode () {}
NodePtr childFromTag (const TQString & tag);
void changedXML (TQTextStream & out);
TQWidget * createWidget (TQWidget * tqparent);
TQWidget * createWidget (TQWidget * parent);
const char * nodeName () const { return tag.ascii (); }
TQString tag;
};
@ -367,7 +367,7 @@ public:
void read (KConfig *);
void sync (bool fromUI);
void prefLocation (TQString & item, TQString & icon, TQString & tab);
TQFrame * prefPage (TQWidget * tqparent);
TQFrame * prefPage (TQWidget * parent);
private:
CallbackProcess * m_process;
XMLPreferencesFrame * m_configframe;
@ -380,7 +380,7 @@ class KMPLAYER_NO_EXPORT Xine : public CallbackProcess, public Recorder {
Q_OBJECT
TQ_OBJECT
public:
Xine (TQObject * tqparent, Settings * settings);
Xine (TQObject * parent, Settings * settings);
~Xine ();
public slots:
bool ready (Viewer *);
@ -393,7 +393,7 @@ class KMPLAYER_NO_EXPORT GStreamer : public CallbackProcess {
Q_OBJECT
TQ_OBJECT
public:
GStreamer (TQObject * tqparent, Settings * settings);
GStreamer (TQObject * parent, Settings * settings);
~GStreamer ();
public slots:
virtual bool ready (Viewer *);
@ -406,7 +406,7 @@ class KMPLAYER_EXPORT FFMpeg : public Process, public Recorder {
Q_OBJECT
TQ_OBJECT
public:
FFMpeg (TQObject * tqparent, Settings * settings);
FFMpeg (TQObject * parent, Settings * settings);
~FFMpeg ();
virtual void init ();
virtual bool deMediafiedPlay ();
@ -430,7 +430,7 @@ public:
BecauseDone = 0, BecauseError = 1, BecauseStopped = 2
};
NpStream (TQObject *tqparent, TQ_UINT32 stream_id, const KURL & url);
NpStream (TQObject *parent, TQ_UINT32 stream_id, const KURL & url);
~NpStream ();
void open ();
@ -460,7 +460,7 @@ class KMPLAYER_NO_EXPORT NpPlayer : public Process {
Q_OBJECT
TQ_OBJECT
public:
NpPlayer (TQObject * tqparent, Settings * settings, const TQString & srv);
NpPlayer (TQObject * parent, Settings * settings, const TQString & srv);
~NpPlayer ();
virtual void init ();
virtual bool deMediafiedPlay ();

12
src/kmplayertvsource.cpp
Unescape View File

@ -55,8 +55,8 @@ static const char * strTV = "TV";
static const char * strTVDriver = "Driver";
KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *tqparent, KMPlayer::NodePtr dev)
: TQFrame (tqparent, "PageTVDevice"), device_doc (dev) {
KDE_NO_CDTOR_EXPORT TVDevicePage::TVDevicePage (TQWidget *parent, KMPlayer::NodePtr dev)
: TQFrame (parent, "PageTVDevice"), device_doc (dev) {
TVDevice * device = KMPlayer::convertNode <TVDevice> (device_doc);
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
TQLabel * deviceLabel = new TQLabel (i18n ("Video device:") + device->src, this, 0);
@ -142,8 +142,8 @@ KDE_NO_EXPORT void TVDevicePage::slotDelete () {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageTV::KMPlayerPrefSourcePageTV (TQWidget *tqparent, KMPlayerTVSource * tvsource)
: TQFrame (tqparent), m_tvsource (tvsource) {
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageTV::KMPlayerPrefSourcePageTV (TQWidget *parent, KMPlayerTVSource * tvsource)
: TQFrame (parent), m_tvsource (tvsource) {
TQVBoxLayout * maintqlayout = new TQVBoxLayout (this, 5);
notebook = new TQTabWidget (this);
notebook->setTabPosition (TQTabWidget::Bottom);
@ -571,9 +571,9 @@ KDE_NO_EXPORT void KMPlayerTVSource::prefLocation (TQString & item, TQString & i
tab = i18n ("TV");
}
KDE_NO_EXPORT TQFrame * KMPlayerTVSource::prefPage (TQWidget * tqparent) {
KDE_NO_EXPORT TQFrame * KMPlayerTVSource::prefPage (TQWidget * parent) {
if (!m_configpage) {
m_configpage = new KMPlayerPrefSourcePageTV (tqparent, this);
m_configpage = new KMPlayerPrefSourcePageTV (parent, this);
scanner = new TVDeviceScannerSource (this);
connect (m_configpage->scan, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScan()));
}

6
src/kmplayertvsource.h
Unescape View File

@ -51,7 +51,7 @@ class KMPLAYER_NO_EXPORT TVDevicePage : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
TVDevicePage (TQWidget *tqparent, KMPlayer::NodePtr dev);
TVDevicePage (TQWidget *parent, KMPlayer::NodePtr dev);
KDE_NO_CDTOR_EXPORT ~TVDevicePage () {}
TQLineEdit * name;
@ -71,7 +71,7 @@ class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageTV : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
KMPlayerPrefSourcePageTV (TQWidget *tqparent, KMPlayerTVSource *);
KMPlayerPrefSourcePageTV (TQWidget *parent, KMPlayerTVSource *);
KDE_NO_CDTOR_EXPORT ~KMPlayerPrefSourcePageTV () {}
TQLineEdit * driver;
KURLRequester * device;
@ -193,7 +193,7 @@ public:
virtual void read (KConfig *);
virtual void sync (bool);
virtual void prefLocation (TQString & item, TQString & icon, TQString & tab);
virtual TQFrame * prefPage (TQWidget * tqparent);
virtual TQFrame * prefPage (TQWidget * parent);
void readXML ();
public slots:
virtual void activate ();

16
src/kmplayervdr.cpp
Unescape View File

@ -75,8 +75,8 @@ static const char * strXVPort = "XV Port";
static const char * strXVEncoding = "XV Encoding";
static const char * strXVScale = "XV Scale";
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidget * tqparent, KMPlayer::PartBase * player)
: TQFrame (tqparent), m_player (player) {
KDE_NO_CDTOR_EXPORT KMPlayerPrefSourcePageVDR::KMPlayerPrefSourcePageVDR (TQWidget * parent, KMPlayer::PartBase * player)
: TQFrame (parent), m_player (player) {
//KURLRequester * v4ldevice;
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 2);
TQGridLayout *gridtqlayout = new TQGridLayout (1, 2);
@ -652,8 +652,8 @@ KDE_NO_EXPORT void KMPlayerVDRSource::read (KConfig * m_config) {
}
struct XVTreeItem : public TQListViewItem {
XVTreeItem (TQListViewItem *tqparent, const TQString & t, int p, int e)
: TQListViewItem (tqparent, t), port (p), encoding (e) {}
XVTreeItem (TQListViewItem *parent, const TQString & t, int p, int e)
: TQListViewItem (parent, t), port (p), encoding (e) {}
int port;
int encoding;
};
@ -728,9 +728,9 @@ KDE_NO_EXPORT void KMPlayerVDRSource::prefLocation (TQString & item, TQString &
tab = i18n ("VDR");
}
KDE_NO_EXPORT TQFrame * KMPlayerVDRSource::prefPage (TQWidget * tqparent) {
KDE_NO_EXPORT TQFrame * KMPlayerVDRSource::prefPage (TQWidget * parent) {
if (!m_configpage)
m_configpage = new KMPlayerPrefSourcePageVDR (tqparent, m_player);
m_configpage = new KMPlayerPrefSourcePageVDR (parent, m_player);
return m_configpage;
}
@ -747,8 +747,8 @@ static const char * xv_supported [] = {
"tvsource", "vdrsource", 0L
};
KDE_NO_CDTOR_EXPORT XVideo::XVideo (TQObject * tqparent, Settings * settings)
: KMPlayer::CallbackProcess (tqparent, settings, "xvideo", i18n ("X&Video")) {
KDE_NO_CDTOR_EXPORT XVideo::XVideo (TQObject * parent, Settings * settings)
: KMPlayer::CallbackProcess (parent, settings, "xvideo", i18n ("X&Video")) {
m_supported_sources = xv_supported;
//m_player->settings ()->addPage (m_configpage);
}

6
src/kmplayervdr.h
Unescape View File

@ -52,7 +52,7 @@ class KMPLAYER_NO_EXPORT KMPlayerPrefSourcePageVDR : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
KMPlayerPrefSourcePageVDR (TQWidget * tqparent, KMPlayer::PartBase * player);
KMPlayerPrefSourcePageVDR (TQWidget * parent, KMPlayer::PartBase * player);
~KMPlayerPrefSourcePageVDR ();
KURLRequester * vcddevice;
KListView * xv_port;
@ -81,7 +81,7 @@ public:
virtual void read (KConfig *);
virtual void sync (bool);
virtual void prefLocation (TQString & item, TQString & icon, TQString & tab);
virtual TQFrame * prefPage (TQWidget * tqparent);
virtual TQFrame * prefPage (TQWidget * parent);
virtual bool requestPlayURL (KMPlayer::NodePtr mrl);
virtual void stateElementChanged (KMPlayer::Node * node, KMPlayer::Node::State os, KMPlayer::Node::State ns);
void waitForConnectionClose ();
@ -163,7 +163,7 @@ class XVideo : public KMPlayer::CallbackProcess {
Q_OBJECT
TQ_OBJECT
public:
XVideo (TQObject * tqparent, KMPlayer::Settings * settings);
XVideo (TQObject * parent, KMPlayer::Settings * settings);
~XVideo ();
public slots:
virtual bool ready (KMPlayer::Viewer *);

20
src/kmplayerview.cpp
Unescape View File

@ -88,8 +88,8 @@ namespace KMPlayer {
class KMPlayerPictureWidget : public TQWidget {
View * m_view;
public:
KDE_NO_CDTOR_EXPORT KMPlayerPictureWidget (TQWidget * tqparent, View * view)
: TQWidget (tqparent), m_view (view) {}
KDE_NO_CDTOR_EXPORT KMPlayerPictureWidget (TQWidget * parent, View * view)
: TQWidget (parent), m_view (view) {}
KDE_NO_CDTOR_EXPORT ~KMPlayerPictureWidget () {}
protected:
void mousePressEvent (TQMouseEvent *);
@ -103,7 +103,7 @@ KDE_NO_EXPORT void KMPlayerPictureWidget::mousePressEvent (TQMouseEvent *) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT TextEdit::TextEdit (TQWidget * tqparent, View * view) : TQTextEdit (tqparent, "kde_kmplayer_console"), m_view (view) {
KDE_NO_CDTOR_EXPORT TextEdit::TextEdit (TQWidget * parent, View * view) : TQTextEdit (parent, "kde_kmplayer_console"), m_view (view) {
setReadOnly (true);
setPaper (TQBrush (TQColor (0, 0, 0)));
setColor (TQColor (0xB2, 0xB2, 0xB2));
@ -115,7 +115,7 @@ KDE_NO_EXPORT void TextEdit::contextMenuEvent (TQContextMenuEvent * e) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT InfoWindow::InfoWindow (TQWidget * tqparent, View * view) : TQTextEdit (tqparent, "kde_kmplayer_console"), m_view (view) {
KDE_NO_CDTOR_EXPORT InfoWindow::InfoWindow (TQWidget * parent, View * view) : TQTextEdit (parent, "kde_kmplayer_console"), m_view (view) {
setReadOnly (true);
setLinkUnderline (false);
}
@ -126,8 +126,8 @@ KDE_NO_EXPORT void InfoWindow::contextMenuEvent (TQContextMenuEvent * e) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT View::View (TQWidget *tqparent, const char *name)
: KMediaPlayer::View (tqparent, name),
KDE_NO_CDTOR_EXPORT View::View (TQWidget *parent, const char *name)
: KMediaPlayer::View (parent, name),
m_image (0L),
m_control_panel (0L),
m_status_bar (0L),
@ -228,7 +228,7 @@ KDE_NO_EXPORT void View::init (KActionCollection * action_collection) {
KDE_NO_CDTOR_EXPORT View::~View () {
delete m_image;
if (TQT_BASE_OBJECT(m_view_area->tqparent ()) != TQT_BASE_OBJECT(this))
if (TQT_BASE_OBJECT(m_view_area->parent ()) != TQT_BASE_OBJECT(this))
delete m_view_area;
}
@ -685,8 +685,8 @@ bool View::x11Event (XEvent * e) {
//----------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT Viewer::Viewer (TQWidget *tqparent, View * view)
: QXEmbed (tqparent), m_plain_window (0), m_bgcolor (0), m_aspect (0.0),
KDE_NO_CDTOR_EXPORT Viewer::Viewer (TQWidget *parent, View * view)
: QXEmbed (parent), m_plain_window (0), m_bgcolor (0), m_aspect (0.0),
m_view (view) {
/*XWindowAttributes xwa;
XGetWindowAttributes (qt_xdisplay(), winId (), &xwa);
@ -694,7 +694,7 @@ KDE_NO_CDTOR_EXPORT Viewer::Viewer (TQWidget *tqparent, View * view)
xswa.background_pixel = 0;
xswa.border_pixel = 0;
xswa.colormap = xwa.colormap;
create (XCreateWindow (qt_xdisplay (), tqparent->winId (), 0, 0, 10, 10, 0,
create (XCreateWindow (qt_xdisplay (), parent->winId (), 0, 0, 10, 10, 0,
x11Depth (), InputOutput, (Visual*)x11Visual (),
CWBackPixel | CWBorderPixel | CWColormap, &xswa));*/
setAcceptDrops (true);

8
src/kmplayerview.h
Unescape View File

@ -65,7 +65,7 @@ typedef KStatusBar StatusBar;
*/
class TextEdit : public TQTextEdit {
public:
TextEdit (TQWidget * tqparent, View * view);
TextEdit (TQWidget * parent, View * view);
protected:
void contextMenuEvent (TQContextMenuEvent * e);
private:
@ -77,7 +77,7 @@ private:
*/
class InfoWindow : public TQTextEdit {
public:
InfoWindow (TQWidget * tqparent, View * view);
InfoWindow (TQWidget * parent, View * view);
KDE_NO_EXPORT View * view () const { return m_view; }
protected:
void contextMenuEvent (TQContextMenuEvent * e);
@ -102,7 +102,7 @@ public:
WT_Video, WT_Console, WT_Picture, WT_Last
};
View (TQWidget *tqparent, const char *);
View (TQWidget *parent, const char *);
~View();
void addText (const TQString &, bool eol=false);
@ -212,7 +212,7 @@ class KMPLAYER_EXPORT Viewer : public QXEmbed {
Q_OBJECT
TQ_OBJECT
public:
Viewer(TQWidget *tqparent, View * view);
Viewer(TQWidget *parent, View * view);
~Viewer();
int heightForWidth (int w) const;

16
src/npplayer.c
Unescape View File

@ -94,7 +94,7 @@ typedef struct _StreamInfo {
struct JsObject;
typedef struct _JsObject {
NPObject npobject;
struct _JsObject * tqparent;
struct _JsObject * parent;
char * name;
} JsObject;
@ -249,15 +249,15 @@ static StreamInfo *addStream (const char *url, const char *mime, const char *tar
static void createJsName (JsObject * obj, char **name, uint32_t * len) {
int slen = strlen (obj->name);
if (obj->tqparent) {
if (obj->parent) {
*len += slen + 1;
createJsName (obj->tqparent, name, len);
createJsName (obj->parent, name, len);
} else {
*name = (char *) malloc (*len + slen + 1);
*(*name + *len + slen) = 0;
*len = 0;
}
if (obj->tqparent) {
if (obj->parent) {
*(*name + *len) = '.';
*len += 1;
}
@ -687,8 +687,8 @@ static NPObject * windowClassAllocate (NPP instance, NPClass *aClass) {
static void windowClassDeallocate (NPObject *npobj) {
JsObject *jo = (JsObject *) npobj;
/*print ("windowClassDeallocate\n");*/
if (jo->tqparent) {
nsReleaseObject ((NPObject *) jo->tqparent);
if (jo->parent) {
nsReleaseObject ((NPObject *) jo->parent);
} else if (jo->name && !strncmp (jo->name, "this.__kmplayer__obj_", 21)) {
char *script = (char *) malloc (strlen (jo->name) + 7);
char *result;
@ -793,7 +793,7 @@ static bool windowClassGetProperty (NPObject *npobj, NPIdentifier property,
}
jo.name = id;
jo.tqparent = (JsObject *) npobj;
jo.parent = (JsObject *) npobj;
createJsName (&jo, (char **)&fullname.utf8characters, &fullname.utf8length);
res = nsEvaluate (npp, npobj, &fullname, result);
@ -814,7 +814,7 @@ static bool windowClassSetProperty (NPObject *npobj, NPIdentifier property,
return false;
jo.name = id;
jo.tqparent = (JsObject *) npobj;
jo.parent = (JsObject *) npobj;
createJsName (&jo, &var_name, &len);
var_val = nsVariant2Str (value);

16
src/playlistview.cpp
Unescape View File

@ -106,8 +106,8 @@ KDE_NO_CDTOR_EXPORT void RootPlayListItem::paintCell (TQPainter * p, const TQCol
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * tqparent, View * view, KActionCollection * ac)
: KListView (tqparent, "kde_kmplayer_playlist"),
KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * parent, View * view, KActionCollection * ac)
: KListView (parent, "kde_kmplayer_playlist"),
m_view (view),
m_find_dialog (0L),
m_active_color (30, 0, 255),
@ -388,8 +388,8 @@ void PlayListView::itemExpanded (TQListViewItem * item) {
RootPlayListItem * PlayListView::rootItem (TQListViewItem * item) const {
if (!item)
return 0L;
while (item->tqparent ())
item = item->tqparent ();
while (item->parent ())
item = item->parent ();
return static_cast <RootPlayListItem *> (item);
}
@ -458,7 +458,7 @@ KDE_NO_EXPORT void PlayListView::itemDropped (TQDropEvent * de, TQListViewItem *
if (!after) { // could still be a descendent
after = itemAt (contentsToViewport (de->pos ()));
if (after)
after = after->tqparent ();
after = after->parent ();
}
if (after) {
RootPlayListItem * ritem = rootItem (after);
@ -514,7 +514,7 @@ KDE_NO_EXPORT void PlayListView::itemIsRenamed (TQListViewItem * qitem) {
item->m_attr->setName (txt);
item->m_attr->setValue (TQString (""));
}
PlayListItem * pi = static_cast <PlayListItem *> (item->tqparent ());
PlayListItem * pi = static_cast <PlayListItem *> (item->parent ());
if (pi && pi->node)
pi->node->document ()->m_tree_version++;
}
@ -528,7 +528,7 @@ KDE_NO_EXPORT void PlayListView::itemIsSelected (TQListViewItem * qitem) {
KDE_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->tqparent ());
PlayListItem * pi = static_cast <PlayListItem *> (qitem->parent ());
if (pi && pi->node && pi->node->isEditable ())
KListView::rename (item, c);
} else if (item && item->node && item->node->isEditable ()) {
@ -590,7 +590,7 @@ KDE_NO_EXPORT void PlayListView::slotFindOk () {
m_current_find_elm = lvi->node;
current_find_tree_id = rootItem (lvi)->id;
} else if (lvi && lvi->m_attr) {
PlayListItem*pi=static_cast<PlayListItem*>(currentItem()->tqparent());
PlayListItem*pi=static_cast<PlayListItem*>(currentItem()->parent());
if (pi) {
m_current_find_attr = lvi->m_attr;
m_current_find_elm = pi->node;

2
src/playlistview.h
Unescape View File

@ -84,7 +84,7 @@ public:
InPlaceEdit = 0x04, TreeEdit = 0x08,
Moveable = 0x10, Deleteable = 0x20
};
PlayListView (TQWidget * tqparent, View * view, KActionCollection * ac);
PlayListView (TQWidget * parent, View * view, KActionCollection * ac);
~PlayListView ();
void selectItem (const TQString & txt);
void showAllNodes (RootPlayListItem *, bool show=true);

36
src/pref.cpp
Unescape View File

@ -199,8 +199,8 @@ KDE_NO_EXPORT void Preferences::removePrefPage(PreferencesPage * page) {
KDE_NO_CDTOR_EXPORT Preferences::~Preferences() {
}
KDE_NO_CDTOR_EXPORT PrefGeneralPageGeneral::PrefGeneralPageGeneral(TQWidget *tqparent, Settings *)
: TQFrame (tqparent, "GeneralPage")
KDE_NO_CDTOR_EXPORT PrefGeneralPageGeneral::PrefGeneralPageGeneral(TQWidget *parent, Settings *)
: TQFrame (parent, "GeneralPage")
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 5, 2);
@ -266,8 +266,8 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageGeneral::PrefGeneralPageGeneral(TQWidget *tqp
tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
}
KDE_NO_CDTOR_EXPORT PrefGeneralPageLooks::PrefGeneralPageLooks (TQWidget *tqparent, Settings * settings)
: TQFrame (tqparent, "LooksPage"),
KDE_NO_CDTOR_EXPORT PrefGeneralPageLooks::PrefGeneralPageLooks (TQWidget *parent, Settings * settings)
: TQFrame (parent, "LooksPage"),
colors (settings->colors),
fonts (settings->fonts) {
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 5, 2);
@ -327,8 +327,8 @@ KDE_NO_EXPORT void PrefGeneralPageLooks::fontClicked () {
}
}
KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *tqparent)
: TQFrame (tqparent, "URLPage")
KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent)
: TQFrame (parent, "URLPage")
{
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
TQHBoxLayout * urltqlayout = new TQHBoxLayout ();
@ -394,7 +394,7 @@ KDE_NO_EXPORT void PrefSourcePageURL::slotTextChanged (const TQString &) {
changed = true;
}
KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *tqparent, PartBase * player, RecorderPage * rl, int rec_len) : TQFrame (tqparent, "RecordPage"), m_player (player), m_recorders (rl), m_recorders_length (rec_len) {
KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase * player, RecorderPage * rl, int rec_len) : TQFrame (parent, "RecordPage"), m_player (player), m_recorders (rl), m_recorders_length (rec_len) {
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
TQHBoxLayout * urltqlayout = new TQHBoxLayout ();
TQLabel *urlLabel = new TQLabel (i18n ("Output file:"), this);
@ -518,8 +518,8 @@ KDE_NO_EXPORT void PrefRecordPage::playingStopped () {
}
}
KDE_NO_CDTOR_EXPORT RecorderPage::RecorderPage (TQWidget *tqparent, PartBase * player)
: TQFrame (tqparent), next (0L), m_player (player) {}
KDE_NO_CDTOR_EXPORT RecorderPage::RecorderPage (TQWidget *parent, PartBase * player)
: TQFrame (parent), next (0L), m_player (player) {}
KDE_NO_EXPORT void RecorderPage::record () {
Process * proc = m_player->recorders () [recorderName ()];
@ -537,7 +537,7 @@ KDE_NO_EXPORT void RecorderPage::record () {
}
}
KDE_NO_CDTOR_EXPORT PrefMEncoderPage::PrefMEncoderPage (TQWidget *tqparent, PartBase * player) : RecorderPage (tqparent, player) {
KDE_NO_CDTOR_EXPORT PrefMEncoderPage::PrefMEncoderPage (TQWidget *parent, PartBase * player) : RecorderPage (parent, player) {
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
format = new TQButtonGroup (3, Qt::Vertical, i18n ("Format"), this);
new TQRadioButton (i18n ("Same as source"), format);
@ -571,7 +571,7 @@ KDE_NO_EXPORT TQString PrefMEncoderPage::name () {
return i18n ("&MEncoder");
}
KDE_NO_CDTOR_EXPORT PrefMPlayerDumpstreamPage::PrefMPlayerDumpstreamPage (TQWidget *tqparent, PartBase * player) : RecorderPage (tqparent, player) {
KDE_NO_CDTOR_EXPORT PrefMPlayerDumpstreamPage::PrefMPlayerDumpstreamPage (TQWidget *parent, PartBase * player) : RecorderPage (parent, player) {
hide();
}
@ -579,7 +579,7 @@ KDE_NO_EXPORT TQString PrefMPlayerDumpstreamPage::name () {
return i18n ("MPlayer -&dumpstream");
}
KDE_NO_CDTOR_EXPORT PrefFFMpegPage::PrefFFMpegPage (TQWidget *tqparent, PartBase * player) : RecorderPage (tqparent, player) {
KDE_NO_CDTOR_EXPORT PrefFFMpegPage::PrefFFMpegPage (TQWidget *parent, PartBase * player) : RecorderPage (parent, player) {
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5, 5);
TQGridLayout *gridtqlayout = new TQGridLayout (1, 2, 2);
TQLabel *argLabel = new TQLabel (i18n("FFMpeg arguments:"), this);
@ -600,7 +600,7 @@ KDE_NO_EXPORT TQString PrefFFMpegPage::name () {
}
#ifdef HAVE_XINE
KDE_NO_CDTOR_EXPORT PrefXinePage::PrefXinePage (TQWidget *tqparent, PartBase * player) : RecorderPage (tqparent, player) {
KDE_NO_CDTOR_EXPORT PrefXinePage::PrefXinePage (TQWidget *parent, PartBase * player) : RecorderPage (parent, player) {
hide();
}
@ -609,8 +609,8 @@ KDE_NO_EXPORT TQString PrefXinePage::name () {
}
#endif
KDE_NO_CDTOR_EXPORT PrefGeneralPageOutput::PrefGeneralPageOutput(TQWidget *tqparent, OutputDriver * ad, OutputDriver * vd)
: TQFrame (tqparent) {
KDE_NO_CDTOR_EXPORT PrefGeneralPageOutput::PrefGeneralPageOutput(TQWidget *parent, OutputDriver * ad, OutputDriver * vd)
: TQFrame (parent) {
TQGridLayout *tqlayout = new TQGridLayout (this, 2, 2, 5);
videoDriver = new TQListBox (this);
@ -628,14 +628,14 @@ KDE_NO_CDTOR_EXPORT PrefGeneralPageOutput::PrefGeneralPageOutput(TQWidget *tqpar
tqlayout->addItem (new TQSpacerItem (0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
}
KDE_NO_CDTOR_EXPORT PrefOPPageGeneral::PrefOPPageGeneral(TQWidget *tqparent)
: TQFrame(tqparent)
KDE_NO_CDTOR_EXPORT PrefOPPageGeneral::PrefOPPageGeneral(TQWidget *parent)
: TQFrame(parent)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout (this, 5);
tqlayout->setAutoAdd (true);
}
KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *tqparent) : TQFrame(tqparent)
KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : TQFrame(parent)
{
TQVBoxLayout *tabLayout = new TQVBoxLayout (this, 5);
postProcessing = new TQCheckBox (i18n ("Enable use of postprocessing filters"), this);

24
src/pref.h
Unescape View File

@ -103,7 +103,7 @@ class KMPLAYER_NO_EXPORT PrefGeneralPageGeneral : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
PrefGeneralPageGeneral(TQWidget *tqparent, Settings *);
PrefGeneralPageGeneral(TQWidget *parent, Settings *);
~PrefGeneralPageGeneral() {}
TQCheckBox *keepSizeRatio;
@ -126,7 +126,7 @@ class KMPLAYER_NO_EXPORT PrefGeneralPageLooks : public TQFrame {
Q_OBJECT
TQ_OBJECT
public:
PrefGeneralPageLooks (TQWidget *tqparent, Settings *);
PrefGeneralPageLooks (TQWidget *parent, Settings *);
~PrefGeneralPageLooks () {}
TQComboBox *colorscombo;
KColorButton *colorbutton;
@ -147,7 +147,7 @@ class KMPLAYER_NO_EXPORT PrefSourcePageURL : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
PrefSourcePageURL (TQWidget *tqparent);
PrefSourcePageURL (TQWidget *parent);
~PrefSourcePageURL () {}
KURLRequester * url;
@ -171,7 +171,7 @@ class KMPLAYER_NO_EXPORT PrefRecordPage : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
PrefRecordPage (TQWidget *tqparent, PartBase *, RecorderPage *, int len);
PrefRecordPage (TQWidget *parent, PartBase *, RecorderPage *, int len);
~PrefRecordPage () {}
KURLRequester * url;
@ -200,7 +200,7 @@ class KMPLAYER_NO_EXPORT RecorderPage : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
RecorderPage (TQWidget *tqparent, PartBase *);
RecorderPage (TQWidget *parent, PartBase *);
virtual ~RecorderPage () {};
virtual void record ();
virtual TQString name () = 0;
@ -215,7 +215,7 @@ class KMPLAYER_NO_EXPORT PrefMEncoderPage : public RecorderPage
Q_OBJECT
TQ_OBJECT
public:
PrefMEncoderPage (TQWidget *tqparent, PartBase *);
PrefMEncoderPage (TQWidget *parent, PartBase *);
~PrefMEncoderPage () {}
void record ();
@ -231,7 +231,7 @@ private:
class KMPLAYER_NO_EXPORT PrefMPlayerDumpstreamPage : public RecorderPage {
public:
PrefMPlayerDumpstreamPage (TQWidget *tqparent, PartBase *);
PrefMPlayerDumpstreamPage (TQWidget *parent, PartBase *);
~PrefMPlayerDumpstreamPage () {}
TQString name ();
@ -241,7 +241,7 @@ public:
#ifdef HAVE_XINE
class KMPLAYER_NO_EXPORT PrefXinePage : public RecorderPage {
public:
PrefXinePage (TQWidget *tqparent, PartBase *);
PrefXinePage (TQWidget *parent, PartBase *);
~PrefXinePage () {}
TQString name ();
@ -254,7 +254,7 @@ class KMPLAYER_NO_EXPORT PrefFFMpegPage : public RecorderPage
Q_OBJECT
TQ_OBJECT
public:
PrefFFMpegPage (TQWidget *tqparent, PartBase *);
PrefFFMpegPage (TQWidget *parent, PartBase *);
~PrefFFMpegPage () {}
void record ();
@ -272,7 +272,7 @@ class KMPLAYER_NO_EXPORT PrefGeneralPageOutput : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
PrefGeneralPageOutput (TQWidget *tqparent, OutputDriver * ad, OutputDriver * vd);
PrefGeneralPageOutput (TQWidget *parent, OutputDriver * ad, OutputDriver * vd);
~PrefGeneralPageOutput() {}
TQListBox *videoDriver;
@ -284,7 +284,7 @@ class KMPLAYER_NO_EXPORT PrefOPPageGeneral : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
PrefOPPageGeneral(TQWidget *tqparent = 0);
PrefOPPageGeneral(TQWidget *parent = 0);
~PrefOPPageGeneral() {}
};
@ -293,7 +293,7 @@ class KMPLAYER_NO_EXPORT PrefOPPagePostProc : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
PrefOPPagePostProc(TQWidget *tqparent = 0);
PrefOPPagePostProc(TQWidget *parent = 0);
~PrefOPPagePostProc() {}
TQCheckBox* postProcessing;

68
src/triestring.cpp
Unescape View File

@ -46,7 +46,7 @@ struct KMPLAYER_NO_EXPORT TrieNode {
char * str;
unsigned short length;
unsigned short ref_count;
TrieNode * tqparent;
TrieNode * parent;
TrieNode * first_child;
TrieNode * next_sibling;
};
@ -70,7 +70,7 @@ KDE_NO_CDTOR_EXPORT TrieNode::TrieNode (const char * s)
: str (s ? strdup (s) : 0L),
length (s ? strlen (s) : 0),
ref_count (1),
tqparent (0L),
parent (0L),
first_child (0L),
next_sibling (0L) {}
@ -81,7 +81,7 @@ KDE_NO_CDTOR_EXPORT TrieNode::~TrieNode () {
KDE_NO_EXPORT void TrieNode::unref () {
if (--ref_count <= 0 && !first_child)
tqparent->removeChild (this);
parent->removeChild (this);
}
KDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) {
@ -95,10 +95,10 @@ KDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) {
}
}
delete node;
if (!tqparent)
if (!parent)
return;
if (!ref_count && !first_child)
tqparent->removeChild (this); // can this happen ?
parent->removeChild (this); // can this happen ?
else if (!ref_count && !first_child->next_sibling) { // merge with child
char * tmp = first_child->str;
first_child->length = first_child->length + length;
@ -106,12 +106,12 @@ KDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) {
strcpy (first_child->str, str);
strcat (first_child->str, tmp);
free (tmp);
first_child->tqparent = tqparent;
first_child->parent = parent;
first_child->next_sibling = next_sibling;
if (tqparent->first_child == this) {
tqparent->first_child = first_child;
if (parent->first_child == this) {
parent->first_child = first_child;
} else {
for (TrieNode *n = tqparent->first_child; n; n = n->next_sibling)
for (TrieNode *n = parent->first_child; n; n = n->next_sibling)
if (n->next_sibling == this) {
n->next_sibling = first_child;
break;
@ -123,9 +123,9 @@ KDE_NO_EXPORT void TrieNode::removeChild (TrieNode * node) {
static char * trieRetrieveString (TrieNode * node, int &len) {
char *buf;
if (node->tqparent) {
if (node->parent) {
len += node->length;
buf = trieRetrieveString (node->tqparent, len);
buf = trieRetrieveString (node->parent, len);
strcat (buf, node->str);
} else {
buf = (char *) malloc (len + 1);
@ -138,8 +138,8 @@ static int trieStringCompare (TrieNode * node, const char * s, int &len) {
int cmp = 0;
if (!node)
return !!s;
if (node->tqparent && node->tqparent != root_trie)
cmp = trieStringCompare (node->tqparent, s, len);
if (node->parent && node->parent != root_trie)
cmp = trieStringCompare (node->parent, s, len);
if (!cmp) {
#ifdef TEST_TRIE
printf( "compare %s %s %d\n", node->str, s + len, node->length);
@ -153,8 +153,8 @@ static int trieStringCompare (TrieNode * node, const char * s, int &len) {
static int trieStringCompare (TrieNode * n1, TrieNode * n2) {
// pre n1 && n2 on same depth and not NIL
int cmp = 0;
if (n1->tqparent && n1->tqparent != root_trie)
cmp = trieStringCompare (n1->tqparent, n2->tqparent);
if (n1->parent && n1->parent != root_trie)
cmp = trieStringCompare (n1->parent, n2->parent);
if (!cmp && n1 != n2) {
#ifdef TEST_TRIE
printf( "compare %s %s", n1->str, n2->str);
@ -174,8 +174,8 @@ static int trieStringCompare (TrieNode * n1, TrieNode * n2) {
static int trieStringStarts (TrieNode * node, const char * s, int & pos) {
int cmp = -1; // -1 still matches, 0 no, 1 yes
if (node->tqparent && node->tqparent != root_trie)
cmp = trieStringStarts (node->tqparent, s, pos);
if (node->parent && node->parent != root_trie)
cmp = trieStringStarts (node->parent, s, pos);
if (cmp == -1) {
for (int i = 0; i < node->length; i++)
if (node->str[i] != s[pos + i])
@ -190,8 +190,8 @@ static TrieNode * trieInsert (const char * s) {
root_trie = new TrieNode (0L);
//printf("trieInsert %s\n", s);
//dumpTrie();
TrieNode * tqparent = root_trie;
for (TrieNode * c = tqparent->first_child; c; c = c->first_child) {
TrieNode * parent = root_trie;
for (TrieNode * c = parent->first_child; c; c = c->first_child) {
TrieNode * prev = c;
for (TrieNode * n = prev; n; n = n->next_sibling) {
if (n->str[0] == s[0]) { // insert here
@ -206,13 +206,13 @@ static TrieNode * trieInsert (const char * s) {
tmp[i] = 0;
TrieNode * node = new TrieNode (tmp);
free (tmp);
node->tqparent = tqparent;
node->parent = parent;
node->next_sibling = n->next_sibling;
if (prev != n)
prev->next_sibling = node;
else
tqparent->first_child = node;
n->tqparent = node;
parent->first_child = node;
n->parent = node;
TrieNode * snode;
if (!s[i]) {
node->first_child = n;
@ -220,7 +220,7 @@ static TrieNode * trieInsert (const char * s) {
snode = node; // s is complete in node
} else {
snode = new TrieNode (s+i);
snode->tqparent = node;
snode->parent = node;
if (bigger) { // set n before snode
node->first_child = n;
n->next_sibling = snode;
@ -244,28 +244,28 @@ static TrieNode * trieInsert (const char * s) {
return n;
} else if (n->str[0] > s[0]) { // insert before
TrieNode * node = new TrieNode (s);
node->tqparent = tqparent;
node->parent = parent;
node->next_sibling = n;
if (prev != n)
prev->next_sibling = node;
else
tqparent->first_child = node;
parent->first_child = node;
return node;
}
prev = n;
}
if (prev) { // insert after
TrieNode * node = new TrieNode (s);
node->tqparent = tqparent;
node->parent = parent;
prev->next_sibling = node;
return node;
}
tqparent = c;
parent = c;
}
// hit an empty first_child, add s as first_child
TrieNode * node = new TrieNode (s);
tqparent->first_child = node;
node->tqparent = tqparent;
parent->first_child = node;
node->parent = parent;
return node;
}
@ -288,7 +288,7 @@ TrieString::~TrieString () {
}
bool TrieString::startsWith (const TrieString & s) const {
for (TrieNode * n = node; n; n = n->tqparent)
for (TrieNode * n = node; n; n = n->parent)
if (n == s.node)
return true;
return s.node ? false : true;
@ -342,11 +342,11 @@ bool TrieString::operator < (const TrieString & s) const {
if (node == s.node)
return false;
int depth1 = 0, depth2 = 0;
for (TrieNode * n = node; n; n = n->tqparent)
for (TrieNode * n = node; n; n = n->parent)
depth1++;
if (!depth1)
return s.node ? true : false;
for (TrieNode * n = s.node; n; n = n->tqparent)
for (TrieNode * n = s.node; n; n = n->parent)
depth2++;
if (!depth2)
return false;
@ -355,13 +355,13 @@ bool TrieString::operator < (const TrieString & s) const {
while (depth1 > depth2) {
if (n1 == n2)
return false;
n1 = n1->tqparent;
n1 = n1->parent;
depth1--;
}
while (depth2 > depth1) {
if (n1 == n2)
return true;
n2 = n2->tqparent;
n2 = n2->parent;
depth2--;
}
int cmp = trieStringCompare (n1, n2);

6
src/viewarea.cpp
Unescape View File

@ -1338,9 +1338,9 @@ KDE_NO_EXPORT void MouseVisitor::visit (SMIL::MediaType * mediatype) {
//-----------------------------------------------------------------------------
KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * tqparent, View * view)
: TQWidget (tqparent, "kde_kmplayer_viewarea", WResizeNoErase | WRepaintNoErase),
m_parent (tqparent),
KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (TQWidget * parent, View * view)
: TQWidget (parent, "kde_kmplayer_viewarea", WResizeNoErase | WRepaintNoErase),
m_parent (parent),
m_view (view),
m_collection (new KActionCollection (this)),
surface (new ViewSurface (this)),

2
src/viewarea.h
Unescape View File

@ -36,7 +36,7 @@ class KMPLAYER_EXPORT ViewArea : public TQWidget {
Q_OBJECT
TQ_OBJECT
public:
ViewArea (TQWidget * tqparent, View * view);
ViewArea (TQWidget * parent, View * view);
~ViewArea ();
KDE_NO_EXPORT bool isFullScreen () const { return m_fullscreen; }
KDE_NO_EXPORT bool isMinimalMode () const { return m_minimal; }

Write Preview
Loading…
Cancel
Save