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/dialogs/copyto.cpp | 22 +++++++++++----------- quanta/dialogs/copyto.h | 2 +- quanta/dialogs/dirtydlg.cpp | 14 +++++++------- quanta/dialogs/dirtydlg.h | 2 +- quanta/dialogs/dtepeditdlg.cpp | 14 +++++++------- quanta/dialogs/dtepeditdlg.h | 14 +++++++------- quanta/dialogs/settings/parseroptions.cpp | 2 +- quanta/dialogs/settings/parseroptions.h | 6 +++--- quanta/dialogs/settings/previewoptions.h | 2 +- quanta/dialogs/tagdialogs/tagdialog.cpp | 2 +- quanta/dialogs/tagdialogs/tagimgdlg.cpp | 6 +++--- 11 files changed, 43 insertions(+), 43 deletions(-) (limited to 'quanta/dialogs') diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index 9f66cb11..bc2543dc 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -54,17 +54,17 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) KURL destURL; if (doCopy) { - KIO::UDSEntry entry; - KIO::NetAccess::stat(urlToCopy, entry, 0); + TDEIO::UDSEntry entry; + TDEIO::NetAccess::stat(urlToCopy, entry, 0); KFileItem item(entry, urlToCopy, false, true); destURL = targetDirURL; destURL.setPath(destURL.path(1) + urlToCopy.fileName(false)); if (item.isDir()) destURL.adjustPath(1); - KIO::CopyJob *job = KIO::copy(urlToCopy, destURL, true); - connect( job, TQT_SIGNAL(result( KIO::Job *)), - TQT_SLOT (slotResult( KIO::Job *))); + TDEIO::CopyJob *job = TDEIO::copy(urlToCopy, destURL, true); + connect( job, TQT_SIGNAL(result( TDEIO::Job *)), + TQT_SLOT (slotResult( TDEIO::Job *))); TQString path = destURL.path(); if (path != "." && path != "..") @@ -74,7 +74,7 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) return destURL; } -void CopyTo::slotResult( KIO::Job *) +void CopyTo::slotResult( TDEIO::Job *) { emit addFilesToProject(m_destList); emit deleteDialog(this); @@ -98,14 +98,14 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) doCopy = QExtFileInfo::createDir(targetDirURL, 0L); } - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (doCopy) { TQString path; for (uint i = 0; i < sourceList.count(); i++) { KURL srcURL = sourceList[i]; - KIO::NetAccess::stat(srcURL, entry, 0); + TDEIO::NetAccess::stat(srcURL, entry, 0); KFileItem item(entry, srcURL, false, true); KURL u = targetDirURL; u.setPath(targetDirURL.path(1) + srcURL.fileName()); @@ -116,9 +116,9 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) m_destList.append(u); } - KIO::CopyJob *job = KIO::copy(sourceList, targetDirURL, true); - connect( job, TQT_SIGNAL(result( KIO::Job *)), - TQT_SLOT (slotResult( KIO::Job *))); + TDEIO::CopyJob *job = TDEIO::copy(sourceList, targetDirURL, true); + connect( job, TQT_SIGNAL(result( TDEIO::Job *)), + TQT_SLOT (slotResult( TDEIO::Job *))); } return m_destList; diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h index 16b7410b..29412488 100644 --- a/quanta/dialogs/copyto.h +++ b/quanta/dialogs/copyto.h @@ -39,7 +39,7 @@ public: KURL::List copy(const KURL::List& sourceList, const KURL &destination ); public slots: // Public slots - void slotResult( KIO::Job *); + void slotResult( TDEIO::Job *); signals: void addFilesToProject(const KURL::List&); diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 3664f21f..be6f308a 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -81,20 +81,20 @@ void DirtyDlg::slotCompareDone(TDEProcess* proc) QExtFileInfo::copy(m_src, backupURL, -1, true, false, this); } - KIO::UDSEntry entry; - KIO::NetAccess::stat(m_src, entry, this); + TDEIO::UDSEntry entry; + TDEIO::NetAccess::stat(m_src, entry, this); KFileItem item(entry, m_src, false, true); m_permissions = item.permissions(); - //TODO: Replace with KIO::NetAccess::file_move, when KDE 3.1 support + //TODO: Replace with TDEIO::NetAccess::file_move, when KDE 3.1 support //is dropped - KIO::FileCopyJob *job = KIO::file_move(m_dest, m_src, m_permissions, true, false,false ); - connect( job, TQT_SIGNAL(result( KIO::Job *)), - TQT_SLOT (slotResult( KIO::Job *))); + TDEIO::FileCopyJob *job = TDEIO::file_move(m_dest, m_src, m_permissions, true, false,false ); + connect( job, TQT_SIGNAL(result( TDEIO::Job *)), + TQT_SLOT (slotResult( TDEIO::Job *))); } /** No descriptions */ -void DirtyDlg::slotResult(KIO::Job *) +void DirtyDlg::slotResult(TDEIO::Job *) { m_busy = false; accept(); diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index 04cf3824..4b6d9232 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -40,7 +40,7 @@ protected slots: // Protected slots /** No descriptions */ void slotCompareDone(TDEProcess*); /** No descriptions */ - void slotResult(KIO::Job *); + void slotResult(TDEIO::Job *); /** No descriptions */ virtual void closeEvent(TQCloseEvent* ev); diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index c2595716..bbb3456d 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -46,7 +46,7 @@ DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent, cons nameEdit->setFocus(); m_descriptionFile = descriptionFile; - m_config = new KConfig(m_descriptionFile, false, false); + m_config = new TDEConfig(m_descriptionFile, false, false); init(); } @@ -215,7 +215,7 @@ void DTEPEditDlg::saveResult() TQFile f(targetFile); if (f.exists()) f.remove(); - KConfig* newConfig = m_config->copyTo(targetFile); + TDEConfig* newConfig = m_config->copyTo(targetFile); newConfig->sync(); writeGeneral(newConfig); writePages(newConfig); @@ -226,7 +226,7 @@ void DTEPEditDlg::saveResult() } } -void DTEPEditDlg::writeGeneral(KConfig *config) +void DTEPEditDlg::writeGeneral(TDEConfig *config) { config->setGroup("General"); writeEntry(config, "Name", nameEdit->text()); @@ -246,7 +246,7 @@ void DTEPEditDlg::writeGeneral(KConfig *config) writeEntry(config, "Names", toolbarsEdit->text()); } -void DTEPEditDlg::writePages(KConfig *config) +void DTEPEditDlg::writePages(TDEConfig *config) { config->deleteGroup("Pages"); if (m_family == 0) @@ -292,7 +292,7 @@ void DTEPEditDlg::writePages(KConfig *config) } } -void DTEPEditDlg::writeParserRules(KConfig *config) +void DTEPEditDlg::writeParserRules(TDEConfig *config) { config->setGroup("Extra rules"); config->writeEntry("MinusAllowedInWord", enableMinusInWords->isChecked()); @@ -378,7 +378,7 @@ void DTEPEditDlg::readStructures() } } -void DTEPEditDlg::writeStructures(KConfig *config) +void DTEPEditDlg::writeStructures(TDEConfig *config) { config->setGroup("Extra rules"); config->writeEntry("StructGroupsCount", m_structGroups.count()); @@ -544,7 +544,7 @@ void DTEPEditDlg::slotDeleteStructGroup() } } -void DTEPEditDlg::writeEntry(KConfig *config, const TQString &key, const TQString &value) +void DTEPEditDlg::writeEntry(TDEConfig *config, const TQString &key, const TQString &value) { if (value.isEmpty()) config->deleteEntry(key); diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h index 3e0f942f..a570881d 100644 --- a/quanta/dialogs/dtepeditdlg.h +++ b/quanta/dialogs/dtepeditdlg.h @@ -26,7 +26,7 @@ @author Andras Mantia */ -class KConfig; +class TDEConfig; class DTEPStructureEditDlgS; struct StructGroup { @@ -74,14 +74,14 @@ class DTEPEditDlg : public DTEPEditDlgS void readStructures(); StructGroup readFromStructDlg(DTEPStructureEditDlgS *structDlg); - void writeGeneral(KConfig *config); - void writePages(KConfig *config); - void writeParserRules(KConfig *config); - void writeStructures(KConfig *config); - void writeEntry(KConfig *config, const TQString &key, const TQString &value); + void writeGeneral(TDEConfig *config); + void writePages(TDEConfig *config); + void writeParserRules(TDEConfig *config); + void writeStructures(TDEConfig *config); + void writeEntry(TDEConfig *config, const TQString &key, const TQString &value); TQString m_descriptionFile; - KConfig *m_config; + TDEConfig *m_config; int m_family; TQWidget *m_pagesWidget; TQValueList m_structGroups; diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp index f3fad631..92ff1206 100644 --- a/quanta/dialogs/settings/parseroptions.cpp +++ b/quanta/dialogs/settings/parseroptions.cpp @@ -25,7 +25,7 @@ * Constructs a ParserOptions which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* name ) +ParserOptions::ParserOptions( TDEConfig *a_config, TQWidget* parent, const char* name ) : ParserOptionsUI( parent, name ) { config = a_config; diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index 39d7bd53..89058786 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -18,7 +18,7 @@ #include "parseroptionsui.h" -class KConfig; +class TDEConfig; class ParserOptions : public ParserOptionsUI { @@ -26,13 +26,13 @@ class ParserOptions : public ParserOptionsUI public: - ParserOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); + ParserOptions( TDEConfig *config, TQWidget* parent = 0, const char* name = 0); ~ParserOptions(); void updateConfig(); protected: - KConfig *config; + TDEConfig *config; }; #endif // PARSEROPTIONS_H diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index 898345af..f688d02d 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -20,7 +20,7 @@ #include "previewoptionss.h" -class KConfig; +class TDEConfig; class PreviewOptions : public PreviewOptionsS { Q_OBJECT diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index bb379ce7..4b491b26 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -192,7 +192,7 @@ void TagDialog::parseTag() addTab( mainDlg, i18n("Main") ); } - KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName); + TDEConfig *dtdConfig = new TDEConfig(dtdTag->parentDTD->fileName); dtdConfig->setGroup("General"); int numOfPages = dtdConfig->readNumEntry("NumOfPages"); extraPageList = new TQPtrList(); diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 17285d96..d2a680f5 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -54,7 +54,7 @@ TagImgDlg::~TagImgDlg() { if (isTmpFile) { - KIO::NetAccess::removeTempFile(imgFileName); + TDEIO::NetAccess::removeTempFile(imgFileName); isTmpFile = false; } } @@ -64,7 +64,7 @@ void TagImgDlg::slotImageSet(const KURL& imageURL) { if (isTmpFile) { - KIO::NetAccess::removeTempFile(imgFileName); + TDEIO::NetAccess::removeTempFile(imgFileName); isTmpFile = false; } if (imageURL.isLocalFile()) @@ -72,7 +72,7 @@ void TagImgDlg::slotImageSet(const KURL& imageURL) imgFileName = imageURL.path(); } else { - KIO::NetAccess::download(imageURL, imgFileName, this); + TDEIO::NetAccess::download(imageURL, imgFileName, this); isTmpFile = true; } widgetImg->slotSetImage(imgFileName); -- cgit v1.2.1