summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore/KoDocument.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kofficecore/KoDocument.cpp')
-rw-r--r--lib/kofficecore/KoDocument.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index ba3c9d547..ddfce1839 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -401,7 +401,7 @@ bool KoDocument::saveFile()
backup = url();
else
backup = d->m_backupPath +"/"+url().fileName();
- backup.setPath( backup.path() + TQString::tqfromLatin1("~") );
+ backup.setPath( backup.path() + TQString::fromLatin1("~") );
KFileItem item( entry, url() );
Q_ASSERT( item.name() == url().fileName() );
KIO::NetAccess::file_copy( url(), backup, item.permissions(), true /*overwrite*/, false /*resume*/, shells().current() );
@@ -418,7 +418,7 @@ bool KoDocument::saveFile()
if ( !d->filterManager )
d->filterManager = new KoFilterManager( this );
- KoFilter::ConversiontqStatus status = d->filterManager->exp0rt( m_file, outputMimeType );
+ KoFilter::ConversionStatus status = d->filterManager->exp0rt( m_file, outputMimeType );
ret = status == KoFilter::OK;
suppressErrorDialog = (status == KoFilter::UserCancelled || status == KoFilter::BadConversionGraph );
} else {
@@ -1274,7 +1274,7 @@ TQString KoDocument::autoSaveFile( const TQString & path ) const
// Never saved? Use a temp file in $HOME then
// Yes, two open unnamed docs will overwrite each other's autosave file,
// but hmm, we can only do something if that's in the same process anyway...
- TQString ret = TQDir::homeDirPath() + "/." + TQString::tqfromLatin1(instance()->instanceName()) + ".autosave" + extension;
+ TQString ret = TQDir::homeDirPath() + "/." + TQString::fromLatin1(instance()->instanceName()) + ".autosave" + extension;
return ret;
}
else
@@ -1456,7 +1456,7 @@ bool KoDocument::openFile()
if ( !isNativeFormat( typeName.latin1() ) ) {
if ( !d->filterManager )
d->filterManager = new KoFilterManager( this );
- KoFilter::ConversiontqStatus status;
+ KoFilter::ConversionStatus status;
importedFile = d->filterManager->import( m_file, status );
if ( status != KoFilter::OK )
{
@@ -2082,7 +2082,7 @@ void KoDocument::setTitleModified()
// Get caption from document info (title(), in about page)
if ( documentInfo() )
{
- KoDocumentInfoPage * page = documentInfo()->page( TQString::tqfromLatin1("about") );
+ KoDocumentInfoPage * page = documentInfo()->page( TQString::fromLatin1("about") );
if (page)
caption = static_cast<KoDocumentInfoAbout *>(page)->title();
}
@@ -2233,7 +2233,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance )
// Try by path first, so that we find the global one (which has the native mimetype)
// even if the user created a kword.desktop in ~/.kde/share/applnk or any subdir of it.
// If he created it under ~/.kde/share/applnk/Office/ then no problem anyway.
- service = KService::serviceByDesktopPath( TQString::tqfromLatin1("Office/%1.desktop").tqarg(instname) );
+ service = KService::serviceByDesktopPath( TQString::fromLatin1("Office/%1.desktop").tqarg(instname) );
}
if ( !service )
service = KService::serviceByDesktopName( instname );