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

This reverts commit 13281e2856.

KDE2PORTING.html

@@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
   to klocale-&gt;translate with i18n.<P>
 
   The return value of i18n is also no longer a const char*,
-  but a unicode TQString.<P>
+  but a tqunicode TQString.<P>
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 

KDE3PORTING.html

@@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.
 
 <p>The API for Kicker panel applets and extensions has changed. Panels can now be
 left/top, center, or right/bottom aligned, and applets and extensions may receive
-notification about a change in alignment.
+notification about a change in tqalignment.
 
 <H4>KPanelApplet</H4>
 
 <p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
 Instead you should reimplement positionChange() and alignmentChange() to be
-notified of changes in the position and alignment of the panel on which your applet
+notified of changes in the position and tqalignment of the panel on which your applet
 resides. In addition, the popupDirection() method and the Direction enum are
 deprecated. Instead you should use the position() method and Position enum. Applets that use
 the deprecated methods will still work with KDE 3, but may not compile or work with
@@ -662,7 +662,7 @@ a future version.
 <H4>KPanelExtension</H4>
 
 <p>There is a new method alignmentChange() that your extension should reimplement if
-it needs to know about changes in alignment.
+it needs to know about changes in tqalignment.
 
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
 <p>

arts/kde/kartsserver.cpp

@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
 
 	X11CommConfig.sync();
 	
-	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data();
+	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
 
 	if(rt)
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
 	else
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
 
 	proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
 

arts/kde/kioinputstream_impl.cpp

@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
 	m_job = KIO::get(m_url, false, false);
 
 	m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
-	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
+	m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
 
 	TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
 			 this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));		     

arts/kde/kplayobject.cc

@@ -65,7 +65,7 @@ void KPlayObject::halt()
 
 TQString KPlayObject::description()
 {
-	return TQString::fromLatin1(object().description().c_str());
+	return TQString::tqfromLatin1(object().description().c_str());
 }
 
 Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
 
 TQString KPlayObject::mediaName()
 {
-	return TQString::fromLatin1(object().mediaName().c_str());
+	return TQString::tqfromLatin1(object().mediaName().c_str());
 }
 
 Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
 {
 	if ( object().isNull() )
 		return TQString();
-	return TQString::fromLatin1(object().description().c_str());
+	return TQString::tqfromLatin1(object().description().c_str());
 }
 
 Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
 {
 	if ( object().isNull() )
 		return TQString();
-	return TQString::fromLatin1(object().mediaName().c_str());
+	return TQString::tqfromLatin1(object().mediaName().c_str());
 }
 
 Arts::poState KDE::PlayObject::state()

arts/kde/kvideowidget.cpp

@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
 	}
 
 	setBackgroundMode( PaletteBackground );
-	repaint();
+	tqrepaint();
 
 	// Resize GUI
 	videoWidth  = 0;

arts/knotify/knotify.cpp

@@ -40,7 +40,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 // KDE headers
 #include <dcopclient.h>
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
 
     // append msg
     TQTextStream strm( &logFile );
-    strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+    strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
     strm << text << endl;
 
     // close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
     TQTextStream strm( stderr, IO_WriteOnly );
 
     // output msg
-    strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
+    strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
     strm << text << endl;
 
     return true;

dcop/KDE-ICE/ICEmsg.h

@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (
 
 
 /*
- * Write pad bytes.  Used to force 32 or 64 bit alignment.
+ * Write pad bytes.  Used to force 32 or 64 bit tqalignment.
  * A maxium of 7 pad bytes can be specified.
  */
 
@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (
 
 
 /*
- * Read pad bytes (for 32 or 64 bit alignment).
+ * Read pad bytes (for 32 or 64 bit tqalignment).
  * A maxium of 7 pad bytes can be specified.
  */
 

dcop/client/dcop.cpp

@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqimage.h>
 #include <tqmap.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvariant.h>
 
 #include "../dcopclient.h"
@@ -158,7 +158,7 @@ void queryFunctions( const char* app, const char* obj )
 
 int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
 {
-    TQString f = func; // Qt is better with unicode strings, so use one.
+    TQString f = func; // Qt is better with tqunicode strings, so use one.
     int left = f.find( '(' );
     int right = f.find( ')' );
 
@@ -262,7 +262,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
 		}
 		if ( s == static_cast<int>(partl.count())-1)
 		{
-			partl.remove(partl.at(s));
+			partl.remove(partl.tqat(s));
 		}
 
 		lt = partl.join(" ");

dcop/client/dcopfind.cpp

@@ -40,7 +40,7 @@ static bool bLaunchApp = 0;
 
 bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
 {
-    TQString f = func; // Qt is better with unicode strings, so use one.
+    TQString f = func; // Qt is better with tqunicode strings, so use one.
     int left = f.find( '(' );
     int right = f.find( ')' );
 
@@ -98,7 +98,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
 		}
 		if (s==(int)partl.count()-1)
 		{
-			partl.remove(partl.at(s));
+			partl.remove(partl.tqat(s));
 		}
 
 	    	lt = partl.join(" ");

dcop/client/dcopstart.cpp

@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
 void startApp(const char *_app, int argc, const char **args)
 {
     const char *function = 0;
-    TQString app = TQString::fromLatin1(_app);
+    TQString app = TQString::tqfromLatin1(_app);
     if (app.endsWith(".desktop"))
        function = "start_service_by_desktop_path(TQString,TQStringList)";
     else

dcop/dcopclient.cpp

@@ -54,7 +54,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define QT_CLEAN_NAMESPACE
 #endif
 #include <tqguardedptr.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqapplication.h>
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
                                                       DCOPAuthCount,
                                                       const_cast<char **>(DCOPAuthNames),
                                                       DCOPClientAuthProcs, 0L)) < 0) {
-        emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
+        emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
         return false;
     }
 
@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             TQCString fName = dcopServerFile();
             TQFile f(TQFile::decodeName(fName));
             if (!f.open(IO_ReadOnly)) {
-                emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
+                emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
                 return false;
             }
             int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
            delete [] d->serverAddr;
            d->serverAddr = 0;
         }
-        emit attachFailed(TQString::fromLatin1( errBuf ));
+        emit attachFailed(TQString::tqfromLatin1( errBuf ));
         return false;
     }
     fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             delete [] d->serverAddr;
             d->serverAddr = 0;
         }
-        emit attachFailed(TQString::fromLatin1( errBuf ));
+        emit attachFailed(TQString::tqfromLatin1( errBuf ));
         return false;
     } else if (setupstat == IceProtocolAlreadyActive) {
         if (bClearServerAddr) {
@@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             d->serverAddr = 0;
         }
         /* should not happen because 3rd arg to IceOpenConnection was 0. */
-        emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
+        emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
         return false;
     }
 
@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
             delete [] d->serverAddr;
             d->serverAddr = 0;
         }
-        emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
+        emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
         return false;
     }
 
@@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             l << "QCStringList properties()";
             l << "bool setProperty(TQCString,TQVariant)";
             l << "TQVariant property(TQCString)";
-            TQStrList lst = o->metaObject()->slotNames( true );
+            TQStrList lst = o->tqmetaObject()->slotNames( true );
             int i = 0;
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-                if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
+                if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
                     continue;
                 TQCString slot = it.current();
                 if ( slot.contains( "()" ) ) {
@@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             replyType = "QCStringList";
             TQDataStream reply( replyData, IO_WriteOnly );
             QCStringList l;
-            TQMetaObject *meta = o->metaObject();
+            TQMetaObject *meta = o->tqmetaObject();
             while ( meta ) {
                 l.prepend( meta->className() );
-                meta = meta->superClass();
+                meta = meta->tqsuperClass();
             }
             reply << l;
             return true;
@@ -1498,9 +1498,9 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             replyType = "QCStringList";
             TQDataStream reply( replyData, IO_WriteOnly );
             QCStringList l;
-            TQStrList lst = o->metaObject()->propertyNames( true );
+            TQStrList lst = o->tqmetaObject()->propertyNames( true );
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-                TQMetaObject *mo = o->metaObject();
+                TQMetaObject *mo = o->tqmetaObject();
                 const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
                 if ( !p )
                     continue;
@@ -1532,7 +1532,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             reply << (TQ_INT8) o->setProperty( name, value );
             return true;
         } else {
-            int slot = o->metaObject()->findSlot( fun, true );
+            int slot = o->tqmetaObject()->findSlot( fun, true );
             if ( slot != -1 ) {
                 replyType = "void";
                 TQUObject uo[ 1 ];

dcop/dcopidl2cpp/main.cpp

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 
 #include <string.h>

dcop/dcopidl2cpp/skel.cpp

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 

dcop/dcopidl2cpp/stub.cpp

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 

dcop/dcopidl2cpp/stubimpl.cpp

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 

dcop/dcopidl2cpp/type.h

@@ -1,7 +1,7 @@
 #ifndef TYPE_H
 #define TYPE_H
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 
 static TQString writeType( TQTextStream& str, const TQDomElement& r )

dcop/dcopref.h

@@ -396,7 +396,7 @@ public:
      * Flag for allowing entering the event loop if the call blocks too long.
      * @p NoEventLoop disables entering the event loop.
      * @p UseEventLoop allows entering the event loop while waiting for long
-     * blocking DCOP call, thus making the GUI repaint if needed, and possibly
+     * blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly
      * allowing also other code in the application to be executed.
      * @see DCOPClient::call()
      */

dcop/dcopserver.cpp

@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define QT_CLEAN_NAMESPACE 1
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdatastream.h>
 #include <tqptrstack.h>
 #include <tqtimer.h>
@@ -126,8 +126,8 @@ static TQCString readQCString(TQDataStream &ds)
    TQCString result;
    TQ_UINT32 len;
    ds >> len;
-   TQIODevice *device = ds.device();
-   int bytesLeft = device->size()-device->at();
+   TQIODevice *device = ds.tqdevice();
+   int bytesLeft = device->size()-device->tqat();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
       qWarning("Corrupt data!\n");
@@ -145,8 +145,8 @@ static TQByteArray readQByteArray(TQDataStream &ds)
    TQByteArray result;
    TQ_UINT32 len;
    ds >> len;
-   TQIODevice *device = ds.device();
-   int bytesLeft = device->size()-device->at();
+   TQIODevice *device = ds.tqdevice();
+   int bytesLeft = device->size()-device->tqat();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
       qWarning("Corrupt data!\n");

interfaces/khexedit/byteseditinterface.h

@@ -143,7 +143,7 @@ class BytesEditInterface
     virtual bool isModified() const = 0;
 
   public: // call for action
-    /** repaint the indizes from i1 to i2 */
+    /** tqrepaint the indizes from i1 to i2 */
     virtual void repaintRange( int i1, int i2 ) = 0;
 };
 
@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
 inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
 {
   return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
-      ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
+      ( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
 }
 
 }

interfaces/kimproxy/interface/kimiface.h

@@ -467,7 +467,7 @@ k_dcop_signals:
 	/**
 	 * @brief Indicates that a contact's presence has changed
 	 *
-	 * Notifies connected DCOP receivers about a change in a contact's
+	 * Notifies connected DCOP tqreceivers about a change in a contact's
 	 * presence.
 	 *
 	 * Implementations just have to call this method with the appropriate

interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp

@@ -2,7 +2,7 @@
 
 #include <tqcheckbox.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvgroupbox.h>
 
 #include <kglobal.h>

interfaces/ktexteditor/editinterfaceext.h

@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
     /**
 	 * Begin an editing sequence.  Edit commands during this sequence will be
 	 * bunched together such that they represent a single undo command in the
-	 * editor, and so that repaint events do not occur inbetween.
+	 * editor, and so that tqrepaint events do not occur inbetween.
 	 *
 	 * Your application should not return control to the event loop while it
 	 * has an unterminated (no matching editEnd() call) editing sequence

interfaces/ktexteditor/editorchooser.cpp

@@ -9,7 +9,7 @@
 #include <klocale.h>
 #include <tqlabel.h>
 #include <kapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "editorchooser_ui.h"
 
@@ -95,7 +95,7 @@ void EditorChooser::writeAppSetting(const TQString& postfix){
 	cfg->setGroup("KTEXTEDITOR:"+postfix);
 	cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
 	cfg->writePathEntry("editor", (d->chooser->editorCombo->currentItem()==0) ? 
-		TQString::null : (*d->elements.at(d->chooser->editorCombo->currentItem()-1)));
+		TQString::null : (*d->elements.tqat(d->chooser->editorCombo->currentItem()-1)));
 	cfg->sync();
 	cfg->setGroup(previousGroup);
 

interfaces/ktexteditor/editorchooser_ui.ui

@@ -31,7 +31,7 @@
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>460</width>
                             <height>0</height>
@@ -40,7 +40,7 @@
                     <property name="text">
                         <string>Please choose the default text editing component that you wish to use in this application. If you choose &lt;B&gt;System Default&lt;/B&gt;, the application will honor your changes in the Control Center. All other choices will override that setting.</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                 </widget>

interfaces/ktexteditor/templateinterface.cpp

@@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
 {
   KABC::StdAddressBook *addrBook = 0;
   KABC::Addressee userAddress;
-  TQDateTime datetime = TQDateTime::currentDateTime();
+  TQDateTime datetime = TQDateTime::tqcurrentDateTime();
   TQDate date = TQT_TQDATE_OBJECT(datetime.date());
   TQTime time = TQT_TQTIME_OBJECT(datetime.time());
 

kab/addressbook.h

@@ -127,7 +127,7 @@ class CategoriesMap : public TQMap<int, TQString>
  *  keys). Of course, in different files a key might be used twice. <BR>
  *  The keys are objects of the type KabKey and define the section in the 
  *  addressbook database where the entry is stored (see QConfigDB
- *  reference). Keys invalidate on file changes, so keep track of the
+ *  reference). Keys tqinvalidate on file changes, so keep track of the
  *  signal ::changed. <BR>
  *  kab watches file changes. If the opened file changes on disk, it is
  *  automatically reloaded and ::changed() is emitted. 

kab/kabapi.cc

@@ -74,7 +74,7 @@ int KabAPI::exec()
 	    }
 	  listbox->setMinimumSize(listbox->sizeHint());
 	  adjustSize();
-	  resize(minimumSize());
+	  resize(tqminimumSize());
 	  return KDialogBase::exec();
 	} else {
 	  kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface."

kab/qconfigDB.cc

@@ -25,7 +25,7 @@ extern "C" {
 }
 
 // #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqdatetime.h>
@@ -1188,7 +1188,7 @@ KeyValueMap::insert(const TQCString& key, const TQStrList& values, bool force)
   // ----- create coded string list:
   for(count=0; count<values.count(); ++count)
     { // create strings like "abc\efgh\eijk":
-      temp=makeComplexString(((TQStrList)values).at(count));
+      temp=makeComplexString(((TQStrList)values).tqat(count));
       temp.remove(0, 1); // remove the leading "\""
       temp.remove(temp.length()-1, 1); // the trailing "\""
       value+=temp;
@@ -1231,7 +1231,7 @@ KeyValueMap::get(const TQCString& key, TQStringList& values) const
   // ----- do the conversion:
   for(count=0; count<temp.count(); ++count)
     {
-      values.append(TQString::fromUtf8(temp.at(count)));
+      values.append(TQString::fromUtf8(temp.tqat(count)));
     }
   // -----
   kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QStringList]: done." << endl;
@@ -1252,7 +1252,7 @@ KeyValueMap::insert(const TQCString& key, const TQStringList& values, bool force
   // ----- create TQCString list:
   for(count=0; count<values.count(); ++count)
     {
-      utf8strings.append((*values.at(count)).utf8());
+      utf8strings.append((*values.tqat(count)).utf8());
     }
   kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::insert[QStringList]: done." << endl;
   return insert(key, utf8strings, force);

kabc/address.cpp

@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
     return it.data();
 
   TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
     return TQString::null;
 
   TQString mapfile = KGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {

kabc/addressbook.cpp

@@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a )
   Addressee addr( a );
   if ( !fAddr.isEmpty() ) {
     if ( fAddr != a )
-      addr.setRevision( TQDateTime::currentDateTime() );
+      addr.setRevision( TQDateTime::tqcurrentDateTime() );
     else {
       if ( fAddr.resource() == 0 ) {
         fAddr.setResource( resource );

kabc/addresseedialog.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 #include <tqregexp.h>

kabc/distributionlistdialog.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>

kabc/distributionlisteditor.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqbuttongroup.h>

kabc/formats/binaryformat.cpp

@@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
   }
 
   // set real number of entries
-  stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
+  stream.tqdevice()->tqat( 2 * sizeof( TQ_UINT32 ) );
   stream << counter;
 }
 

kabc/kab2kabc.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kabapi.h>
 #include <kaboutdata.h>
@@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   TQString name;
   TQString comment;
 
-  if ( entry.at( entry.length() -1 ) == ')' ) {
+  if ( entry.tqat( entry.length() -1 ) == ')' ) {
     int br = entry.findRev( '(' );
     if ( br >= 0 ) {
       comment = entry.mid( br + 1, entry.length() - br - 2 );
       entry.truncate( br );
-      if ( entry.at( entry.length() - 1 ).isSpace() ) {
+      if ( entry.tqat( entry.length() - 1 ).isSpace() ) {
         entry.truncate( br - 1 );
       }
     }
@@ -80,22 +80,22 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
     name = entry.left( posSpace );
   }
 
-  if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) {
+  if ( email.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) {
     email = email.mid( 1, email.length() - 2 );
   }
-  if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) {
+  if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) {
     name = name.mid( 1, name.length() - 2 );
   }
-  if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) {
+  if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) {
     name = name.mid( 1, name.length() - 2 );
   }
 
-  if ( name.at( name.length() -1 ) == ')' ) {
+  if ( name.tqat( name.length() -1 ) == ')' ) {
     int br = name.findRev( '(' );
     if ( br >= 0 ) {
       comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
       name.truncate( br );
-      if ( name.at( name.length() - 1 ).isSpace() ) {
+      if ( name.tqat( name.length() - 1 ).isSpace() ) {
         name.truncate( br - 1 );
       }
     }
@@ -148,16 +148,16 @@ void importKMailAddressBook( KABC::AddressBook *ab )
 
   TQStringList::ConstIterator it;
   for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) {
-    if ( (*it).at( 0 ) == '#' ) continue;
+    if ( (*it).tqat( 0 ) == '#' ) continue;
     bool insideQuote = false;
     int end = (*it).length() - 1;
     for ( int i = end; i; i-- ) {
-      if ( (*it).at( i ) == '"' ) {
+      if ( (*it).tqat( i ) == '"' ) {
         if ( insideQuote )
           insideQuote = false;
         else
           insideQuote = true;
-      } else if ( (*it).at( i ) == ',' && !insideQuote ) {
+      } else if ( (*it).tqat( i ) == ',' && !insideQuote ) {
         readKMailEntry( (*it).mid( i + 1, end - i ), ab );
         end = i - 1;
       }

kabc/ldapclient.cpp

@@ -26,7 +26,7 @@
 #include <tqimage.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqurl.h>
 
 #include <kapplication.h>
@@ -50,7 +50,7 @@ public:
 
 TQString LdapObject::toString() const
 {
-  TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
+  TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
   for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
     TQString attr = it.key();
     for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {

kabc/ldapconfigwidget.cpp

@@ -22,7 +22,7 @@
 #include <tqobjectlist.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqvgroupbox.h>

kabc/ldifconverter.cpp

@@ -36,7 +36,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
   data.setRawData( latinstr, latinstrlen );
   ldif.setLDIF( data );
   if (!dt.isValid())
-    dt = TQDateTime::currentDateTime();
+    dt = TQDateTime::tqcurrentDateTime();
   a.setRevision(dt);
   homeAddr = Address( Address::Home );
   workAddr = Address( Address::Work );
@@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
                                   Address &workAddr,
                                   TQString &fieldname, TQString &value )
 {
-  if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false!
+  if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false!
     return false;
 
   if ( fieldname.startsWith("#") ) {
@@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "givenname" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) {
     a.setGivenName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
-       fieldname == TQString::fromLatin1( "nickname") ) {
+  if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") ||
+       fieldname == TQString::tqfromLatin1( "nickname") ) {
     a.setNickName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "sn" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "sn" ) ) {
     a.setFamilyName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "uid" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "uid" ) ) {
     a.setUid( value );
     return true;
   }
-  if ( fieldname == TQString::fromLatin1( "mail" ) ||
-       fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
+  if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
+       fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
     if ( a.emails().findIndex( value ) == -1 )
       a.insertEmail( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "title" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "title" ) ) {
     a.setTitle( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) {
     a.setPrefix( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "cn" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "cn" ) ) {
     a.setFormattedName( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "o" ) ||
-       fieldname == TQString::fromLatin1( "organization" ) ||      // Exchange
-       fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
+  if ( fieldname == TQString::tqfromLatin1( "o" ) ||
+       fieldname == TQString::tqfromLatin1( "organization" ) ||      // Exchange
+       fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange
     a.setOrganization( value );
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "description" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "description" ) ) {
 addComment:
     if ( !a.note().isEmpty() )
       a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
     return true;
   }
 
-  if ( fieldname == TQString::fromLatin1( "custom1" ) ||
-       fieldname == TQString::fromLatin1( "custom2" ) ||
-       fieldname == TQString::fromLatin1( "custom3" ) ||
-       fieldname == TQString::fromLatin1( "custom4" ) ) {
+  if ( fieldname == TQString::tqfromLatin1( "custom1" ) ||
+       fieldname == TQString::tqfromLatin1( "custom2" ) ||
+       fieldname == TQString::tqfromLatin1( "custom3" ) ||
+       fieldname == TQString::tqfromLatin1( "custom4" ) ) {