diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 08:24:43 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 08:24:43 +0000 |
| commit | 96a33d90689a46ea58f812d76fdd2eaf93edecfa (patch) | |
| tree | 756ca55bffdffc115088699dd1b76c61eb6f64bf /khtml | |
| parent | 5783baba4a547c443e4392f51c8023d38cb9fe6a (diff) | |
| download | tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.tar.gz tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.zip | |
Additional TQt for Qt4 compilation fixes
This should not affect TQt for Qt3 per usual
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1215674 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml')
| -rw-r--r-- | khtml/html/html_elementimpl.cpp | 12 | ||||
| -rw-r--r-- | khtml/khtml_settings.cc | 6 | ||||
| -rw-r--r-- | khtml/test_regression.cpp | 14 |
3 files changed, 16 insertions, 16 deletions
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp index a5931cd41..736b5a3b9 100644 --- a/khtml/html/html_elementimpl.cpp +++ b/khtml/html/html_elementimpl.cpp @@ -347,17 +347,17 @@ void HTMLElementImpl::addCSSLength(int id, const DOMString &value, bool numOnly, } static inline bool isHexDigit( const TQChar &c ) { - return ( c >= '0' && c <= '9' ) || - ( c >= 'a' && c <= 'f' ) || - ( c >= 'A' && c <= 'F' ); + return ( c >= TQChar('0') && c <= TQChar('9') ) || + ( c >= TQChar('a') && c <= TQChar('f') ) || + ( c >= TQChar('A') && c <= TQChar('F') ); } static inline int toHex( const TQChar &c ) { - return ( (c >= '0' && c <= '9') + return ( (c >= TQChar('0') && c <= TQChar('9')) ? (c.tqunicode() - '0') - : ( ( c >= 'a' && c <= 'f' ) + : ( ( c >= TQChar('a') && c <= TQChar('f') ) ? (c.tqunicode() - 'a' + 10) - : ( ( c >= 'A' && c <= 'F' ) + : ( ( c >= TQChar('A') && c <= TQChar('F') ) ? (c.tqunicode() - 'A' + 10) : -1 ) ) ); } diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc index 57ff92689..405fa4234 100644 --- a/khtml/khtml_settings.cc +++ b/khtml/khtml_settings.cc @@ -107,7 +107,7 @@ public: TQStringList defaultFonts; TQValueVector<TQRegExp> adFilters; - TQValueList< QPair< TQString, TQChar > > m_fallbackAccessKeysAssignments; + TQValueList< TQPair< TQString, TQChar > > m_fallbackAccessKeysAssignments; }; @@ -442,7 +442,7 @@ void KHTMLSettings::init( KConfig * config, bool reset ) d->m_fallbackAccessKeysAssignments.clear(); for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it ) if( (*it).length() > 2 && (*it)[ 1 ] == ':' ) - d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); + d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); } // Colors @@ -1043,7 +1043,7 @@ bool KHTMLSettings::autoSpellCheck() const return d->m_autoSpellCheck; } -TQValueList< QPair< TQString, TQChar > > KHTMLSettings::fallbackAccessKeysAssignments() const +TQValueList< TQPair< TQString, TQChar > > KHTMLSettings::fallbackAccessKeysAssignments() const { return d->m_fallbackAccessKeysAssignments; } diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index c756dc2ea..982539621 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -350,7 +350,7 @@ Value KHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List & char buf[1024]; int bytesread; while (!file.atEnd()) { - bytesread = file.readBlock(buf,1024); + bytesread = file.tqreadBlock(buf,1024); stream.writeRawBytes(buf,bytesread); } file.close(); @@ -642,7 +642,7 @@ int main(int argc, char *argv[]) link = TQString( "<hr>%1 failures. (%2 expected failures)" ) .arg(regressionTest->m_failures_work ) .arg( regressionTest->m_failures_fail ); - list.writeBlock( link.latin1(), link.length() ); + list.tqwriteBlock( link.latin1(), link.length() ); list.close(); } } @@ -697,12 +697,12 @@ RegressionTest::RegressionTest(KHTMLPart *part, const TQString &baseDir, const T TQString s; f.open( IO_WriteOnly | IO_Truncate ); s = "<html><body>Follow the white rabbit"; - f.writeBlock( s.latin1(), s.length() ); + f.tqwriteBlock( s.latin1(), s.length() ); f.close(); f.setName( m_outputDir + "/index.html" ); f.open( IO_WriteOnly | IO_Truncate ); s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>"; - f.writeBlock( s.latin1(), s.length() ); + f.tqwriteBlock( s.latin1(), s.length() ); f.close(); m_paintBuffer = 0; @@ -1032,7 +1032,7 @@ void RegressionTest::createLink( const TQString& test, int failures ) if ( failures & PaintFailure ) link += "P"; link += "]<br>\n"; - list.writeBlock( link.latin1(), link.length() ); + list.tqwriteBlock( link.latin1(), link.length() ); list.close(); } @@ -1056,7 +1056,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) text.replace( '\n', "<br>\n" ); cl += text; cl += "</tt></body></html>"; - compare.writeBlock( cl.latin1(), cl.length() ); + compare.tqwriteBlock( cl.latin1(), cl.length() ); compare.close(); } @@ -1248,7 +1248,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) cl += "<div id='dom' class='diff'>" + domDiff + "</div>"; cl += "</body></html>"; - compare.writeBlock( cl.latin1(), cl.length() ); + compare.tqwriteBlock( cl.latin1(), cl.length() ); compare.close(); } |