From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 lib/widgets/kdevhtmlpart.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/widgets/kdevhtmlpart.cpp')

diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index c99dcf36..5bda3bed 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -97,7 +97,7 @@ void KDevHTMLPart::popup( const TQString & url, const TQPoint & p )
   if (!url.isEmpty() && (m_options & CanOpenInNewWindow))
   {
     idNewWindow = popup.insertItem(SmallIcon("window_new"),i18n("Open in New Tab"));
-    popup.setWhatsThis(idNewWindow, i18n("<b>Open in new window</b><p>Opens current link in a new window."));
+    popup.TQMenuData::setWhatsThis(idNewWindow, i18n("<b>Open in new window</b><p>Opens current link in a new window."));
     needSep = true;
   }
   if (m_options & CanDuplicate)
@@ -254,7 +254,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
 {
   // check for environment variables and make necessary translations
   TQString path = url;
-  int nDollarPos = path.find( '$' );
+  int nDollarPos = path.tqfind( '$' );
 
   // Note: the while loop below is a copy of code in kdecore/kconfigbase.cpp ;)
   while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) {
@@ -275,7 +275,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
          result = ts.read().stripWhiteSpace();
          pclose(fs);
       }
-      path.replace( nDollarPos, nEndPos-nDollarPos, result );
+      path.tqreplace( nDollarPos, nEndPos-nDollarPos, result );
     } else if( (path)[nDollarPos+1] != '$' ) {
       uint nEndPos = nDollarPos+1;
       // the next character is no $
@@ -302,9 +302,9 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
         // A environment variables may contain values in 8bit
         // locale cpecified encoding or in UTF8 encoding.
         if (isUtf8( pEnv ))
-            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) );
+            path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) );
         else
-            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) );
+            path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) );
       } else
       path.remove( nDollarPos, nEndPos-nDollarPos );
     } else {
@@ -312,7 +312,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
       path.remove( nDollarPos, 1 );
       nDollarPos++;
     }
-    nDollarPos = path.find( '$', nDollarPos );
+    nDollarPos = path.tqfind( '$', nDollarPos );
   }
 
   return path;
@@ -494,8 +494,8 @@ void KDevHTMLPart::addHistoryEntry()
 void KDevHTMLPart::slotCopy( )
 {
     TQString text = selectedText();
-    text.replace( TQChar( 0xa0 ), ' ' );
-    QClipboard *cb = TQApplication::clipboard();
+    text.tqreplace( TQChar( 0xa0 ), ' ' );
+    TQClipboard *cb = TQApplication::tqclipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
-- 
cgit v1.2.1