Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 57 insertions, 57 deletions

diff --git a/khtml/java/kjavaapplet.h b/khtml/java/kjavaapplet.h
index 6fe0f7709..8e02c5ba4 100644
--- a/khtml/java/kjavaapplet.h
+++ b/khtml/java/kjavaapplet.h
@@ -47,7 +47,7 @@ class KJavaAppletContext;
 class KJavaAppletPrivate;
 
 
-class KJavaApplet : public QObject
+class KJavaApplet : public TQObject
 {
 Q_OBJECT
 
diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp
index 76914a5dc..776eb8a64 100644
--- a/khtml/java/kjavaappletcontext.cpp
+++ b/khtml/java/kjavaappletcontext.cpp
@@ -138,7 +138,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
     kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl;
     kdDebug(6100) << "arg count = " << arg.count() << endl;
 
-    if ( cmd == TQString::fromLatin1("showstatus")
+    if ( cmd == TQString::tqfromLatin1("showstatus")
 	 && !arg.empty() )
     {
         TQString tmp = arg.first();
@@ -146,19 +146,19 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         kdDebug(6100) << "status message = " << tmp << endl;
         emit showStatus( tmp );
     }
-    else if ( cmd == TQString::fromLatin1( "showurlinframe" )
+    else if ( cmd == TQString::tqfromLatin1( "showurlinframe" )
               && arg.count() > 1 )
     {
         kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl;
         emit showDocument( arg[0], arg[1] );
     }
-    else if ( cmd == TQString::fromLatin1( "showdocument" )
+    else if ( cmd == TQString::tqfromLatin1( "showdocument" )
               && !arg.empty() )
     {
         kdDebug(6100) << "url = " << arg.first() << endl;
         emit showDocument( arg.first(), "_top" );
     }
-    else if ( cmd == TQString::fromLatin1( "resizeapplet" )
+    else if ( cmd == TQString::tqfromLatin1( "resizeapplet" )
               && arg.count() > 2 )
     {
         //arg[1] should be appletID
@@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
                 tmp->resizeAppletWidget( width, height );
         }
     }
-    else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) {
+    else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) {
         kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd  << " " << arg[0] << endl;
     }
-    else if ( cmd == TQString::fromLatin1( "JS_Event" )
+    else if ( cmd == TQString::tqfromLatin1( "JS_Event" )
               && arg.count() > 2 )
     {
         bool ok;
@@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         else
             kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl;
     }
-    else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) )
+    else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) )
     {
         bool ok;
         const int appletID = arg.first().toInt(&ok);
@@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
         } else
             kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl;
     }
-    else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) {
+    else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) {
         bool ok;
         const int appletID = arg.first().toInt(&ok);
         if (ok)
diff --git a/khtml/java/kjavaappletcontext.h b/khtml/java/kjavaappletcontext.h
index ca851a42e..119699f23 100644
--- a/khtml/java/kjavaappletcontext.h
+++ b/khtml/java/kjavaappletcontext.h
@@ -42,7 +42,7 @@ class KJavaAppletServer;
 class KJavaApplet;
 class KJavaAppletContextPrivate;
 
-class KJavaAppletContext : public QObject
+class KJavaAppletContext : public TQObject
 {
 Q_OBJECT
 
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 59d0517a2..199256b59 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -448,7 +448,7 @@ void KJavaAppletServer::sendURLData( int loaderID, int code, const TQByteArray&
 
 void KJavaAppletServer::removeDataJob( int loaderID )
 {
-    const KIOJobMap::iterator it = d->kiojobs.find( loaderID );
+    const KIOJobMap::iterator it = d->kiojobs.tqfind( loaderID );
     if (it != d->kiojobs.end()) {
         it.data()->deleteLater();
         d->kiojobs.erase( it );
@@ -502,7 +502,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     if (cmd_code == KJAS_PUT_DATA) {
         // rest of the data is for kio put
         if (ok) {
-            KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+            KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num );
             if (ok && it != d->kiojobs.end()) {
                 TQByteArray qba;
                 qba.setRawData(qb.data() + index, qb.size() - index - 1);
@@ -517,7 +517,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     //now parse out the arguments
     while( index < qb_size )
     {
-        int sep_pos = qb.find( 0, index );
+        int sep_pos = qb.tqfind( 0, index );
         if (sep_pos < 0) {
             kdError(6100) << "Missing separation byte" << endl;
             sep_pos = qb_size;
@@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
     switch( cmd_code )
     {
         case KJAS_SHOW_DOCUMENT:
-            cmd = TQString::fromLatin1( "showdocument" );
+            cmd = TQString::tqfromLatin1( "showdocument" );
             break;
 
         case KJAS_SHOW_URLINFRAME:
-            cmd = TQString::fromLatin1( "showurlinframe" );
+            cmd = TQString::tqfromLatin1( "showurlinframe" );
             break;
 
         case KJAS_SHOW_STATUS:
-            cmd = TQString::fromLatin1( "showstatus" );
+            cmd = TQString::tqfromLatin1( "showstatus" );
             break;
 
         case KJAS_RESIZE_APPLET:
-            cmd = TQString::fromLatin1( "resizeapplet" );
+            cmd = TQString::tqfromLatin1( "resizeapplet" );
             break;
 
         case KJAS_GET_URLDATA:
@@ -565,7 +565,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         case KJAS_DATA_COMMAND:
             if (ok && !args.empty()) {
                 const int cmd = args.first().toInt( &ok );
-                KIOJobMap::iterator it = d->kiojobs.find( ID_num );
+                KIOJobMap::iterator it = d->kiojobs.tqfind( ID_num );
                 if (ok && it != d->kiojobs.end())
                     it.data()->jobCommand( cmd );
                 kdDebug(6100) << "KIO Data command: " << ID_num << " " << args.first() << endl;
@@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                 kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl;
             return;
         case KJAS_JAVASCRIPT_EVENT:
-            cmd = TQString::fromLatin1( "JS_Event" );
+            cmd = TQString::tqfromLatin1( "JS_Event" );
             kdDebug(6100) << "Javascript request: "<< contextID
                           << " code: " << args[0] << endl;
             break;
@@ -581,7 +581,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
         case KJAS_PUT_MEMBER:
         case KJAS_CALL_MEMBER: {
             const int ticket = args[0].toInt();
-            JSStack::iterator it = d->jsstack.find(ticket);
+            JSStack::iterator it = d->jsstack.tqfind(ticket);
             if (it != d->jsstack.end()) {
                 kdDebug(6100) << "slotJavaRequest: " << ticket << endl;
                 args.pop_front();
@@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
             return;
         }
         case KJAS_AUDIOCLIP_PLAY:
-            cmd = TQString::fromLatin1( "audioclip_play" );
+            cmd = TQString::tqfromLatin1( "audioclip_play" );
             kdDebug(6100) << "Audio Play: url=" << args[0] << endl;
             break;
         case KJAS_AUDIOCLIP_LOOP:
-            cmd = TQString::fromLatin1( "audioclip_loop" );
+            cmd = TQString::tqfromLatin1( "audioclip_loop" );
             kdDebug(6100) << "Audio Loop: url=" << args[0] << endl;
             break;
         case KJAS_AUDIOCLIP_STOP:
-            cmd = TQString::fromLatin1( "audioclip_stop" );
+            cmd = TQString::tqfromLatin1( "audioclip_stop" );
             kdDebug(6100) << "Audio Stop: url=" << args[0] << endl;
             break;
         case KJAS_APPLET_STATE:
             kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl;
-            cmd = TQString::fromLatin1( "AppletStateNotification" );
+            cmd = TQString::tqfromLatin1( "AppletStateNotification" );
             break;
         case KJAS_APPLET_FAILED:
             kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl;
-            cmd = TQString::fromLatin1( "AppletFailed" );
+            cmd = TQString::tqfromLatin1( "AppletFailed" );
             break;
         case KJAS_SECURITY_CONFIRM: {
             if (KSSL::doesSSLWork() && !d->kssl)
@@ -670,7 +670,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                         TQString subject = cert->getSubject() + TQChar('\n');
                         TQRegExp reg(TQString("/[A-Z]+="));
                         int pos = 0;
-                        while ((pos = subject.find(reg, pos)) > -1)
+                        while ((pos = subject.tqfind(reg, pos)) > -1)
                             subject.replace(pos, 1, TQString("\n    "));
                         text += subject.mid(1);
                     }
@@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                     KSSLCertChain chain;
                     chain.setChain( certs );
                     if ( chain.isValid() )
-                        answer = PermissionDialog( qApp->activeWindow() ).exec( text, args[0] );
+                        answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] );
                 }
             }
             sl.push_front( TQString(answer) );
@@ -779,7 +779,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent )
 TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) {
     TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog");
 
-    dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
+    dialog->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
     dialog->setModal( true );
     dialog->setCaption( i18n("Security Alert") );
 
@@ -807,7 +807,7 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm )
     TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" );
     buttonLayout->addWidget( grant );
     dialogLayout->addLayout( buttonLayout );
-    dialog->resize( dialog->minimumSizeHint() );
+    dialog->resize( dialog->tqminimumSizeHint() );
     //clearWState( WState_Polished );
 
     connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
@@ -827,7 +827,7 @@ PermissionDialog::~PermissionDialog()
 void PermissionDialog::clicked()
 {
     m_button = sender()->name();
-    static_cast<const TQWidget*>(sender())->parentWidget()->close();
+    static_cast<const TQWidget*>(sender())->tqparentWidget()->close();
 }
 
 #include "kjavaappletserver.moc"
diff --git a/khtml/java/kjavaappletserver.h b/khtml/java/kjavaappletserver.h
index 08d0f2983..63463b040 100644
--- a/khtml/java/kjavaappletserver.h
+++ b/khtml/java/kjavaappletserver.h
@@ -39,7 +39,7 @@ class KJavaAppletContext;
 class KJavaAppletServerPrivate;
 class JSStackFrame;
 
-class KJavaAppletServer : public QObject
+class KJavaAppletServer : public TQObject
 {
 Q_OBJECT
 
@@ -161,7 +161,7 @@ private:
 };
 
 
-class PermissionDialog : public QObject
+class PermissionDialog : public TQObject
 {
     Q_OBJECT
 public:
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index d4c8e266f..7e9264786 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -230,7 +230,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
     TQStringList::const_iterator it = args.begin();
     const TQStringList::const_iterator itEnd = args.end();
     for ( ; it != itEnd; ++it) {
-        const int equalPos = (*it).find("=");
+        const int equalPos = (*it).tqfind("=");
         if (equalPos > 0) {
             const TQString name = (*it).left (equalPos).upper ();
             TQString value = (*it).right ((*it).length () - equalPos - 1);
@@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
                     baseurl = KURL (KURL (value), TQString (".")).url ();
                 } else if (name == "__KHTML__CODEBASE")
                     khtml_codebase = value;
-                else if (name_lower == TQString::fromLatin1("codebase") ||
-                         name_lower == TQString::fromLatin1("java_codebase")) {
+                else if (name_lower == TQString::tqfromLatin1("codebase") ||
+                         name_lower == TQString::tqfromLatin1("java_codebase")) {
                     if (!value.isEmpty ())
                         codebase = value;
                 } else if (name == "__KHTML__CLASSID")
-                //else if (name.lower()==TQString::fromLatin1("classid"))
+                //else if (name.lower()==TQString::tqfromLatin1("classid"))
                     classid = value;
-                else if (name_lower == TQString::fromLatin1("code") ||
-                         name_lower == TQString::fromLatin1("java_code"))
+                else if (name_lower == TQString::tqfromLatin1("code") ||
+                         name_lower == TQString::tqfromLatin1("java_code"))
                     classname = value;
-                else if (name_lower == TQString::fromLatin1("src"))
+                else if (name_lower == TQString::tqfromLatin1("src"))
                     src_param = value;
-                else if (name_lower == TQString::fromLatin1("archive") ||
-                         name_lower == TQString::fromLatin1("java_archive") ||
+                else if (name_lower == TQString::tqfromLatin1("archive") ||
+                         name_lower == TQString::tqfromLatin1("java_archive") ||
                          name_lower.startsWith ("cache_archive"))
                     applet->setArchives (value);
-                else if (name_lower == TQString::fromLatin1("name"))
+                else if (name_lower == TQString::tqfromLatin1("name"))
                     applet->setAppletName (value);
-                else if (name_lower == TQString::fromLatin1("width"))
+                else if (name_lower == TQString::tqfromLatin1("width"))
                     width = value.toInt();
-                else if (name_lower == TQString::fromLatin1("height"))
+                else if (name_lower == TQString::tqfromLatin1("height"))
                     height = value.toInt();
                 if (!name.startsWith ("__KHTML__")) {
                     applet->setParameter (name, value);
@@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
         info.verifyPath = true;
 
         TQDataStream stream(params, IO_WriteOnly);
-        stream << info << m_view->topLevelWidget()->winId();
+        stream << info << m_view->tqtopLevelWidget()->winId();
 
         if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
             kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
@@ -342,7 +342,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
 
     /* install event filter for close events */
     if (wparent)
-        wparent->topLevelWidget ()->installEventFilter (this);
+        wparent->tqtopLevelWidget ()->installEventFilter (this);
 
     setInstance (KJavaAppletViewerFactory::instance ());
     KParts::Part::setWidget (m_view);
@@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) {
         } else
             applet->setAppletClass (url.url ());
         AppletParameterDialog (w).exec ();
-        applet->setSize (w->sizeHint());
+        applet->setSize (w->tqsizeHint());
     }
     if (!m_statusbar_icon) {
         KStatusBar *sb = m_statusbar->statusBar();
@@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) {
         applet->setParameter (key, val);
         kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl;
     }
-    applet->setSize (w->sizeHint ());
+    applet->setSize (w->tqsizeHint ());
     if (w->isVisible())
         w->showApplet ();
 }
diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp
index 1299ce7e8..2e9597b2d 100644
--- a/khtml/java/kjavaappletwidget.cpp
+++ b/khtml/java/kjavaappletwidget.cpp
@@ -50,7 +50,7 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
 
     d->tmplabel = new TQLabel( this );
     d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
-    d->tmplabel->setAlignment( Qt::AlignCenter | Qt::WordBreak );
+    d->tmplabel->tqsetAlignment( Qt::AlignCenter | Qt::WordBreak );
     d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
     d->tmplabel->show();
 
@@ -98,10 +98,10 @@ void KJavaAppletWidget::setWindow( WId w )
     }
 }
 
-TQSize KJavaAppletWidget::sizeHint() const
+TQSize KJavaAppletWidget::tqsizeHint() const
 {
-    kdDebug(6100) << "KJavaAppletWidget::sizeHint()" << endl;
-    TQSize rval = QXEmbed::sizeHint();
+    kdDebug(6100) << "KJavaAppletWidget::tqsizeHint()" << endl;
+    TQSize rval = QXEmbed::tqsizeHint();
 
     if( rval.width() == 0 || rval.height() == 0 )
     {
@@ -132,7 +132,7 @@ void KJavaAppletWidget::showEvent (TQShowEvent * e) {
     if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) {
         // delayed showApplet
         if (applet()->size().width() <= 0)
-            applet()->setSize (sizeHint());
+            applet()->setSize (tqsizeHint());
         showApplet();
     }
 }
diff --git a/khtml/java/kjavaappletwidget.h b/khtml/java/kjavaappletwidget.h
index 18f5be341..0b8ce90e9 100644
--- a/khtml/java/kjavaappletwidget.h
+++ b/khtml/java/kjavaappletwidget.h
@@ -75,7 +75,7 @@
 
 class KJavaAppletWidgetPrivate;
 
-class KJavaAppletWidget : public QXEmbed
+class KJavaAppletWidget : public TQXEmbed
 {
     Q_OBJECT
 public:
@@ -96,7 +96,7 @@ public:
      */
     void showApplet();
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     void resize( int, int );
 
 protected slots:
diff --git a/khtml/java/kjavadownloader.h b/khtml/java/kjavadownloader.h
index d3cf0de41..f9514304c 100644
--- a/khtml/java/kjavadownloader.h
+++ b/khtml/java/kjavadownloader.h
@@ -40,7 +40,7 @@ namespace KIO {
 class KJavaDownloaderPrivate;
 class KJavaUploaderPrivate;
 
-class KJavaKIOJob : public QObject
+class KJavaKIOJob : public TQObject
 {
 Q_OBJECT
 public:
diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp
index 1c9f1b346..48eb7b764 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/khtml/java/kjavaprocess.cpp
@@ -300,7 +300,7 @@ bool KJavaProcess::invokeJVM()
     TQString argStr;
     TQTextOStream stream( &argStr );
     const TQValueList<TQCString> args = javaProcess->args();
-    qCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) );
+    tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) );
     kdDebug(6100) << argStr << endl;
 
     KProcess::Communication flags =  (KProcess::Communication)