From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- khtml/test_regression.cpp | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'khtml/test_regression.cpp') diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp index 70a34b984..288f0df6b 100644 --- a/khtml/test_regression.cpp +++ b/khtml/test_regression.cpp @@ -92,7 +92,7 @@ #include #include "khtmlview.h" -#include "rendering/render_tqreplaced.h" +#include "rendering/render_replaced.h" #include "xml/dom_docimpl.h" #include "html/html_baseimpl.h" #include "dom/dom_doc.h" @@ -215,9 +215,9 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar switch (id) { case Print: { UString str = args[0].toString(exec); - if ( str.qstring().lower().tqfind( "failed!" ) >= 0 ) + if ( str.qstring().lower().find( "failed!" ) >= 0 ) m_regTest->saw_failure = true; - TQString res = str.qstring().tqreplace('\007', ""); + TQString res = str.qstring().replace('\007', ""); m_regTest->m_currentOutput += res + "\n"; break; } @@ -236,7 +236,7 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar if ( docimpl && docimpl->view() && docimpl->renderer() ) { docimpl->updateRendering(); - docimpl->view()->tqlayout(); + docimpl->view()->layout(); } TQString filename = args[0].toString(exec).qstring(); filename = RegressionTest::curr->m_currentCategory+"/"+filename; @@ -676,7 +676,7 @@ RegressionTest::RegressionTest(KHTMLPart *part, const TQString &baseDir, const T { m_part = part; m_baseDir = baseDir; - m_baseDir = m_baseDir.tqreplace( "//", "/" ); + m_baseDir = m_baseDir.replace( "//", "/" ); if ( m_baseDir.endsWith( "/" ) ) m_baseDir = m_baseDir.left( m_baseDir.length() - 1 ); if (outputDir.isEmpty()) @@ -770,16 +770,16 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur TQString filename = sourceDir[fileno]; TQString relFilename = relPath.isEmpty() ? filename : relPath+"/"+filename; - if (filename == "." || filename == ".." || ignoreFiles.tqcontains(filename) ) + if (filename == "." || filename == ".." || ignoreFiles.contains(filename) ) continue; int failure_type = NoFailure; - if ( failureFiles.tqcontains( filename ) ) + if ( failureFiles.contains( filename ) ) failure_type |= AllFailure; - if ( failureFiles.tqcontains ( filename + "-render" ) ) + if ( failureFiles.contains ( filename + "-render" ) ) failure_type |= RenderFailure; - if ( failureFiles.tqcontains ( filename + "-dump.png" ) ) + if ( failureFiles.contains ( filename + "-dump.png" ) ) failure_type |= PaintFailure; - if ( failureFiles.tqcontains ( filename + "-dom" ) ) + if ( failureFiles.contains ( filename + "-dom" ) ) failure_type |= DomFailure; runTests(relFilename, false, failure_type ); } @@ -849,7 +849,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa if ( node.handle()->id() == ID_FRAME ) { outputStream << endl; TQString frameName = static_cast( node.handle() )->name.string(); - KHTMLPart* frame = part->tqfindFrame( frameName ); + KHTMLPart* frame = part->findFrame( frameName ); Q_ASSERT( frame ); if ( frame ) getPartDOMOutput( outputStream, frame, indent ); @@ -923,7 +923,7 @@ void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part names.sort(); for ( TQStringList::iterator it = names.begin(); it != names.end(); ++it ) { outputStream << "FRAME: " << (*it) << "\n"; - KHTMLPart* frame = part->tqfindFrame( (*it) ); + KHTMLPart* frame = part->findFrame( (*it) ); Q_ASSERT( frame ); if ( frame ) dumpRenderTree( outputStream, frame ); @@ -943,7 +943,7 @@ TQString RegressionTest::getPartOutput( OutputType type) getPartDOMOutput( outputStream, m_part, 0 ); } - dump.tqreplace( m_baseDir + "/tests", TQString::tqfromLatin1( "REGRESSION_SRCDIR" ) ); + dump.replace( m_baseDir + "/tests", TQString::fromLatin1( "REGRESSION_SRCDIR" ) ); return dump; } @@ -1000,9 +1000,9 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi ) for ( int x = 0; x < w; ++x ) { QRgb l = ls[x]; QRgb r = rs[x]; - if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) && - ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) && - ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) ) + if ( ( abs( qRed( l ) - qRed(r ) ) < 20 ) && + ( abs( qGreen( l ) - qGreen(r ) ) < 20 ) && + ( abs( qBlue( l ) - qBlue(r ) ) < 20 ) ) continue; kdDebug() << "pixel (" << x << ", " << y << ") is different " << TQColor( lhsi.pixel ( x, y ) ) << " " << TQColor( rhsi.pixel ( x, y ) ) << endl; return false; @@ -1045,15 +1045,15 @@ void RegressionTest::doJavascriptReport( const TQString &test ) cl = TQString( "%1" ).arg( test ); cl += ""; TQString text = "\n" + m_currentOutput; - text.tqreplace( '<', "<" ); - text.tqreplace( '>', ">" ); - text.tqreplace( TQRegExp( "\nFAILED" ), "\nFAILED" ); - text.tqreplace( TQRegExp( "\nFAIL" ), "\nFAIL" ); - text.tqreplace( TQRegExp( "\nPASSED" ), "\nPASSED" ); - text.tqreplace( TQRegExp( "\nPASS" ), "\nPASS" ); + text.replace( '<', "<" ); + text.replace( '>', ">" ); + text.replace( TQRegExp( "\nFAILED" ), "\nFAILED" ); + text.replace( TQRegExp( "\nFAIL" ), "\nFAIL" ); + text.replace( TQRegExp( "\nPASSED" ), "\nPASSED" ); + text.replace( TQRegExp( "\nPASS" ), "\nPASS" ); if ( text.at( 0 ) == '\n' ) text = text.mid( 1, text.length() ); - text.tqreplace( '\n', "
\n" ); + text.replace( '\n', "
\n" ); cl += text; cl += ""; compare.writeBlock( cl.latin1(), cl.length() ); @@ -1063,7 +1063,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) /** returns the path in a way that is relatively reachable from base. * @param base base directory (must not include trailing slash) * @param path directory/file to be relatively reached by base - * @return path with all elements tqreplaced by .. and concerning path elements + * @return path with all elements replaced by .. and concerning path elements * to be relatively reachable from base. */ static TQString makeRelativePath(const TQString &base, const TQString &path) @@ -1077,10 +1077,10 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) int pos = 0; do { pos++; - int newpos = absBase.tqfind('/', pos); + int newpos = absBase.find('/', pos); if (newpos == -1) newpos = absBase.length(); - TQConstString cmpPathComp(absPath.tqunicode() + pos, newpos - pos); - TQConstString cmpBaseComp(absBase.tqunicode() + pos, newpos - pos); + TQConstString cmpPathComp(absPath.unicode() + pos, newpos - pos); + TQConstString cmpBaseComp(absBase.unicode() + pos, newpos - pos); // kdDebug() << "cmpPathComp: \"" << cmpPathComp.string() << "\"" << endl; // kdDebug() << "cmpBaseComp: \"" << cmpBaseComp.string() << "\"" << endl; // kdDebug() << "pos: " << pos << " newpos: " << newpos << endl; @@ -1094,11 +1094,11 @@ static TQString makeRelativePath(const TQString &base, const TQString &path) TQString rel; { - TQConstString relBase(absBase.tqunicode() + basepos, absBase.length() - basepos); - TQConstString relPath(absPath.tqunicode() + pathpos, absPath.length() - pathpos); + TQConstString relBase(absBase.unicode() + basepos, absBase.length() - basepos); + TQConstString relPath(absPath.unicode() + pathpos, absPath.length() - pathpos); // generate as many .. as there are path elements in relBase if (relBase.string().length() > 0) { - for (int i = relBase.string().tqcontains('/'); i > 0; --i) + for (int i = relBase.string().contains('/'); i > 0; --i) rel += "../"; rel += ".."; if (relPath.string().length() > 0) rel += "/"; @@ -1138,13 +1138,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) if ( failures & RenderFailure ) { renderDiff += "
";
-        FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-render %3/%2-render" )
+        FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-render %3/%2-render" )
                             .arg ( test, test, relOutputDir ).latin1(), "r" );
         TQTextIStream *is = new TQTextIStream( pipe );
         for ( int line = 0; line < 100 && !is->eof(); ++line ) {
             TQString line = is->readLine();
-            line = line.tqreplace( '<', "<" );
-            line = line.tqreplace( '>', ">" );
+            line = line.replace( '<', "<" );
+            line = line.replace( '>', ">" );
             renderDiff += line + "\n";
         }
         delete is;
@@ -1154,13 +1154,13 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
     if ( failures & DomFailure ) {
         domDiff += "
";
-        FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
+        FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-dom %3/%2-dom" )
                             .arg ( test, test, relOutputDir ).latin1(), "r" );
         TQTextIStream *is = new TQTextIStream( pipe );
         for ( int line = 0; line < 100 && !is->eof(); ++line ) {
             TQString line = is->readLine();
-            line = line.tqreplace( '<', "<" );
-            line = line.tqreplace( '>', ">" );
+            line = line.replace( '<', "<" );
+            line = line.replace( '>', ">" );
             domDiff += line  + "\n";
         }
         delete is;
@@ -1254,7 +1254,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
 
 void RegressionTest::testStaticFile(const TQString & filename)
 {
-    tqApp->mainWidget()->resize( 800, 600); // restore size
+    qApp->mainWidget()->resize( 800, 600); // restore size
 
     // Set arguments
     KParts::URLArgs args;
@@ -1400,11 +1400,11 @@ public:
 
 void RegressionTest::testJSFile(const TQString & filename )
 {
-    tqApp->mainWidget()->resize( 800, 600); // restore size
+    qApp->mainWidget()->resize( 800, 600); // restore size
 
     // create interpreter
     // note: this is different from the interpreter used by the part,
-    // it tqcontains regression test-specific objects & functions
+    // it contains regression test-specific objects & functions
     Object global(new GlobalImp());
     khtml::ChildFrame frame;
     frame.m_part = m_part;
@@ -1571,7 +1571,7 @@ void RegressionTest::printDescription(const TQString& description)
 
     if (!description.isEmpty()) {
         TQString desc = description;
-        desc.tqreplace( '\n', ' ' );
+        desc.replace( '\n', ' ' );
 	printf(" [%s]", desc.latin1());
     }
 
@@ -1591,7 +1591,7 @@ void RegressionTest::createMissingDirs(const TQString & filename)
     pathComponents.prepend(parentDir.absFilePath());
     while (!parentDir.exists()) {
 	TQString parentPath = parentDir.absFilePath();
-	int slashPos = parentPath.tqfindRev('/');
+	int slashPos = parentPath.findRev('/');
 	if (slashPos < 0)
 	    break;
 	parentPath = parentPath.left(slashPos);
@@ -1636,7 +1636,7 @@ bool RegressionTest::svnIgnored( const TQString &filename )
 
 void RegressionTest::resizeTopLevelWidget( int w, int h )
 {
-    tqApp->mainWidget()->resize( w, h );
+    qApp->mainWidget()->resize( w, h );
     // Since we're not visible, this doesn't have an immediate effect, TQWidget posts the event
     TQApplication::sendPostedEvents( 0, TQEvent::Resize );
 }
-- 
cgit v1.2.3