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/treeviews/basetreeview.cpp | 24 +++++++++++------------ quanta/treeviews/basetreeview.h | 18 ++++++++--------- quanta/treeviews/docfolder.cpp | 4 ++-- quanta/treeviews/docfolder.h | 6 +++--- quanta/treeviews/docitem.h | 2 +- quanta/treeviews/doctreeview.cpp | 2 +- quanta/treeviews/filestreeview.cpp | 2 +- quanta/treeviews/filestreeview.h | 4 ++-- quanta/treeviews/servertreeview.cpp | 2 +- quanta/treeviews/servertreeview.h | 4 ++-- quanta/treeviews/structtreeview.h | 4 ++-- quanta/treeviews/templatestreeview.cpp | 36 +++++++++++++++++----------------- 12 files changed, 54 insertions(+), 54 deletions(-) (limited to 'quanta/treeviews') diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 278505a2..7ff962e1 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -669,7 +669,7 @@ void BaseTreeView::slotPaste() } -void BaseTreeView::slotPercent(KIO::Job *job, unsigned long value) +void BaseTreeView::slotPercent(TDEIO::Job *job, unsigned long value) { Q_UNUSED(job); progressBar->setProgress(value); @@ -818,7 +818,7 @@ void BaseTreeView::reload(BaseTreeBranch *btb) } -void BaseTreeView::slotJobFinished(KIO::Job *job) +void BaseTreeView::slotJobFinished(TDEIO::Job *job) { if ( job->error() ) job->showErrorDialog(this); @@ -894,7 +894,7 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil } } bool tooltip = showToolTips(); - KIO::Job *job; + TDEIO::Job *job; switch ( result ) { case 1 : setShowToolTips(false); setDragEnabled(false); @@ -908,18 +908,18 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil setDragEnabled(true); setShowToolTips(tooltip); return; - case 3 : job = KIO::link(fileList, dest); + case 3 : job = TDEIO::link(fileList, dest); break; default : return ; } if (!job) return; - connect(job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( slotJobFinished(KIO::Job *) ) ); + connect(job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( slotJobFinished(TDEIO::Job *) ) ); progressBar->setTotalSteps(100); - connect(job, TQT_SIGNAL(percent( KIO::Job *, unsigned long)), - this, TQT_SLOT(slotPercent( KIO::Job *, unsigned long))); + connect(job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long)), + this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long))); } @@ -1057,13 +1057,13 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName) } -void BaseTreeView::saveLayout(KConfig *config, const TQString &group) +void BaseTreeView::saveLayout(TDEConfig *config, const TQString &group) { KListView::saveLayout(config, group); if (! m_saveOpenFolder || ! qConfig.saveTrees) return; - KConfigGroupSaver saver(config, group); + TDEConfigGroupSaver saver(config, group); BaseTreeBranch *btb; int i = 0; KFileTreeBranchIterator it( branches() ); @@ -1083,10 +1083,10 @@ void BaseTreeView::saveLayout(KConfig *config, const TQString &group) } -void BaseTreeView::restoreLayout(KConfig *config, const TQString &group) +void BaseTreeView::restoreLayout(TDEConfig *config, const TQString &group) { KListView::restoreLayout(config, group); - KConfigGroupSaver saver(config, group); + TDEConfigGroupSaver saver(config, group); setShowToolTips( config->readBoolEntry("ShowToolTips", true) ); if (! m_saveOpenFolder || ! qConfig.saveTrees) diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index 19e73839..bf7110cf 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -142,21 +142,21 @@ public: /** * Saves the list view's layout (column widtsh, column order, sort column) - * to a KConfig group. Reimplemented to save the open folders. + * to a TDEConfig group. Reimplemented to save the open folders. * - * @param config the KConfig object to write to + * @param config the TDEConfig object to write to * @param group the config group to use */ - void saveLayout(KConfig *config, const TQString &group); + void saveLayout(TDEConfig *config, const TQString &group); /** - * Reads the list view's layout from a KConfig group as stored with + * Reads the list view's layout from a TDEConfig group as stored with * saveLayout. Reimplemented to load the open folders. * - * @param config the KConfig object to read from + * @param config the TDEConfig object to read from * @param group the config group to use */ - void restoreLayout(KConfig *config, const TQString &group); + void restoreLayout(TDEConfig *config, const TQString &group); /** * en/disable saving a list of open folders in @ref saveLayout and @@ -182,15 +182,15 @@ protected slots: void slotCopy(); void slotPaste(); void slotDelete(); - virtual void slotJobFinished( KIO::Job *job); + virtual void slotJobFinished( TDEIO::Job *job); void slotInsertInProject(); void slotInsertDirInProject(); virtual void slotReturnPressed(TQListViewItem *item); virtual void slotDropped (TQWidget *, TQDropEvent *, KURL::List&, KURL&); /** - sends value from KIO::Job to progressbar + sends value from TDEIO::Job to progressbar */ - virtual void slotPercent(KIO::Job *job, unsigned long value); + virtual void slotPercent(TDEIO::Job *job, unsigned long value); void slotPopulateFinished(KFileTreeViewItem *item); /** diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp index 0a1d941d..3e7e8949 100644 --- a/quanta/treeviews/docfolder.cpp +++ b/quanta/treeviews/docfolder.cpp @@ -28,7 +28,7 @@ #include "docfolder.h" #include "docitem.h" -DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath) +DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *config, const TQString &basePath) : KListViewItem(parent) { name = _name; @@ -59,7 +59,7 @@ DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *con } } -DocFolder::DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath) +DocFolder::DocFolder(TQListView *parent, const TQString &_name, TDEConfig *config, const TQString &basePath) : KListViewItem(parent) { name = _name; diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h index f3c8db87..5f36a825 100644 --- a/quanta/treeviews/docfolder.h +++ b/quanta/treeviews/docfolder.h @@ -29,12 +29,12 @@ Doc tree *@author Yacovlev Alexander & Dmitry Poplavsky */ -class KConfig; +class TDEConfig; class DocFolder : public KListViewItem { public: - DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath); - DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath); + DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *config, const TQString &basePath); + DocFolder(TQListView *parent, const TQString &_name, TDEConfig *config, const TQString &basePath); ~DocFolder(); TQString text( int column ) const; void setup(); diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h index 59b126a1..6022650b 100644 --- a/quanta/treeviews/docitem.h +++ b/quanta/treeviews/docitem.h @@ -22,7 +22,7 @@ #include -class KConfig; +class TDEConfig; /** *@author Yacovlev Alexander & Dmitry Poplavsky diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 39d8ba5b..31579563 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -90,7 +90,7 @@ void DocTreeView::slotRefreshTree() for ( TQStringList::Iterator it_f = files.begin(); it_f != files.end(); ++it_f ) { - KConfig config( docDir + *it_f ); + TDEConfig config( docDir + *it_f ); config.setGroup("Tree"); TQString relDocDir = config.readEntry("Doc dir"); diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index d543f5d0..b9a0ac1d 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -40,7 +40,7 @@ //FilesTreeView implementation -FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name) +FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *name) : BaseTreeView(parent, name) { setAcceptDrops(true); diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h index bdee0d0c..4cf89304 100644 --- a/quanta/treeviews/filestreeview.h +++ b/quanta/treeviews/filestreeview.h @@ -36,7 +36,7 @@ class FilesTreeView : public BaseTreeView { public: - FilesTreeView(KConfig *config, TQWidget *parent, const char *name = 0L); + FilesTreeView(TDEConfig *config, TQWidget *parent, const char *name = 0L); virtual ~FilesTreeView(); KURL::List topURLList; TQMap topURLAliases; @@ -69,7 +69,7 @@ protected: int m_insertFileInProject; int m_insertFolderInProject; // config - KConfig *m_config; + TDEConfig *m_config; private: int m_menuTop; diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index ad2309da..4c9a821f 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -87,7 +87,7 @@ KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *paren // ServerTreeView implementation // // -ServerTreeView::ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name) +ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &url, const char *name) : BaseTreeView(parent, name) { setAcceptDrops(true); diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h index 02213bee..fc3b8c96 100644 --- a/quanta/treeviews/servertreeview.h +++ b/quanta/treeviews/servertreeview.h @@ -62,7 +62,7 @@ class ServerTreeView : public BaseTreeView { public: - ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name = 0L); + ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &url, const char *name = 0L); virtual ~ServerTreeView(); protected slots: @@ -82,7 +82,7 @@ protected: int m_insertFileInProject; int m_insertFolderInProject; // config - KConfig *m_config; + TDEConfig *m_config; private: int m_menuDel; diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index a13261fa..d0e32dfc 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -28,7 +28,7 @@ */ class KPopupMenu; -class KConfig; +class TDEConfig; class KURL; class TQTime; @@ -134,7 +134,7 @@ private: KPopupMenu *emptyAreaMenu; KPopupMenu *dtdMenu; StructTreeTag *lastTag; - KConfig *config; + TDEConfig *config; TQStringList dtdList; TQValueList m_parsingDTDList; int openFileMenuId; diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index cfd05141..bd00665f 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -115,7 +115,7 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *pa } if (dotFileInfo.exists()) { - KConfig *config = new KConfig(dotFileInfo.filePath()); + TDEConfig *config = new TDEConfig(dotFileInfo.filePath()); TQString s = config->readEntry("Type"); tvi->setText(1, typeToi18n[s]); delete config; @@ -508,7 +508,7 @@ DirInfo TemplatesTreeView::readDirInfo(const TQString& dir) dotFileInfo.setFile(TQFileInfo(dotFileInfo.dirPath()).dirPath()+"/.dirinfo"); } - KConfig *config = new KConfig(dotFileInfo.filePath()); + TDEConfig *config = new TDEConfig(dotFileInfo.filePath()); dirInfo.mimeType = config->readEntry("Type"); dirInfo.preText = config->readEntry("PreText"); dirInfo.postText = config->readEntry("PostText"); @@ -540,7 +540,7 @@ bool TemplatesTreeView::writeDirInfo(const TQString& m_dirInfoFile) TQFileInfo dotFileInfo(TQFileInfo(startDir).dirPath()+"/.dirinfo"); bool success = false; - KConfig *config = new KConfig(dotFileInfo.filePath()); + TDEConfig *config = new TDEConfig(dotFileInfo.filePath()); if (!config->isReadOnly()) { config->writeEntry("Type", m_dirInfo.mimeType); @@ -575,8 +575,8 @@ void TemplatesTreeView::slotProperties() m_quantaProperties->typesCombo->setCurrentItem(typeToi18n[m_dirInfo.mimeType]); - KIO::UDSEntry entry; - KIO::NetAccess::stat(url, entry, this); + TDEIO::UDSEntry entry; + TDEIO::NetAccess::stat(url, entry, this); KFileItem fItem(entry, url); TQString permissions = fItem.permissionsString(); TQString userName; @@ -632,7 +632,7 @@ void TemplatesTreeView::slotProperties() connect( propDlg, TQT_SIGNAL( applied() ), this , TQT_SLOT( slotPropertiesApplied()) ); TQString name = url.path() + TMPL; - KConfig config(name); + TDEConfig config(name); config.setGroup("Filtering"); name = config.readEntry("Action", NONE); if ( name == NONE ) @@ -833,7 +833,7 @@ void TemplatesTreeView::slotNewProjectLoaded(const TQString &projectName, const void TemplatesTreeView::writeTemplateInfo() { TQString fileName = currentURL().path() + TMPL; - KConfig config(fileName); + TDEConfig config(fileName); config.setGroup("Filtering"); if ( m_quantaProperties->actionCombo->currentText() == i18n(NONE) ) config.writeEntry("Action", NONE); @@ -861,8 +861,8 @@ void TemplatesTreeView::slotPaste() url = currentURL(); if ( ! currentKFileTreeViewItem()->isDir() ) url.setFileName(""); // don't paste on files but in dirs - KIO::Job *job = KIO::copy( list, url); - connect( job, TQT_SIGNAL( result( KIO::Job *) ), this , TQT_SLOT( slotJobFinished( KIO::Job *) ) ); + TDEIO::Job *job = TDEIO::copy( list, url); + connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); } } @@ -879,12 +879,12 @@ void TemplatesTreeView::slotDelete() if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { - KIO::Job *job = KIO::del(url); - connect( job, TQT_SIGNAL( result( KIO::Job *) ), this , TQT_SLOT( slotJobFinished( KIO::Job *) ) ); + TDEIO::Job *job = TDEIO::del(url); + connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); url.setFileName(url.fileName()+ TMPL); if ( TQFileInfo(url.path()).exists() ) { - KIO::Job *job2 = KIO::del(url); - connect( job2, TQT_SIGNAL( result( KIO::Job *) ), this , TQT_SLOT( slotJobFinished( KIO::Job *) ) ); + TDEIO::Job *job2 = TDEIO::del(url); + connect( job2, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); }; } } @@ -896,7 +896,7 @@ KURL TemplatesTreeView::filterTemplate() { KURL url = currentURL(); TQString name = url.path() + TMPL; - KConfig config(name); + TDEConfig config(name); config.setGroup("Filtering"); name = config.readEntry("Action", NONE); TagAction *filterAction = 0L; @@ -1035,7 +1035,7 @@ void TemplatesTreeView::slotExtractSiteTemplate() KURL targetURL = urlRequester.selectedURL(); KURL url = currentURL(); TQString tempFile; - if (KIO::NetAccess::download(url, tempFile, this)) + if (TDEIO::NetAccess::download(url, tempFile, this)) { KTar tar(tempFile); if (tar.open(IO_ReadOnly)) @@ -1053,15 +1053,15 @@ void TemplatesTreeView::slotExtractSiteTemplate() KURL::List fileList; for (TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) fileList.append(KURL::fromPathOrURL(tempDirName + "/" + *it)); - if (!KIO::NetAccess::dircopy(fileList, targetURL, this)) + if (!TDEIO::NetAccess::dircopy(fileList, targetURL, this)) error = true; - KIO::NetAccess::del(KURL().fromPathOrURL(tempDirName), this); + TDEIO::NetAccess::del(KURL().fromPathOrURL(tempDirName), this); delete tempDir; } tar.close(); } else error = true; - KIO::NetAccess::removeTempFile(tempFile); + TDEIO::NetAccess::removeTempFile(tempFile); if (!m_projectBaseURL.isEmpty() && !QExtFileInfo::toRelative(targetURL, m_projectBaseURL).url().startsWith(".")) { if (KMessageBox::questionYesNo(this, i18n("You have extracted the site template to a folder which is not under your main project folder.\nDo you want to copy the folder into the main project folder?"), TQString(), i18n("Copy Folder"), i18n("Do Not Copy")) == KMessageBox::Yes) -- cgit v1.2.3