From f9ced3b3f13f3136ef63c33ef163042010d6e80b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:39:24 -0600 Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kfilereplace/kfilereplacepart.cpp | 6 +- kfilereplace/kfilereplacepart.h | 6 +- kfilereplace/knewprojectdlg.h | 2 +- kfilereplace/koptionsdlg.cpp | 2 +- kfilereplace/koptionsdlg.h | 4 +- kimagemapeditor/kimagemapeditor.cpp | 16 +-- kimagemapeditor/kimagemapeditor.h | 14 +-- kimagemapeditor/kimedialogs.cpp | 2 +- kimagemapeditor/kimedialogs.h | 6 +- kimagemapeditor/kimeshell.cpp | 12 +-- kimagemapeditor/kimeshell.h | 8 +- kimagemapeditor/qextfileinfo.cpp | 48 ++++----- kimagemapeditor/qextfileinfo.h | 6 +- klinkstatus/ChangeLog | 2 +- klinkstatus/src/engine/linkchecker.cpp | 48 ++++----- klinkstatus/src/engine/linkchecker.h | 12 +-- klinkstatus/src/klinkstatus.cpp | 4 +- klinkstatus/src/klinkstatus.h | 6 +- klinkstatus/src/klinkstatus_part.cpp | 2 +- klinkstatus/src/ui/klshistorycombo.h | 2 +- klinkstatus/src/ui/sessionwidget.cpp | 6 +- klinkstatus/src/ui/sessionwidget.h | 2 +- kommander/editor/main.cpp | 2 +- kommander/editor/mainwindow.cpp | 14 +-- kommander/factory/kommanderfactory.cpp | 2 +- kommander/pluginmanager/pluginmanager.cpp | 2 +- kommander/pluginmanager/pluginmanager.h | 4 +- kommander/widget/functionlib.cpp | 4 +- kommander/widget/kommanderfunctions.cpp | 4 +- kxsldbg/kxsldbg.cpp | 4 +- kxsldbg/kxsldbg.h | 6 +- kxsldbg/kxsldbgpart/qxsldbgdoc.cpp | 4 +- kxsldbg/kxsldbgpart/qxsldbgdoc.h | 2 +- .../kmdi/qextmdi/kdockwidget.cpp | 20 ++-- lib/compatibility/kmdi/qextmdi/kdockwidget.h | 32 +++--- .../kmdi/qextmdi/kdockwidget_p.h | 4 +- .../kmdi/qextmdi/kmdidockcontainer.cpp | 4 +- .../kmdi/qextmdi/kmdidockcontainer.h | 8 +- .../kmdi/qextmdi/kmdiguiclient.cpp | 2 +- lib/compatibility/kmdi/qextmdi/ktabwidget.cpp | 2 +- .../knewstuff/downloaddialog.cpp | 26 ++--- lib/compatibility/knewstuff/downloaddialog.h | 12 +-- lib/compatibility/knewstuff/engine.cpp | 46 ++++---- lib/compatibility/knewstuff/engine.h | 18 ++-- .../knewstuff/knewstuffgeneric.h | 4 +- .../knewstuff/knewstuffsecure.cpp | 10 +- lib/compatibility/knewstuff/provider.cpp | 16 +-- lib/compatibility/knewstuff/provider.h | 6 +- lib/compatibility/knewstuff/uploaddialog.cpp | 4 +- lib/qextfileinfo.cpp | 100 +++++++++--------- lib/qextfileinfo.h | 12 +-- quanta/components/csseditor/csseditor.h | 4 +- .../components/debugger/dbgp/dbgpnetwork.cpp | 10 +- quanta/components/debugger/dbgp/dbgpnetwork.h | 2 +- .../debugger/gubed/quantadebuggergubed.cpp | 10 +- .../debugger/gubed/quantadebuggergubed.h | 2 +- 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 +- quanta/parsers/dtd/dtd.cpp | 4 +- quanta/parsers/dtd/dtdparser.cpp | 4 +- quanta/parts/kafka/htmlenhancer.cpp | 2 +- quanta/parts/kafka/htmlenhancer.h | 4 +- quanta/parts/kafka/kafkasyncoptions.cpp | 2 +- quanta/parts/kafka/kafkasyncoptions.h | 6 +- quanta/parts/kafka/nodeenhancer.h | 4 +- quanta/parts/kafka/undoredo.cpp | 2 +- quanta/parts/kafka/wkafkapart.cpp | 2 +- quanta/parts/kafka/wkafkapart.h | 4 +- quanta/parts/preview/whtmlpart.cpp | 2 +- quanta/plugins/quantaplugininterface.cpp | 4 +- quanta/project/project.cpp | 14 +-- quanta/project/project.h | 4 +- quanta/project/projectnewlocal.cpp | 2 +- quanta/project/projectprivate.cpp | 24 ++--- quanta/project/projectprivate.h | 4 +- quanta/project/projectupload.cpp | 26 ++--- quanta/project/projectupload.h | 6 +- quanta/project/rescanprj.cpp | 30 +++--- quanta/project/rescanprj.h | 4 +- quanta/quanta_uml.xmi | 30 +++--- quanta/src/document.cpp | 6 +- quanta/src/document.h | 6 +- quanta/src/dtds.cpp | 10 +- quanta/src/dtds.h | 2 +- quanta/src/kqapp.cpp | 4 +- quanta/src/quanta.cpp | 12 +-- quanta/src/quanta.h | 4 +- quanta/src/quanta_init.cpp | 16 +-- quanta/src/quanta_init.h | 4 +- quanta/src/quantadoc.h | 2 +- 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 +++---- quanta/utility/quantabookmarks.cpp | 2 +- quanta/utility/quantacommon.cpp | 4 +- quanta/utility/quantacommon.h | 10 +- quanta/utility/quantanetaccess.cpp | 16 +-- quanta/utility/quantanetaccess.h | 2 +- quanta/utility/tagactionset.cpp | 2 +- 117 files changed, 549 insertions(+), 549 deletions(-) diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index 8d24a84c..49730efa 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -65,7 +65,7 @@ KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObjec setInstance(FileReplaceFactory::instance()); TDEGlobal::locale()->insertCatalogue("kfilereplace"); m_parentWidget = parentWidget; - m_config = new KConfig("kfilereplacerc"); + m_config = new TDEConfig("kfilereplacerc"); m_aboutDlg = 0; m_stop = false; m_optionMask = TQDir::Files; @@ -370,7 +370,7 @@ void KFileReplacePart::slotOpenRecentStringFile(const KURL& urlFile) TQString fileName; // Downloads file if need (if url is "http://...") - if (!(KIO::NetAccess::download(urlFile, fileName, 0))) + if (!(TDEIO::NetAccess::download(urlFile, fileName, 0))) return; // Checks it's not a directory @@ -1050,7 +1050,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri { if(atLeastOneStringFound) { - KIO::NetAccess::file_copy(KURL::fromPathOrURL(oldPathString), KURL::fromPathOrURL(oldPathString + backupExtension), -1, true); + TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(oldPathString), KURL::fromPathOrURL(oldPathString + backupExtension), -1, true); } } diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h index b2206b59..57e1706d 100644 --- a/kfilereplace/kfilereplacepart.h +++ b/kfilereplace/kfilereplacepart.h @@ -21,7 +21,7 @@ #include class KAboutApplication; class TDEAboutData; -class KConfig; +class TDEConfig; // local #include "configurationclasses.h" @@ -38,7 +38,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart KFileReplaceView* m_view; TQWidget* m_parentWidget, * m_w; - KConfig* m_config; + TDEConfig* m_config; KAboutApplication* m_aboutDlg; KeyValueMap m_replacementMap; RCOptions* m_option; @@ -87,7 +87,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart //METHODS public: static TDEAboutData* createAboutData(); - KConfig *config(){ return m_config; } + TDEConfig *config(){ return m_config; } protected: virtual bool openFile() { return false; } diff --git a/kfilereplace/knewprojectdlg.h b/kfilereplace/knewprojectdlg.h index 8a81c494..7be5ecb9 100644 --- a/kfilereplace/knewprojectdlg.h +++ b/kfilereplace/knewprojectdlg.h @@ -20,7 +20,7 @@ #define KNEWPROJECTDLG_H //KDE -class KConfig; +class TDEConfig; //local #include "knewprojectdlgs.h" diff --git a/kfilereplace/koptionsdlg.cpp b/kfilereplace/koptionsdlg.cpp index 20d80e47..8d303f08 100644 --- a/kfilereplace/koptionsdlg.cpp +++ b/kfilereplace/koptionsdlg.cpp @@ -43,7 +43,7 @@ using namespace whatthisNameSpace; KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : KOptionsDlgS(parent,name,true) { - m_config = new KConfig("kfilereplacerc"); + m_config = new TDEConfig("kfilereplacerc"); m_option = info; initGUI(); diff --git a/kfilereplace/koptionsdlg.h b/kfilereplace/koptionsdlg.h index 0ffd3da8..a9e8e620 100644 --- a/kfilereplace/koptionsdlg.h +++ b/kfilereplace/koptionsdlg.h @@ -20,7 +20,7 @@ #define KOPTIONSDLG_H // KDE -class KConfig; +class TDEConfig; //local #include "configurationclasses.h" @@ -40,7 +40,7 @@ class KOptionsDlg : public KOptionsDlgS private: RCOptions* m_option; - KConfig *m_config; + TDEConfig *m_config; private slots: void slotOK(); diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 1e31596d..3093e7a3 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -338,16 +338,16 @@ void KImageMapEditor::setModified(bool modified) } -KConfig *KImageMapEditor::config() +TDEConfig *KImageMapEditor::config() { return KimeFactory::instance()->config(); } -void KImageMapEditor::readConfig(KConfig* config) { +void KImageMapEditor::readConfig(TDEConfig* config) { recentFilesAction->loadEntries(config,"Data"); } -void KImageMapEditor::writeConfig(KConfig* config) { +void KImageMapEditor::writeConfig(TDEConfig* config) { config->writeEntry("highlightareas",highlightAreasAction->isChecked()); config->writeEntry("showalt",showAltAction->isChecked()); recentFilesAction->saveEntries(config,"Data"); @@ -368,12 +368,12 @@ void KImageMapEditor::writeConfig() { } -void KImageMapEditor::saveProperties(KConfig *config) +void KImageMapEditor::saveProperties(TDEConfig *config) { saveLastURL(config); } -void KImageMapEditor::readProperties(KConfig * config) +void KImageMapEditor::readProperties(TDEConfig * config) { openLastURL(config); } @@ -399,7 +399,7 @@ void KImageMapEditor::slotConfigChanged() drawZone->viewport()->repaint(); } -void KImageMapEditor::openLastURL(KConfig* config) { +void KImageMapEditor::openLastURL(TDEConfig* config) { KURL lastURL ( config->readPathEntry("lastopenurl") ); TQString lastMap = config->readEntry("lastactivemap"); TQString lastImage = config->readPathEntry("lastactiveimage"); @@ -418,7 +418,7 @@ void KImageMapEditor::openLastURL(KConfig* config) { } } -void KImageMapEditor::saveLastURL(KConfig* config) { +void KImageMapEditor::saveLastURL(TDEConfig* config) { config->writePathEntry("lastopenurl",url().path()); config->writeEntry("lastactivemap",mapName()); config->writePathEntry("lastactiveimage",_imageUrl.path()); @@ -2273,7 +2273,7 @@ void KImageMapEditor::saveImageMap(const KURL & url) if (!backupFileCreated) { TQString backupFile = url.path()+"~"; - KIO::file_copy(url, KURL::fromPathOrURL( backupFile ), -1, true, false, false); + TDEIO::file_copy(url, KURL::fromPathOrURL( backupFile ), -1, true, false, false); backupFileCreated = true; } diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index 9497ee84..34c7b0fc 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -139,7 +139,7 @@ public : virtual ~KImageMapEditor(); static TDEAboutData *createAboutData(); - static KConfig *config(); + static TDEConfig *config(); /** * Makes sure, that the actions cut, copy, delete and @@ -182,8 +182,8 @@ public : void readConfig(); void writeConfig(); - virtual void readProperties(KConfig *); - virtual void saveProperties(KConfig *); + virtual void readProperties(TDEConfig *); + virtual void saveProperties(TDEConfig *); virtual bool closeURL(); bool queryClose(); virtual void setReadWrite(bool); @@ -205,10 +205,10 @@ public : * Opens the last URL the user worked with. * Sets also, the last map and the last image */ - void openLastURL(KConfig*); + void openLastURL(TDEConfig*); - void readConfig(KConfig*); - void writeConfig(KConfig*); + void readConfig(TDEConfig*); + void writeConfig(TDEConfig*); virtual bool openURL(const KURL & url); @@ -227,7 +227,7 @@ protected: /** * Saves information to restore the last working state */ - void saveLastURL(KConfig*); + void saveLastURL(TDEConfig*); private: diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 87d59980..02464423 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -749,7 +749,7 @@ void ImageMapChooseDialog::slotMapChanged(int i) { selectImageWithUsemap(currentMap->name); } -PreferencesDialog::PreferencesDialog(TQWidget *parent, KConfig* conf) +PreferencesDialog::PreferencesDialog(TQWidget *parent, TDEConfig* conf) : KDialogBase(parent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true) { config = conf; diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h index 02a3bf24..ed965f06 100644 --- a/kimagemapeditor/kimedialogs.h +++ b/kimagemapeditor/kimedialogs.h @@ -175,13 +175,13 @@ class ImageMapChooseDialog : public KDialogBase { }; -class KConfig; +class TDEConfig; class PreferencesDialog : public KDialogBase { Q_OBJECT public: - PreferencesDialog(TQWidget *parent,KConfig*); + PreferencesDialog(TQWidget *parent,TDEConfig*); ~PreferencesDialog(); protected slots: virtual void slotDefault( void ); @@ -194,7 +194,7 @@ class PreferencesDialog : public KDialogBase { // TQCheckBox *colorizeAreaChk; // TQCheckBox *showAltChk; TQCheckBox *startWithCheck; - KConfig *config; + TDEConfig *config; }; class KHTMLPart; diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 1cc8a867..cb7d9e21 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -185,7 +185,7 @@ void KimeShell::fileOpen() void KimeShell::readConfig() { - KConfig *config; + TDEConfig *config; config = kapp->config(); @@ -194,14 +194,14 @@ void KimeShell::readConfig() { } -void KimeShell::readConfig(KConfig* config) { +void KimeShell::readConfig(TDEConfig* config) { // applyMainWindowSettings(config); // restoreWindowSize(config); readDockConfig(config); } void KimeShell::writeConfig() { - KConfig *config; + TDEConfig *config; config = kapp->config(); @@ -209,7 +209,7 @@ void KimeShell::writeConfig() { writeConfig(config); } -void KimeShell::writeConfig(KConfig* config) { +void KimeShell::writeConfig(TDEConfig* config) { saveMainWindowSettings(config); saveWindowSize(config); writeDockConfig(config); @@ -218,7 +218,7 @@ void KimeShell::writeConfig(KConfig* config) { } -void KimeShell::saveProperties(KConfig *config) +void KimeShell::saveProperties(TDEConfig *config) { //writeConfig(config); m_part->saveProperties(config); @@ -226,7 +226,7 @@ void KimeShell::saveProperties(KConfig *config) } -void KimeShell::readProperties(KConfig *config) +void KimeShell::readProperties(TDEConfig *config) { readConfig(); m_part->readProperties(config); diff --git a/kimagemapeditor/kimeshell.h b/kimagemapeditor/kimeshell.h index 489de23f..8eaf4a3c 100644 --- a/kimagemapeditor/kimeshell.h +++ b/kimagemapeditor/kimeshell.h @@ -45,12 +45,12 @@ public: protected: void setupActions(); - void readConfig(KConfig*); - void writeConfig(KConfig*); + void readConfig(TDEConfig*); + void writeConfig(TDEConfig*); // virtual bool queryClose(); - virtual void readProperties(KConfig *config); - virtual void saveProperties(KConfig *config); + virtual void readProperties(TDEConfig *config); + virtual void saveProperties(TDEConfig *config); virtual bool queryClose(); virtual bool queryExit(); diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 5ef6d8d0..440e9c78 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -143,7 +143,7 @@ bool QExtFileInfo::createDir( const KURL& path ) // debug(d1); } // dir2.setPath(dir2.path(-1)); - result = KIO::NetAccess::mkdir(dir2, 0L, -1); + result = TDEIO::NetAccess::mkdir(dir2, 0L, -1); i++; } result = exists(path); @@ -184,7 +184,7 @@ bool QExtFileInfo::exists(const KURL& a_url) { // Andras: Don't use it now, as it brings up an extra dialog and need manual // intervention when usign fish -// return KIO::NetAccess::exists(a_url, false); +// return TDEIO::NetAccess::exists(a_url, false); // No dialog when stating. if ( a_url.isLocalFile() ) @@ -219,11 +219,11 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& lstFilters.append( new TQRegExp(*it, false, true ) ); bJobOK = true; - KIO::ListJob *job = KIO::listRecursive(startURL, false, true); - connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)), - this, TQT_SLOT(slotNewEntries(KIO::Job *, const KIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); + connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); // kdDebug(24000) << "Now listing: " << startURL.url() << endl; enter_loop(); @@ -238,17 +238,17 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& } -//Some hackery from KIO::NetAccess as they do not do exactly what we want +//Some hackery from TDEIO::NetAccess as they do not do exactly what we want /* return true if the url exists*/ bool QExtFileInfo::internalExists(const KURL& url) { bJobOK = true; // kdDebug(24000)<<"QExtFileInfo::internalExists"<setDetails(0); job->setSide(false); //check the url for writing - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); //To avoid lock-ups, start a timer. TQTimer::singleShot(10*1000, this,TQT_SLOT(slotTimeout())); @@ -263,11 +263,11 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss { bJobOK = true; // success unless further error occurs - KIO::Scheduler::checkSlaveOnHold(true); - KIO::Job * job = KIO::file_copy( src, target, permissions, overwrite, resume ); + TDEIO::Scheduler::checkSlaveOnHold(true); + TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -288,7 +288,7 @@ void QExtFileInfo::enter_loop() tqt_leave_modal(&dummy); } -void QExtFileInfo::slotResult( KIO::Job * job ) +void QExtFileInfo::slotResult( TDEIO::Job * job ) { bJobOK = !job->error(); if ( !bJobOK ) @@ -296,30 +296,30 @@ void QExtFileInfo::slotResult( KIO::Job * job ) if ( !lastErrorMsg ) lastErrorMsg = job->errorString(); } - if ( job->isA("KIO::StatJob") ) - m_entry = static_cast(job)->statResult(); + if ( job->isA("TDEIO::StatJob") ) + m_entry = static_cast(job)->statResult(); tqApp->exit_loop(); } -void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList) +void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList) { - KURL url = static_cast(job)->url(); + KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again static const TQString& dot = TDEGlobal::staticQString("."); static const TQString& dotdot = TDEGlobal::staticQString(".."); - KIO::UDSEntryListConstIterator it = udsList.begin(); - KIO::UDSEntryListConstIterator end = udsList.end(); + TDEIO::UDSEntryListConstIterator it = udsList.begin(); + TDEIO::UDSEntryListConstIterator end = udsList.end(); KURL itemURL; for ( ; it != end; ++it ) { TQString name; // find out about the name - KIO::UDSEntry::ConstIterator entit = (*it).begin(); + TDEIO::UDSEntry::ConstIterator entit = (*it).begin(); for( ; entit != (*it).end(); ++entit ) - if ( (*entit).m_uds == KIO::UDS_NAME ) + if ( (*entit).m_uds == TDEIO::UDS_NAME ) { name = (*entit).m_str; break; diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h index 210dd617..b064bcd8 100644 --- a/kimagemapeditor/qextfileinfo.h +++ b/kimagemapeditor/qextfileinfo.h @@ -55,7 +55,7 @@ private: bool bJobOK; static TQString lastErrorMsg; - KIO::UDSEntry m_entry; + TDEIO::UDSEntry m_entry; KURL::List dirListItems; TQPtrList lstFilters; @@ -65,8 +65,8 @@ private: // friend class I_like_this_class; private slots: - void slotResult( KIO::Job * job ); - void slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList); + void slotResult( TDEIO::Job * job ); + void slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList); public slots: // Public slots /** Timeout occured while waiting for some network function to return. */ void slotTimeout(); diff --git a/klinkstatus/ChangeLog b/klinkstatus/ChangeLog index 61a35c86..74116590 100644 --- a/klinkstatus/ChangeLog +++ b/klinkstatus/ChangeLog @@ -98,7 +98,7 @@ Changes for 0.1.2 Changes for 0.1.1 ----------------------------------------------------- -- KConfigXT (no GUI yet) +- TDEConfigXT (no GUI yet) - File Dialog opens remote files now. - Fixed error status when URL is a directory - Combo url saves history and has autocompletion diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 8186bda8..2168b0b6 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -80,7 +80,7 @@ void LinkChecker::check() } } - t_job_ = KIO::get(url, false, false); + t_job_ = TDEIO::get(url, false, false); t_job_->addMetaData("PropagateHttpHeader", "true"); // to have the http header @@ -97,14 +97,14 @@ void LinkChecker::check() t_job_->addMetaData("SendUserAgent", "false"); - TQObject::connect(t_job_, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - TQObject::connect(t_job_, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - this, TQT_SLOT(slotMimetype(KIO::Job *, const TQString &))); - TQObject::connect(t_job_, TQT_SIGNAL(result(KIO::Job *)), - this, TQT_SLOT(slotResult(KIO::Job *))); - TQObject::connect(t_job_, TQT_SIGNAL(redirection(KIO::Job *, const KURL &)), - this, TQT_SLOT(slotRedirection(KIO::Job *, const KURL &))); + TQObject::connect(t_job_, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(t_job_, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQT_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); + TQObject::connect(t_job_, TQT_SIGNAL(result(TDEIO::Job *)), + this, TQT_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(t_job_, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + this, TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); TQTimer::singleShot( time_out_ * 1000, this, TQT_SLOT(slotTimeOut()) ); @@ -123,7 +123,7 @@ void LinkChecker::slotTimeOut() // Q_ASSERT(t_job_); // can happen: e.g. bad result signal - if(t_job_->error() != KIO::ERR_USER_CANCELED) + if(t_job_->error() != TDEIO::ERR_USER_CANCELED) { linkstatus_->setErrorOccurred(true); linkstatus_->setChecked(true); @@ -136,7 +136,7 @@ void LinkChecker::slotTimeOut() } } -void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type) +void LinkChecker::slotMimetype (TDEIO::Job* /*job*/, const TQString &type) { if(finnished_) return; @@ -196,7 +196,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type) } } -void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data) +void LinkChecker::slotData(TDEIO::Job* /*job*/, const TQByteArray& data) { if(finnished_) return; @@ -305,7 +305,7 @@ void LinkChecker::findDocumentCharset(TQString const& doc) // only comes here if an error happened or in case of a clean html page // if onlyCheckHeader is false -void LinkChecker::slotResult(KIO::Job* /*job*/) +void LinkChecker::slotResult(TDEIO::Job* /*job*/) { if(finnished_) return; @@ -325,12 +325,12 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) } } - KIO::TransferJob* job = t_job_; + TDEIO::TransferJob* job = t_job_; t_job_ = 0; emit jobFinnished(this); - if(job->error() == KIO::ERR_USER_CANCELED) + if(job->error() == TDEIO::ERR_USER_CANCELED) { // FIXME This can happen! If the job is non interactive... kdWarning(23100) << endl << "Job killed quietly, yet signal result was emited..." << endl; @@ -363,7 +363,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) kdDebug(23100) << "Job error: " << job->errorString() << endl; kdDebug(23100) << "Job error code: " << job->error() << endl; - if(job->error() == KIO::ERR_IS_DIRECTORY) + if(job->error() == TDEIO::ERR_IS_DIRECTORY) { ls->setStatusText("OK"); ls->setStatus(LinkStatus::SUCCESSFULL); @@ -371,14 +371,14 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) else { ls->setErrorOccurred(true); - if(job->error() == KIO::ERR_SERVER_TIMEOUT) + if(job->error() == TDEIO::ERR_SERVER_TIMEOUT) ls->setStatus(LinkStatus::TIMEOUT); else ls->setStatus(LinkStatus::BROKEN); if(job->errorString().isEmpty()) kdWarning(23100) << "\n\nError string is empty, error = " << job->error() << "\n\n\n"; - if(job->error() != KIO::ERR_NO_CONTENT) + if(job->error() != TDEIO::ERR_NO_CONTENT) ls->setError(job->errorString()); else ls->setError(i18n("No Content")); @@ -425,7 +425,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/) } -void LinkChecker::slotRedirection (KIO::Job* /*job*/, const KURL &url) +void LinkChecker::slotRedirection (TDEIO::Job* /*job*/, const KURL &url) { kdDebug(23100) << "LinkChecker::slotRedirection -> " << linkstatus_->absoluteUrl().url() << " -> " << url.url() << endl; @@ -506,7 +506,7 @@ void LinkChecker::finnish() } } -HttpResponseHeader LinkChecker::getHttpHeader(KIO::Job* /*job*/, bool remember_check) +HttpResponseHeader LinkChecker::getHttpHeader(TDEIO::Job* /*job*/, bool remember_check) { //kdDebug(23100) << "LinkChecker::getHttpHeader -> " << linkstatus_->absoluteUrl().url() << endl; @@ -586,18 +586,18 @@ void LinkChecker::checkRef(KURL const& url) html_part->setOnlyLocalReferences(true); TQString tmpFile; - if(KIO::NetAccess::download(url, tmpFile, 0)) + if(TDEIO::NetAccess::download(url, tmpFile, 0)) { TQString doc_html = FileManager::read(tmpFile); html_part->begin(); html_part->write(doc_html); html_part->end(); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } else { - kdDebug(23100) << KIO::NetAccess::lastErrorString() << endl; + kdDebug(23100) << TDEIO::NetAccess::lastErrorString() << endl; } search_manager_->addHtmlPart(url_string, html_part); @@ -678,7 +678,7 @@ void LinkChecker::killJob() if(!t_job_) return; - KIO::TransferJob* aux = t_job_; + TDEIO::TransferJob* aux = t_job_; t_job_ = 0; aux->disconnect(this); aux->kill(true); // quietly diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index e24d2037..a28d66bb 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -62,16 +62,16 @@ signals: protected slots: - void slotData(KIO::Job *, const TQByteArray &data); - void slotRedirection (KIO::Job *, const KURL &url); - void slotMimetype(KIO::Job *, const TQString &type); - void slotResult(KIO::Job* job); + void slotData(TDEIO::Job *, const TQByteArray &data); + void slotRedirection (TDEIO::Job *, const KURL &url); + void slotMimetype(TDEIO::Job *, const TQString &type); + void slotResult(TDEIO::Job* job); void slotTimeOut(); protected: void finnish(); - HttpResponseHeader getHttpHeader(KIO::Job* job, bool remember_check = true); + HttpResponseHeader getHttpHeader(TDEIO::Job* job, bool remember_check = true); void checkRef(); // #... private: @@ -92,7 +92,7 @@ private: SearchManager* search_manager_; LinkStatus* const linkstatus_; - KIO::TransferJob* t_job_; + TDEIO::TransferJob* t_job_; int time_out_; LinkChecker* checker_; TQString document_charset_; diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 42d65a66..2efde62e 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -144,14 +144,14 @@ void KLinkStatus::removeDuplicatedActions() part_action_collection->remove(part_report_action); } -void KLinkStatus::saveProperties(KConfig* /*config*/) +void KLinkStatus::saveProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored } -void KLinkStatus::readProperties(KConfig* /*config*/) +void KLinkStatus::readProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. this function is automatically called whenever diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h index 47bef3f7..f12ad736 100644 --- a/klinkstatus/src/klinkstatus.h +++ b/klinkstatus/src/klinkstatus.h @@ -54,14 +54,14 @@ protected: * This method is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This method is called when this app is restored. The KConfig + * This method is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); private slots: void optionsShowToolbar(); diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index b152fc0a..2b1ea9a4 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -147,7 +147,7 @@ void KLinkStatusPart::slotClose() void KLinkStatusPart::slotConfigureKLinkStatus() { - KConfigDialog *dialog = new KConfigDialog(tabwidget_, "klsconfig", KLSConfig::self()); + TDEConfigDialog *dialog = new TDEConfigDialog(tabwidget_, "klsconfig", KLSConfig::self()); dialog->addPage(new ConfigSearchDialog(0, "config_search_dialog"), i18n("Check"), "viewmag"); dialog->addPage(new ConfigResultsDialog(0, "config_results_dialog"), i18n("Results"), "player_playlist"); dialog->addPage(new ConfigIdentificationDialog(0), i18n("Identification"), diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h index 501c7474..06973616 100644 --- a/klinkstatus/src/ui/klshistorycombo.h +++ b/klinkstatus/src/ui/klshistorycombo.h @@ -13,7 +13,7 @@ #define KLSHISTORYCOMBO_H #include -class KConfig; +class TDEConfig; /** @author Paulo Moura Guedes diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index 7c611bc0..e6a96f61 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -228,7 +228,7 @@ void SessionWidget::slotCheck() paused_ = false; stopped_ = false; - slotLoadSettings(false); // it seems that KConfigDialogManager is not trigering this slot + slotLoadSettings(false); // it seems that TDEConfigDialogManager is not trigering this slot newSearchManager(); @@ -631,7 +631,7 @@ void SessionWidget::slotPauseSearch() search_manager_->resume(); emit signalSearchStarted(); - slotLoadSettings(isEmpty()); // it seems that KConfigDialogManager is not trigering this slot + slotLoadSettings(isEmpty()); // it seems that TDEConfigDialogManager is not trigering this slot resetPendingActions(); } @@ -716,7 +716,7 @@ void SessionWidget::slotExportAsHTML( ) if (url.isLocalFile()) return; - KIO::NetAccess::upload(filename, url, 0); + TDEIO::NetAccess::upload(filename, url, 0); } diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index 368a7964..111b059d 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -35,7 +35,7 @@ class TQStringList; class TQListViewItem; class KURL; -class KConfig; +class TDEConfig; class KToggleAction; #include diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp index 7f790f0b..a4c4b27b 100644 --- a/kommander/editor/main.cpp +++ b/kommander/editor/main.cpp @@ -57,7 +57,7 @@ int main( int argc, char *argv[] ) KLocale::setMainCatalogue("kommander"); TDEApplication a(true, true); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); bool splashScreen = config->readBoolEntry("SplashScreen", true); KSplashScreen* splash = 0; diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 43aea773..36d23b04 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -434,7 +434,7 @@ void MainWindow::runForm() bool readOnlyFile = !TQFileInfo(m_fileName).isWritable(); struct stat statbuf; ::stat(m_fileName.local8Bit(), &statbuf); - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); return; @@ -444,7 +444,7 @@ void MainWindow::runForm() form->formFile()->setModified(true); if (form->formFile()->save(false)) { - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); } @@ -498,7 +498,7 @@ void MainWindow::runForm4() bool readOnlyFile = !TQFileInfo(m_fileName).isWritable(); struct stat statbuf; ::stat(m_fileName.local8Bit(), &statbuf); - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); return; @@ -508,7 +508,7 @@ void MainWindow::runForm4() form->formFile()->setModified(true); if (form->formFile()->save(false)) { - if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) + if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); } @@ -537,7 +537,7 @@ void MainWindow::closeRunningForm(TDEProcess* process) struct stat statbuf; ::stat(m_fileName.local8Bit(), &statbuf); FormWindow* form = activeForm(); - KIO::NetAccess::file_move(KURL::fromPathOrURL(m_backupName), KURL::fromPathOrURL(m_fileName), statbuf.st_mode, true); + TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_backupName), KURL::fromPathOrURL(m_fileName), statbuf.st_mode, true); form->formFile()->setModified(m_modified); } } @@ -1448,7 +1448,7 @@ void MainWindow::selectionChanged() void MainWindow::writeConfig() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("General"); config->writeEntry("RestoreWorkspace", restoreConfig); @@ -1485,7 +1485,7 @@ void MainWindow::writeConfig() void MainWindow::readConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); restoreConfig = config->readBoolEntry("RestoreWorkspace", true); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 1aa27412..7c717a68 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -449,7 +449,7 @@ int KommanderFactory::loadPlugins(bool force) return num_plugins_loaded; num_plugins_loaded = 0; - KConfig cfg("kommanderrc", true); + TDEConfig cfg("kommanderrc", true); TQStringList plugins = "libkommanderwidgets"; plugins += cfg.readListEntry("plugins"); TQStringList::Iterator it; diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp index 01ffacf5..e5de0841 100644 --- a/kommander/pluginmanager/pluginmanager.cpp +++ b/kommander/pluginmanager/pluginmanager.cpp @@ -21,7 +21,7 @@ PluginManager::PluginManager() { - m_cfg = new KConfig("kommanderrc"); + m_cfg = new TDEConfig("kommanderrc"); m_list = new TQStringList(m_cfg->readListEntry("plugins")); } diff --git a/kommander/pluginmanager/pluginmanager.h b/kommander/pluginmanager/pluginmanager.h index 28a7a66e..47d0fa87 100644 --- a/kommander/pluginmanager/pluginmanager.h +++ b/kommander/pluginmanager/pluginmanager.h @@ -19,7 +19,7 @@ #include -class KConfig; +class TDEConfig; class PluginManager { @@ -45,7 +45,7 @@ private: TQString libraryName(const TQString& plugin) const; TQStringList* m_list; - KConfig *m_cfg; + TDEConfig *m_cfg; }; diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index d4151015..a43fbfaf 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -883,7 +883,7 @@ static ParseNode f_read_setting(Parser* parser, const ParameterList& params) TQString fname = parser->currentWidget()->fileName(); if (fname.isEmpty()) return ParseNode(); - KConfig cfg("kommanderrc", true); + TDEConfig cfg("kommanderrc", true); cfg.setGroup(fname); return cfg.readEntry(params[0].toString(), def); } @@ -897,7 +897,7 @@ static ParseNode f_write_setting(Parser* parser, const ParameterList& params) TQString fname = parser->currentWidget()->fileName(); if (fname.isEmpty()) return ParseNode(); - KConfig cfg("kommanderrc", false); + TDEConfig cfg("kommanderrc", false); cfg.setGroup(fname); cfg.writeEntry(params[0].toString(), params[1].toString()); } diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 9470108a..b36a7251 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -77,7 +77,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL TQString fname = fileName(); if (!fname.isEmpty()) { - KConfig cfg("kommanderrc", true); + TDEConfig cfg("kommanderrc", true); cfg.setGroup(fname); return cfg.readEntry(args[0], args[1]); } @@ -88,7 +88,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL TQString fname = fileName(); if (!fname.isEmpty()) { - KConfig cfg("kommanderrc", false); + TDEConfig cfg("kommanderrc", false); cfg.setGroup(fname); cfg.writeEntry(args[0], args[1]); } diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index a9aa23f0..49b2305e 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -100,14 +100,14 @@ void KXsldbg::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } -void KXsldbg::saveProperties(KConfig* /*config*/) +void KXsldbg::saveProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored } -void KXsldbg::readProperties(KConfig* /*config*/) +void KXsldbg::readProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. this function is automatically called whenever diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h index 1d3ee6c6..5eb95600 100644 --- a/kxsldbg/kxsldbg.h +++ b/kxsldbg/kxsldbg.h @@ -48,14 +48,14 @@ protected: * This method is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This method is called when this app is restored. The KConfig + * This method is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); virtual bool closeURL(); diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index 1b8d2df3..eac763e0 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -18,7 +18,7 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); - connect(kDoc, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(lockDoc())); + connect(kDoc, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(lockDoc())); connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); if (kDoc){ kView = kDoc->createView(parent, "QXsldbgDocView"); @@ -47,7 +47,7 @@ QXsldbgDoc::~QXsldbgDoc() } } -void QXsldbgDoc::slotResult( KIO::Job *job ) +void QXsldbgDoc::slotResult( TDEIO::Job *job ) { if ( job->error() != 0 ){ }else{ diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index 3661141f..2fabde26 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -44,7 +44,7 @@ signals: void docChanged(); private slots: - void slotResult( KIO::Job *job ); + void slotResult( TDEIO::Job *job ); void lockDoc(); void unlockDoc(); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 92fc9ba3..47e2d71d 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -165,12 +165,12 @@ void KDockMainWindow::readDockConfig(TQDomElement &base) } #ifndef NO_KDE2 -void KDockMainWindow::writeDockConfig( KConfig* c, TQString group ) +void KDockMainWindow::writeDockConfig( TDEConfig* c, TQString group ) { dockManager->writeConfig( c, group ); } -void KDockMainWindow::readDockConfig( KConfig* c, TQString group ) +void KDockMainWindow::readDockConfig( TDEConfig* c, TQString group ) { dockManager->readConfig( c, group ); } @@ -423,12 +423,12 @@ void KDockWidgetHeader::setDragEnabled(bool b) } #ifndef NO_KDE2 -void KDockWidgetHeader::saveConfig( KConfig* c ) +void KDockWidgetHeader::saveConfig( TDEConfig* c ) { c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() ); } -void KDockWidgetHeader::loadConfig( KConfig* c ) +void KDockWidgetHeader::loadConfig( TDEConfig* c ) { setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) ); } @@ -2474,7 +2474,7 @@ void KDockManager::setReadDockConfigMode(int mode) } #ifndef NO_KDE2 -void KDockManager::writeConfig( KConfig* c, TQString group ) +void KDockManager::writeConfig( TDEConfig* c, TQString group ) { //debug("BEGIN Write Config"); if ( !c ) c = TDEGlobal::config(); @@ -2616,7 +2616,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) //debug("END Write Config"); } #include -void KDockManager::readConfig( KConfig* c, TQString group ) +void KDockManager::readConfig( TDEConfig* c, TQString group ) { if ( !c ) c = TDEGlobal::config(); if ( group.isEmpty() ) group = "dock_setting_default"; @@ -3075,12 +3075,12 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) } #ifndef NO_KDE2 -void KDockArea::writeDockConfig( KConfig* c, TQString group ) +void KDockArea::writeDockConfig( TDEConfig* c, TQString group ) { dockManager->writeConfig( c, group ); } -void KDockArea::readDockConfig( KConfig* c, TQString group ) +void KDockArea::readDockConfig( TDEConfig* c, TQString group ) { dockManager->readConfig( c, group ); } @@ -3205,8 +3205,8 @@ void KDockContainer::removeWidget (KDockWidget *dw){ void KDockContainer::undockWidget (KDockWidget *){;} void KDockContainer::setToolTip(KDockWidget *, TQString &){;} void KDockContainer::setPixmap(KDockWidget*,const TQPixmap&){;} -void KDockContainer::load (KConfig*, const TQString&){;} -void KDockContainer::save (KConfig*, const TQString&){;} +void KDockContainer::load (TDEConfig*, const TQString&){;} +void KDockContainer::save (TDEConfig*, const TQString&){;} void KDockContainer::load (TQDomElement&){;} void KDockContainer::save (TQDomElement&){;} void KDockContainer::prepareSave(TQStringList &names) diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index d0cb5681..5b355867 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -83,7 +83,7 @@ class TQPixmap; #ifndef NO_KDE2 class KToolBar; -class KConfig; +class TDEConfig; #else class TQToolBar; #endif @@ -130,12 +130,12 @@ public: /** * Provides saving the current configuration. Must be overridden by an inheriting class. */ - virtual void saveConfig( KConfig* ){}; + virtual void saveConfig( TDEConfig* ){}; /** * Provides loading the current configuration. Must be overridden by an inheriting class */ - virtual void loadConfig( KConfig* ){}; + virtual void loadConfig( TDEConfig* ){}; #endif protected: @@ -293,14 +293,14 @@ public: * * @param c the configuration safe */ - virtual void saveConfig( KConfig* c); + virtual void saveConfig( TDEConfig* c); /** * Loads the current button state from a KDE config container object. * * @param c the configuration safe */ - virtual void loadConfig( KConfig* c); + virtual void loadConfig( TDEConfig* c); #endif /*@since 3.2 @@ -903,7 +903,7 @@ private: * that can be called within a KDockMainWindow or a KDockWidget . * * An important feature is the ability to read or save the current state of all things concerning to - * dockwidgets to KConfig . + * dockwidgets to TDEConfig . * * The dockmanager is also often used when a certain dockwidget or a child of such dockwidget must be found. * @@ -951,9 +951,9 @@ public: * last but not least some necessary things for recovering the dockmainwindow state. * * @param c the KDE configuration saver - * @param group the name of the section in KConfig + * @param group the name of the section in TDEConfig */ - void writeConfig( KConfig* c = 0L, TQString group = TQString() ); + void writeConfig( TDEConfig* c = 0L, TQString group = TQString() ); /** * Like writeConfig but reads the whole stuff in. @@ -969,9 +969,9 @@ public: * to work, each widget must have a unique name. * * @param c the KDE configuration saver - * @param group the name of the section in KConfig + * @param group the name of the section in TDEConfig */ - void readConfig ( KConfig* c = 0L, TQString group = TQString() ); + void readConfig ( TDEConfig* c = 0L, TQString group = TQString() ); #endif /// @since 3.1 @@ -1381,20 +1381,20 @@ public: #ifndef NO_KDE2 /** - * It writes the current dock state in the given section of KConfig. + * It writes the current dock state in the given section of TDEConfig. * * @param c KDE class for saving configurations * @param group name of section to write to */ - void writeDockConfig( KConfig* c = 0L, TQString group = TQString() ); + void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString() ); /** - * It reads the current dock state from the given section of KConfig. + * It reads the current dock state from the given section of TDEConfig. * * @param c KDE class for saving configurations * @param group name of section to read from */ - void readDockConfig ( KConfig* c = 0L, TQString group = TQString() ); + void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString() ); #endif /** @@ -1500,8 +1500,8 @@ public: void readDockConfig(TQDomElement &base); #ifndef NO_KDE2 - void writeDockConfig( KConfig* c = 0L, TQString group = TQString() ); - void readDockConfig ( KConfig* c = 0L, TQString group = TQString() ); + void writeDockConfig( TDEConfig* c = 0L, TQString group = TQString() ); + void readDockConfig ( TDEConfig* c = 0L, TQString group = TQString() ); #endif diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h index 9ee9e8e7..471c4d9b 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h @@ -50,9 +50,9 @@ public: virtual void showWidget(KDockWidget *); virtual void removeWidget(KDockWidget*); virtual void undockWidget(KDockWidget*); - virtual void save(KConfig *cfg,const TQString& group_or_prefix); + virtual void save(TDEConfig *cfg,const TQString& group_or_prefix); virtual void save(TQDomElement& dockElement); - virtual void load(KConfig *cfg,const TQString& group_or_prefix); + virtual void load(TDEConfig *cfg,const TQString& group_or_prefix); virtual void load(TQDomElement& dockElement); virtual void setToolTip (KDockWidget *, TQString &); virtual void setPixmap(KDockWidget*,const TQPixmap&); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index 4fde9799..173cb723 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp @@ -621,7 +621,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); } -void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) +void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); @@ -669,7 +669,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) } -void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) +void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) { TQString grp = cfg->group(); cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h index 5ada8db6..5f1f5dcc 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h @@ -89,22 +89,22 @@ public: void hideIfNeeded(); /** - * Save the config using a KConfig object + * Save the config using a TDEConfig object * * The combination of the group_or_prefix variable and the parent * dockwidget's name will be the group the configuration is saved in * \param group_or_prefix the prefix to append to the parent dockwidget's name */ - virtual void save( KConfig *, const TQString& group_or_prefix ); + virtual void save( TDEConfig *, const TQString& group_or_prefix ); /** - * Load the config using a KConfig object + * Load the config using a TDEConfig object * * The combination of the group_or_prefix variable and the parent * dockwidget's name will be the group the configuration is loaded from * \param group_or_prefix the prefix to append to the parent dockwidget's name */ - virtual void load( KConfig *, const TQString& group_or_prefix ); + virtual void load( TDEConfig *, const TQString& group_or_prefix ); /** * Save the config to a TQDomElement diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp index 494f3bca..34c25f0d 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp @@ -251,7 +251,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) // try to read the action shortcut KShortcut sc; - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup( "Shortcuts" ); // if ( cfg->hasKey( aname ) ) diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp index 39b7678e..2320fb90 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp @@ -41,7 +41,7 @@ public: KTabWidgetPrivate() { m_automaticResizeTabs = false; - KConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); + TDEConfigGroupSaver groupsaver(TDEGlobal::config(), "General"); m_maxLength = TDEGlobal::config()->readNumEntry("MaximumTabLength", 30); m_minLength = TDEGlobal::config()->readNumEntry("MinimumTabLength", 3); m_CurrentMaxLength = m_minLength; diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index d2516134..c5f402e1 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -195,7 +195,7 @@ void DownloadDialog::addProvider(Provider *p) ret = true; if(!p->icon().isValid()) ret = false; - else ret = KIO::NetAccess::download(p->icon(), tmp, this); + else ret = TDEIO::NetAccess::download(p->icon(), tmp, this); if(ret) pix = TQPixmap(tmp); else pix = TDEGlobal::iconLoader()->loadIcon("knewstuff", KIcon::Panel); frame = addPage(p->name(), p->name(), pix); @@ -280,7 +280,7 @@ void DownloadDialog::addProvider(Provider *p) TQTimer::singleShot(100, this, TQT_SLOT(slotFinish())); } -void DownloadDialog::slotResult(KIO::Job *job) +void DownloadDialog::slotResult(TDEIO::Job *job) { TQDomDocument dom; TQDomElement knewstuff; @@ -379,7 +379,7 @@ void DownloadDialog::addEntry(Entry *entry) kdDebug() << "added entry " << entry->name() << endl; } -void DownloadDialog::slotData(KIO::Job *job, const TQByteArray &a) +void DownloadDialog::slotData(TDEIO::Job *job, const TQByteArray &a) { TQCString tmp(a, a.size() + 1); m_data[job].append(TQString::fromUtf8(tmp)); @@ -446,8 +446,8 @@ void DownloadDialog::slotInstall() KURL source = e->payload(); KURL dest = KURL(m_s->downloadDestination(e)); - KIO::FileCopyJob *job = KIO::file_copy(source, dest, -1, true); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotInstalled(KIO::Job*))); + TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*))); } } @@ -471,14 +471,14 @@ void DownloadDialog::install(Entry *e) if(in) in->setEnabled(false); } -void DownloadDialog::slotInstalled(KIO::Job *job) +void DownloadDialog::slotInstalled(TDEIO::Job *job) { bool ret = (job->error() == 0); - KIO::FileCopyJob *cjob; + TDEIO::FileCopyJob *cjob; if(ret) { - cjob = static_cast(job); + cjob = static_cast(job); if(cjob) { ret = m_s->install(cjob->destURL().path()); @@ -519,7 +519,7 @@ void DownloadDialog::slotSelected() } else { - KIO::NetAccess::download(e->preview(lang), tmp, this); + TDEIO::NetAccess::download(e->preview(lang), tmp, this); m_rt->setText(TQString("%1
%2
%3


%5
(%6)").arg( e->name()).arg(e->author()).arg(TDEGlobal::locale()->formatDate(e->releaseDate())).arg(tmp).arg(e->summary(lang)).arg(e->license())); } @@ -585,13 +585,13 @@ void DownloadDialog::slotPage(TQWidget *w) void DownloadDialog::loadProvider(Provider *p) { - KIO::TransferJob *job = KIO::get(p->downloadUrl()); + TDEIO::TransferJob *job = TDEIO::get(p->downloadUrl()); m_jobs[job] = p; - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*))); - connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void DownloadDialog::setType(TQString type) diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h index 2a0b729d..3c7257d7 100644 --- a/lib/compatibility/knewstuff/downloaddialog.h +++ b/lib/compatibility/knewstuff/downloaddialog.h @@ -23,7 +23,7 @@ #include #include -namespace KIO +namespace TDEIO { class Job; } @@ -193,11 +193,11 @@ class KDE_EXPORT DownloadDialog : public KDialogBase void slotOk(); private slots: - void slotResult(KIO::Job *job); - void slotData(KIO::Job *job, const TQByteArray &a); + void slotResult(TDEIO::Job *job); + void slotData(TDEIO::Job *job, const TQByteArray &a); void slotInstall(); void slotDetails(); - void slotInstalled(KIO::Job *job); + void slotInstalled(TDEIO::Job *job); void slotTab(int tab); void slotSelected(); void slotPage(TQWidget *w); @@ -224,8 +224,8 @@ class KDE_EXPORT DownloadDialog : public KDialogBase TQMap m_providers; TQMap m_rts; TQMap* > m_buttons; - TQMap m_jobs; - TQMap m_data; + TQMap m_jobs; + TQMap m_data; TQString m_filter; TQString m_providerlist; Engine *m_engine; diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp index ca63ea98..2abb7bca 100644 --- a/lib/compatibility/knewstuff/engine.cpp +++ b/lib/compatibility/knewstuff/engine.cpp @@ -96,18 +96,18 @@ void Engine::getMetaInformation( Provider::List *providers ) for ( p = providers->first(); p; p = providers->next() ) { if ( p->downloadUrl().isEmpty() ) continue; - KIO::TransferJob *job = KIO::get( p->downloadUrl() ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotNewStuffJobResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotNewStuffJobData( KIO::Job *, const TQByteArray & ) ) ); + TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl() ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) ); mNewStuffJobData.insert( job, "" ); mProviderJobs[ job ] = p; } } -void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ) +void Engine::slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data ) { if ( data.isEmpty() ) return; @@ -118,7 +118,7 @@ void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ) mNewStuffJobData[ job ].append( TQString::fromUtf8( str ) ); } -void Engine::slotNewStuffJobResult( KIO::Job *job ) +void Engine::slotNewStuffJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug(5850) << "Error downloading new stuff descriptions." << endl; @@ -192,12 +192,12 @@ void Engine::download( Entry *entry ) kdDebug(5850) << " SOURCE: " << source.url() << endl; kdDebug(5850) << " DESTINATION: " << destination.url() << endl; - KIO::FileCopyJob *job = KIO::file_copy( source, destination, -1, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotDownloadJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) ); } -void Engine::slotDownloadJobResult( KIO::Job *job ) +void Engine::slotDownloadJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug(5850) << "Error downloading new stuff payload." << endl; @@ -313,9 +313,9 @@ void Engine::upload( Entry *entry ) KURL destination = mUploadProvider->uploadUrl(); destination.setFileName( fi.fileName() ); - KIO::FileCopyJob *job = KIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadPayloadJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) ); } else { emit uploadFinished( false ); } @@ -356,7 +356,7 @@ bool Engine::createMetaFile( Entry *entry ) return true; } -void Engine::slotUploadPayloadJobResult( KIO::Job *job ) +void Engine::slotUploadPayloadJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug(5850) << "Error uploading new stuff payload." << endl; @@ -375,12 +375,12 @@ void Engine::slotUploadPayloadJobResult( KIO::Job *job ) KURL previewDestination = mUploadProvider->uploadUrl(); previewDestination.setFileName( fi.fileName() ); - KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); - connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadPreviewJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); + connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) ); } -void Engine::slotUploadPreviewJobResult( KIO::Job *job ) +void Engine::slotUploadPreviewJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug(5850) << "Error uploading new stuff preview." << endl; @@ -394,12 +394,12 @@ void Engine::slotUploadPreviewJobResult( KIO::Job *job ) KURL metaDestination = mUploadProvider->uploadUrl(); metaDestination.setFileName( fi.fileName() ); - KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); - connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadMetaJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); + connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) ); } -void Engine::slotUploadMetaJobResult( KIO::Job *job ) +void Engine::slotUploadMetaJobResult( TDEIO::Job *job ) { mUploadMetaFile = TQString(); if ( job->error() ) { diff --git a/lib/compatibility/knewstuff/engine.h b/lib/compatibility/knewstuff/engine.h index 5362351d..4341dd21 100644 --- a/lib/compatibility/knewstuff/engine.h +++ b/lib/compatibility/knewstuff/engine.h @@ -27,7 +27,7 @@ #include "entry.h" #include "provider.h" -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KNewStuff; @@ -143,14 +143,14 @@ class Engine : public TQObject void getMetaInformation( Provider::List *providers ); void selectUploadProvider( Provider::List *providers ); - void slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ); - void slotNewStuffJobResult( KIO::Job *job ); + void slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data ); + void slotNewStuffJobResult( TDEIO::Job *job ); - void slotDownloadJobResult( KIO::Job *job ); + void slotDownloadJobResult( TDEIO::Job *job ); - void slotUploadPayloadJobResult( KIO::Job *job ); - void slotUploadPreviewJobResult (KIO::Job *job ); - void slotUploadMetaJobResult( KIO::Job *job ); + void slotUploadPayloadJobResult( TDEIO::Job *job ); + void slotUploadPreviewJobResult (TDEIO::Job *job ); + void slotUploadMetaJobResult( TDEIO::Job *job ); protected: bool createMetaFile( Entry * ); @@ -160,8 +160,8 @@ class Engine : public TQObject ProviderLoader *mProviderLoader; - TQMap mNewStuffJobData; - TQMap mProviderJobs; + TQMap mNewStuffJobData; + TQMap mProviderJobs; TQPtrList mNewStuffList; diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.h b/lib/compatibility/knewstuff/knewstuffgeneric.h index 6347bf53..053f83a0 100644 --- a/lib/compatibility/knewstuff/knewstuffgeneric.h +++ b/lib/compatibility/knewstuff/knewstuffgeneric.h @@ -23,7 +23,7 @@ #include "knewstuff.h" -class KConfig; +class TDEConfig; /** * @short Basic KNewStuff class with predefined actions. @@ -80,7 +80,7 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff private: TQString destinationPath( KNS::Entry *entry ); - KConfig *mConfig; + TDEConfig *mConfig; }; #endif diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp index 8e408e2d..3c90f068 100644 --- a/lib/compatibility/knewstuff/knewstuffsecure.cpp +++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp @@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result) emit installFinished(); } else { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->deleteGroup("KNewStuffStatus"); cfg->setGroup("KNewStuffStatus"); for (TQMap::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) @@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); @@ -179,7 +179,7 @@ void KNewStuffSecure::uploadResource(const TQString& fileName) m_tempDir->setAutoDelete(true); TQFileInfo f(fileName); m_signedFileName = m_tempDir->name() + "/" + f.fileName(); - KIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true); + TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true); Security::ref()->signFile(m_signedFileName); } @@ -215,7 +215,7 @@ void KNewStuffSecure::slotFileSigned(int result) file.close(); } tar.close(); - KIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); + TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); KNewStuff::upload(m_signedFileName, TQString()); disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); } @@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory() { if (m_tempDir) { - KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); + TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); delete m_tempDir; m_tempDir = 0L; } diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp index 67a44ebd..92be65b6 100644 --- a/lib/compatibility/knewstuff/provider.cpp +++ b/lib/compatibility/knewstuff/provider.cpp @@ -154,7 +154,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) mProviders.clear(); mJobData = ""; - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup("KNewStuff"); TQString providersUrl = providersList; @@ -171,16 +171,16 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) kdDebug(5850) << "ProviderLoader::load(): providersUrl: " << providersUrl << endl; - KIO::TransferJob *job = KIO::get( KURL( providersUrl ) ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) ); + TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); // job->dumpObjectInfo(); } -void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data ) +void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data ) { kdDebug(5850) << "ProviderLoader::slotJobData()" << endl; @@ -191,7 +191,7 @@ void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data ) mJobData.append( TQString::fromUtf8( str ) ); } -void ProviderLoader::slotJobResult( KIO::Job *job ) +void ProviderLoader::slotJobResult( TDEIO::Job *job ) { if ( job->error() ) { job->showErrorDialog( mParentWidget ); diff --git a/lib/compatibility/knewstuff/provider.h b/lib/compatibility/knewstuff/provider.h index 268bd92b..630568e4 100644 --- a/lib/compatibility/knewstuff/provider.h +++ b/lib/compatibility/knewstuff/provider.h @@ -28,7 +28,7 @@ #include -namespace KIO { class Job; } +namespace TDEIO { class Job; } namespace KNS { @@ -191,8 +191,8 @@ class ProviderLoader : public TQObject void providersLoaded( Provider::List * ); protected slots: - void slotJobData( KIO::Job *, const TQByteArray & ); - void slotJobResult( KIO::Job * ); + void slotJobData( TDEIO::Job *, const TQByteArray & ); + void slotJobResult( TDEIO::Job * ); private: TQWidget *mParentWidget; diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp index 12261d71..9e6ae83a 100644 --- a/lib/compatibility/knewstuff/uploaddialog.cpp +++ b/lib/compatibility/knewstuff/uploaddialog.cpp @@ -100,7 +100,7 @@ UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) : mSummaryEdit = new KTextEdit( topPage ); topLayout->addMultiCellWidget( mSummaryEdit, 8, 8, 0, 1 ); - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup("KNewStuffUpload"); TQString name = conf->readEntry("name"); TQString author = conf->readEntry("author"); @@ -152,7 +152,7 @@ void UploadDialog::slotOk() entry->setPreview( KURL( mPreviewUrl->url().section("/", -1) ), mLanguageCombo->currentText() ); entry->setSummary( mSummaryEdit->text(), mLanguageCombo->currentText() ); - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup("KNewStuffUpload"); conf->writeEntry("name", mNameEdit->text()); conf->writeEntry("author", mAuthorEdit->text()); diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index f701fb5a..3aaf5e1b 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -214,7 +214,7 @@ bool QExtFileInfo::createDir(const KURL& path, TQWidget *window) } dir3 = dir2; dir3.adjustPath(-1); //some servers refuse to create directories ending with a slash - result = KIO::NetAccess::mkdir(dir3, window); + result = TDEIO::NetAccess::mkdir(dir3, window); if (dir2.path() == "/" || !result) break; i++; @@ -259,7 +259,7 @@ bool QExtFileInfo::exists(const KURL& a_url, bool readingOnly, TQWidget *window) { // Andras: Don't use it now, as it brings up an extra dialog and need manual // intervention when usign fish -// return KIO::NetAccess::exists(a_url, false); +// return TDEIO::NetAccess::exists(a_url, false); // No dialog when stating. if (a_url.isLocalFile()) @@ -297,13 +297,13 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& lstFilters.append( new TQRegExp(*it, false, true ) ); bJobOK = true; - KIO::ListJob *job = KIO::listRecursive(startURL, false, true); + TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)), - this, TQT_SLOT(slotNewEntries(KIO::Job *, const KIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotListResult (KIO::Job *) ) ); + connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; @@ -335,13 +335,13 @@ TQDict QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c lstFilters.append( new TQRegExp(*it, false, true ) ); bJobOK = true; - KIO::ListJob *job = KIO::listRecursive(startURL, false, true); + TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList&)), - this, TQT_SLOT(slotNewDetailedEntries(KIO::Job *, const KIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotListResult (KIO::Job *) ) ); + connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQT_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; enter_loop(); @@ -385,7 +385,7 @@ KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString } -//Some hackery from KIO::NetAccess as they do not do exactly what we want +//Some hackery from TDEIO::NetAccess as they do not do exactly what we want /* return true if the url exists*/ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *window) { @@ -393,12 +393,12 @@ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *w KURL url2 = url; url2.adjustPath(-1); // kdDebug(24000)<<"QExtFileInfo::internalExists"<setWindow(window); job->setDetails(0); job->setSide(readingOnly); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); //To avoid lock-ups, start a timer. TQTimer::singleShot(60*1000, this,TQT_SLOT(slotTimeout())); @@ -413,21 +413,21 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss { bJobOK = true; // success unless further error occurs - KIO::Scheduler::checkSlaveOnHold(true); - KIO::Job * job = KIO::file_copy( src, target, permissions, overwrite, resume, false ); -// KIO::Job * job2 = KIO::del(target, false ); + TDEIO::Scheduler::checkSlaveOnHold(true); + TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume, false ); +// TDEIO::Job * job2 = TDEIO::del(target, false ); //job2->setWindow (window); - //connect( job2, TQT_SIGNAL( result (KIO::Job *) ), -// this, TQT_SLOT( slotResult (KIO::Job *) ) ); + //connect( job2, TQT_SIGNAL( result (TDEIO::Job *) ), +// this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); //enter_loop(); //if (bJobOK) { // kdDebug(24000) << "Copying " << src << " to " << target << endl; - // KIO::Job *job = KIO::copy( src, target, false ); + // TDEIO::Job *job = TDEIO::copy( src, target, false ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (KIO::Job *) ), - this, TQT_SLOT( slotResult (KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), + this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); } return bJobOK; @@ -448,14 +448,14 @@ void QExtFileInfo::enter_loop() tqt_leave_modal(&dummy); } -void QExtFileInfo::slotListResult(KIO::Job *job) +void QExtFileInfo::slotListResult(TDEIO::Job *job) { m_listJobCount--; if (m_listJobCount == 0) slotResult(job); } -void QExtFileInfo::slotResult(KIO::Job *job) +void QExtFileInfo::slotResult(TDEIO::Job *job) { //kdDebug(24000)<<"QExtFileInfo::slotResult"<error(); @@ -464,21 +464,21 @@ void QExtFileInfo::slotResult(KIO::Job *job) if ( !lastErrorMsg ) lastErrorMsg = job->errorString(); } - if ( job->isA("KIO::StatJob") ) - m_entry = static_cast(job)->statResult(); + if ( job->isA("TDEIO::StatJob") ) + m_entry = static_cast(job)->statResult(); tqApp->exit_loop(); } -void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList) +void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList) { - KURL url = static_cast(job)->url(); + KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again static const TQString& dot = TDEGlobal::staticQString("."); static const TQString& dotdot = TDEGlobal::staticQString(".."); - KIO::UDSEntryListConstIterator it = udsList.begin(); - KIO::UDSEntryListConstIterator end = udsList.end(); + TDEIO::UDSEntryListConstIterator it = udsList.begin(); + TDEIO::UDSEntryListConstIterator end = udsList.end(); KURL itemURL; TQPtrList linkItems; linkItems.setAutoDelete(true); @@ -487,9 +487,9 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis TQString name; // find out about the name - KIO::UDSEntry::ConstIterator entit = (*it).begin(); + TDEIO::UDSEntry::ConstIterator entit = (*it).begin(); for( ; entit != (*it).end(); ++entit ) - if ((*entit).m_uds == KIO::UDS_NAME) + if ((*entit).m_uds == TDEIO::UDS_NAME) { name = (*entit).m_str; break; @@ -533,26 +533,26 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis } for (TQPtrList::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it) { - KIO::ListJob *ljob = KIO::listRecursive((*it)->url(), false, true); + TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; //kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)), - this,TQT_SLOT (slotNewEntries(KIO::Job *,const KIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(KIO::Job *)), - this,TQT_SLOT (slotListResult(KIO::Job *))); + connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQT_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), + this,TQT_SLOT (slotListResult(TDEIO::Job *))); } } -void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList& udsList) +void QExtFileInfo::slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList) { - KURL url = static_cast(job)->url(); + KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again static const TQString& dot = TDEGlobal::staticQString("."); static const TQString& dotdot = TDEGlobal::staticQString(".."); - KIO::UDSEntryListConstIterator it = udsList.begin(); - KIO::UDSEntryListConstIterator end = udsList.end(); + TDEIO::UDSEntryListConstIterator it = udsList.begin(); + TDEIO::UDSEntryListConstIterator end = udsList.end(); KURL itemURL; TQPtrList linkItems; linkItems.setAutoDelete(true); @@ -561,9 +561,9 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList TQString name; // find out about the name - KIO::UDSEntry::ConstIterator entit = (*it).begin(); + TDEIO::UDSEntry::ConstIterator entit = (*it).begin(); for( ; entit != (*it).end(); ++entit ) - if ((*entit).m_uds == KIO::UDS_NAME) + if ((*entit).m_uds == TDEIO::UDS_NAME) { name = (*entit).m_str; break; @@ -600,13 +600,13 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList } for (TQPtrList::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it) { - KIO::ListJob *ljob = KIO::listRecursive((*it)->url(), false, true); + TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; // kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)), - this,TQT_SLOT (slotNewDetailedEntries(KIO::Job *,const KIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(KIO::Job *)), - this,TQT_SLOT (slotListResult(KIO::Job *))); + connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQT_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), + this,TQT_SLOT (slotListResult(TDEIO::Job *))); } } diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h index 488e4e5b..1fbe1093 100644 --- a/lib/qextfileinfo.h +++ b/lib/qextfileinfo.h @@ -77,7 +77,7 @@ public: static KURL path(const KURL &); /** Returns the user's home directory as an url. */ static KURL home(); - /** A slightly better working alternative of KIO::NetAccess::exists(). + /** A slightly better working alternative of TDEIO::NetAccess::exists(). Checks for the existance of the url. readingOnly is true if we check if the url is readable, and false if we check if it is writable.*/ static bool exists(const KURL& url, bool readingOnly, TQWidget *window); @@ -99,7 +99,7 @@ private: bool bJobOK; static TQString lastErrorMsg; - KIO::UDSEntry m_entry; + TDEIO::UDSEntry m_entry; KURL::List dirListItems; TQDict detailedDirListItems; TQPtrList lstFilters; @@ -107,10 +107,10 @@ private: TQString m_listStartURL; private slots: - void slotListResult(KIO::Job *job); - void slotResult(KIO::Job * job); - void slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList); - void slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList& udsList); + void slotListResult(TDEIO::Job *job); + void slotResult(TDEIO::Job * job); + void slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList); + void slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& udsList); public slots: /** Timeout occurred while waiting for some network function to return. */ void slotTimeout(); diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h index aee0695b..fa9e3339 100644 --- a/quanta/components/csseditor/csseditor.h +++ b/quanta/components/csseditor/csseditor.h @@ -26,7 +26,7 @@ #include class propertySetter; -class KConfig; +class TDEConfig; class KHTMLPart; class TQListViewItem; class TQDomNodeList; @@ -75,7 +75,7 @@ class CSSEditor : public CSSEditorS m_fileToPreview; bool m_isFileToPreviewExternal; - KConfig *m_config; + TDEConfig *m_config; //sourceFileName; diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index a087ae03..4454f0d7 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -62,7 +62,7 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt { if(!m_server) { - m_server = new KNetwork::KServerSocket(service); + m_server = new KNetwork::TDEServerSocket(service); m_server->setAddressReuseable(true); connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); @@ -118,8 +118,8 @@ void DBGpNetwork::slotError(int) kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(m_socket) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; - if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected) + kdDebug(24002) << k_funcinfo << ", " << m_socket->TDESocketBase::errorString() << endl; + if(m_socket->error() == KNetwork::TDESocketBase::RemotelyDisconnected) { slotConnectionClosed(); emit networkError(i18n("Disconnected from remote host"), true); @@ -128,7 +128,7 @@ void DBGpNetwork::slotError(int) if(m_socket->error()) { - emit networkError(m_socket->KSocketBase::errorString(), true); + emit networkError(m_socket->TDESocketBase::errorString(), true); } } @@ -148,7 +148,7 @@ void DBGpNetwork::slotReadyAccept() { disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // KSocketServer returns a KStreamSocket (!) + m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) { kdDebug(24002) << k_funcinfo << ", ready" << ", m_socket" << m_socket << endl; diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h index 8cce9d6a..1ac8e2f4 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.h +++ b/quanta/components/debugger/dbgp/dbgpnetwork.h @@ -35,7 +35,7 @@ class DBGpNetwork : public TQObject private: KNetwork::KStreamSocket *m_socket; - KNetwork::KServerSocket *m_server; + KNetwork::TDEServerSocket *m_server; TQByteArrayFifo m_fifo; bool m_useproxy; long m_datalen; diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 3edcd527..872e1707 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -116,7 +116,7 @@ void QuantaDebuggerGubed::startSession() { if(!m_server) { - m_server = new KNetwork::KServerSocket(m_listenPort); + m_server = new KNetwork::TDEServerSocket(m_listenPort); m_server->setAddressReuseable(true); connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); @@ -250,7 +250,7 @@ void QuantaDebuggerGubed::slotError(int) kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(m_socket) { - if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected) + if(m_socket->error() == KNetwork::TDESocketBase::RemotelyDisconnected) { slotConnectionClosed(); return; @@ -258,8 +258,8 @@ void QuantaDebuggerGubed::slotError(int) if(m_socket->error()) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; - debuggerInterface()->showStatus(m_socket->KSocketBase::errorString(), false); + kdDebug(24002) << k_funcinfo << ", " << m_socket->TDESocketBase::errorString() << endl; + debuggerInterface()->showStatus(m_socket->TDESocketBase::errorString(), false); } } @@ -282,7 +282,7 @@ void QuantaDebuggerGubed::slotReadyAccept() // Perhaps this shouldnt be disconnected - instead check if connections are available at disconnect? disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // KSocketServer returns a KStreamSocket (!) + m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) { kdDebug(24002) << k_funcinfo << ", ready" << endl; diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index 5b53f128..ead8ffd5 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -98,7 +98,7 @@ class QuantaDebuggerGubed : public DebuggerClient private: KNetwork::KStreamSocket *m_socket; - KNetwork::KServerSocket *m_server; + KNetwork::TDEServerSocket *m_server; TQString m_command, m_buffer; long m_datalen; 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); diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp index 92e1e8f8..34826ca4 100644 --- a/quanta/parsers/dtd/dtd.cpp +++ b/quanta/parsers/dtd/dtd.cpp @@ -112,7 +112,7 @@ void DTD::writeTagFiles() } } - KConfig config(dirName + "description.rc"); + TDEConfig config(dirName + "description.rc"); config.setGroup("General"); config.writeEntry("Name", TQFileInfo(m_dtdURL.fileName()).baseName()); //TODO: get from the DTD! config.writeEntry("NickName", TQFileInfo(m_dtdURL.fileName()).baseName()); //TODO: get from the user! @@ -122,7 +122,7 @@ void DTD::writeTagFiles() bool DTD::parseDTD(const KURL &url) { TQString fileName = TQString(); - if (!KIO::NetAccess::download(url, fileName)) + if (!TDEIO::NetAccess::download(url, fileName)) { KMessageBox::error(0, i18n("Cannot download the DTD from %1.").arg(url.prettyURL(0, KURL::StripFileProtocol))); return false; diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index c8eb2a98..07d571f8 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -73,7 +73,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) { bool fineTune = false; TQString fileName = TQString(); - if (!KIO::NetAccess::download(m_dtdURL, fileName, 0)) + if (!TDEIO::NetAccess::download(m_dtdURL, fileName, 0)) { KMessageBox::error(0, i18n("Cannot download the DTD from %1.").arg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); return false; @@ -190,7 +190,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) void DTDParser::writeDescriptionRC() { - KConfig config(DTD::dirName + "description.rc"); + TDEConfig config(DTD::dirName + "description.rc"); config.setGroup("General"); config.writeEntry("Name", m_name); config.writeEntry("NickName", m_nickName); diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp index b2647423..8077a76b 100644 --- a/quanta/parts/kafka/htmlenhancer.cpp +++ b/quanta/parts/kafka/htmlenhancer.cpp @@ -385,7 +385,7 @@ void HTMLEnhancer::postUnenhanceNode(DOM::Node domNode) } } -void HTMLEnhancer::readConfig(KConfig *m_config) +void HTMLEnhancer::readConfig(TDEConfig *m_config) { m_config->setGroup("HTML Enhancer"); m_showIconForScripts = m_config->readBoolEntry("Show Scripts Icons", true); diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h index ac3753c0..9fdc8658 100644 --- a/quanta/parts/kafka/htmlenhancer.h +++ b/quanta/parts/kafka/htmlenhancer.h @@ -22,7 +22,7 @@ #include "nodeenhancer.h" -class KConfig; +class TDEConfig; class Node; class KafkaDocument; class KStandardDirs; @@ -70,7 +70,7 @@ public: * Read the config. * @m_config The config to read. */ - void readConfig(KConfig *m_config); + void readConfig(TDEConfig *m_config); /** * Set the base URL of the current document to update src attrs. diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp index 26013c25..2c37f0cd 100644 --- a/quanta/parts/kafka/kafkasyncoptions.cpp +++ b/quanta/parts/kafka/kafkasyncoptions.cpp @@ -25,7 +25,7 @@ #include "kafkasyncoptions.h" #include "kafkasyncoptions.moc" -KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* parent, const char* name ) +KafkaSyncOptions::KafkaSyncOptions( TDEConfig *a_config, TQWidget* parent, const char* name ) : KafkaSyncOptionsUI( parent, name ) { config = a_config; diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h index 9009f6b7..c924b34e 100644 --- a/quanta/parts/kafka/kafkasyncoptions.h +++ b/quanta/parts/kafka/kafkasyncoptions.h @@ -20,7 +20,7 @@ #include "kafkasyncoptionsui.h" -class KConfig; +class TDEConfig; class KafkaSyncOptions : public KafkaSyncOptionsUI { @@ -28,13 +28,13 @@ class KafkaSyncOptions : public KafkaSyncOptionsUI public: - KafkaSyncOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); + KafkaSyncOptions( TDEConfig *config, TQWidget* parent = 0, const char* name = 0); ~KafkaSyncOptions(); void updateConfig(); protected: - KConfig *config; + TDEConfig *config; }; #endif diff --git a/quanta/parts/kafka/nodeenhancer.h b/quanta/parts/kafka/nodeenhancer.h index 44fd2e59..4fca17e1 100644 --- a/quanta/parts/kafka/nodeenhancer.h +++ b/quanta/parts/kafka/nodeenhancer.h @@ -18,7 +18,7 @@ #ifndef NODEENHANCER_H #define NODEENHANCER_H -class KConfig; +class TDEConfig; class Node; namespace DOM { @@ -66,7 +66,7 @@ public: * Read the config. * @m_config The config to read. */ - virtual void readConfig(KConfig *m_config) = 0; + virtual void readConfig(TDEConfig *m_config) = 0; /** * This need to be strongly extended. diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index d21129cd..e788a5c7 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -190,7 +190,7 @@ void undoRedo::addNewModifsSet(NodeModifsSet *modifs, int modifLocation, NodeSel return; } - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Kate Document Defaults"); int indentationWidth = config->readNumEntry("Indentation Width", 4); diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 8880dd27..39cefc8f 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -1796,7 +1796,7 @@ DOM::Node KafkaDocument::getNextSiblingNSpecial(DOM::Node domNode) return DOM::Node(); } -void KafkaDocument::readConfig(KConfig *m_config) +void KafkaDocument::readConfig(TDEConfig *m_config) { #ifdef LIGHT_DEBUG kdDebug(25001)<< "KafkaDocument::readConfig()" << endl; diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h index 2d03477b..9c4f3529 100644 --- a/quanta/parts/kafka/wkafkapart.h +++ b/quanta/parts/kafka/wkafkapart.h @@ -18,7 +18,7 @@ #ifndef WKAFKAPART_H #define WKAFKAPART_H -class KConfig; +class TDEConfig; namespace DOM { class Node; @@ -349,7 +349,7 @@ public: * Read the config. * @param m_config The config to read. */ - void readConfig(KConfig *m_config); + void readConfig(TDEConfig *m_config); /** * Returns the default DTD of the current Document. diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 42af2d0c..e86a9203 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -40,7 +40,7 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << this << endl; hpos = 0; // get settings from konq. - KConfig konqConfig("konquerorrc"); + TDEConfig konqConfig("konquerorrc"); konqConfig.setGroup("HTML Settings"); diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index 098c7828..fc9a8823 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -56,7 +56,7 @@ QuantaPluginInterface::~QuantaPluginInterface() void QuantaPluginInterface::readConfigFile(const TQString& configFile) { - KConfig *config = new KConfig(configFile); + TDEConfig *config = new TDEConfig(configFile); config->setGroup("General"); TQStringList pList = config->readListEntry("Plugins"); for(TQStringList::Iterator it = pList.begin();it != pList.end(); ++it) @@ -133,7 +133,7 @@ void QuantaPluginInterface::readConfig() void QuantaPluginInterface::writeConfig() { // write the plugin settings to the rc file - KConfig *config = new KConfig(locateLocal("appdata", "plugins.rc")); + TDEConfig *config = new TDEConfig(locateLocal("appdata", "plugins.rc")); TQStringList names = pluginNames(); diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index aed1942e..3e29c099 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -167,7 +167,7 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) } -void Project::readConfig(KConfig *config) +void Project::readConfig(TDEConfig *config) { d->config = config; config->setGroup("General Options"); @@ -209,10 +209,10 @@ void Project::loadLastProject(bool reload) TQString tempPath = tempList[0]; TQString sessionTempPath = sessionTempList[0]; // test if the remote project is available - if ( KIO::NetAccess::exists(url, false, d->m_mainWindow) ) + if ( TDEIO::NetAccess::exists(url, false, d->m_mainWindow) ) { KURL tempURL = KURL().fromPathOrURL(tempPath); - if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) && + if (TDEIO::NetAccess::exists(tempURL, false, d->m_mainWindow) && KMessageBox::questionYesNo(d->m_mainWindow, i18n("Found a backup for project %1.
Do you want to open it?").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) == KMessageBox::Yes) { @@ -448,7 +448,7 @@ void Project::slotRemove(const KURL& urlToRemove) TQString passwd = password(e.attribute("remote_protocol") + "://" + e.attribute("user") + "@" + e.attribute("remote_host")); baseUrl.setPass(passwd); baseUrl.addPath(urlPath); - KIO::NetAccess::del(baseUrl, d->m_mainWindow); + TDEIO::NetAccess::del(baseUrl, d->m_mainWindow); } } } @@ -997,7 +997,7 @@ KURL Project::projectBaseURL() void Project::savePassword(const TQString &entry, const TQString &passwd, bool store) { d->m_passwdList[entry] = passwd; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Projects"); if (store) { @@ -1017,7 +1017,7 @@ TQString Project::password(const TQString &entry) return d->m_passwdList[entry]; else { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Projects"); TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,"")); // TQString passwd = config->readEntry(d->projectName + " | " + entry,""); @@ -1027,7 +1027,7 @@ TQString Project::password(const TQString &entry) bool Project::passwordSaved(const TQString &entry) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("Projects"); TQString passwd = KStringHandler::obscure(config->readEntry(d->projectName + " | " + entry,"")); // TQString passwd = config->readEntry(d->projectName + " | " + entry,""); diff --git a/quanta/project/project.h b/quanta/project/project.h index 9014d16f..42d18fef 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -36,7 +36,7 @@ typedef TQMap > EventActions; *@author Yacovlev Alexander & Dmitry Poplavsky & Andras Mantia & Jens Herden */ -class KConfig; +class TDEConfig; class KMainWindow; struct TeamMember { @@ -80,7 +80,7 @@ public: KURL::List files(); void insertFile( const KURL& nameURL, bool repaint ); - void readConfig(KConfig *); + void readConfig(TDEConfig *); /** loads the last project again if reload == true but checks in any case if there is a left over project from a crash */ diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index fb67e4fb..97d824f4 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -352,7 +352,7 @@ void ProjectNewLocal::slotClearList() //Really wondering why would we delete the files from baseURL??? //I've added this code, but I don't remember the reason. :-( //Anyway, it is quite evil thing to do. - //KIO::del( baseURL ); + //TDEIO::del( baseURL ); listView->clear(); fileList.clear(); checkInsert->setChecked(false); diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index fd49f0ce..096ef83f 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -1010,7 +1010,7 @@ bool ProjectPrivate::createEmptyDom() tempFile->close(); result = QExtFileInfo::createDir(baseURL, m_mainWindow); if (result) - result = KIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow); + result = TDEIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow); if (result) m_tmpProjectFile = tempFile->name(); @@ -1019,7 +1019,7 @@ bool ProjectPrivate::createEmptyDom() sessionTempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8); *(sessionTempFile->textStream()) << sessionStr; sessionTempFile->close(); - result = KIO::NetAccess::upload(sessionTempFile->name(), sessionURL, m_mainWindow); + result = TDEIO::NetAccess::upload(sessionTempFile->name(), sessionURL, m_mainWindow); if (result) m_tmpSessionFile= sessionTempFile->name(); } else @@ -1364,8 +1364,8 @@ bool ProjectPrivate::loadProject(const KURL &url) TQString sessionTmpFile; // test if url is writeable and download to local file - if (KIO::NetAccess::exists(url, false, m_mainWindow) && - KIO::NetAccess::download(url, projectTmpFile, m_mainWindow)) + if (TDEIO::NetAccess::exists(url, false, m_mainWindow) && + TDEIO::NetAccess::download(url, projectTmpFile, m_mainWindow)) { if (parent->hasProject()) { @@ -1378,8 +1378,8 @@ bool ProjectPrivate::loadProject(const KURL &url) else fileName += ".session"; sessionURL.setFileName(fileName); - if (KIO::NetAccess::exists(sessionURL, false, m_mainWindow)) - KIO::NetAccess::download(sessionURL, sessionTmpFile, m_mainWindow); + if (TDEIO::NetAccess::exists(sessionURL, false, m_mainWindow)) + TDEIO::NetAccess::download(sessionURL, sessionTmpFile, m_mainWindow); else { TQString sessionStr; @@ -1635,7 +1635,7 @@ bool ProjectPrivate::uploadProjectFile() m_tmpProjectFile = TQString(); return true; } - if (KIO::NetAccess::upload(m_tmpProjectFile, projectURL, m_mainWindow) && KIO::NetAccess::upload(m_tmpSessionFile, sessionURL, m_mainWindow)) + if (TDEIO::NetAccess::upload(m_tmpProjectFile, projectURL, m_mainWindow) && TDEIO::NetAccess::upload(m_tmpSessionFile, sessionURL, m_mainWindow)) { removeFromConfig(projectURL.url()); // remove the project from the list of open projects if (quantaApp) @@ -1647,11 +1647,11 @@ bool ProjectPrivate::uploadProjectFile() delete sessionTempFile; sessionTempFile = 0L; // second the one from downloading a project - KIO::NetAccess::removeTempFile(m_tmpProjectFile); - KIO::NetAccess::removeTempFile(m_tmpSessionFile); + TDEIO::NetAccess::removeTempFile(m_tmpProjectFile); + TDEIO::NetAccess::removeTempFile(m_tmpSessionFile); // third if we recovered after crash - KIO::NetAccess::del(KURL().fromPathOrURL(m_tmpProjectFile), m_mainWindow); - KIO::NetAccess::del(KURL().fromPathOrURL(m_tmpSessionFile), m_mainWindow); + TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tmpProjectFile), m_mainWindow); + TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tmpSessionFile), m_mainWindow); m_tmpProjectFile = ""; m_tmpSessionFile = ""; } @@ -1660,7 +1660,7 @@ bool ProjectPrivate::uploadProjectFile() if (quantaApp) { parent->statusMsg(TQString() ); - KMessageBox::error(m_mainWindow, KIO::NetAccess::lastErrorString()); + KMessageBox::error(m_mainWindow, TDEIO::NetAccess::lastErrorString()); } return false; } diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index aa01a91d..0b0a14df 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -32,7 +32,7 @@ class TQWidgetStack; class KAction; class KActionCollection; -class KConfig; +class TDEConfig; class KDirWatch; class KRecentFilesAction; class KSelectAction; @@ -83,7 +83,7 @@ upload.*/ TQWidgetStack *stack; TQString currentProjectView; - KConfig *config; + TDEConfig *config; bool m_modified; bool m_excludeCvsignore; /** Default DTD for this project. */ diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index f38cf937..1f389cb4 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -158,7 +158,7 @@ void ProjectUpload::slotBuildTree() { emit eventHappened("upload_requested", m_project->projectBaseURL().url(), ""); loadRemoteUploadInfo(); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQString strUrl = QuantaCommon::qUrl(startUrl); bool isDirectory = strUrl.endsWith("/"); bool forceUpload = !startUrl.isEmpty(); @@ -209,7 +209,7 @@ void ProjectUpload::slotBuildTree() int uploadedTime = -1; if (m_uploadTimeList.contains(s)) uploadedTime = m_uploadTimeList[s]; - int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME); + int modifiedTime = item.time(TDEIO::UDS_MODIFICATION_TIME); el.setAttribute("modified_time", modifiedTime); int uploadStatus = el.attribute("uploadstatus", "1").toInt(); if (m_quickUpload || (forceUpload && uploadStatus == 0)) @@ -454,14 +454,14 @@ void ProjectUpload::upload() if (!from.fileName(false).isEmpty() && fileItem) { emit eventHappened("before_upload", from.url(), to.url()); - KIO::FileCopyJob *job = KIO::file_copy( from, to, fileItem->permissions(), true, false, false ); + TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ),this, - TQT_SLOT( uploadFinished( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( percent( KIO::Job *,unsigned long ) ), - this, TQT_SLOT( uploadProgress( KIO::Job *,unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ), - this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this, + TQT_SLOT( uploadFinished( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), + this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); + connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), + this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); @@ -477,7 +477,7 @@ void ProjectUpload::upload() reject(); } -void ProjectUpload::uploadFinished( KIO::Job *job ) +void ProjectUpload::uploadFinished( TDEIO::Job *job ) { if ( !job ) return; @@ -489,18 +489,18 @@ void ProjectUpload::uploadFinished( KIO::Job *job ) saveRemoteUploadInfo(); return; } - KIO::FileCopyJob *fJob = dynamic_cast(job); + TDEIO::FileCopyJob *fJob = dynamic_cast(job); if (fJob) emit eventHappened("after_upload", fJob->srcURL().url(), fJob->destURL().url()); slotUploadNext(); } -void ProjectUpload::uploadProgress ( KIO::Job *, unsigned long percent ) +void ProjectUpload::uploadProgress ( TDEIO::Job *, unsigned long percent ) { currentProgress->setProgress( percent ); } -void ProjectUpload::uploadMessage ( KIO::Job *, const TQString & msg ) +void ProjectUpload::uploadMessage ( TDEIO::Job *, const TQString & msg ) { labelCurFile->setText( currentURL.fileName() + " : " + msg ); } diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h index 473f3e7e..bd341eec 100644 --- a/quanta/project/projectupload.h +++ b/quanta/project/projectupload.h @@ -56,9 +56,9 @@ public slots: // Public slots protected slots: void startUpload(); void upload(); - void uploadFinished( KIO::Job *job ); - void uploadProgress ( KIO::Job *job, unsigned long percent ); - void uploadMessage ( KIO::Job *, const TQString & msg ); + void uploadFinished( TDEIO::Job *job ); + void uploadProgress ( TDEIO::Job *job, unsigned long percent ); + void uploadMessage ( TDEIO::Job *, const TQString & msg ); void slotUploadNext(); void clearSelection(); diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index daa628a5..5f5ebc71 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -53,13 +53,13 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, co excludeRx = p_excludeRx; progressText->setText(i18n("Reading folder:")); - KIO::ListJob *job = KIO::listRecursive( baseURL, false ); + TDEIO::ListJob *job = TDEIO::listRecursive( baseURL, false ); m_listJobCount = 1; - connect( job, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(KIO::Job *,const KIO::UDSEntryList &))); - connect( job, TQT_SIGNAL(result(KIO::Job *)), - this,TQT_SLOT (slotListDone(KIO::Job *))); + connect( job, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( job, TQT_SIGNAL(result(TDEIO::Job *)), + this,TQT_SLOT (slotListDone(TDEIO::Job *))); connect( buttonSelect, TQT_SIGNAL(clicked()), @@ -83,16 +83,16 @@ RescanPrj::~RescanPrj() urlList.clear(); } -void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) +void RescanPrj::addEntries(TDEIO::Job *job,const TDEIO::UDSEntryList &list) { - KURL url = static_cast(job)->url(); + KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again static const TQString& dot = TDEGlobal::staticQString("."); static const TQString& dotdot = TDEGlobal::staticQString(".."); - KIO::UDSEntryListConstIterator it = list.begin(); - KIO::UDSEntryListConstIterator end = list.end(); + TDEIO::UDSEntryListConstIterator it = list.begin(); + TDEIO::UDSEntryListConstIterator end = list.end(); KURL itemURL; URLListEntry urlEntry; TQString name; @@ -148,13 +148,13 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) } for (TQPtrList::ConstIterator it = linkItems.constBegin(); it != linkItems.constEnd(); ++it) { - KIO::ListJob *ljob = KIO::listRecursive( (*it)->url(), false ); + TDEIO::ListJob *ljob = TDEIO::listRecursive( (*it)->url(), false ); m_listJobCount++; - connect( ljob, TQT_SIGNAL(entries(KIO::Job *,const KIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(KIO::Job *,const KIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(KIO::Job *)), - this,TQT_SLOT (slotListDone(KIO::Job *))); + connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), + this,TQT_SLOT (slotListDone(TDEIO::Job *))); } } @@ -220,7 +220,7 @@ KURL::List RescanPrj::files() return r; } /** No descriptions */ -void RescanPrj::slotListDone(KIO::Job *) +void RescanPrj::slotListDone(TDEIO::Job *) { m_listJobCount--; // kdDebug(24000) << "slotListDone " << m_listJobCount << endl; diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index bfc7b635..da3844ac 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -51,7 +51,7 @@ public slots: KURL::List files(); - void addEntries(KIO::Job *,const KIO::UDSEntryList &); + void addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &); private: KURL baseURL; @@ -62,7 +62,7 @@ private: protected slots: // Protected slots /** No descriptions */ - void slotListDone(KIO::Job *); + void slotListDone(TDEIO::Job *); }; #endif diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index b2c7001b..5a384a85 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -147,7 +147,7 @@ - + @@ -261,7 +261,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -275,7 +275,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -519,7 +519,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -573,7 +573,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -875,13 +875,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1024,10 +1024,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1036,13 +1036,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1171,13 +1171,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + - + @@ -1318,7 +1318,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + @@ -1346,7 +1346,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + 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("Cannot download %1.").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 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: %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; 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 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) diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index e5329b8a..734220b8 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -241,7 +241,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse void QuantaBookmarks::bookmarkMenuAboutToShow() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); if (config->hasGroup("Kate View Defaults")) { config->setGroup("Kate View Defaults"); diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index 4a1d61f5..e29c1013 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -714,7 +714,7 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window) return result; } -TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pKey) +TQStringList QuantaCommon::readPathListEntry(TDEConfig *config, const TQString &pKey) { TQStringList list = config->readPathListEntry(pKey); TQStringList::Iterator end = list.end(); @@ -730,7 +730,7 @@ TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pK return list; } -TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey) +TQString QuantaCommon::readPathEntry(TDEConfig *config, const TQString &pKey) { TQString path = config->readPathEntry(pKey); KURL u = KURL::fromPathOrURL(path); diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h index 91e08f57..586b7e50 100644 --- a/quanta/utility/quantacommon.h +++ b/quanta/utility/quantacommon.h @@ -35,7 +35,7 @@ class KStandardDirs; class TQWidget; class Tag; -class KConfig; +class TDEConfig; class KPopupMenu; /** Describes one abbreviation group */ @@ -196,20 +196,20 @@ pointer must be deleted by the caller!! */ static bool checkOverwrite(const KURL& url, TQWidget *window); /** - * Same as KConfigBase::readPathListEntry, but resolves symlinks + * Same as TDEConfigBase::readPathListEntry, but resolves symlinks * @param config * @param pKey * @return */ - static TQStringList readPathListEntry(KConfig *config, const TQString &pKey); + static TQStringList readPathListEntry(TDEConfig *config, const TQString &pKey); /** - * Same as KConfigBase::readPathEntry, but resolves symlinks + * Same as TDEConfigBase::readPathEntry, but resolves symlinks * @param config * @param pKey * @return */ - static TQString readPathEntry(KConfig *config, const TQString &pKey); + static TQString readPathEntry(TDEConfig *config, const TQString &pKey); /** * Returns the HTML encoding string for character with the specified code. diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp index 375f6f6d..6fa248eb 100644 --- a/quanta/utility/quantanetaccess.cpp +++ b/quanta/utility/quantanetaccess.cpp @@ -30,7 +30,7 @@ bool QuantaNetAccess::upload(const TQString& src, const KURL& target, TQWidget* window, bool confirm) { - bool ok = KIO::NetAccess::upload(src, target, window); + bool ok = TDEIO::NetAccess::upload(src, target, window); if (ok) { checkProjectInsert(target, window, confirm); } else { @@ -44,7 +44,7 @@ bool QuantaNetAccess::upload(const TQString& src, const KURL& target, TQWidget* bool QuantaNetAccess::file_copy( const KURL& src, const KURL& target, int permissions, bool overwrite, bool resume, TQWidget* window, bool confirm) { - bool ok = KIO::NetAccess::file_copy( src, target, permissions, overwrite, resume, window ); + bool ok = TDEIO::NetAccess::file_copy( src, target, permissions, overwrite, resume, window ); if (ok) { checkProjectInsert(target, window, confirm); } else { @@ -68,7 +68,7 @@ bool QuantaNetAccess::file_move( const KURL& src, const KURL& target, int permis if ( !checkProjectRemove(src, window, confirm)) { return false; } - bool ok = KIO::NetAccess::file_move( src, target, permissions, overwrite, resume, window ); + bool ok = TDEIO::NetAccess::file_move( src, target, permissions, overwrite, resume, window ); if (ok) { checkProjectInsert(target, window, confirm); } else { @@ -81,7 +81,7 @@ bool QuantaNetAccess::file_move( const KURL& src, const KURL& target, int permis bool QuantaNetAccess::dircopy( const KURL::List & srcList, const KURL & target, TQWidget* window, bool confirm ) { - bool ok = KIO::NetAccess::dircopy( srcList, target, window ); + bool ok = TDEIO::NetAccess::dircopy( srcList, target, window ); if (ok) { KURL url; for ( KURL::List::ConstIterator it = srcList.begin(); it != srcList.end(); ++it ) { @@ -124,7 +124,7 @@ bool QuantaNetAccess::move( const KURL::List& srcList, const KURL& target, TQWid if ( Project::ref()->projectBaseURL().isParentOf(*it) ) Project::ref()->slotRemove(*it); } - bool ok = KIO::NetAccess::move( srcList, targetURL, window ); + bool ok = TDEIO::NetAccess::move( srcList, targetURL, window ); if (ok) { KURL url; for ( KURL::List::ConstIterator it = srcList.begin(); it != srcList.end(); ++it ) { @@ -147,7 +147,7 @@ bool QuantaNetAccess::del( const KURL & url, TQWidget* window, bool confirm ) if ( !checkProjectDel(url, window, confirm)) { return false; } - bool ok = KIO::NetAccess::del( url, window ); + bool ok = TDEIO::NetAccess::del( url, window ); if (!ok && confirm) { errorMsg(window); @@ -160,7 +160,7 @@ bool QuantaNetAccess::mkdir( const KURL & url, TQWidget* window, int permissions { KURL u = url; u.adjustPath(-1); //some servers refuse to create directories ending with a slash - bool ok = KIO::NetAccess::mkdir( u, window, permissions ); + bool ok = TDEIO::NetAccess::mkdir( u, window, permissions ); if (ok) { checkProjectInsert(url, window, confirm); } else { @@ -262,7 +262,7 @@ KURL QuantaNetAccess::adjustURL(const KURL &url) void QuantaNetAccess::errorMsg(TQWidget* window) { - TQString msg = KIO::NetAccess::lastErrorString(); + TQString msg = TDEIO::NetAccess::lastErrorString(); if ( !msg.isEmpty()) KMessageBox::sorry(window, msg); } diff --git a/quanta/utility/quantanetaccess.h b/quanta/utility/quantanetaccess.h index 39798354..450db7d2 100644 --- a/quanta/utility/quantanetaccess.h +++ b/quanta/utility/quantanetaccess.h @@ -19,7 +19,7 @@ /** @short helperclass to track changes in the project - This class be used as replacement of KIO::NetAccess (look there for details). + This class be used as replacement of TDEIO::NetAccess (look there for details). Every possible impact on the project will be monitored and signaled to the project. If you don't want user interaction use the extra parameter confirm diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 22ba46d5..58af9c65 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -186,7 +186,7 @@ void TagActionSet::slotApplySourceIndentation() QuantaView* view = ViewManager::ref()->activeView(); NodeModifsSet *modifs = new NodeModifsSet(); - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup("Kate Document Defaults"); int indentationWidth = config->readNumEntry("Indentation Width", 4);