From 81ad3b51a1f061b0934426aaf339917f76c0cfc5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:10:16 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- src/kmplayer_atom.cpp | 14 ++--- src/kmplayer_part.cpp | 100 +++++++++++++++++------------------ src/kmplayer_rp.cpp | 6 +-- src/kmplayer_smil.cpp | 26 ++++----- src/kmplayer_smil.h | 2 +- src/kmplayerapp.cpp | 24 ++++----- src/kmplayerbroadcast.cpp | 2 +- src/kmplayerconfig.cpp | 2 +- src/kmplayercontrolpanel.cpp | 8 +-- src/kmplayerpartbase.cpp | 16 +++--- src/kmplayerpartbase.h | 2 +- src/kmplayerprocess.cpp | 4 +- src/kmplayertvsource.cpp | 8 +-- src/kmplayerview.cpp | 20 +++---- src/npplayer.c | 4 +- src/playlistview.cpp | 6 +-- src/pref.cpp | 18 +++---- src/viewarea.cpp | 14 ++--- 18 files changed, 138 insertions(+), 138 deletions(-) diff --git a/src/kmplayer_atom.cpp b/src/kmplayer_atom.cpp index a35c649..3b5915f 100644 --- a/src/kmplayer_atom.cpp +++ b/src/kmplayer_atom.cpp @@ -75,7 +75,7 @@ void ATOM::Link::closed () { else if (a->name () == "rel") rel = a->value (); } - if (!href.isEmpty () && rel == TQString::tqfromLatin1 ("enclosure")) + if (!href.isEmpty () && rel == TQString::fromLatin1 ("enclosure")) src = href; else if (pretty_name.isEmpty ()) pretty_name = href; @@ -87,12 +87,12 @@ void ATOM::Content::closed () { src = a->value (); else if (a->name () == StringPool::attr_type) { TQString v = a->value ().lower (); - if (v == TQString::tqfromLatin1 ("text")) - mimetype = TQString::tqfromLatin1 ("text/plain"); - else if (v == TQString::tqfromLatin1 ("html")) - mimetype = TQString::tqfromLatin1 ("text/html"); - else if (v == TQString::tqfromLatin1 ("xhtml")) - mimetype = TQString::tqfromLatin1 ("application/xhtml+xml"); + if (v == TQString::fromLatin1 ("text")) + mimetype = TQString::fromLatin1 ("text/plain"); + else if (v == TQString::fromLatin1 ("html")) + mimetype = TQString::fromLatin1 ("text/html"); + else if (v == TQString::fromLatin1 ("xhtml")) + mimetype = TQString::fromLatin1 ("application/xhtml+xml"); else mimetype = v; } diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp index d897c73..4fb7800 100644 --- a/src/kmplayer_part.cpp +++ b/src/kmplayer_part.cpp @@ -81,8 +81,8 @@ struct KMPLAYER_NO_EXPORT GroupPredicate { !part->master () && !part->url ().isEmpty ()) || (m_part->allowRedir (part->m_docbase) && (part->m_group == m_group || - part->m_group == TQString::tqfromLatin1("_master") || - m_group == TQString::tqfromLatin1("_master")) && + part->m_group == TQString::fromLatin1("_master") || + m_group == TQString::fromLatin1("_master")) && (part->m_features & KMPlayerPart::Feat_Viewer) != (m_part->m_features & KMPlayerPart::Feat_Viewer))); } @@ -128,9 +128,9 @@ KDE_NO_EXPORT KParts::Part *KMPlayerFactory::createPartObject //----------------------------------------------------------------------------- static bool getBoolValue (const TQString & value) { - return (value.lower() != TQString::tqfromLatin1("false") && - value.lower() != TQString::tqfromLatin1("off") && - value.lower() != TQString::tqfromLatin1("0")); + return (value.lower() != TQString::fromLatin1("false") && + value.lower() != TQString::fromLatin1("off") && + value.lower() != TQString::fromLatin1("0")); } #define SET_FEAT_ON(f) { m_features |= f; turned_off_features &= ~f; } @@ -184,13 +184,13 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char * urlsource->setURL (KURL (value)); urlsource->setIdentified (false); m_havehref = true; - } else if (name == TQString::tqfromLatin1("width")) { + } else if (name == TQString::fromLatin1("width")) { m_noresize = true; - } else if (name == TQString::tqfromLatin1("height")) { + } else if (name == TQString::fromLatin1("height")) { m_noresize = true; - } else if (name == TQString::tqfromLatin1("type")) { + } else if (name == TQString::fromLatin1("type")) { urlsource->document ()->mrl ()->mimetype = value; - } else if (name == TQString::tqfromLatin1("controls")) { + } else if (name == TQString::fromLatin1("controls")) { //http://service.real.com/help/library/guides/production8/realpgd.htm?src=noref,rnhmpg_080301,rnhmtn,nosrc //http://service.real.com/help/library/guides/production8/htmfiles/control.htm TQStringList sl = TQStringList::split (TQChar (','), value); @@ -198,107 +198,107 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char * const TQStringList::const_iterator e = sl.end (); for (TQStringList::const_iterator i = sl.begin (); i != e; ++i) { TQString val_lower ((*i).lower ()); - if (val_lower == TQString::tqfromLatin1("imagewindow")) { + if (val_lower == TQString::fromLatin1("imagewindow")) { SET_FEAT_ON (Feat_ImageWindow | Feat_Viewer) - } else if (val_lower == TQString::tqfromLatin1("all")) { + } else if (val_lower == TQString::fromLatin1("all")) { m_features = (Feat_Controls | Feat_StatusBar); - } else if (val_lower == TQString::tqfromLatin1("tacctrl")) { + } else if (val_lower == TQString::fromLatin1("tacctrl")) { SET_FEAT_ON (Feat_Label) - } else if (val_lower == TQString::tqfromLatin1("controlpanel")) { + } else if (val_lower == TQString::fromLatin1("controlpanel")) { SET_FEAT_ON (Feat_Controls) - } else if (val_lower == TQString::tqfromLatin1("infovolumepanel")){ + } else if (val_lower == TQString::fromLatin1("infovolumepanel")){ SET_FEAT_ON (Feat_Controls) // TODO - } else if (val_lower == TQString::tqfromLatin1("positionfield") || - val_lower == TQString::tqfromLatin1("positionslider")) { + } else if (val_lower == TQString::fromLatin1("positionfield") || + val_lower == TQString::fromLatin1("positionslider")) { setAutoControls (false); panel->positionSlider ()->show (); SET_FEAT_ON (Feat_Controls) - } else if ( val_lower == TQString::tqfromLatin1("homectrl")) { + } else if ( val_lower == TQString::fromLatin1("homectrl")) { setAutoControls (false); panel->button (KMPlayer::ControlPanel::button_config)->show(); - } else if (val_lower == TQString::tqfromLatin1("mutectrl") || - val_lower == TQString::tqfromLatin1("mutevolume")) { + } else if (val_lower == TQString::fromLatin1("mutectrl") || + val_lower == TQString::fromLatin1("mutevolume")) { setAutoControls (false); - panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->tqminimumSize ().height ())); + panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->minimumSize ().height ())); panel->volumeBar()->show (); SET_FEAT_ON (Feat_Controls) - } else if (val_lower == TQString::tqfromLatin1("rwctrl")) { + } else if (val_lower == TQString::fromLatin1("rwctrl")) { setAutoControls (false); panel->button (KMPlayer::ControlPanel::button_back)->show (); // rewind ? SET_FEAT_ON (Feat_Controls) - } else if ( val_lower == TQString::tqfromLatin1("ffctrl")) { + } else if ( val_lower == TQString::fromLatin1("ffctrl")) { setAutoControls (false); panel->button(KMPlayer::ControlPanel::button_forward)->show(); m_features = Feat_Controls; - } else if ( val_lower ==TQString::tqfromLatin1("stopbutton")) { + } else if ( val_lower ==TQString::fromLatin1("stopbutton")) { setAutoControls (false); panel->button (KMPlayer::ControlPanel::button_stop)->show (); SET_FEAT_ON (Feat_Controls) - } else if (val_lower == TQString::tqfromLatin1("playbutton") || - val_lower ==TQString::tqfromLatin1("playonlybutton")) { + } else if (val_lower == TQString::fromLatin1("playbutton") || + val_lower ==TQString::fromLatin1("playonlybutton")) { setAutoControls (false); panel->button (KMPlayer::ControlPanel::button_play)->show (); SET_FEAT_ON (Feat_Controls) - } else if (val_lower ==TQString::tqfromLatin1("pausebutton")) { + } else if (val_lower ==TQString::fromLatin1("pausebutton")) { setAutoControls (false); panel->button (KMPlayer::ControlPanel::button_pause)->show (); SET_FEAT_ON (Feat_Controls) - } else if (val_lower == TQString::tqfromLatin1("statusbar") || - val_lower == TQString::tqfromLatin1("statusfield")) { + } else if (val_lower == TQString::fromLatin1("statusbar") || + val_lower == TQString::fromLatin1("statusfield")) { SET_FEAT_ON (Feat_StatusBar) - } else if (val_lower == TQString::tqfromLatin1("infopanel")) { + } else if (val_lower == TQString::fromLatin1("infopanel")) { SET_FEAT_ON (Feat_InfoPanel) - } else if (val_lower == TQString::tqfromLatin1("playlist")) { + } else if (val_lower == TQString::fromLatin1("playlist")) { SET_FEAT_ON (Feat_PlayList) - } else if (val_lower==TQString::tqfromLatin1("volumeslider")) { + } else if (val_lower==TQString::fromLatin1("volumeslider")) { SET_FEAT_ON (Feat_VolumeSlider) setAutoControls (false); panel->volumeBar()->show (); - panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->tqminimumSize ().height ())); + panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->minimumSize ().height ())); } } - } else if (name == TQString::tqfromLatin1("uimode")) { + } else if (name == TQString::fromLatin1("uimode")) { TQString val_lower (value.lower ()); - if (val_lower == TQString::tqfromLatin1("full")) + if (val_lower == TQString::fromLatin1("full")) SET_FEAT_ON (Feat_All & ~(Feat_PlayList | Feat_ImageWindow)) // TODO: invisible, none, mini - } else if (name == TQString::tqfromLatin1("nolabels")) { + } else if (name == TQString::fromLatin1("nolabels")) { SET_FEAT_OFF (Feat_Label) - } else if (name == TQString::tqfromLatin1("nocontrols")) { + } else if (name == TQString::fromLatin1("nocontrols")) { SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider) - } else if (name == TQString::tqfromLatin1("showdisplay")) { + } else if (name == TQString::fromLatin1("showdisplay")) { // the author name, the clip name, and the copyright information if (getBoolValue (value)) SET_FEAT_ON (Feat_InfoPanel) else SET_FEAT_OFF (Feat_InfoPanel) - } else if (name == TQString::tqfromLatin1("showcontrols")) { + } else if (name == TQString::fromLatin1("showcontrols")) { if (getBoolValue (value)) SET_FEAT_ON (Feat_Viewer | Feat_Controls) else SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider) - } else if (name == TQString::tqfromLatin1("showstatusbar")) { + } else if (name == TQString::fromLatin1("showstatusbar")) { if (getBoolValue (value)) SET_FEAT_ON (Feat_Viewer | Feat_StatusBar) else SET_FEAT_OFF (Feat_StatusBar) // else showcaptioning/showgotobar/showpositioncontrols/showtracker - } else if (name == TQString::tqfromLatin1("console")) { - m_group = value.isEmpty() ? TQString::tqfromLatin1("_anonymous") : value; - } else if (name == TQString::tqfromLatin1("__khtml__pluginbaseurl")) { + } else if (name == TQString::fromLatin1("console")) { + m_group = value.isEmpty() ? TQString::fromLatin1("_anonymous") : value; + } else if (name == TQString::fromLatin1("__khtml__pluginbaseurl")) { m_docbase = KURL (value); - } else if (name == TQString::tqfromLatin1("src")) { + } else if (name == TQString::fromLatin1("src")) { m_src_url = value; - } else if (name == TQString::tqfromLatin1("filename")) { + } else if (name == TQString::fromLatin1("filename")) { m_file_name = value; - } else if (name == TQString::tqfromLatin1 ("fullscreenmode")) { + } else if (name == TQString::fromLatin1 ("fullscreenmode")) { show_fullscreen = getBoolValue (value); - } else if (name == TQString::tqfromLatin1 ("autostart")) { + } else if (name == TQString::fromLatin1 ("autostart")) { urlsource->setAutoPlay (getBoolValue (value)); } // volume/clicktoplay/transparentatstart/animationatstart // autorewind/displaysize/border - if (name.startsWith (TQString::tqfromLatin1 ("__khtml__"))) + if (name.startsWith (TQString::fromLatin1 ("__khtml__"))) name = name.mid (9); convertNode (urlsource->document ())->setAttribute (name, value); } @@ -332,7 +332,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char * else m_view->setControlPanelMode (KMPlayer::View::CP_AutoHide); } - bool group_member = !m_group.isEmpty () && m_group != TQString::tqfromLatin1("_unique") && m_features != Feat_Unknown; + bool group_member = !m_group.isEmpty () && m_group != TQString::fromLatin1("_unique") && m_features != Feat_Unknown; if (!group_member || m_features & Feat_Viewer) { // not part of a group or we're the viewer setProcess ("mplayer"); @@ -1017,8 +1017,8 @@ KDE_NO_EXPORT bool KMPlayerLiveConnectExtension::call break; case showcontrolpanel: if (args.size () && - (args.first () == TQString::tqfromLatin1 ("0") || - args.first () == TQString::tqfromLatin1 ("false"))) + (args.first () == TQString::fromLatin1 ("0") || + args.first () == TQString::fromLatin1 ("false"))) static_cast (player->view ())->setControlPanelMode (KMPlayer::View::CP_Hide); else static_cast (player->view ())->setControlPanelMode (KMPlayer::View::CP_Show); diff --git a/src/kmplayer_rp.cpp b/src/kmplayer_rp.cpp index 9ecdb62..b9793a6 100644 --- a/src/kmplayer_rp.cpp +++ b/src/kmplayer_rp.cpp @@ -447,11 +447,11 @@ KDE_NO_EXPORT void RP::Wipe::activate () { //TODO implement 'type="push"' TQString dir = getAttribute ("direction").lower (); direction = dir_right; - if (dir == TQString::tqfromLatin1 ("left")) + if (dir == TQString::fromLatin1 ("left")) direction = dir_left; - else if (dir == TQString::tqfromLatin1 ("up")) + else if (dir == TQString::fromLatin1 ("up")) direction = dir_up; - else if (dir == TQString::tqfromLatin1 ("down")) + else if (dir == TQString::fromLatin1 ("down")) direction = dir_down; TimingsBase::activate (); } diff --git a/src/kmplayer_smil.cpp b/src/kmplayer_smil.cpp index a48640b..56d4147 100644 --- a/src/kmplayer_smil.cpp +++ b/src/kmplayer_smil.cpp @@ -635,7 +635,7 @@ KDE_NO_EXPORT void CalculatedSizer::resetSizes () { right.reset (); bottom.reset (); reg_point.truncate (0); - reg_align = TQString::tqfromLatin1 ("topLeft"); + reg_align = TQString::fromLatin1 ("topLeft"); } static bool regPoints (const TQString & str, Single & x, Single & y) { @@ -939,11 +939,11 @@ bool AnimateData::parseParam (const TrieString & name, const TQString & val) { } else if (name == "values") { change_values = TQStringList::split (TQString (";"), val); } else if (name == "calcMode") { - if (val == TQString::tqfromLatin1 ("discrete")) + if (val == TQString::fromLatin1 ("discrete")) calcMode = calc_discrete; - else if (val == TQString::tqfromLatin1 ("linear")) + else if (val == TQString::fromLatin1 ("linear")) calcMode = calc_linear; - else if (val == TQString::tqfromLatin1 ("paced")) + else if (val == TQString::fromLatin1 ("paced")) calcMode = calc_paced; } else return AnimateGroupData::parseParam (name, val); @@ -1156,13 +1156,13 @@ bool AnimateMotionData::parseParam (const TrieString & name, const TQString & va } else if (name == "keySplines") { splines = TQStringList::split (TQString (";"), val); } else if (name == "calcMode") { - if (val == TQString::tqfromLatin1 ("discrete")) + if (val == TQString::fromLatin1 ("discrete")) calcMode = calc_discrete; - else if (val == TQString::tqfromLatin1 ("linear")) + else if (val == TQString::fromLatin1 ("linear")) calcMode = calc_linear; - else if (val == TQString::tqfromLatin1 ("paced")) + else if (val == TQString::fromLatin1 ("paced")) calcMode = calc_paced; - else if (val == TQString::tqfromLatin1 ("spline")) + else if (val == TQString::fromLatin1 ("spline")) calcMode = calc_spline; } else return AnimateGroupData::parseParam (name, val); @@ -1657,9 +1657,9 @@ KDE_NO_EXPORT void SMIL::Smil::closed () { } else if (e->id == id_node_meta) { Element * elm = convertNode (e); const TQString name = elm->getAttribute (StringPool::attr_name); - if (name == TQString::tqfromLatin1 ("title")) + if (name == TQString::fromLatin1 ("title")) pretty_name = elm->getAttribute ("content"); - else if (name == TQString::tqfromLatin1 ("base")) + else if (name == TQString::fromLatin1 ("base")) src = elm->getAttribute ("content"); } } @@ -3409,7 +3409,7 @@ KDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) { mt->resetSurface (); TQString mime = mimetype (); kdDebug () << "ImageRuntime::remoteReady " << mime << " empty:" << cached_img.isEmpty () << " " << mt->src << endl; - if (mime.startsWith (TQString::tqfromLatin1 ("text/"))) { + if (mime.startsWith (TQString::fromLatin1 ("text/"))) { TQTextStream ts (data, IO_ReadOnly); readXML (element, ts, TQString ()); Mrl *mrl = mt->external_tree ? mt->external_tree->mrl () : NULL; @@ -3426,7 +3426,7 @@ KDE_NO_EXPORT void ImageRuntime::remoteReady (TQByteArray & data) { cached_img.data->image = pix; img_movie = new TQMovie (data, data.size ()); img_movie->connectUpdate(this,TQT_SLOT(movieUpdated(const TQRect&))); - img_movie->connectStatus (this, TQT_SLOT (movietqStatus (int))); + img_movie->connectStatus (this, TQT_SLOT (movieStatus (int))); img_movie->connectResize(this,TQT_SLOT (movieResize(const TQSize&))); frame_nr = 0; mt->width = pix->width (); @@ -3457,7 +3457,7 @@ KDE_NO_EXPORT void ImageRuntime::movieUpdated (const TQRect &) { img_movie->pause (); } -KDE_NO_EXPORT void ImageRuntime::movietqStatus (int s) { +KDE_NO_EXPORT void ImageRuntime::movieStatus (int s) { if (element && element->state >= Node::state_began && SMIL::TimedMrl::keepContent (element)) { if (s == TQMovie::EndOfMovie) { diff --git a/src/kmplayer_smil.h b/src/kmplayer_smil.h index 5392101..12247f5 100644 --- a/src/kmplayer_smil.h +++ b/src/kmplayer_smil.h @@ -215,7 +215,7 @@ protected: virtual void remoteReady (TQByteArray &); private slots: void movieUpdated (const TQRect &); - void movietqStatus (int); + void movieStatus (int); void movieResize (const TQSize &); }; diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 3996635..3354f04 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -202,7 +202,7 @@ KDE_NO_CDTOR_EXPORT FileDocument::FileDocument (short i, const TQString &s, KMPl } KDE_NO_EXPORT KMPlayer::NodePtr FileDocument::childFromTag(const TQString &tag) { - if (tag == TQString::tqfromLatin1 (nodeName ())) + if (tag == TQString::fromLatin1 (nodeName ())) return this; return 0L; } @@ -246,9 +246,9 @@ KDE_NO_EXPORT void Recents::defer () { KDE_NO_EXPORT KMPlayer::NodePtr Recents::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; - if (tag == TQString::tqfromLatin1 ("item")) + if (tag == TQString::fromLatin1 ("item")) return new Recent (m_doc, app); - else if (tag == TQString::tqfromLatin1 ("group")) + else if (tag == TQString::fromLatin1 ("group")) return new Group (m_doc, app); return FileDocument::childFromTag (tag); } @@ -282,9 +282,9 @@ Group::Group (KMPlayer::NodePtr & doc, KMPlayerApp * a, const TQString & pn) } KDE_NO_EXPORT KMPlayer::NodePtr Group::childFromTag (const TQString & tag) { - if (tag == TQString::tqfromLatin1 ("item")) + if (tag == TQString::fromLatin1 ("item")) return new Recent (m_doc, app); - else if (tag == TQString::tqfromLatin1 ("group")) + else if (tag == TQString::fromLatin1 ("group")) return new Group (m_doc, app); return 0L; } @@ -862,7 +862,7 @@ KDE_NO_EXPORT void IntroSource::activate () { TQTextStream ts (&file); KMPlayer::readXML (m_document, ts, TQString (), false); } else { - TQString smil = TQString::tqfromLatin1 ( + TQString smil = TQString::fromLatin1 ( "" "" "" @@ -882,7 +882,7 @@ KDE_NO_EXPORT void IntroSource::activate () { "" "" "" - ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64)); + ).arg (locate ("data", "kmplayer/noise.gif")).arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("kmplayer"), -64)); TQTextStream ts (smil.utf8 (), IO_ReadOnly); KMPlayer::readXML (m_document, ts, TQString (), false); } @@ -1165,7 +1165,7 @@ KDE_NO_EXPORT void KMPlayerApp::readOptions() { #include #undef Always #undef Never -#undef tqStatus +#undef Status #undef Unsorted #undef Bool @@ -1227,7 +1227,7 @@ KDE_NO_EXPORT void ExitSource::activate () { TQTextStream ts (&file); KMPlayer::readXML (m_document, ts, TQString (), false); } else { - TQString smil = TQString::tqfromLatin1 ("" + TQString smil = TQString::fromLatin1 ("" "" "" "" @@ -1238,7 +1238,7 @@ KDE_NO_EXPORT void ExitSource::activate () { //"" "" "" - "").arg (KGlobal::iconLoader()->iconPath (TQString::tqfromLatin1 ("kmplayer"), -64)); + "").arg (KGlobal::iconLoader()->iconPath (TQString::fromLatin1 ("kmplayer"), -64)); TQTextStream ts (smil.utf8 (), IO_ReadOnly); KMPlayer::readXML (m_document, ts, TQString (), false); } @@ -1261,7 +1261,7 @@ KDE_NO_EXPORT void ExitSource::stateElementChanged (KMPlayer::Node * node, KMPla if (new_state == KMPlayer::Node::state_deactivated && m_document == node && m_player->view ()) - m_player->view ()->tqtopLevelWidget ()->close (); + m_player->view ()->topLevelWidget ()->close (); } #endif @@ -1452,7 +1452,7 @@ KDE_NO_EXPORT void KMPlayerApp::slotStatusMsg (const TQString &text) { } KDE_NO_EXPORT void KMPlayerApp::fullScreen () { -// if (TQT_TQOBJECT(const_cast(sender ()))->tqmetaObject ()->inherits ("KAction")) +// if (TQT_TQOBJECT(const_cast(sender ()))->metaObject ()->inherits ("KAction")) if (TQT_TQOBJECT(const_cast(sender ()))->inherits ("KAction")) m_view->fullScreen(); #if KDE_IS_VERSION(3,1,90) diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp index 41a4dca..d79428c 100644 --- a/src/kmplayerbroadcast.cpp +++ b/src/kmplayerbroadcast.cpp @@ -197,7 +197,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPrefBroadcastFormatPage::KMPlayerPrefBroadcastFormat { TQHBoxLayout *tqlayout = new TQHBoxLayout (this, 5); TQGridLayout *formattqlayout = new TQGridLayout (11, 2, 2); - formattqlayout->tqsetAlignment (TQt::AlignTop); + formattqlayout->setAlignment (TQt::AlignTop); TQVBoxLayout *lefttqlayout = new TQVBoxLayout (15); TQHBoxLayout *ledtqlayout = new TQHBoxLayout (5); format = new TQComboBox (this); diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp index a5e975f..42df760 100644 --- a/src/kmplayerconfig.cpp +++ b/src/kmplayerconfig.cpp @@ -497,7 +497,7 @@ void Settings::show (const char * pagename) { if (pagename) configDialog ()->setPage (pagename); if (created) - configdialog->resize (configdialog->tqminimumSize ()); + configdialog->resize (configdialog->minimumSize ()); configdialog->show (); } diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp index ce5be9d..8973e89 100644 --- a/src/kmplayercontrolpanel.cpp +++ b/src/kmplayercontrolpanel.cpp @@ -292,7 +292,7 @@ KDE_NO_EXPORT void KMPlayerPopupMenu::leaveEvent (TQEvent *) { KDE_NO_CDTOR_EXPORT VolumeBar::VolumeBar (TQWidget * parent, View * view) : TQWidget (parent), m_view (view), m_value (100) { - tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); + setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setMinimumSize (TQSize (51, button_height_only_buttons + 2)); TQToolTip::add (this, i18n ("Volume is %1").arg (m_value)); } @@ -517,11 +517,11 @@ void ControlPanel::setAutoControls (bool b) { KDE_NO_EXPORT void ControlPanel::showPopupMenu () { m_view->updateVolume (); - m_popupMenu->exec (m_buttons [button_config]->mapToGlobal (TQPoint (0, tqmaximumSize ().height ()))); + m_popupMenu->exec (m_buttons [button_config]->mapToGlobal (TQPoint (0, maximumSize ().height ()))); } KDE_NO_EXPORT void ControlPanel::showLanguageMenu () { - m_languageMenu->exec (m_buttons [button_language]->mapToGlobal (TQPoint (0, tqmaximumSize ().height ()))); + m_languageMenu->exec (m_buttons [button_language]->mapToGlobal (TQPoint (0, maximumSize ().height ()))); } void ControlPanel::showPositionSlider (bool show) { @@ -540,7 +540,7 @@ KDE_NO_EXPORT void ControlPanel::setupPositionSlider (bool show) { m_posSlider->show (); m_buttonbox->setMargin (4); m_buttonbox->setSpacing (4); - setEraseColor (m_view->tqtopLevelWidget ()->paletteBackgroundColor ()); + setEraseColor (m_view->topLevelWidget ()->paletteBackgroundColor ()); } else { m_posSlider->hide (); m_buttonbox->setMargin (1); diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp index 00c83e8..54ca4a7 100644 --- a/src/kmplayerpartbase.cpp +++ b/src/kmplayerpartbase.cpp @@ -702,7 +702,7 @@ void PartBase::updateInfo (const TQString & msg) { emit infoUpdated (msg); } -void PartBase::updatetqStatus (const TQString & msg) { +void PartBase::updateStatus (const TQString & msg) { emit statusUpdated (msg); } @@ -1376,7 +1376,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) { Recorder *rec = dynamic_cast (p); if (rec && !rec->recordURL ().isEmpty ()) { kdDebug () << "recordState " << statemap[olds] << " -> " << statemap[news] << endl; - m_player->updatetqStatus (i18n ("Recorder %1 %2").arg (p->name ()).arg (statemap[news])); + m_player->updateStatus (i18n ("Recorder %1 %2").arg (p->name ()).arg (statemap[news])); p->viewer ()->view ()->controlPanel ()->setRecording (news > Process::Ready); if (news == Process::Ready) { if (olds > Process::Ready) { @@ -1394,7 +1394,7 @@ void Source::stateChange(Process *p, Process::State olds, Process::State news) { } else { p->viewer()->view()->controlPanel()->setPlaying(news > Process::Ready); kdDebug () << "processState " << statemap[olds] << " -> " << statemap[news] << endl; - m_player->updatetqStatus (i18n ("Player %1 %2").arg (p->name ()).arg (statemap[news])); + m_player->updateStatus (i18n ("Player %1 %2").arg (p->name ()).arg (statemap[news])); if (!p->mrl () && news > Process::Ready) { p->stop (); // reschedule for Ready state } else if (news == Process::Playing) { @@ -1502,7 +1502,7 @@ KDE_NO_EXPORT void URLSource::stopResolving () { for (SharedPtr ri = m_resolve_info; ri; ri = ri->next) ri->job->kill (); m_resolve_info = 0L; - m_player->updatetqStatus (i18n ("Disconnected")); + m_player->updateStatus (i18n ("Disconnected")); m_player->setLoaded (100); } } @@ -1724,7 +1724,7 @@ KDE_NO_EXPORT void URLSource::kioResult (KIO::Job * job) { kdWarning () << "Spurious kioData" << endl; return; } - m_player->updatetqStatus (""); + m_player->updateStatus (""); m_player->setLoaded (100); if (previnfo) previnfo->next = rinfo->next; @@ -1836,8 +1836,8 @@ bool URLSource::resolveURL (NodePtr m) { url.protocol ().compare (TQString ("rtp"))) || (mimestr.isEmpty () && (url.protocol ().startsWith (TQString ("http")) || - url.protocol () == TQString::tqfromLatin1 ("media") || - url.protocol () == TQString::tqfromLatin1 ("remote")))) { + url.protocol () == TQString::fromLatin1 ("media") || + url.protocol () == TQString::fromLatin1 ("remote")))) { KIO::Job * job = KIO::get (url, false, false); job->addMetaData ("PropagateHttpHeader", "true"); job->addMetaData ("errorPage", "false"); @@ -1851,7 +1851,7 @@ bool URLSource::resolveURL (NodePtr m) { connect (m_resolve_info->job, TQT_SIGNAL (result (KIO::Job *)), this, TQT_SLOT (kioResult (KIO::Job *))); static_cast (m_player->view ())->controlPanel ()->setPlaying (true); - m_player->updatetqStatus (i18n ("Connecting")); + m_player->updateStatus (i18n ("Connecting")); m_player->setLoaded (0); return false; // wait for result .. } diff --git a/src/kmplayerpartbase.h b/src/kmplayerpartbase.h index 52b01e1..2ab8450 100644 --- a/src/kmplayerpartbase.h +++ b/src/kmplayerpartbase.h @@ -152,7 +152,7 @@ public: bool mayResize () const { return !m_noresize; } void updatePlayerMenu (ControlPanel *); void updateInfo (const TQString & msg); - void updatetqStatus (const TQString & msg); + void updateStatus (const TQString & msg); #ifdef HAVE_DBUS void setServiceName (const TQString & srv) { m_service = srv; } TQString serviceName () const { return m_service; } diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp index f36a410..091d409 100644 --- a/src/kmplayerprocess.cpp +++ b/src/kmplayerprocess.cpp @@ -101,7 +101,7 @@ void Process::initProcess (Viewer * viewer) { delete m_process; m_process = new KProcess; m_process->setUseShell (true); - m_process->setEnvironment (TQString::tqfromLatin1 ("SESSION_MANAGER"), TQString::tqfromLatin1 ("")); + m_process->setEnvironment (TQString::fromLatin1 ("SESSION_MANAGER"), TQString::fromLatin1 ("")); if (m_source) m_source->setPosition (0); } @@ -548,7 +548,7 @@ bool MPlayer::run (const char * args, const char * pipe) { fprintf (stderr, " -vo %s", strVideoDriver.lower().ascii()); *m_process << " -vo " << strVideoDriver.lower(); if (viewer ()->view ()->keepSizeRatio () && - strVideoDriver.lower() == TQString::tqfromLatin1 ("x11")) { + strVideoDriver.lower() == TQString::fromLatin1 ("x11")) { fprintf (stderr, " -zoom"); *m_process << " -zoom"; } diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp index 9596879..93b4f27 100644 --- a/src/kmplayertvsource.cpp +++ b/src/kmplayertvsource.cpp @@ -213,7 +213,7 @@ KDE_NO_CDTOR_EXPORT TVInput::TVInput (KMPlayer::NodePtr & d) : TVNode (d, TQStri KDE_NO_EXPORT KMPlayer::NodePtr TVInput::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; - if (tag == TQString::tqfromLatin1 ("channel")) { + if (tag == TQString::fromLatin1 ("channel")) { return new TVChannel (m_doc); } else return 0L; @@ -252,7 +252,7 @@ KDE_NO_CDTOR_EXPORT TVDevice::~TVDevice () { KDE_NO_EXPORT KMPlayer::NodePtr TVDevice::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; - if (tag == TQString::tqfromLatin1 ("input")) + if (tag == TQString::fromLatin1 ("input")) return new TVInput (m_doc); return 0L; } @@ -323,7 +323,7 @@ TVDocument::TVDocument (KMPlayerTVSource * source) KDE_NO_EXPORT KMPlayer::NodePtr TVDocument::childFromTag (const TQString & tag) { // kdDebug () << nodeName () << " childFromTag " << tag << endl; - if (tag == TQString::tqfromLatin1 ("device")) + if (tag == TQString::fromLatin1 ("device")) return new TVDevice (m_doc); return FileDocument::childFromTag (tag); } @@ -377,7 +377,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::activate () { KMPlayer::Source::reset (); buildArguments (); if (m_cur_tvdevice) { - TQString playback = static_cast (m_cur_tvdevice.ptr ())->getAttribute (TQString::tqfromLatin1 ("playback")); + TQString playback = static_cast (m_cur_tvdevice.ptr ())->getAttribute (TQString::fromLatin1 ("playback")); if (playback.isEmpty () || playback.toInt ()) TQTimer::singleShot (0, m_player, TQT_SLOT (play ())); } diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp index dd1e1f4..5ea3e1e 100644 --- a/src/kmplayerview.cpp +++ b/src/kmplayerview.cpp @@ -68,7 +68,7 @@ static const int XKeyPress = KeyPress; #undef KeyPress #undef Always #undef Never -#undef tqStatus +#undef Status #undef Unsorted #undef Bool @@ -190,10 +190,10 @@ KDE_NO_EXPORT void View::init (KActionCollection * action_collection) { viewbox->addWidget (m_dockarea); m_widgetstack = new TQWidgetStack (m_view_area); m_control_panel = new ControlPanel (m_view_area, this); - m_control_panel->setMaximumSize (2500, controlPanel ()->tqmaximumSize ().height ()); + m_control_panel->setMaximumSize (2500, controlPanel ()->maximumSize ().height ()); m_status_bar = new StatusBar (m_view_area); m_status_bar->insertItem (TQString (""), 0); - TQSize sbsize = m_status_bar->tqsizeHint (); + TQSize sbsize = m_status_bar->sizeHint (); m_status_bar->hide (); m_status_bar->setMaximumSize (2500, sbsize.height ()); m_viewer = new Viewer (m_widgetstack, this); @@ -267,9 +267,9 @@ void View::toggleShowPlaylist () { else { bool horz = true; TQStyle & style = m_playlist->tqstyle (); - int h = style.tqpixelMetric (TQStyle::PM_ScrollBarExtent, m_playlist); - h += style.tqpixelMetric(TQStyle::PM_DockWindowFrameWidth, m_playlist); - h +=style.tqpixelMetric(TQStyle::PM_DockWindowHandleExtent,m_playlist); + int h = style.pixelMetric (TQStyle::PM_ScrollBarExtent, m_playlist); + h += style.pixelMetric(TQStyle::PM_DockWindowFrameWidth, m_playlist); + h +=style.pixelMetric(TQStyle::PM_DockWindowHandleExtent,m_playlist); for (TQListViewItem *i=m_playlist->firstChild();i;i=i->itemBelow()) { h += i->height (); if (h > int (0.25 * height ())) { @@ -482,7 +482,7 @@ KDE_NO_EXPORT void View::timerEvent (TQTimerEvent * e) { m_widgetstack->visibleWidget () == m_widgettypes[WT_Picture]) { int vert_buttons_pos = m_view_area->height()-statusBarHeight (); TQPoint mouse_pos = m_view_area->mapFromGlobal (TQCursor::pos ()); - int cp_height = m_control_panel->tqmaximumSize ().height (); + int cp_height = m_control_panel->maximumSize ().height (); bool mouse_on_buttons = (//m_view_area->hasMouse () && mouse_pos.y () >= vert_buttons_pos-cp_height && mouse_pos.y ()<= vert_buttons_pos && @@ -632,7 +632,7 @@ KDE_NO_EXPORT int View::statusBarHeight () const { if (statusBarMode () == SB_Only) return height (); else - return statusBar()->tqmaximumSize ().height (); + return statusBar()->maximumSize ().height (); } return 0; } @@ -665,7 +665,7 @@ bool View::x11Event (XEvent * e) { if (e->xmotion.window == m_viewer->embeddedWinId ()) delayedShowButtons (e->xmotion.y > m_view_area->height () - statusBarHeight () - - m_control_panel->tqmaximumSize ().height ()); + m_control_panel->maximumSize ().height ()); m_view_area->mouseMoved (); break; case MapNotify: @@ -749,7 +749,7 @@ KDE_NO_EXPORT void Viewer::windowChanged (WId w) { KDE_NO_EXPORT void Viewer::mouseMoveEvent (TQMouseEvent * e) { if (e->state () == Qt::NoButton) { - int cp_height = m_view->controlPanel ()->tqmaximumSize ().height (); + int cp_height = m_view->controlPanel ()->maximumSize ().height (); m_view->delayedShowButtons (e->y () > height () - cp_height); } m_view->viewArea ()->mouseMoved (); diff --git a/src/npplayer.c b/src/npplayer.c index 8209bbf..e7f67bb 100644 --- a/src/npplayer.c +++ b/src/npplayer.c @@ -379,7 +379,7 @@ static NPError nsDestroyStream (NPP instance, NPStream *stream, NPError reason) return NPERR_NO_DATA; } -static void nstqStatus (NPP instance, const char* message) { +static void nsStatus (NPP instance, const char* message) { (void)instance; print ("NPN_Status %s\n", message ? message : "-"); } @@ -966,7 +966,7 @@ static int initPlugin (const char *plugin_lib) { ns_funcs.newstream = nsNewStream; ns_funcs.write = nsWrite; ns_funcs.destroystream = nsDestroyStream; - ns_funcs.status = nstqStatus; + ns_funcs.status = nsStatus; ns_funcs.uagent = nsUserAgent; ns_funcs.memalloc = nsAlloc; ns_funcs.memfree = nsMemFree; diff --git a/src/playlistview.cpp b/src/playlistview.cpp index 20a761e..7a5cfc9 100644 --- a/src/playlistview.cpp +++ b/src/playlistview.cpp @@ -96,9 +96,9 @@ RootPlayListItem::RootPlayListItem (int _id, PlayListView *v, const NodePtr & e, KDE_NO_CDTOR_EXPORT void RootPlayListItem::paintCell (TQPainter * p, const TQColorGroup & cg, int column, int width, int align) { TQColorGroup mycg (cg); - mycg.setColor (TQColorGroup::Base, listview->tqtopLevelWidget()->paletteBackgroundColor()); + mycg.setColor (TQColorGroup::Base, listview->topLevelWidget()->paletteBackgroundColor()); mycg.setColor (TQColorGroup::Highlight, mycg.base ()); - mycg.setColor (TQColorGroup::Text, listview->tqtopLevelWidget()->paletteForegroundColor()); + mycg.setColor (TQColorGroup::Text, listview->topLevelWidget()->paletteForegroundColor()); mycg.setColor (TQColorGroup::HighlightedText, mycg.text ()); TQListViewItem::paintCell (p, mycg, column, width, align); qDrawShadeRect (p, 0, 0, width -1, height () -1, mycg, !isOpen ()); @@ -238,7 +238,7 @@ void PlayListView::updateTree (int id, NodePtr root, NodePtr active, bool select, bool open) { // TODO, if root is same as rootitems->node and treeversion is the same // and show all nodes is unchanged then only update the cells - TQWidget * w = tqfocusWidget (); + TQWidget * w = focusWidget (); if (w && w != this) w->clearFocus (); //setSelected (firstChild (), true); diff --git a/src/pref.cpp b/src/pref.cpp index 423102e..2887244 100644 --- a/src/pref.cpp +++ b/src/pref.cpp @@ -340,14 +340,14 @@ KDE_NO_CDTOR_EXPORT PrefSourcePageURL::PrefSourcePageURL (TQWidget *parent) url = new KURLRequester (urllist, this); TQWhatsThis::add (url, i18n ("Location of the playable item")); //url->setShowLocalProtocol (true); - url->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred)); + url->setSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred)); TQLabel *sub_urlLabel = new TQLabel (i18n ("Sub title:"), this, 0); sub_urllist = new KComboBox (true, this); sub_urllist->setMaxCount (20); sub_urllist->setDuplicatesEnabled (false); // not that it helps much :( sub_url = new KURLRequester (sub_urllist, this); TQWhatsThis::add (sub_url, i18n ("Optional location of a file containing the subtitles of the URL above")); - sub_url->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred)); + sub_url->setSizePolicy (TQSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Preferred)); backend = new TQListBox (this); allowhref = new TQCheckBox (i18n ("Enable 'Click to Play' support"), this); TQWhatsThis::add (allowhref, i18n ("Support for WEB pages having a start image")); @@ -444,7 +444,7 @@ KDE_NO_CDTOR_EXPORT PrefRecordPage::PrefRecordPage (TQWidget *parent, PartBase * KDE_NO_EXPORT void PrefRecordPage::recordingStarted () { recordButton->setText (i18n ("Stop Recording")); url->setEnabled (false); - tqtopLevelWidget ()->hide (); + topLevelWidget ()->hide (); } KDE_NO_EXPORT void PrefRecordPage::recordingFinished () { @@ -475,7 +475,7 @@ KDE_NO_EXPORT void PrefRecordPage::sourceChanged (Source * olds, Source * nws) { } KDE_NO_EXPORT void PrefRecordPage::recorderClicked (int id) { - bool b = recorder->find(id)->text().find (TQString::tqfromLatin1("Xine")) > -1; + bool b = recorder->find(id)->text().find (TQString::fromLatin1("Xine")) > -1; replay->setEnabled (!b); if (b) replay->setButton (Settings::ReplayNo); @@ -651,7 +651,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T PostprocessingOptions->setAutoMask (false); PostprocessingOptions->setTabPosition( TQTabWidget::Top ); PostprocessingOptions->setTabShape( TQTabWidget::Rounded ); - PostprocessingOptions->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, PostprocessingOptions->sizePolicy().hasHeightForWidth() ) ); + PostprocessingOptions->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, PostprocessingOptions->sizePolicy().hasHeightForWidth() ) ); TQWidget *presetSelectionWidget = new TQWidget( PostprocessingOptions, "presetSelectionWidget" ); TQGridLayout *presetSelectionWidgetLayout = new TQGridLayout( presetSelectionWidget, 1, 1, 1); @@ -681,7 +681,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T TQVBoxLayout *customFiltersWidgetLayout = new TQVBoxLayout( customFiltersWidget ); TQGroupBox *customFilters = new TQGroupBox(0, Qt::Vertical, customFiltersWidget, "customFilters" ); - customFilters->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2)); + customFilters->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2)); customFilters->setFlat(false); customFilters->setEnabled( false ); customFilters->setInsideSpacing(7); @@ -701,7 +701,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T customFiltersLayout1->addWidget( HzDeblockCFiltering ); TQFrame *line1 = new TQFrame( customFilters, "line1" ); - line1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) ); + line1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) ); line1->setFrameShape( TQFrame::HLine ); line1->setFrameShadow( TQFrame::Sunken ); customFiltersLayout->add(line1); @@ -721,7 +721,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T TQFrame *line2 = new TQFrame( customFilters, "line2" ); - line2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) ); + line2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)2 ) ); line2->setFrameShape( TQFrame::HLine ); line2->setFrameShadow( TQFrame::Sunken ); customFiltersLayout->add(line2); @@ -768,7 +768,7 @@ KDE_NO_CDTOR_EXPORT PrefOPPagePostProc::PrefOPPagePostProc(TQWidget *parent) : T TmpNoiseSlider->setOrientation( TQSlider::Horizontal ); TmpNoiseSlider->setTickmarks( TQSlider::Left ); TmpNoiseSlider->setTickInterval( 1 ); - TmpNoiseSlider->tqsetSizePolicy(TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1));*/ + TmpNoiseSlider->setSizePolicy(TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1));*/ /*customFiltersLayout->addWidget(TmpNoiseFilter,7,0); customFiltersLayout->addWidget(TmpNoiseSlider,7,2);*/ diff --git a/src/viewarea.cpp b/src/viewarea.cpp index daf5e5a..5a42e5b 100644 --- a/src/viewarea.cpp +++ b/src/viewarea.cpp @@ -1378,7 +1378,7 @@ KDE_NO_EXPORT void ViewArea::fullScreen () { } m_view->controlPanel ()->button (ControlPanel::button_playlist)->setIconSet (TQIconSet (TQPixmap (playlist_xpm))); } else { - m_topwindow_rect = tqtopLevelWidget ()->tqgeometry (); + m_topwindow_rect = topLevelWidget ()->tqgeometry (); reparent (0L, 0, tqApp->desktop()->screenGeometry(this).topLeft(), true); showFullScreen (); for (unsigned i = 0; i < m_collection->count (); ++i) @@ -1425,7 +1425,7 @@ void ViewArea::minimalMode () { m_view->setNoInfoMessages (false); m_view->controlPanel ()->button (ControlPanel::button_playlist)->setIconSet (TQIconSet (TQPixmap (playlist_xpm))); } - m_topwindow_rect = tqtopLevelWidget ()->tqgeometry (); + m_topwindow_rect = topLevelWidget ()->tqgeometry (); } KDE_NO_EXPORT void ViewArea::accelActivated () { @@ -1447,7 +1447,7 @@ KDE_NO_EXPORT void ViewArea::mouseDoubleClickEvent (TQMouseEvent *) { KDE_NO_EXPORT void ViewArea::mouseMoveEvent (TQMouseEvent * e) { if (e->state () == Qt::NoButton) { int vert_buttons_pos = height () - m_view->statusBarHeight (); - int cp_height = m_view->controlPanel ()->tqmaximumSize ().height (); + int cp_height = m_view->controlPanel ()->maximumSize ().height (); m_view->delayedShowButtons (e->y() > vert_buttons_pos-cp_height && e->y() < vert_buttons_pos); } @@ -1510,7 +1510,7 @@ KDE_NO_EXPORT void ViewArea::updateSurfaceBounds () { h -= m_view->controlPanel ()->isVisible () ? (m_view->controlPanelMode () == View::CP_Only ? h - : (Single) m_view->controlPanel()->tqmaximumSize ().height ()) + : (Single) m_view->controlPanel()->maximumSize ().height ()) : Single (0); surface->resize (SRect (x, y, w, h)); Mrl *mrl = surface->node ? surface->node->mrl () : NULL; @@ -1545,7 +1545,7 @@ KDE_NO_EXPORT void ViewArea::resizeEvent (TQResizeEvent *) { Single hcp = m_view->controlPanel ()->isVisible () ? (m_view->controlPanelMode () == View::CP_Only ? h-hsb - : (Single) m_view->controlPanel()->tqmaximumSize ().height ()) + : (Single) m_view->controlPanel()->maximumSize ().height ()) : Single (0); Single wws = w; // move controlpanel over video when autohiding and playing @@ -1680,8 +1680,8 @@ KDE_NO_EXPORT void ViewArea::closeEvent (TQCloseEvent * e) { //kdDebug () << "closeEvent" << endl; if (m_fullscreen) { fullScreen (); - if (!m_parent->tqtopLevelWidget ()->isVisible ()) - m_parent->tqtopLevelWidget ()->show (); + if (!m_parent->topLevelWidget ()->isVisible ()) + m_parent->topLevelWidget ()->show (); e->ignore (); } else TQWidget::closeEvent (e);