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

This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.

12 files changed, 39 insertions, 39 deletions

diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index 3dfc236..b79fc80 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -121,7 +121,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -157,7 +157,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -205,7 +205,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index 797e5ce..ee50054 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -24,7 +24,7 @@
 #include "hostdialog.h"
 #include "monitordialog.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 
diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui
index 69b94db..608dc8f 100644
--- a/ksim/monitors/snmp/configwidget.ui
+++ b/ksim/monitors/snmp/configwidget.ui
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>141</width>
                             <height>20</height>
@@ -156,7 +156,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui
index f25aa12..d3da054 100644
--- a/ksim/monitors/snmp/hostdialogbase.ui
+++ b/ksim/monitors/snmp/hostdialogbase.ui
@@ -78,7 +78,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>91</width>
                     <height>20</height>
@@ -132,7 +132,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>41</height>
@@ -149,7 +149,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>160</width>
                                         <height>20</height>
@@ -253,7 +253,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>71</width>
                                         <height>20</height>
@@ -309,7 +309,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -359,7 +359,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>351</width>
                             <height>20</height>
@@ -384,7 +384,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -408,7 +408,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>220</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 6ab85b6..1bcbb0b 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -117,8 +117,8 @@ TQString KSim::Snmp::monitorDisplayTypeToString( MonitorConfig::DisplayType type
 {
     switch ( type )
     {
-        case MonitorConfig::Label: return TQString::fromLatin1( "Label" );
-        case MonitorConfig::Chart: return TQString::fromLatin1( "Chart" );
+        case MonitorConfig::Label: return TQString::tqfromLatin1( "Label" );
+        case MonitorConfig::Chart: return TQString::tqfromLatin1( "Chart" );
         default: assert( false );
     };
     return TQString();
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index bb7f7cc..5f9fb53 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -104,7 +104,7 @@
                     <property name="text">
                         <string>The text in the edit box is what is displayed except that any occurrence of &lt;b&gt;%s&lt;/b&gt; will be replaced with the snmp object value and any occurrence of &lt;b&gt;%n&lt;/b&gt; will be replaced with the name of this monitor (see Name input field) .</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -112,7 +112,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>141</width>
                             <height>20</height>
@@ -174,7 +174,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -205,7 +205,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>271</width>
                             <height>20</height>
@@ -224,7 +224,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>244</width>
                     <height>20</height>
@@ -246,7 +246,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>210</width>
                     <height>20</height>
@@ -282,7 +282,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -335,7 +335,7 @@
                 <cstring>status</cstring>
             </property>
             <property name="text">
-                <string>blehStatus</string>
+                <string>blehtqStatus</string>
             </property>
         </widget>
         <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="4">
diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp
index bed1e21..1c8033a 100644
--- a/ksim/monitors/snmp/proberesultdialog.cpp
+++ b/ksim/monitors/snmp/proberesultdialog.cpp
@@ -30,7 +30,7 @@ ProbeResultDialog::ProbeResultDialog( const HostConfig &hostConfig, const ProbeD
                                       TQWidget *parent, const char *name )
         : ProbeResultDialogBase( parent, name )
 {
-    info->setText( i18n( "Results of scanning host %1:" ).arg( hostConfig.name ) );
+    info->setText( i18n( "Results of scanning host %1:" ).tqarg( hostConfig.name ) );
 
     for ( ProbeDialog::ProbeResultList::ConstIterator it = probeResults.begin();
           it != probeResults.end(); ++it )
diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui
index dcdbd2a..c3df9bd 100644
--- a/ksim/monitors/snmp/proberesultdialogbase.ui
+++ b/ksim/monitors/snmp/proberesultdialogbase.ui
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp
index 6d63fab..2f16adc 100644
--- a/ksim/monitors/snmp/session.cpp
+++ b/ksim/monitors/snmp/session.cpp
@@ -54,7 +54,7 @@ Session::Session( const HostConfig &source )
 
     d->source = source;
 
-    // unicode madness
+    // tqunicode madness
     d->host = source.name.ascii();
     d->community = source.community.ascii();
     d->securityName = source.securityName.ascii();
diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp
index ae04b67..d79c596 100644
--- a/ksim/monitors/snmp/snmp.cpp
+++ b/ksim/monitors/snmp/snmp.cpp
@@ -57,7 +57,7 @@ static TQStringList allStrings( const EnumStringMapInfo *array )
 {
     TQStringList result;
     for ( uint i = 0; array[ i ].stringValue; ++i )
-        result << TQString::fromLatin1( array[ i ].stringValue );
+        result << TQString::tqfromLatin1( array[ i ].stringValue );
     return result;
 }
 
@@ -65,7 +65,7 @@ static TQString enumToString( const EnumStringMapInfo *array, int value )
 {
     for ( uint i = 0; array[ i ].stringValue; ++i )
         if ( array[ i ].enumValue == value )
-            return TQString::fromLatin1( array[ i ].stringValue );
+            return TQString::tqfromLatin1( array[ i ].stringValue );
 
     assert( false );
     return TQString();
@@ -76,7 +76,7 @@ static int stringToEnum( const EnumStringMapInfo *array, TQString string, bool *
     string = string.lower();
     uint i;
     for ( i = 0; array[ i ].stringValue; ++i )
-        if ( TQString::fromLatin1( array[ i ].stringValue ).lower() == string ) {
+        if ( TQString::tqfromLatin1( array[ i ].stringValue ).lower() == string ) {
             if ( ok ) *ok = true;
             return array[ i ].enumValue;
         }
@@ -291,9 +291,9 @@ int KSim::Snmp::sessionErrorCode( netsnmp_session &session )
 static TQString messageForErrorCode( int errorCode )
 {
     if ( errorCode >= SNMPERR_MAX && errorCode <= SNMPERR_GENERR )
-        return TQString::fromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) );
+        return TQString::tqfromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) );
     if ( errorCode >= SNMP_ERR_NOERROR && errorCode <= MAX_SNMP_ERR )
-        return TQString::fromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) );
+        return TQString::tqfromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) );
 
     return TQString();
 }
diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp
index ad707b5..2803aec 100644
--- a/ksim/monitors/snmp/value.cpp
+++ b/ksim/monitors/snmp/value.cpp
@@ -294,9 +294,9 @@ TQString Value::toString( int conversionFlags ) const
         case Value::TimeTicks: return formatTimeTicks( toTimeTicks(), conversionFlags );
         // not using i18n here, because it may be called from within a worker thread, and I'm
         // not sure it makes sense to translate it anyway
-        case Value::NoSuchObject: return TQString::fromLatin1( "No Such Object" );
-        case Value::NoSuchInstance: return TQString::fromLatin1( "No Such Instance" );
-        case Value::EndOfMIBView: return TQString::fromLatin1( "End Of MIB View" );
+        case Value::NoSuchObject: return TQString::tqfromLatin1( "No Such Object" );
+        case Value::NoSuchInstance: return TQString::tqfromLatin1( "No Such Instance" );
+        case Value::EndOfMIBView: return TQString::tqfromLatin1( "End Of MIB View" );
         case Value::Invalid:
         case Value::Null: return TQString();
     }
@@ -321,7 +321,7 @@ TQString Value::formatTimeTicks( int ticks, int conversionFlags )
     if ( days > 0 )
         result += TQString::number( days ) + "d:";
 
-    result += TQString(TQString::fromAscii( "%1h:%2m" )).arg( hours ).arg( minutes );
+    result += TQString(TQString::fromAscii( "%1h:%2m" )).tqarg( hours ).tqarg( minutes );
 
     if ( conversionFlags & TimeTicksWithSeconds )
         result += ":" + TQString::number( seconds ) + "s";
diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp
index 4b01203..9515645 100644
--- a/ksim/monitors/snmp/view.cpp
+++ b/ksim/monitors/snmp/view.cpp
@@ -23,7 +23,7 @@
 
 #include <label.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kconfig.h>