summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold Dumas <contact@arnolddumas.fr>2014-10-05 20:14:11 (GMT)
committerArnold Dumas <contact@arnolddumas.fr>2014-10-05 20:14:11 (GMT)
commita92c9c31a582e831b38edaf5964441d5871f8277 (patch)
tree5ee16ea22f41654a5a66d88b02703f0ad89b7648
parent50f2ee6951901cc768543fc7c9e614f9138f9120 (diff)
Get rid of to/fromAscii methods.
-rw-r--r--generators/djvu/kdjvu.cpp2
-rw-r--r--generators/dvi/TeXFont_PFB.cpp2
-rw-r--r--generators/dvi/psgs.cpp2
-rw-r--r--generators/ooo/manifest.cpp6
-rw-r--r--generators/spectre/generator_ghostview.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/generators/djvu/kdjvu.cpp b/generators/djvu/kdjvu.cpp
index 3fdeac7..a6df08c 100644
--- a/generators/djvu/kdjvu.cpp
+++ b/generators/djvu/kdjvu.cpp
@@ -1065,7 +1065,7 @@ bool KDjVu::exportAsPostScript( QFile* file, const QList<int>& pageList ) const
// setting the options
static const int optc = 1;
const char ** optv = (const char**)malloc( 1 * sizeof( char* ) );
- QByteArray plb = pl.toAscii();
+ QByteArray plb = pl.toLatin1();
optv[0] = plb.constData();
ddjvu_job_t *printjob = ddjvu_document_print( d->m_djvu_document, f, optc, optv );
diff --git a/generators/dvi/TeXFont_PFB.cpp b/generators/dvi/TeXFont_PFB.cpp
index 532362b..a6f5dcd 100644
--- a/generators/dvi/TeXFont_PFB.cpp
+++ b/generators/dvi/TeXFont_PFB.cpp
@@ -85,7 +85,7 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double sl
qCDebug(OkularDviDebug) << "Trying to associate glyph indices to names from the encoding vector.";
#endif
for(int i=0; i<256; i++) {
- charMap[i] = FT_Get_Name_Index( face, (FT_String *)(enc->glyphNameVector[i].toAscii().data()) );
+ charMap[i] = FT_Get_Name_Index( face, (FT_String *)(enc->glyphNameVector[i].toLatin1().data()) );
#ifdef DEBUG_PFB
qCDebug(OkularDviDebug) << i << ": " << enc->glyphNameVector[i] << ", GlyphIndex=" << charMap[i];
#endif
diff --git a/generators/dvi/psgs.cpp b/generators/dvi/psgs.cpp
index 13117c4..a6df727 100644
--- a/generators/dvi/psgs.cpp
+++ b/generators/dvi/psgs.cpp
@@ -214,7 +214,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co
PSfile.close();
// Step 2: Call GS with the File
- QFile::remove(filename.toAscii());
+ QFile::remove(filename.toLatin1());
KProcess proc;
proc.setOutputChannelMode(KProcess::SeparateChannels);
QStringList argus;
diff --git a/generators/ooo/manifest.cpp b/generators/ooo/manifest.cpp
index 36533f5..23b5d98 100644
--- a/generators/ooo/manifest.cpp
+++ b/generators/ooo/manifest.cpp
@@ -63,7 +63,7 @@ QString ManifestEntry::checksumType() const
void ManifestEntry::setChecksum( const QString &checksum )
{
- m_checksum = QByteArray::fromBase64( checksum.toAscii() );
+ m_checksum = QByteArray::fromBase64( checksum.toLatin1() );
}
QByteArray ManifestEntry::checksum() const
@@ -83,7 +83,7 @@ QString ManifestEntry::algorithm() const
void ManifestEntry::setInitialisationVector( const QString &initialisationVector )
{
- m_initialisationVector = QByteArray::fromBase64( initialisationVector.toAscii() );
+ m_initialisationVector = QByteArray::fromBase64( initialisationVector.toLatin1() );
}
QByteArray ManifestEntry::initialisationVector() const
@@ -113,7 +113,7 @@ int ManifestEntry::iterationCount() const
void ManifestEntry::setSalt( const QString &salt )
{
- m_salt = QByteArray::fromBase64( salt.toAscii() );
+ m_salt = QByteArray::fromBase64( salt.toLatin1() );
}
QByteArray ManifestEntry::salt() const
diff --git a/generators/spectre/generator_ghostview.cpp b/generators/spectre/generator_ghostview.cpp
index 778735c..76ad910 100644
--- a/generators/spectre/generator_ghostview.cpp
+++ b/generators/spectre/generator_ghostview.cpp
@@ -315,7 +315,7 @@ QVariant GSGenerator::metaData(const QString &key, const QVariant &option) const
{
const char *title = spectre_document_get_title(m_internalDocument);
if (title)
- return QString::fromAscii(title);
+ return QString::fromLatin1(title);
}
return QVariant();
}