diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:39:24 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:39:24 -0600 |
commit | f9ced3b3f13f3136ef63c33ef163042010d6e80b (patch) | |
tree | 293ce93dfb0dcfd79f83674116d7b3bc56f29af2 /quanta/src | |
parent | 29df04c24350cc76a41e2410d1c92445f9338b98 (diff) | |
download | tdewebdev-f9ced3b3f13f3136ef63c33ef163042010d6e80b.tar.gz tdewebdev-f9ced3b3f13f3136ef63c33ef163042010d6e80b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'quanta/src')
-rw-r--r-- | quanta/src/document.cpp | 6 | ||||
-rw-r--r-- | quanta/src/document.h | 6 | ||||
-rw-r--r-- | quanta/src/dtds.cpp | 10 | ||||
-rw-r--r-- | quanta/src/dtds.h | 2 | ||||
-rw-r--r-- | quanta/src/kqapp.cpp | 4 | ||||
-rw-r--r-- | quanta/src/quanta.cpp | 12 | ||||
-rw-r--r-- | quanta/src/quanta.h | 4 | ||||
-rw-r--r-- | quanta/src/quanta_init.cpp | 16 | ||||
-rw-r--r-- | quanta/src/quanta_init.h | 4 | ||||
-rw-r--r-- | quanta/src/quantadoc.h | 2 |
10 files changed, 33 insertions, 33 deletions
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index c8a84ef4..2cec0c03 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -407,7 +407,7 @@ void Document::insertFile(const KURL& url) fileName = url.path(); } else { - if (!KIO::NetAccess::download(url, fileName, this)) + if (!TDEIO::NetAccess::download(url, fileName, this)) { KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").arg( url.prettyURL(0, KURL::StripFileProtocol))); return; @@ -2667,7 +2667,7 @@ void Document::setBackupPathEntryValue(const TQString& ev) } /** if the document is modified then backup it and insert an entry in quantarc */ -void Document::createBackup(KConfig* config) +void Document::createBackup(TDEConfig* config) { if (isModified()) { @@ -2715,7 +2715,7 @@ void Document::createBackup(KConfig* config) } } /** if there is no more need for a backup copy then remove it */ -void Document::removeBackup(KConfig *config) +void Document::removeBackup(TDEConfig *config) { TQString backupPathValueURL = KURL::fromPathOrURL(m_backupPathValue).url(); diff --git a/quanta/src/document.h b/quanta/src/document.h index 8ed866c3..99511907 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -39,7 +39,7 @@ class TQEvent; class TQFocusEvent; class TQTextCodec; class TQStringList; -class KConfig; +class TDEConfig; class KTempFile; class KURL; class Tag; @@ -218,13 +218,13 @@ work correctly. */ bool isBackedUp(); /** Creates an automatic backup copy for the crash recovering mechanism */ - void createBackup(KConfig* config); + void createBackup(TDEConfig* config); /** No descriptions */ TQString backupPathEntryValue(); /** No descriptions */ void setBackupPathEntryValue(const TQString& ev); /** Removes automatic backup copies */ - void removeBackup(KConfig *config); + void removeBackup(TDEConfig *config); /** create a string using document path string */ static TQString hashFilePath(const TQString& p); TQString annotationText(uint line); diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 97ec6ec0..9a91f304 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -165,7 +165,7 @@ bool DTDs::readTagDir(const TQString &dirName, bool loadAll) TQString tmpStr = dirName + m_rcFilename; if (!TQFile::exists(tmpStr)) return false; - KConfig *dtdConfig = new KConfig(tmpStr, true); + TDEConfig *dtdConfig = new TDEConfig(tmpStr, true); dtdConfig->setGroup("General"); TQString dtdName = dtdConfig->readEntry("Name", "Unknown"); if (m_dict->find(dtdName.lower())) @@ -241,7 +241,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) kapp->setOverrideCursor( TQCursor(TQt::WaitCursor) ); - KConfig *dtdConfig = new KConfig(dtd->fileName, true); + TDEConfig *dtdConfig = new TDEConfig(dtd->fileName, true); //read the general DTD info dtdConfig->setGroup("General"); @@ -908,7 +908,7 @@ void DTDs::slotLoadDTD() if (dtdParser.parse()) { TQString dirName = dtdParser.dirName(); - KConfig dtdcfg(dirName + m_rcFilename, true); + TDEConfig dtdcfg(dirName + m_rcFilename, true); dtdcfg.setGroup("General"); TQString dtdName = dtdcfg.readEntry("Name"); TQString nickName = dtdcfg.readEntry("NickName", dtdName); @@ -940,7 +940,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) TQString dirName = _dirName; if (!dirName.endsWith("/")) dirName += "/"; - KConfig dtdcfg(dirName + m_rcFilename, true); + TDEConfig dtdcfg(dirName + m_rcFilename, true); dtdcfg.setGroup("General"); TQString dtdName = dtdcfg.readEntry("Name"); TQString nickName = dtdcfg.readEntry("NickName", dtdName); @@ -964,7 +964,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) KURL target; TQString destDir = TDEGlobal::dirs()->saveLocation("data") + resourceDir + "dtep/"; target.setPath(destDir + src.fileName()); - KIO::copy( src, target, false); //don't care about the result + TDEIO::copy( src, target, false); //don't care about the result } Document *w = ViewManager::ref()->activeDocument(); if (family == "1" && w && diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h index e532a934..e1329b24 100644 --- a/quanta/src/dtds.h +++ b/quanta/src/dtds.h @@ -37,7 +37,7 @@ class TQDomDocument; class TQTag; class TQString; class TQStringList; -class KConfig; +class TDEConfig; struct DTDStruct; diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 3b306f0f..33a68e91 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -77,7 +77,7 @@ KQApplication::KQApplication() } else */ { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); TQString layout = config->readEntry("Window layout", "Default"); @@ -148,7 +148,7 @@ int KQUniqueApplication::newInstance() else { splash = 0L; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); TQString layout = config->readEntry("Window layout", "Default"); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 434bff2f..cbcbfd50 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -302,7 +302,7 @@ QuantaApp::~QuantaApp() tempFileList.clear(); for (uint i = 0; i < tempDirList.count(); i++) { - KIO::NetAccess::del(KURL().fromPathOrURL(tempDirList.at(i)->name()), this); + TDEIO::NetAccess::del(KURL().fromPathOrURL(tempDirList.at(i)->name()), this); } tempDirList.clear(); TQDictIterator<ToolbarEntry> iter(m_toolbarList); @@ -879,7 +879,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo) if (mimetype.contains("image")) { TQString imgFileName; - KIO::NetAccess::download(url, imgFileName, this); + TDEIO::NetAccess::download(url, imgFileName, this); TQImage img(imgFileName); if (!img.isNull()) { @@ -900,7 +900,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo) w->insertTag(imgTag); isImage = true; } - KIO::NetAccess::removeTempFile(imgFileName); + TDEIO::NetAccess::removeTempFile(imgFileName); } if (!isImage) { @@ -1414,7 +1414,7 @@ void QuantaApp::slotShowPreviewWidget(bool show) { KURL url = m_previewedDocument->url(); url.setFileName("preview-" + url.fileName()); - KIO::NetAccess::del(url, this); + TDEIO::NetAccess::del(url, this); Document *w = view->document(); if (w) w->view()->setFocus(); @@ -1452,7 +1452,7 @@ void QuantaApp::slotChangePreviewStatus() { KURL url = m_previewedDocument->url(); url.setFileName("preview-" + url.fileName()); - KIO::NetAccess::del(url, this); + TDEIO::NetAccess::del(url, this); } slotRepaintPreview(); m_previewedDocument = 0L; @@ -1474,7 +1474,7 @@ void QuantaApp::slotPreviewHasFocus(bool focus) { KURL url = m_previewedDocument->url(); url.setFileName("preview-" + url.fileName()); - KIO::NetAccess::del(url, this); + TDEIO::NetAccess::del(url, this); } m_previewedDocument = 0L; } diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index c701d25b..7140b51a 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -122,7 +122,7 @@ public: QuantaDoc *doc() const {return m_doc; } TQPopupMenu *tagsMenu() const {return m_tagsMenu;} - KConfig *config() const {return m_config;} + TDEConfig *config() const {return m_config;} //TODO: check if we really need these "get" methods (and get rid o get) MessageOutput *messageOutput() const {return m_messageOutput;} @@ -574,7 +574,7 @@ private: TQPopupMenu *m_tagsMenu; // config - KConfig *m_config; + TDEConfig *m_config; /** HTML class for preview */ WHTMLPart *m_htmlPart; 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: <b>%5</b><br><br>" "</qt>") .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; diff --git a/quanta/src/quanta_init.h b/quanta/src/quanta_init.h index 196c723c..5ca93826 100644 --- a/quanta/src/quanta_init.h +++ b/quanta/src/quanta_init.h @@ -34,7 +34,7 @@ class ViewManager; class ProjectTreeView; class TemplatesTreeView; class ScriptTreeView; -class KConfig; +class TDEConfig; /** * The base class for Quanta application windows. @@ -91,7 +91,7 @@ private: ProjectTreeView *pTab; TemplatesTreeView *tTab; // config - KConfig *m_config; + TDEConfig *m_config; TQStringList m_PIDlist; /** @return number of Quanta instances registered by dcop */ int runningQuantas(); diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h index e40d1fa5..276c3a8c 100644 --- a/quanta/src/quantadoc.h +++ b/quanta/src/quantadoc.h @@ -22,7 +22,7 @@ // forward declaration of the Quanta classes class Document; -class KConfig; +class TDEConfig; class KURL; class QuantaDoc : public TQObject |