Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 152546 | Differences between
and this patch

Collapse All | Expand All

(-)kdelibs-3.4.0/kdoctools/kio_help.cpp~ (-1 / +1 lines)
Lines 134-140 void HelpProtocol::unicodeError( const Q Link Here
134 
{
 134 
{
135 
   data(fromUnicode( QString(
 135 
   data(fromUnicode( QString(
136 
        "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n"
 136 
        "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n"
137 
        "%2</html>" ).arg( QTextCodec::codecForLocale()->name() ).arg( t ) ) );
 137 
        "%2</html>" ).arg( QTextCodec::codecForLocale()->mimeName() ).arg( t ) ) );
138 
}
 138 
}
139 

          139
          

        

        

          140
          
void HelpProtocol::notFound()

          140
          
void HelpProtocol::notFound()

        



(-)kdelibs-3.4.0/kdoctools/xslt.cpp~
      (-2 / +1 lines)




  

    
      
            Lines 348-355
          QCString fromUnicode( const QString &dat
      
      
        Link Here
      
    
  

        

          348
          

          348
          

        

        

          349
          
void replaceCharsetHeader( QString &output )

          349
          
void replaceCharsetHeader( QString &output )

        

        

          350
          
{

          350
          
{

        

          
            

              351
              
    QString name = QTextCodec::codecForLocale()->name();


              351
              
    QString name = QTextCodec::codecForLocale()->mimeName();

            

            

              352
              
    name.replace( QString( "ISO " ), "iso-" );


              
              
            

        

          353
          
    output.replace( QString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" ),

          352
          
    output.replace( QString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" ),

        

        

          354
          
                    QString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\">" ).arg( name ) );

          353
          
                    QString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\">" ).arg( name ) );

        

        

          355
          
}

          354
          
}

        






  

  Return to bug 152546