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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.

1 files changed, 36 insertions, 36 deletions

diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index f201b70c0..00a9f5b81 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -381,7 +381,7 @@ bool KStartupInfo::sendStartup( const KStartupInfoId& id_P, const KStartupInfoDa
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::fromLatin1( "new: %1 %2" )
+    TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     msg = check_required_startup_fields( msg, data_P, qt_xscreen());
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -394,7 +394,7 @@ bool KStartupInfo::sendStartupX( Display* disp_P, const KStartupInfoId& id_P,
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::fromLatin1( "new: %1 %2" )
+    TQString msg = TQString::tqfromLatin1( "new: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     msg = check_required_startup_fields( msg, data_P, DefaultScreen( disp_P ));
 #ifdef KSTARTUPINFO_ALL_DEBUG
@@ -425,7 +425,7 @@ bool KStartupInfo::sendChange( const KStartupInfoId& id_P, const KStartupInfoDat
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::fromLatin1( "change: %1 %2" )
+    TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -437,7 +437,7 @@ bool KStartupInfo::sendChangeX( Display* disp_P, const KStartupInfoId& id_P,
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::fromLatin1( "change: %1 %2" )
+    TQString msg = TQString::tqfromLatin1( "change: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -450,7 +450,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P )
     if( id_P.none())
         return false;
     KXMessages msgs;
-    TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
+    TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
     return true;
@@ -460,7 +460,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P )
     {
     if( id_P.none())
         return false;
-    TQString msg = TQString::fromLatin1( "remove: %1" ).arg( id_P.to_text());
+    TQString msg = TQString::tqfromLatin1( "remove: %1" ).arg( id_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
 #endif
@@ -472,7 +472,7 @@ bool KStartupInfo::sendFinish( const KStartupInfoId& id_P, const KStartupInfoDat
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
     KXMessages msgs;
-    TQString msg = TQString::fromLatin1( "remove: %1 %2" )
+    TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
     kdDebug( 172 ) << "sending " << msg << endl;
     msgs.broadcastMessage( NET_STARTUP_MSG, msg, -1, false );
@@ -484,7 +484,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
     {
 //    if( id_P.none()) // id may be none, the pids and hostname matter then
 //        return false;
-    TQString msg = TQString::fromLatin1( "remove: %1 %2" )
+    TQString msg = TQString::tqfromLatin1( "remove: %1 %2" )
         .arg( id_P.to_text()).arg( data_P.to_text());
 #ifdef KSTARTUPINFO_ALL_DEBUG
     kdDebug( 172 ) << "sending " << msg << endl;
@@ -955,14 +955,14 @@ const TQCString& KStartupInfoId::id() const
 
 TQString KStartupInfoId::to_text() const
     {
-    return TQString::fromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
+    return TQString::tqfromLatin1( " ID=\"%1\" " ).arg( escape_str( id()));
     }
 
 KStartupInfoId::KStartupInfoId( const TQString& txt_P )
     {
     d = new KStartupInfoIdPrivate;
     TQStringList items = get_fields( txt_P );
-    const TQString id_str = TQString::fromLatin1( "ID=" );
+    const TQString id_str = TQString::tqfromLatin1( "ID=" );
     for( TQStringList::Iterator it = items.begin();
          it != items.end();
          ++it )
@@ -1124,34 +1124,34 @@ TQString KStartupInfoData::to_text() const
     {
     TQString ret = "";
     if( !d->bin.isEmpty())
-        ret += TQString::fromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
+        ret += TQString::tqfromLatin1( " BIN=\"%1\"" ).arg( escape_str( d->bin ));
     if( !d->name.isEmpty())
-        ret += TQString::fromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
+        ret += TQString::tqfromLatin1( " NAME=\"%1\"" ).arg( escape_str( d->name ));
     if( !d->description.isEmpty())
-        ret += TQString::fromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
+        ret += TQString::tqfromLatin1( " DESCRIPTION=\"%1\"" ).arg( escape_str( d->description ));
     if( !d->icon.isEmpty())
-        ret += TQString::fromLatin1( " ICON=%1" ).arg( d->icon );
+        ret += TQString::tqfromLatin1( " ICON=%1" ).arg( d->icon );
     if( d->desktop != 0 )
-        ret += TQString::fromLatin1( " DESKTOP=%1" )
+        ret += TQString::tqfromLatin1( " DESKTOP=%1" )
             .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0
     if( !d->wmclass.isEmpty())
-        ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
+        ret += TQString::tqfromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
     if( !d->hostname.isEmpty())
-        ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
+        ret += TQString::tqfromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
     for( TQValueList< pid_t >::ConstIterator it = d->pids.begin();
          it != d->pids.end();
          ++it )
-        ret += TQString::fromLatin1( " PID=%1" ).arg( *it );
+        ret += TQString::tqfromLatin1( " PID=%1" ).arg( *it );
     if( d->silent != Unknown )
-	ret += TQString::fromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
+	ret += TQString::tqfromLatin1( " SILENT=%1" ).arg( d->silent == Yes ? 1 : 0 );
     if( d->timestamp != -1U )
-        ret += TQString::fromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
+        ret += TQString::tqfromLatin1( " TIMESTAMP=%1" ).arg( d->timestamp );
     if( d->screen != -1 )
-        ret += TQString::fromLatin1( " SCREEN=%1" ).arg( d->screen );
+        ret += TQString::tqfromLatin1( " SCREEN=%1" ).arg( d->screen );
     if( d->xinerama != -1 )
-        ret += TQString::fromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
+        ret += TQString::tqfromLatin1( " XINERAMA=%1" ).arg( d->xinerama );
     if( d->launched_by != 0 )
-        ret += TQString::fromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
+        ret += TQString::tqfromLatin1( " LAUNCHED_BY=%1" ).arg( d->launched_by );
     return ret;
     }
 
@@ -1159,19 +1159,19 @@ KStartupInfoData::KStartupInfoData( const TQString& txt_P )
     {
     d = new KStartupInfoDataPrivate;
     TQStringList items = get_fields( txt_P );
-    const TQString bin_str = TQString::fromLatin1( "BIN=" );
-    const TQString name_str = TQString::fromLatin1( "NAME=" );
-    const TQString description_str = TQString::fromLatin1( "DESCRIPTION=" );
-    const TQString icon_str = TQString::fromLatin1( "ICON=" );
-    const TQString desktop_str = TQString::fromLatin1( "DESKTOP=" );
-    const TQString wmclass_str = TQString::fromLatin1( "WMCLASS=" );
-    const TQString hostname_str = TQString::fromLatin1( "HOSTNAME=" ); // SELI nonstd
-    const TQString pid_str = TQString::fromLatin1( "PID=" );  // SELI nonstd
-    const TQString silent_str = TQString::fromLatin1( "SILENT=" );
-    const TQString timestamp_str = TQString::fromLatin1( "TIMESTAMP=" );
-    const TQString screen_str = TQString::fromLatin1( "SCREEN=" );
-    const TQString xinerama_str = TQString::fromLatin1( "XINERAMA=" );
-    const TQString launched_by_str = TQString::fromLatin1( "LAUNCHED_BY=" );
+    const TQString bin_str = TQString::tqfromLatin1( "BIN=" );
+    const TQString name_str = TQString::tqfromLatin1( "NAME=" );
+    const TQString description_str = TQString::tqfromLatin1( "DESCRIPTION=" );
+    const TQString icon_str = TQString::tqfromLatin1( "ICON=" );
+    const TQString desktop_str = TQString::tqfromLatin1( "DESKTOP=" );
+    const TQString wmclass_str = TQString::tqfromLatin1( "WMCLASS=" );
+    const TQString hostname_str = TQString::tqfromLatin1( "HOSTNAME=" ); // SELI nonstd
+    const TQString pid_str = TQString::tqfromLatin1( "PID=" );  // SELI nonstd
+    const TQString silent_str = TQString::tqfromLatin1( "SILENT=" );
+    const TQString timestamp_str = TQString::tqfromLatin1( "TIMESTAMP=" );
+    const TQString screen_str = TQString::tqfromLatin1( "SCREEN=" );
+    const TQString xinerama_str = TQString::tqfromLatin1( "XINERAMA=" );
+    const TQString launched_by_str = TQString::tqfromLatin1( "LAUNCHED_BY=" );
     for( TQStringList::Iterator it = items.begin();
          it != items.end();
          ++it )