From f9ced3b3f13f3136ef63c33ef163042010d6e80b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:39:24 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- quanta/src/quanta_init.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'quanta/src/quanta_init.cpp') diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 73d6c858..974dbc92 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -691,7 +691,7 @@ void QuantaInit::loadInitialProject(const TQString& url) if(runningQuantas() == 1) { // Get config - KConfig *config = m_quanta->config(); + TDEConfig *config = m_quanta->config(); config->setGroup("General Options"); // Reload last project if setting is enabled @@ -1143,16 +1143,16 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) if (!isPrj || originalVersion.isLocalFile()) { //find some information about local files - KIO::UDSEntry entry; - KIO::NetAccess::stat(originalVersion, entry, m_quanta); + TDEIO::UDSEntry entry; + TDEIO::NetAccess::stat(originalVersion, entry, m_quanta); KFileItem* item= new KFileItem(entry, originalVersion, false, true); TQString origTime = item->timeString(); - KIO::filesize_t origSize = item->size(); + TDEIO::filesize_t origSize = item->size(); delete item; - KIO::NetAccess::stat(autosavedVersion, entry, m_quanta); + TDEIO::NetAccess::stat(autosavedVersion, entry, m_quanta); item= new KFileItem(entry, autosavedVersion, false, true); TQString backupTime = item->timeString(); - KIO::filesize_t backupSize = item->size(); + TDEIO::filesize_t backupSize = item->size(); delete item; if (TQFileInfo(autosavedPath).exists()) //if the backup file exists @@ -1169,8 +1169,8 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) "Backup created on: %5

" "") .arg(originalVersion.prettyURL(0, KURL::StripFileProtocol )) - .arg(KIO::convertSize(origSize)).arg(origTime) - .arg(KIO::convertSize(backupSize)).arg(backupTime)); + .arg(TDEIO::convertSize(origSize)).arg(origTime) + .arg(TDEIO::convertSize(backupSize)).arg(backupTime)); w->buttonLoad->setText(i18n("&Restore the file from backup")); w->buttonIgnore->setText(i18n("Do ¬ restore the file from backup")); delete w->warningLabel; -- cgit v1.2.3