Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f97c8a56e217f04e08776ccf8021721b7d919b7d.

1 files changed, 50 insertions, 50 deletions

diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index 4fb7800..d897c73 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::fromLatin1("_master") ||
-                  m_group == TQString::fromLatin1("_master")) &&
+                  part->m_group == TQString::tqfromLatin1("_master") ||
+                  m_group == TQString::tqfromLatin1("_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::fromLatin1("false") &&
-            value.lower() != TQString::fromLatin1("off") &&
-            value.lower() != TQString::fromLatin1("0"));
+    return (value.lower() != TQString::tqfromLatin1("false") &&
+            value.lower() != TQString::tqfromLatin1("off") &&
+            value.lower() != TQString::tqfromLatin1("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::fromLatin1("width")) {
+            } else if (name == TQString::tqfromLatin1("width")) {
                 m_noresize = true;
-            } else if (name == TQString::fromLatin1("height")) {
+            } else if (name == TQString::tqfromLatin1("height")) {
                 m_noresize = true;
-            } else if (name == TQString::fromLatin1("type")) {
+            } else if (name == TQString::tqfromLatin1("type")) {
                 urlsource->document ()->mrl ()->mimetype = value;
-            } else if (name == TQString::fromLatin1("controls")) {
+            } else if (name == TQString::tqfromLatin1("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::fromLatin1("imagewindow")) {
+                    if (val_lower == TQString::tqfromLatin1("imagewindow")) {
                         SET_FEAT_ON (Feat_ImageWindow | Feat_Viewer)
-                    } else if (val_lower == TQString::fromLatin1("all")) {
+                    } else if (val_lower == TQString::tqfromLatin1("all")) {
                         m_features = (Feat_Controls | Feat_StatusBar);
-                    } else if (val_lower == TQString::fromLatin1("tacctrl")) {
+                    } else if (val_lower == TQString::tqfromLatin1("tacctrl")) {
                         SET_FEAT_ON (Feat_Label)
-                    } else if (val_lower == TQString::fromLatin1("controlpanel")) {
+                    } else if (val_lower == TQString::tqfromLatin1("controlpanel")) {
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::fromLatin1("infovolumepanel")){
+                    } else if (val_lower == TQString::tqfromLatin1("infovolumepanel")){
                         SET_FEAT_ON (Feat_Controls) // TODO
-                    } else if (val_lower == TQString::fromLatin1("positionfield") ||
-                            val_lower == TQString::fromLatin1("positionslider")) {
+                    } else if (val_lower == TQString::tqfromLatin1("positionfield") ||
+                            val_lower == TQString::tqfromLatin1("positionslider")) {
                         setAutoControls (false);
                         panel->positionSlider ()->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if ( val_lower == TQString::fromLatin1("homectrl")) {
+                    } else if ( val_lower == TQString::tqfromLatin1("homectrl")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_config)->show();
-                    } else if (val_lower == TQString::fromLatin1("mutectrl") ||
-                            val_lower == TQString::fromLatin1("mutevolume")) {
+                    } else if (val_lower == TQString::tqfromLatin1("mutectrl") ||
+                            val_lower == TQString::tqfromLatin1("mutevolume")) {
                         setAutoControls (false);
-                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->minimumSize ().height ()));
+                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->tqminimumSize ().height ()));
                         panel->volumeBar()->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::fromLatin1("rwctrl")) {
+                    } else if (val_lower == TQString::tqfromLatin1("rwctrl")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_back)->show (); // rewind ?
                         SET_FEAT_ON (Feat_Controls)
-                    } else if ( val_lower == TQString::fromLatin1("ffctrl")) {
+                    } else if ( val_lower == TQString::tqfromLatin1("ffctrl")) {
                         setAutoControls (false);
                         panel->button(KMPlayer::ControlPanel::button_forward)->show();
                         m_features = Feat_Controls;
-                    } else if ( val_lower ==TQString::fromLatin1("stopbutton")) {
+                    } else if ( val_lower ==TQString::tqfromLatin1("stopbutton")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_stop)->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::fromLatin1("playbutton") ||
-                            val_lower ==TQString::fromLatin1("playonlybutton")) {
+                    } else if (val_lower == TQString::tqfromLatin1("playbutton") ||
+                            val_lower ==TQString::tqfromLatin1("playonlybutton")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_play)->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower ==TQString::fromLatin1("pausebutton")) {
+                    } else if (val_lower ==TQString::tqfromLatin1("pausebutton")) {
                         setAutoControls (false);
                         panel->button (KMPlayer::ControlPanel::button_pause)->show ();
                         SET_FEAT_ON (Feat_Controls)
-                    } else if (val_lower == TQString::fromLatin1("statusbar") ||
-                            val_lower == TQString::fromLatin1("statusfield")) {
+                    } else if (val_lower == TQString::tqfromLatin1("statusbar") ||
+                            val_lower == TQString::tqfromLatin1("statusfield")) {
                         SET_FEAT_ON (Feat_StatusBar)
-                    } else if (val_lower == TQString::fromLatin1("infopanel")) {
+                    } else if (val_lower == TQString::tqfromLatin1("infopanel")) {
                         SET_FEAT_ON (Feat_InfoPanel)
-                    } else if (val_lower == TQString::fromLatin1("playlist")) {
+                    } else if (val_lower == TQString::tqfromLatin1("playlist")) {
                         SET_FEAT_ON (Feat_PlayList)
-                    } else if (val_lower==TQString::fromLatin1("volumeslider")) {
+                    } else if (val_lower==TQString::tqfromLatin1("volumeslider")) {
                         SET_FEAT_ON (Feat_VolumeSlider)
                         setAutoControls (false);
                         panel->volumeBar()->show ();
-                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->minimumSize ().height ()));
+                        panel->volumeBar()->setMinimumSize (TQSize (20, panel->volumeBar()->tqminimumSize ().height ()));
                     }
                 }
-            } else if (name == TQString::fromLatin1("uimode")) {
+            } else if (name == TQString::tqfromLatin1("uimode")) {
                 TQString val_lower (value.lower ());
-                if (val_lower == TQString::fromLatin1("full"))
+                if (val_lower == TQString::tqfromLatin1("full"))
                     SET_FEAT_ON (Feat_All & ~(Feat_PlayList | Feat_ImageWindow))
                 // TODO: invisible, none, mini
-            } else if (name == TQString::fromLatin1("nolabels")) {
+            } else if (name == TQString::tqfromLatin1("nolabels")) {
                 SET_FEAT_OFF (Feat_Label)
-            } else if (name == TQString::fromLatin1("nocontrols")) {
+            } else if (name == TQString::tqfromLatin1("nocontrols")) {
                 SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider)
-            } else if (name == TQString::fromLatin1("showdisplay")) {
+            } else if (name == TQString::tqfromLatin1("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::fromLatin1("showcontrols")) {
+            } else if (name == TQString::tqfromLatin1("showcontrols")) {
                 if (getBoolValue (value))
                     SET_FEAT_ON (Feat_Viewer | Feat_Controls)
                 else
                     SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider)
-            } else if (name == TQString::fromLatin1("showstatusbar")) {
+            } else if (name == TQString::tqfromLatin1("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::fromLatin1("console")) {
-                m_group = value.isEmpty() ? TQString::fromLatin1("_anonymous") : value;
-            } else if (name == TQString::fromLatin1("__khtml__pluginbaseurl")) {
+            } else if (name == TQString::tqfromLatin1("console")) {
+                m_group = value.isEmpty() ? TQString::tqfromLatin1("_anonymous") : value;
+            } else if (name == TQString::tqfromLatin1("__khtml__pluginbaseurl")) {
                 m_docbase = KURL (value);
-            } else if (name == TQString::fromLatin1("src")) {
+            } else if (name == TQString::tqfromLatin1("src")) {
                 m_src_url = value;
-            } else if (name == TQString::fromLatin1("filename")) {
+            } else if (name == TQString::tqfromLatin1("filename")) {
                 m_file_name = value;
-            } else if (name == TQString::fromLatin1 ("fullscreenmode")) {
+            } else if (name == TQString::tqfromLatin1 ("fullscreenmode")) {
                 show_fullscreen = getBoolValue (value);
-            } else if (name == TQString::fromLatin1 ("autostart")) {
+            } else if (name == TQString::tqfromLatin1 ("autostart")) {
                 urlsource->setAutoPlay (getBoolValue (value));
 	    }
             // volume/clicktoplay/transparentatstart/animationatstart
             // autorewind/displaysize/border
-            if (name.startsWith (TQString::fromLatin1 ("__khtml__")))
+            if (name.startsWith (TQString::tqfromLatin1 ("__khtml__")))
                 name = name.mid (9);
             convertNode <KMPlayer::Element> (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::fromLatin1("_unique") && m_features != Feat_Unknown;
+    bool group_member = !m_group.isEmpty () && m_group != TQString::tqfromLatin1("_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::fromLatin1 ("0") ||
-                     args.first () == TQString::fromLatin1 ("false")))
+                    (args.first () == TQString::tqfromLatin1 ("0") ||
+                     args.first () == TQString::tqfromLatin1 ("false")))
                 static_cast <KMPlayer::View*> (player->view ())->setControlPanelMode (KMPlayer::View::CP_Hide);
             else
                 static_cast <KMPlayer::View*> (player->view ())->setControlPanelMode (KMPlayer::View::CP_Show);