diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/kmultipart/kmultipart.cpp | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
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
Diffstat (limited to 'khtml/kmultipart/kmultipart.cpp')
-rw-r--r-- | khtml/kmultipart/kmultipart.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp index a9fef06b5..17ea9d485 100644 --- a/khtml/kmultipart/kmultipart.cpp +++ b/khtml/kmultipart/kmultipart.cpp @@ -93,7 +93,7 @@ Data for the second and last object. */ -KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, +KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadOnlyPart( parent, name ) { @@ -101,7 +101,7 @@ KMultiPart::KMultiPart( TQWidget *tqparentWidget, const char *widgetName, setInstance( KMultiPartFactory::instance() ); - TQVBox *box = new TQVBox( tqparentWidget, widgetName ); + TQVBox *box = new TQVBox( parentWidget, widgetName ); setWidget( box ); m_extension = new KParts::BrowserExtension( this ); @@ -234,7 +234,7 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) } else if ( !qstrnicmp( line.data(), "Content-Encoding:", 17 ) ) { - TQString encoding = TQString::tqfromLatin1(line.data()+17).stripWhiteSpace().lower(); + TQString encoding = TQString::fromLatin1(line.data()+17).stripWhiteSpace().lower(); if (encoding == "gzip" || encoding == "x-gzip") { m_gzip = true; } else { @@ -245,8 +245,8 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !qstrnicmp( line.data(), "Content-Type:", 13 ) ) { Q_ASSERT( m_nextMimeType.isNull() ); - m_nextMimeType = TQString::tqfromLatin1( line.data() + 14 ).stripWhiteSpace(); - int semicolon = m_nextMimeType.tqfind( ';' ); + m_nextMimeType = TQString::fromLatin1( line.data() + 14 ).stripWhiteSpace(); + int semicolon = m_nextMimeType.find( ';' ); if ( semicolon != -1 ) m_nextMimeType = m_nextMimeType.left( semicolon ); kdDebug() << "m_nextMimeType=" << m_nextMimeType << endl; @@ -266,14 +266,14 @@ void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data ) else if ( !line.isEmpty() ) // this happens with e.g. Set-Cookie: kdDebug() << "Ignoring header " << line << endl; } else { - if ( !tqstrncmp( line, m_boundary, m_boundaryLength ) ) + if ( !qstrncmp( line, m_boundary, m_boundaryLength ) ) { #ifdef DEBUG_PARSING kdDebug() << "boundary found!" << endl; kdDebug() << "after it is " << line.data() + m_boundaryLength << endl; #endif // Was it the very last boundary ? - if ( !tqstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) + if ( !qstrncmp( line.data() + m_boundaryLength, "--", 2 ) ) { #ifdef DEBUG_PARSING kdDebug() << "Completed!" << endl; @@ -312,7 +312,7 @@ void KMultiPart::setPart( const TQString& mimeType ) guiFactory->removeClient( this ); kdDebug() << "KMultiPart::setPart " << mimeType << endl; delete m_part; - // Try to tqfind an appropriate viewer component + // Try to find an appropriate viewer component m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart> ( m_mimeType, TQString::null, widget(), 0L, this, 0L ); if ( !m_part ) { |