diff options
746 files changed, 3622 insertions, 3622 deletions
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index 15a826872..a3abb27c8 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -814,7 +814,7 @@ class Cfg2k: public ThemeEngineConfig { Q_OBJECT public: - Cfg2k( KConfig * ); + Cfg2k( TDEConfig * ); }; class ObjKsTheme; @@ -828,7 +828,7 @@ public: { return( QString("KSplash2k") ); } - inline const KDialogBase *config( KConfig *kc ) + inline const KDialogBase *config( TDEConfig *kc ) { return new Cfg2k( kc ); } @@ -924,7 +924,7 @@ void Theme2k::readSettings() if( !mTheme ) return; - KConfig *cfg = mTheme->themeConfig(); + TDEConfig *cfg = mTheme->themeConfig(); if( !cfg ) return; @@ -1099,7 +1099,7 @@ appropriate plugin.</para> K_EXPORT_COMPONENT_FACTORY( ksplash2k, KGenericFactory<Theme2k> ); -Cfg2k::Cfg2k( KConfig * ) +Cfg2k::Cfg2k( TDEConfig * ) {} Theme2k::Theme2k( QWidget *parent, const char *name, const QStringList &args @@ -1164,7 +1164,7 @@ void Theme2k::readSettings() if( !mTheme ) return; - KConfig *cfg = mTheme->themeConfig(); + TDEConfig *cfg = mTheme->themeConfig(); if( !cfg ) return; diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index e73baee75..5760b000e 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger() bool KrashDebugger::performChecks( TQString* msg ) { bool ret = true; - KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true ); + TDEConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true ); kdedcfg.setGroup( "General" ); if( kdedcfg.readBoolEntry( "DelayedCheck", false )) { diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 9bdf405e2..b7ce210fe 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -88,7 +88,7 @@ void KrashConfig :: readConfig() KStartupInfo::sendFinish( id ); } - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("drkonqi"); // maybe we should check if it's relative? @@ -98,7 +98,7 @@ void KrashConfig :: readConfig() TQString debuggername = config->readEntry("Debugger", TQString::fromLatin1("gdb")); - KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername), + TDEConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername), true, false, "appdata"); debuggers.setGroup("General"); @@ -112,7 +112,7 @@ void KrashConfig :: readConfig() m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); m_kcrashRegExp = debuggers.readEntry("KCrashRegExp"); - KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname), + TDEConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname), true, false, "appdata"); preset.setGroup("ErrorDescription"); diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 9bf1c4150..6dbde4a7e 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -352,7 +352,7 @@ bool KateApp::openInput (const TQString &text) return true; } -KateMainWindow *KateApp::newMainWindow (KConfig *sconfig, const TQString &sgroup) +KateMainWindow *KateApp::newMainWindow (TDEConfig *sconfig, const TQString &sgroup) { KateMainWindow *mainWindow = new KateMainWindow (sconfig, sgroup); m_mainWindows.push_back (mainWindow); diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h index fb7d30f5b..e18dba866 100644 --- a/kate/app/kateapp.h +++ b/kate/app/kateapp.h @@ -140,7 +140,7 @@ class KDE_EXPORT KateApp : public TDEApplication * @param sgroup session group for this window * @return new constructed main window */ - KateMainWindow *newMainWindow (KConfig *sconfig = 0, const TQString &sgroup = ""); + KateMainWindow *newMainWindow (TDEConfig *sconfig = 0, const TQString &sgroup = ""); /** * removes the mainwindow given, DOES NOT DELETE IT diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index 1433d95be..afa77b6a5 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -68,7 +68,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) parent, "configdialog" ) { - KConfig *config = KateApp::self()->config(); + TDEConfig *config = KateApp::self()->config(); KWin::setIcons( winId(), KateApp::self()->icon(), KateApp::self()->miniIcon() ); @@ -372,7 +372,7 @@ void KateConfigDialog::slotOk() void KateConfigDialog::slotApply() { - KConfig *config = KateApp::self()->config(); + TDEConfig *config = KateApp::self()->config(); // if data changed apply the kate app stuff if( dataChanged ) diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index f23d5abba..8e895e019 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -60,7 +60,7 @@ KateDocManager::KateDocManager (TQObject *parent) m_dcop = new KateDocManagerDCOPIface (this); - m_metaInfos = new KConfig("metainfos", false, false, "appdata"); + m_metaInfos = new TDEConfig("metainfos", false, false, "appdata"); createDoc (); } @@ -315,7 +315,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL) "Do you want to delete it anyway?").arg(m_tempFiles[ documentNumber ].first.prettyURL()), i18n("Delete File?") ) == KMessageBox::Yes*/ ) { - KIO::del( m_tempFiles[ documentNumber ].first, false, false ); + TDEIO::del( m_tempFiles[ documentNumber ].first, false, false ); kdDebug(13001)<<"Deleted temporary file "<<m_tempFiles[ documentNumber ].first<<endl; m_tempFiles.remove( documentNumber ); } @@ -444,7 +444,7 @@ void KateDocManager::saveAll() ((Kate::View*)it.current()->views().first())->save(); } -void KateDocManager::saveDocumentList (KConfig* config) +void KateDocManager::saveDocumentList (TDEConfig* config) { TQString prevGrp=config->group(); config->setGroup ("Open Documents"); @@ -466,7 +466,7 @@ void KateDocManager::saveDocumentList (KConfig* config) config->setGroup(prevGrp); } -void KateDocManager::restoreDocumentList (KConfig* config) +void KateDocManager::restoreDocumentList (TDEConfig* config) { TQString prevGrp=config->group(); config->setGroup ("Open Documents"); diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h index 25b1ba631..1eaef7f99 100644 --- a/kate/app/katedocmanager.h +++ b/kate/app/katedocmanager.h @@ -36,7 +36,7 @@ namespace KParts { class Factory; } -class KConfig; +class TDEConfig; class DCOPObject; class KateDocumentInfo @@ -104,8 +104,8 @@ class KateDocManager : public TQObject TQPtrList<Kate::Document> modifiedDocumentList(); bool queryCloseDocuments(KateMainWindow *w); - void saveDocumentList (class KConfig *config); - void restoreDocumentList (class KConfig *config); + void saveDocumentList (class TDEConfig *config); + void restoreDocumentList (class TDEConfig *config); DCOPObject *dcopObject () { return m_dcop; }; @@ -143,7 +143,7 @@ class KateDocManager : public TQObject TQPtrDict<KateDocumentInfo> m_docInfos; TQMap<uint,TPair> m_tempFiles; TQGuardedPtr<Kate::Document> m_currentDoc; - KConfig *m_metaInfos; + TDEConfig *m_metaInfos; bool m_saveMetaInfos; int m_daysMetaInfos; diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index ec1e92847..1ceab8a23 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -151,7 +151,7 @@ void KateExternalToolsCommand::reload () { m_list.clear(); m_map.clear(); - KConfig config("externaltools", false, false, "appdata"); + TDEConfig config("externaltools", false, false, "appdata"); config.setGroup("Global"); TQStringList tools = config.readListEntry("tools"); @@ -312,7 +312,7 @@ void KateExternalToolsMenuAction::reload() popupMenu()->clear(); // load all the tools, and create a action for each of them - KConfig *config = new KConfig( "externaltools", false, false, "appdata" ); + TDEConfig *config = new TDEConfig( "externaltools", false, false, "appdata" ); config->setGroup( "Global" ); TQStringList tools = config->readListEntry( "tools" ); @@ -601,7 +601,7 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent, TQWhatsThis::add( lbTools, i18n( "This list shows all the configured tools, represented by their menu text.") ); - config = new KConfig("externaltools", false, false, "appdata"); + config = new TDEConfig("externaltools", false, false, "appdata"); reload(); slotSelectionChanged(); } @@ -616,7 +616,7 @@ void KateExternalToolsConfigWidget::reload() //m_tools.clear(); lbTools->clear(); - // load the files from a KConfig + // load the files from a TDEConfig config->setGroup( "Global" ); TQStringList tools = config->readListEntry("tools"); diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h index 507e1cfca..1d88ab847 100644 --- a/kate/app/kateexternaltools.h +++ b/kate/app/kateexternaltools.h @@ -171,7 +171,7 @@ class KateExternalToolsConfigWidget : public Kate::ConfigPage class KListBox *lbTools; class TQPushButton *btnNew, *btnRemove, *btnEdit, *btnMoveUp, *btnMoveDwn; - class KConfig *config; + class TDEConfig *config; bool m_changed; }; diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index cda0d6b00..f956c9ea5 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -480,7 +480,7 @@ void KateFileList::updateSort () updateFileListLocations(); } -void KateFileList::readConfig( KConfig *config, const TQString &group ) +void KateFileList::readConfig( TDEConfig *config, const TQString &group ) { TQString oldgroup = config->group(); config->setGroup( group ); @@ -495,7 +495,7 @@ void KateFileList::readConfig( KConfig *config, const TQString &group ) config->setGroup( oldgroup ); } -void KateFileList::writeConfig( KConfig *config, const TQString &group ) +void KateFileList::writeConfig( TDEConfig *config, const TQString &group ) { TQString oldgroup = config->group(); config->setGroup( group ); @@ -715,7 +715,7 @@ void KFLConfigPage::apply() void KFLConfigPage::reload() { // read in from config file - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup( "Filelist" ); cbEnableShading->setChecked( config->readBoolEntry("Shading Enabled", &m_filelist->m_enableBgShading ) ); kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) ); diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h index 76403c1e8..dd166b460 100644 --- a/kate/app/katefilelist.h +++ b/kate/app/katefilelist.h @@ -102,8 +102,8 @@ class KateFileList : public KListView TQColor viewShade() const { return m_viewShade; } bool shadingEnabled() { return m_enableBgShading; } - void readConfig( class KConfig *config, const TQString &group ); - void writeConfig( class KConfig *config, const TQString &group ); + void readConfig( class TDEConfig *config, const TQString &group ); + void writeConfig( class TDEConfig *config, const TQString &group ); /** * reimplemented to remove the item from the history stacks diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index de2b617a5..0482b2739 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -216,7 +216,7 @@ KateFileSelector::~KateFileSelector() //BEGIN Public Methods -void KateFileSelector::readConfig(KConfig *config, const TQString & name) +void KateFileSelector::readConfig(TDEConfig *config, const TQString & name) { dir->setViewConfig( config, name + ":view" ); dir->readConfig(config, name + ":dir"); @@ -258,7 +258,7 @@ void KateFileSelector::initialDirChangeHack() setDir( waitingDir ); } -void KateFileSelector::setupToolbar( KConfig *config ) +void KateFileSelector::setupToolbar( TDEConfig *config ) { toolbar->clear(); TQStringList tbactions = config->readListEntry( "toolbar actions", ',' ); @@ -279,7 +279,7 @@ void KateFileSelector::setupToolbar( KConfig *config ) } } -void KateFileSelector::writeConfig(KConfig *config, const TQString & name) +void KateFileSelector::writeConfig(TDEConfig *config, const TQString & name) { dir->writeConfig(config,name + ":dir"); @@ -630,7 +630,7 @@ void KFSConfigPage::apply() m_changed = false; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup( "fileselector" ); // toolbar TQStringList l; @@ -672,7 +672,7 @@ void KFSConfigPage::reload() } void KFSConfigPage::init() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup( "fileselector" ); // toolbar TQStringList l = config->readListEntry( "toolbar actions", ',' ); diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h index 285418d64..7a6f9c728 100644 --- a/kate/app/katefileselector.h +++ b/kate/app/katefileselector.h @@ -83,9 +83,9 @@ class KateFileSelector : public TQVBox TQWidget * parent = 0, const char * name = 0 ); ~KateFileSelector(); - void readConfig( KConfig *, const TQString & ); - void writeConfig( KConfig *, const TQString & ); - void setupToolbar( KConfig * ); + void readConfig( TDEConfig *, const TQString & ); + void writeConfig( TDEConfig *, const TQString & ); + void setupToolbar( TDEConfig * ); void setView( KFile::FileView ); KDirOperator *dirOperator(){ return dir; } KActionCollection *actionCollection() { return mActionCollection; }; diff --git a/kate/app/kategrepdialog.h b/kate/app/kategrepdialog.h index 0d8d48366..a3cbbc871 100644 --- a/kate/app/kategrepdialog.h +++ b/kate/app/kategrepdialog.h @@ -31,7 +31,7 @@ class TQListBox; class KPushButton; class TQLabel; class TDEProcess; -class KConfig; +class TDEConfig; class KURLRequester; class TQEvent; @@ -85,7 +85,7 @@ private: TDEProcess *childproc; TQString buf; TQString errbuf; - KConfig* config; + TDEConfig* config; TQStringList lastSearchItems; TQStringList lastSearchPaths; TQStringList lastSearchFiles; diff --git a/kate/app/katemain.h b/kate/app/katemain.h index 5c9c3d1b9..6a6eaedbc 100644 --- a/kate/app/katemain.h +++ b/kate/app/katemain.h @@ -38,7 +38,7 @@ class TQWidgetStack; class KAction; class KActionMenu; -class KConfig; +class TDEConfig; class KDirOperator; class KEditToolbar; class KFileViewItem; diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index cc19881cb..e0967695e 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -86,7 +86,7 @@ uint KateMainWindow::uniqueID = 1; -KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) +KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup) : KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1()) { // first the very important id @@ -402,7 +402,7 @@ void KateMainWindow::slotFileQuit() void KateMainWindow::readOptions () { - KConfig *config = KateApp::self()->config (); + TDEConfig *config = KateApp::self()->config (); config->setGroup("General"); syncKonsole = config->readBoolEntry("Sync Konsole", true); @@ -420,7 +420,7 @@ void KateMainWindow::readOptions () void KateMainWindow::saveOptions () { - KConfig *config = KateApp::self()->config (); + TDEConfig *config = KateApp::self()->config (); config->setGroup("General"); @@ -553,7 +553,7 @@ void KateMainWindow::editKeys() } } - externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new KConfig("externaltools", false, false, "appdata") ); + externalTools->actionCollection()->writeShortcutSettings( "Shortcuts", new TDEConfig("externaltools", false, false, "appdata") ); } void KateMainWindow::openURL (const TQString &name) @@ -823,7 +823,7 @@ void KateMainWindow::updateCaption (Kate::Document *doc) m_viewManager->activeView()->getDoc()->isModified()); } -void KateMainWindow::saveProperties(KConfig *config) +void KateMainWindow::saveProperties(TDEConfig *config) { TQString grp=config->group(); @@ -833,7 +833,7 @@ void KateMainWindow::saveProperties(KConfig *config) config->setGroup(grp); } -void KateMainWindow::readProperties(KConfig *config) +void KateMainWindow::readProperties(TDEConfig *config) { TQString grp=config->group(); @@ -844,7 +844,7 @@ void KateMainWindow::readProperties(KConfig *config) config->setGroup(grp); } -void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig ) +void KateMainWindow::saveGlobalProperties( TDEConfig* sessionConfig ) { KateDocManager::self()->saveDocumentList (sessionConfig); diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h index 77db9999c..f6b20dfa5 100644 --- a/kate/app/katemainwindow.h +++ b/kate/app/katemainwindow.h @@ -58,7 +58,7 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa * @param sconfig session config for this window, 0 if none * @param sgroup session config group to use */ - KateMainWindow (KConfig *sconfig, const TQString &sgroup); + KateMainWindow (TDEConfig *sconfig, const TQString &sgroup); /** * Destruct the nice window @@ -102,9 +102,9 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa KateTabWidget *tabWidget (); public: - void readProperties(KConfig *config); - void saveProperties(KConfig *config); - void saveGlobalProperties( KConfig* sessionConfig ); + void readProperties(TDEConfig *config); + void saveProperties(TDEConfig *config); + void saveGlobalProperties( TDEConfig* sessionConfig ); public: bool queryClose_internal(); diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 4220a4b15..874639652 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -167,7 +167,7 @@ void GUIClient::registerToolView (ToolView *tv) // try to read the action shortcut KShortcut sc; - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); TQString _grp = cfg->group(); cfg->setGroup("Shortcuts"); sc = KShortcut( cfg->readEntry( aname, "" ) ); @@ -542,7 +542,7 @@ class TmpToolViewSorter unsigned int pos; }; -void Sidebar::restoreSession (KConfig *config) +void Sidebar::restoreSession (TDEConfig *config) { // get the last correct placed toolview unsigned int firstWrong = 0; @@ -637,7 +637,7 @@ void Sidebar::restoreSession (KConfig *config) m_ownSplit->hide(); } -void Sidebar::saveSession (KConfig *config) +void Sidebar::saveSession (TDEConfig *config) { // store the own splitter sizes TQValueList<int> s = m_ownSplit->sizes(); @@ -847,7 +847,7 @@ bool MainWindow::hideToolView (ToolView *widget) return widget->sidebar()->hideWidget (widget); } -void MainWindow::startRestore (KConfig *config, const TQString &group) +void MainWindow::startRestore (TDEConfig *config, const TQString &group) { // first save this stuff m_restoreConfig = config; @@ -929,7 +929,7 @@ void MainWindow::finishRestore () m_restoreGroup = ""; } -void MainWindow::saveSession (KConfig *config, const TQString &group) +void MainWindow::saveSession (TDEConfig *config, const TQString &group) { if (!config) return; diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index 57ccd325f..e4649e7f4 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -207,13 +207,13 @@ class Sidebar : public KMultiTabBar * restore the current session config from given object, use current group * @param config config object to use */ - void restoreSession (KConfig *config); + void restoreSession (TDEConfig *config); /** * save the current session config to given object, use current group * @param config config object to use */ - void saveSession (KConfig *config); + void saveSession (TDEConfig *config); public slots: // reimplemented, to block a show() call if we have no children or if @@ -370,7 +370,7 @@ class MainWindow : public KParts::MainWindow * @param config config object to use * @param group config group to use */ - void startRestore (KConfig *config, const TQString &group); + void startRestore (TDEConfig *config, const TQString &group); /** * finish the restore @@ -382,7 +382,7 @@ class MainWindow : public KParts::MainWindow * @param config config object to use * @param group config group to use */ - void saveSession (KConfig *config, const TQString &group); + void saveSession (TDEConfig *config, const TQString &group); /** * internal data ;) @@ -428,7 +428,7 @@ class MainWindow : public KParts::MainWindow * config object for session restore, only valid between * start and finish restore calls */ - KConfig *m_restoreConfig; + TDEConfig *m_restoreConfig; /** * restore group diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index e21b9f29b..104c4abda 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -169,7 +169,7 @@ bool KateSession::rename (const TQString &name) m_sessionName = name; - KConfig config (sessionFile (), false, false); + TDEConfig config (sessionFile (), false, false); config.setGroup ("General"); config.writeEntry ("Name", m_sessionName); config.sync (); @@ -177,7 +177,7 @@ bool KateSession::rename (const TQString &name) return true; } -KConfig *KateSession::configRead () +TDEConfig *KateSession::configRead () { if (m_sessionFileRel.isEmpty()) return 0; @@ -188,7 +188,7 @@ KConfig *KateSession::configRead () return m_readConfig = new KSimpleConfig (sessionFile (), true); } -KConfig *KateSession::configWrite () +TDEConfig *KateSession::configWrite () { if (m_sessionFileRel.isEmpty()) return 0; @@ -288,7 +288,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa // open the new session Kate::Document::setOpenErrorDialogsActivated (false); - KConfig *sc = activeSession()->configRead(); + TDEConfig *sc = activeSession()->configRead(); if (sc) KateApp::self()->documentManager()->restoreDocumentList (sc); @@ -301,7 +301,7 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa // window config if (sc) { - KConfig *c = KateApp::self()->config(); + TDEConfig *c = KateApp::self()->config(); c->setGroup("General"); if (c->readBoolEntry("Restore Window Configuration", true)) @@ -371,7 +371,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast) if (tryAsk) { // app config - KConfig *c = KateApp::self()->config(); + TDEConfig *c = KateApp::self()->config(); c->setGroup("General"); TQString sesExit (c->readEntry ("Session Exit", "save")); @@ -407,7 +407,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast) } } - KConfig *sc = activeSession()->configWrite(); + TDEConfig *sc = activeSession()->configWrite(); if (!sc) return false; @@ -428,7 +428,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast) if (rememberAsLast) { - KConfig *c = KateApp::self()->config(); + TDEConfig *c = KateApp::self()->config(); c->setGroup("General"); c->writeEntry ("Last Session", activeSession()->sessionFileRelative()); c->sync (); @@ -442,7 +442,7 @@ bool KateSessionManager::chooseSession () bool success = true; // app config - KConfig *c = KateApp::self()->config(); + TDEConfig *c = KateApp::self()->config(); c->setGroup("General"); // get last used session, default to default session diff --git a/kate/app/katesession.h b/kate/app/katesession.h index 412207b28..e636294e3 100644 --- a/kate/app/katesession.h +++ b/kate/app/katesession.h @@ -109,7 +109,7 @@ class KateSession : public KShared * return 0 if we have no file to read config from atm * @return config to read from */ - KConfig *configRead (); + TDEConfig *configRead (); /** * config to write @@ -117,7 +117,7 @@ class KateSession : public KShared * return 0 if we have no file to write config to atm * @return config to write from */ - KConfig *configWrite (); + TDEConfig *configWrite (); /** * count of documents in this session diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index d77ad0c3e..296c083b2 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -463,7 +463,7 @@ void KateViewManager::setShowFullPath( bool enable ) * session config functions */ // FIXME 3.0 - make those config goups more streamlined: "objN:objN..." -void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp) +void KateViewManager::saveViewConfiguration(TDEConfig *config,const TQString& grp) { // Use the same group name for view configuration as usual for sessions. // (When called by session manager grp is a 1-based index for the main window) @@ -481,7 +481,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp) } } -void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString& grp) +void KateViewManager::restoreViewConfiguration (TDEConfig *config, const TQString& grp) { // Use the same group name for view configuration as usual for sessions. // (When called by session manager grp is a 1-based index for the main window) diff --git a/kate/app/kateviewmanager.h b/kate/app/kateviewmanager.h index 6bf1b5f77..01df13492 100644 --- a/kate/app/kateviewmanager.h +++ b/kate/app/kateviewmanager.h @@ -31,7 +31,7 @@ class KateMainWindow; class KateViewSpaceContainer; -class KConfig; +class TDEConfig; class KAction; class TQToolButton; @@ -60,10 +60,10 @@ class KateViewManager : public TQObject public: /* This will save the splitter configuration */ - void saveViewConfiguration(KConfig *config,const TQString& group); + void saveViewConfiguration(TDEConfig *config,const TQString& group); /* restore it */ - void restoreViewConfiguration (KConfig *config,const TQString& group); + void restoreViewConfiguration (TDEConfig *config,const TQString& group); uint openURL (const KURL &url, const TQString& encoding, bool activate = true, bool isTempFile=false); diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index 33f87e7c0..e8ba58ee5 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -233,7 +233,7 @@ void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, mStatusBar->setStatus( r, c, ovr, block, mod, msg ); } -void KateViewSpace::saveConfig ( KConfig* config, int myIndex ,const TQString& viewConfGrp) +void KateViewSpace::saveConfig ( TDEConfig* config, int myIndex ,const TQString& viewConfGrp) { // kdDebug()<<"KateViewSpace::saveConfig("<<myIndex<<", "<<viewConfGrp<<") - currentView: "<<currentView()<<")"<<endl; TQString group = TQString(viewConfGrp+"-ViewSpace %1").arg( myIndex ); @@ -272,7 +272,7 @@ void KateViewSpace::modifiedOnDisc(Kate::Document *, bool, unsigned char) mStatusBar->updateMod( currentView()->getDoc()->isModified() ); } -void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group ) +void KateViewSpace::restoreConfig ( KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group ) { config->setGroup (group); TQString fn = config->readEntry( "Active View" ); diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h index 2c82332d3..0407d35fe 100644 --- a/kate/app/kateviewspace.h +++ b/kate/app/kateviewspace.h @@ -33,7 +33,7 @@ class KVSSBSep; -class KConfig; +class TDEConfig; class KSqueezedTextLabel; class KateViewSpaceContainer; @@ -88,8 +88,8 @@ class KateViewSpace : public TQVBox Kate::View* currentView(); int viewCount() const { return mViewList.count(); } - void saveConfig (KConfig* config, int myIndex,const TQString& viewConfGrp); - void restoreConfig ( class KateViewSpaceContainer *viewMan, KConfig* config, const TQString &group ); + void saveConfig (TDEConfig* config, int myIndex,const TQString& viewConfGrp); + void restoreConfig ( class KateViewSpaceContainer *viewMan, TDEConfig* config, const TQString &group ); protected: diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 8f4e3886c..d68c42724 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -602,7 +602,7 @@ void KateViewSpaceContainer::setShowFullPath( bool enable ) * session config functions */ -void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQString& group) +void KateViewSpaceContainer::saveViewConfiguration(TDEConfig *config,const TQString& group) { bool weHaveSplittersAlive (viewSpaceCount() > 1); @@ -629,7 +629,7 @@ void KateViewSpaceContainer::saveViewConfiguration(KConfig *config,const TQStrin delete l; } -void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQString& group) +void KateViewSpaceContainer::restoreViewConfiguration (TDEConfig *config, const TQString& group) { config->setGroup(group); //config->setGroup ("View Configuration"); @@ -665,7 +665,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ } -void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, KConfig* config, const TQString& viewConfGrp ) +void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, TDEConfig* config, const TQString& viewConfGrp ) { TQString grp = TQString(viewConfGrp+"-Splitter %1").arg(idx); config->setGroup(grp); @@ -712,7 +712,7 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx, config->writeEntry("Children", childList); } -void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp) +void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString &group, TQWidget* parent, const TQString& viewConfGrp) { config->setGroup( group ); diff --git a/kate/app/kateviewspacecontainer.h b/kate/app/kateviewspacecontainer.h index 0c6b33246..2f1fa5372 100644 --- a/kate/app/kateviewspacecontainer.h +++ b/kate/app/kateviewspacecontainer.h @@ -29,7 +29,7 @@ #include "katemdi.h" -class KConfig; +class TDEConfig; class KateMainWindow; class KateViewSpaceContainer: public TQVBox @@ -48,10 +48,10 @@ class KateViewSpaceContainer: public TQVBox public: /* This will save the splitter configuration */ - void saveViewConfiguration(KConfig *config,const TQString& group); + void saveViewConfiguration(TDEConfig *config,const TQString& group); /* restore it */ - void restoreViewConfiguration (KConfig *config,const TQString& group); + void restoreViewConfiguration (TDEConfig *config,const TQString& group); private: /** @@ -69,12 +69,12 @@ class KateViewSpaceContainer: public TQVBox * If child splitters are found, it calls it self with those as the argument. * If a viewspace child is found, it is asked to save its filelist. */ - void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, KConfig* config=0L, const TQString& viewConfGrp=""); + void saveSplitterConfig(KateMDI::Splitter* s, int idx=0, TDEConfig* config=0L, const TQString& viewConfGrp=""); /** Restore a single splitter. * This is all the work is done for @see saveSplitterConfig() */ - void restoreSplitter ( KConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp); + void restoreSplitter ( TDEConfig* config, const TQString &group, TQWidget* parent , const TQString& viewConfGrp); void removeViewSpace (KateViewSpace *viewspace); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 152a96b98..114cfb6a4 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -248,7 +248,7 @@ void KWrite::slotOpen( const KURL& url ) { if (url.isEmpty()) return; - if (!KIO::NetAccess::exists(url, true, this)) + if (!TDEIO::NetAccess::exists(url, true, this)) { KMessageBox::error (this, i18n("The given file could not be read, check if it exists or if it is readable for the current user.")); return; @@ -395,7 +395,7 @@ void KWrite::slotEnableActions( bool enable ) } //common config -void KWrite::readConfig(KConfig *config) +void KWrite::readConfig(TDEConfig *config) { config->setGroup("General Options"); @@ -413,7 +413,7 @@ void KWrite::readConfig(KConfig *config) statusBar()->hide(); } -void KWrite::writeConfig(KConfig *config) +void KWrite::writeConfig(TDEConfig *config) { config->setGroup("General Options"); @@ -431,23 +431,23 @@ void KWrite::writeConfig(KConfig *config) //config file void KWrite::readConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); readConfig(config); } void KWrite::writeConfig() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); writeConfig(config); } // session management -void KWrite::restore(KConfig *config, int n) +void KWrite::restore(TDEConfig *config, int n) { readPropertiesInternal(config, n); } -void KWrite::readProperties(KConfig *config) +void KWrite::readProperties(TDEConfig *config) { readConfig(config); @@ -455,7 +455,7 @@ void KWrite::readProperties(KConfig *config) KTextEditor::sessionConfigInterface(m_view)->readSessionConfig(config); } -void KWrite::saveProperties(KConfig *config) +void KWrite::saveProperties(TDEConfig *config) { writeConfig(config); config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1); @@ -464,7 +464,7 @@ void KWrite::saveProperties(KConfig *config) KTextEditor::sessionConfigInterface(m_view)->writeSessionConfig(config); } -void KWrite::saveGlobalProperties(KConfig *config) //save documents +void KWrite::saveGlobalProperties(TDEConfig *config) //save documents { config->setGroup("Number"); config->writeEntry("NumberOfDocuments",docList.count()); @@ -492,7 +492,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents //restore session void KWrite::restore() { - KConfig *config = kapp->sessionConfig(); + TDEConfig *config = kapp->sessionConfig(); if (!config) return; diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h index 3e2abe860..0d0ee79f0 100644 --- a/kate/app/kwritemain.h +++ b/kate/app/kwritemain.h @@ -91,21 +91,21 @@ class KWrite : public KParts::MainWindow //config file functions public: - void readConfig (KConfig *); - void writeConfig (KConfig *); + void readConfig (TDEConfig *); + void writeConfig (TDEConfig *); void readConfig (); void writeConfig (); //session management public: - void restore(KConfig *,int); + void restore(TDEConfig *,int); static void restore(); private: - void readProperties(KConfig *); - void saveProperties(KConfig *); - void saveGlobalProperties(KConfig *); + void readProperties(TDEConfig *); + void saveProperties(TDEConfig *); + void saveGlobalProperties(TDEConfig *); private: KTextEditor::View * m_view; diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 52fe79d98..ea3412f0c 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -175,7 +175,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args ) kapp->dcopClient()->attach(); // This key has no GUI apparently - KConfig config("kcmdisplayrc", true ); + TDEConfig config("kcmdisplayrc", true ); config.setGroup("X11"); bool multihead = !config.readBoolEntry( "disableMultihead", false) && (ScreenCount(tqt_xdisplay()) > 1); diff --git a/kcontrol/TODO b/kcontrol/TODO index 201b265ed..2e791d895 100644 --- a/kcontrol/TODO +++ b/kcontrol/TODO @@ -80,7 +80,7 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-TDE-s * Remove old categories, for example X-TDE-settings-peripherals. -* Convert all options in "Internet & Network/Preferences" to KConfigXT and then remove the KCM. +* Convert all options in "Internet & Network/Preferences" to TDEConfigXT and then remove the KCM. * Remove "KDE Components" and put the KCMs elsewhere, most of them in "System". Wake up: a non KDE hacker can't differentiate between KDE and other parts of the system. @@ -112,12 +112,12 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-TDE-s * A lot, perhaps even the majority, violate the HIG by not displaying properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to iterate through all KCMs and file bug reports for each missbehaving. See the KDE UI Guidelines. -* KCMs needs to be converted to KConfigXT and use the global kdeglobals KConfigXT object. +* KCMs needs to be converted to TDEConfigXT and use the global kdeglobals TDEConfigXT object. * Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue. If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used. -* Rewrite kcmshell to the new KCModuleProxy and fix bugs. Move it to tdelibs. +* Rewrite kcmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs. -------------------------------------------------------------------------- diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 01b5090de..48c649c9a 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -122,7 +122,7 @@ int KAccessApp::newInstance() void KAccessApp::readSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); // bell --------------------------------------------------------------- @@ -790,7 +790,7 @@ void KAccessApp::applyChanges() { unsigned int enabled = requestedFeatures & ~features; unsigned int disabled = features & ~requestedFeatures; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); if (enabled & XkbSlowKeysMask) @@ -823,7 +823,7 @@ void KAccessApp::yesClicked() { dialog->deleteLater(); dialog = 0; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); switch (showModeCombobox->currentItem()) { case 0: @@ -854,7 +854,7 @@ void KAccessApp::noClicked() { dialog = 0; requestedFeatures = features; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Keyboard"); switch (showModeCombobox->currentItem()) { case 0: diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 64cb290e9..218dbfbb4 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -101,7 +101,7 @@ void ExtendedIntNumInput::slotSliderValueChanged(int val) m_spin->setValue ((int)floor(0.5 + linearVal)); } -static bool needToRunKAccessDaemon( KConfig *config ) +static bool needToRunKAccessDaemon( TDEConfig *config ) { // We always start the KAccess Daemon, if it is not needed, // it will terminate itself after configuring the AccessX @@ -222,7 +222,7 @@ TQString mouseKeysShortcut (Display *display) { } KAccessConfig::KAccessConfig(TQWidget *parent, const char *) - : KCModule(parent, "kcmaccess") + : TDECModule(parent, "kcmaccess") { TDEAboutData *about = @@ -602,7 +602,7 @@ void KAccessConfig::load() void KAccessConfig::load( bool useDefaults ) { - KConfig *config = new KConfig("kaccessrc", true, false); + TDEConfig *config = new TDEConfig("kaccessrc", true, false); config->setGroup("Bell"); config->setReadDefaults( useDefaults ); @@ -657,7 +657,7 @@ void KAccessConfig::load( bool useDefaults ) void KAccessConfig::save() { - KConfig *config= new KConfig("kaccessrc", false); + TDEConfig *config= new TDEConfig("kaccessrc", false); config->setGroup("Bell"); @@ -707,7 +707,7 @@ void KAccessConfig::save() customBell->isChecked() || visibleBell->isChecked()) { - KConfig cfg("kdeglobals", false, false); + TDEConfig cfg("kdeglobals", false, false); cfg.setGroup("General"); cfg.writeEntry("UseSystemBell", true); cfg.sync(); @@ -783,7 +783,7 @@ void KAccessConfig::checkAccess() extern "C" { - KDE_EXPORT KCModule *create_access(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name) { return new KAccessConfig(parent, name); } @@ -793,7 +793,7 @@ extern "C" */ KDE_EXPORT void init_access() { - KConfig *config = new KConfig("kaccessrc", true, false); + TDEConfig *config = new TDEConfig("kaccessrc", true, false); bool run = needToRunKAccessDaemon( config ); delete config; diff --git a/kcontrol/access/kcmaccess.h b/kcontrol/access/kcmaccess.h index fac04aef4..0553979bc 100644 --- a/kcontrol/access/kcmaccess.h +++ b/kcontrol/access/kcmaccess.h @@ -57,7 +57,7 @@ class ExtendedIntNumInput : public KIntNumInput int sliderMax; }; -class KAccessConfig : public KCModule +class KAccessConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp index b22df15ff..b9dd2a734 100644 --- a/kcontrol/accessibility/accessibility.cpp +++ b/kcontrol/accessibility/accessibility.cpp @@ -38,8 +38,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_accessibility, AccessibilityFactory("kcmaccessib * This function checks if the kaccess daemon needs to be run * This function will be deprecated since the kaccess daemon will be part of kded */ -// static bool needToRunKAccessDaemon( KConfig *config ){ -// KConfigGroup group( config, "Bell" ); +// static bool needToRunKAccessDaemon( TDEConfig *config ){ +// TDEConfigGroup group( config, "Bell" ); // // if(!group.readBoolEntry("SystemBell", true)){ // return true; @@ -85,7 +85,7 @@ void AccessibilityConfig::load( bool useDefaults ) { kdDebug() << "Running: AccessibilityConfig::load()" << endl; - KConfig *bell = new KConfig("bellrc", true); + TDEConfig *bell = new TDEConfig("bellrc", true); bell->setReadDefaults( useDefaults ); @@ -114,7 +114,7 @@ void AccessibilityConfig::load( bool useDefaults ) void AccessibilityConfig::save(){ kdDebug() << "Running: AccessibilityConfig::save()" << endl; - KConfig *bell = new KConfig("bellrc"); + TDEConfig *bell = new TDEConfig("bellrc"); bell->setGroup("General"); bell->writeEntry("SystemBell", systemBell->isChecked()); diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui index 773303a1b..43914c62d 100644 --- a/kcontrol/accessibility/accessibilityconfigwidget.ui +++ b/kcontrol/accessibility/accessibilityconfigwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AccessibilityConfigWidget</class> <author>José Pablo Ezequiel Fernández <[email protected]></author> -<widget class="KCModule"> +<widget class="TDECModule"> <property name="name"> <cstring>AccessibilityConfigWidget</cstring> </property> diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index c6a012fe7..feea9b1d1 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -55,7 +55,7 @@ extern "C" { KDE_EXPORT void init_arts(); - KDE_EXPORT KCModule *create_arts(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/) { TDEGlobal::locale()->insertCatalogue("kcmarts"); return new KArtsModule(parent, "kcmarts" ); @@ -64,7 +64,7 @@ extern "C" { static bool startArts() { - KConfig *config = new KConfig("kcmartsrc", true, false); + TDEConfig *config = new TDEConfig("kcmartsrc", true, false); config->setGroup("Arts"); bool startServer = config->readBoolEntry("StartServer",true); @@ -139,7 +139,7 @@ void KArtsModule::slotProcessArtsdOutput(TDEProcess*, char* buf, int len) } KArtsModule::KArtsModule(TQWidget *parent, const char *name) - : KCModule(parent, name), configChanged(false) + : TDECModule(parent, name), configChanged(false) { setButtons(Default|Apply); @@ -157,7 +157,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) general = new generalTab(tab); hardware = new hardwareTab(tab); - //mixer = KCModuleLoader::loadModule("kmixcfg", tab); + //mixer = TDECModuleLoader::loadModule("kmixcfg", tab); //midi = new KMidConfig(tab, "kmidconfig"); general->layout()->setMargin( KDialog::marginHint() ); @@ -211,7 +211,7 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) }; - config = new KConfig("kcmartsrc"); + config = new TDEConfig("kcmartsrc"); load(); suspendTime->setRange( 1, 999, 1, true ); @@ -306,7 +306,7 @@ void KArtsModule::load( bool useDefaults ) // config->setGroup( "Mixer" ); // general->volumeSystray->setChecked( config->readBoolEntry( "VolumeControlOnSystray", true ) ); - KConfig *midiConfig = new KConfig( "kcmmidirc", true ); + TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", true ); midiConfig->setGroup( "Configuration" ); hardware->midiDevice->setCurrentItem( midiConfig->readNumEntry( "midiDevice", 0 ) ); @@ -376,7 +376,7 @@ void KArtsModule::saveParams( void ) // config->setGroup( "Mixer" ); // config->writeEntry( "VolumeControlOnSystray", general->volumeSystray->isChecked() ); - KConfig *midiConfig = new KConfig( "kcmmidirc", false ); + TDEConfig *midiConfig = new TDEConfig( "kcmmidirc", false ); midiConfig->setGroup( "Configuration" ); midiConfig->writeEntry( "midiDevice", hardware->midiDevice->currentItem() ); @@ -385,7 +385,7 @@ void KArtsModule::saveParams( void ) delete midiConfig; - KConfig *knotifyConfig = new KConfig( "knotifyrc", false ); + TDEConfig *knotifyConfig = new TDEConfig( "knotifyrc", false ); knotifyConfig->setGroup( "StartProgress" ); knotifyConfig->writeEntry( "Arts Init", startServer->isChecked() ); diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index 4e4b4fd81..fe30b4961 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -46,7 +46,7 @@ class TDEProcess; class DeviceManager; -class KArtsModule : public KCModule +class KArtsModule : public TDECModule { Q_OBJECT @@ -90,7 +90,7 @@ private: KIntNumInput *suspendTime; generalTab *general; hardwareTab *hardware; - KConfig *config; + TDEConfig *config; DeviceManager *deviceManager; int latestProcessStatus; int fragmentCount; diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index da216aaf3..5eae86c62 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -88,7 +88,7 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, if (m_multidesktop) { - KConfig cfg(desktopConfigname(), false, false); + TDEConfig cfg(desktopConfigname(), false, false); cfg.setGroup( "General" ); if (!cfg.readBoolEntry( "Enabled", true )) { diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 2905d7ac7..448eda455 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -66,7 +66,7 @@ #define NR_PREDEF_PATTERNS 6 -BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) +BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) : BGDialog_UI(parent, "BGDialog") { m_pGlobals = new TDEGlobalBackgroundSettings(_config); @@ -1244,7 +1244,7 @@ void BGDialog::slotGetNewStuff() //FIXME set this to a server when we get one //should really be in a .rc file but could be either //kcmshellrc or kcontrolrc - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("KNewStuff"); config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" ); config->writeEntry( "StandardResource", "wallpaper" ); diff --git a/kcontrol/background/bgdialog.h b/kcontrol/background/bgdialog.h index 86e10a039..2a76acd52 100644 --- a/kcontrol/background/bgdialog.h +++ b/kcontrol/background/bgdialog.h @@ -36,7 +36,7 @@ class BGDialog : public BGDialog_UI { Q_OBJECT public: - BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop = true); + BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop = true); ~BGDialog(); void load( bool useDefaults ); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 2c3da199f..164616c14 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -47,7 +47,7 @@ /**** KBackgroundRenderer ****/ -KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config) +KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config) : KBackgroundSettings(desk, screen, drawBackgroundPerScreen, config) { m_State = 0; @@ -1019,7 +1019,7 @@ void KBackgroundRenderer::saveCacheFile() } //BEGIN class KVirtualBGRenderer -KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config ) +KVirtualBGRenderer::KVirtualBGRenderer( int desk, TDEConfig *config ) { m_pPixmap = 0l; m_desk = desk; @@ -1038,7 +1038,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config ) else configname.sprintf("kdesktop-screen-%drc", screen_number); - m_pConfig = new KConfig(configname, false, false); + m_pConfig = new TDEConfig(configname, false, false); m_bDeleteConfig = true; } else { m_pConfig = config; diff --git a/kcontrol/background/bgrender.h b/kcontrol/background/bgrender.h index ee798894e..b10f4033c 100644 --- a/kcontrol/background/bgrender.h +++ b/kcontrol/background/bgrender.h @@ -23,7 +23,7 @@ class TQRect; class TQString; class TQTimer; -class KConfig; +class TDEConfig; class TDEProcess; class KTempFile; class KShellProcess; @@ -42,7 +42,7 @@ class KBackgroundRenderer: Q_OBJECT public: - KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config=0); + KBackgroundRenderer(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config=0); ~KBackgroundRenderer(); void load(int desk, int screen, bool drawBackgroundPerScreen, bool reparseConfig=true); @@ -124,7 +124,7 @@ class KVirtualBGRenderer : public QObject { Q_OBJECT public: - KVirtualBGRenderer(int desk, KConfig *config=0l); + KVirtualBGRenderer(int desk, TDEConfig *config=0l); ~KVirtualBGRenderer(); KBackgroundRenderer * renderer(unsigned screen); @@ -162,7 +162,7 @@ private: TQSize renderSize(int screen); // the size the renderer should be void initRenderers(); - KConfig *m_pConfig; + TDEConfig *m_pConfig; float m_scaleX; float m_scaleY; int m_desk; diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index d51995299..7bc17a215 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -415,7 +415,7 @@ TQStringList KBackgroundProgram::list() /**** KBackgroundSettings ****/ -KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config) +KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config) : KBackgroundPattern(), KBackgroundProgram() { @@ -501,7 +501,7 @@ KBackgroundSettings::KBackgroundSettings(int desk, int screen, bool drawBackgrou else configname.sprintf("kdesktop-screen-%drc", screen_number); - m_pConfig = new KConfig(configname, false, false); + m_pConfig = new TDEConfig(configname, false, false); m_bDeleteConfig = true; } else { m_pConfig = config; @@ -1065,7 +1065,7 @@ void KBackgroundSettings::setEnabled(const bool enable) /**** TDEGlobalBackgroundSettings ****/ -TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(KConfig *_config) +TDEGlobalBackgroundSettings::TDEGlobalBackgroundSettings(TDEConfig *_config) { m_pConfig = _config; diff --git a/kcontrol/background/bgsettings.h b/kcontrol/background/bgsettings.h index 03aa171e7..d007f5753 100644 --- a/kcontrol/background/bgsettings.h +++ b/kcontrol/background/bgsettings.h @@ -19,7 +19,7 @@ template <class TQString, class T> class TQMap; class KStandardDirs; class KSimpleConfig; -class KConfig; +class TDEConfig; class TQString; class TQImage; @@ -156,7 +156,7 @@ public: * mode) will be treated as one big display, and the "screen" paramater * will be ignored. */ - KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, KConfig *config); + KBackgroundSettings(int desk, int screen, bool drawBackgroundPerScreen, TDEConfig *config); ~KBackgroundSettings(); void copyConfig(const KBackgroundSettings*); @@ -282,7 +282,7 @@ private: int m_CurrentWallpaper; TQString m_CurrentWallpaperName; - KConfig *m_pConfig; + TDEConfig *m_pConfig; KStandardDirs *m_pDirs; bool m_bDeleteConfig; bool m_bEnabled; @@ -305,7 +305,7 @@ public: class TDEGlobalBackgroundSettings { public: - TDEGlobalBackgroundSettings(KConfig *config); + TDEGlobalBackgroundSettings(TDEConfig *config); TQString deskName(int desk); //void setDeskName(int desk, TQString name); @@ -347,7 +347,7 @@ public: void readSettings(); void writeSettings(); - KConfig* getConfig() { return m_pConfig; } + TDEConfig* getConfig() { return m_pConfig; } private: bool dirty; @@ -363,7 +363,7 @@ private: bool m_shadowEnabled; int m_textLines; int m_textWidth; - KConfig *m_pConfig; + TDEConfig *m_pConfig; bool m_bDeleteConfig; TQValueVector<bool> m_bDrawBackgroundPerScreen; // m_bDrawBackgroundPerScreen[desk] }; diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index aab1f7bba..06d84ff86 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -42,7 +42,7 @@ KBackground::~KBackground( ) } KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList &/* */) - : KCModule(KBackGndFactory::instance(), parent, name) + : TDECModule(KBackGndFactory::instance(), parent, name) { int screen_number = 0; if (tqt_xdisplay()) @@ -52,7 +52,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList configname = "kdesktoprc"; else configname.sprintf("kdesktop-screen-%drc", screen_number); - m_pConfig = new KConfig(configname, false, false); + m_pConfig = new TDEConfig(configname, false, false); TQVBoxLayout *layout = new TQVBoxLayout(this); m_base = new BGDialog(this, m_pConfig); diff --git a/kcontrol/background/main.h b/kcontrol/background/main.h index 100d9c2b9..a879becd8 100644 --- a/kcontrol/background/main.h +++ b/kcontrol/background/main.h @@ -12,13 +12,13 @@ #include <kcmodule.h> -class KConfig; +class TDEConfig; class BGDialog; /** * The Desktop/Background tab in kcontrol. */ -class KBackground: public KCModule +class KBackground: public TDECModule { Q_OBJECT @@ -33,7 +33,7 @@ public: private: BGDialog *m_base; - KConfig *m_pConfig; + TDEConfig *m_pConfig; }; diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index eff4eb2aa..0c04a8aa4 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT KCModule *create_bell(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *) { return new KBellConfig(parent, "kcmbell"); } @@ -52,7 +52,7 @@ extern "C" XGetKeyboardControl(kapp->getDisplay(), &kbd); - KConfig config("kcmbellrc", true, false); + TDEConfig config("kcmbellrc", true, false); config.setGroup("General"); kbdc.bell_percent = config.readNumEntry("Volume", kbd.bell_percent); @@ -65,7 +65,7 @@ extern "C" } KBellConfig::KBellConfig(TQWidget *parent, const char *name): - KCModule(parent, name) + TDECModule(parent, name) { TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -160,7 +160,7 @@ void KBellConfig::load( bool useDefaults ) m_pitch->setValue(kbd.bell_pitch); m_duration->setValue(kbd.bell_duration); - KConfig cfg("kdeglobals", false, false); + TDEConfig cfg("kdeglobals", false, false); cfg.setReadDefaults( useDefaults ); cfg.setGroup("General"); m_useBell->setChecked(cfg.readBoolEntry("UseSystemBell", false)); @@ -183,7 +183,7 @@ void KBellConfig::save() KBBellPercent | KBBellPitch | KBBellDuration, &kbd); - KConfig config("kcmbellrc", false, false); + TDEConfig config("kcmbellrc", false, false); config.setGroup("General"); config.writeEntry("Volume",bellVolume); config.writeEntry("Pitch",bellPitch); @@ -191,14 +191,14 @@ void KBellConfig::save() config.sync(); - KConfig cfg("kdeglobals", false, false); + TDEConfig cfg("kdeglobals", false, false); cfg.setGroup("General"); cfg.writeEntry("UseSystemBell", m_useBell->isChecked()); cfg.sync(); if (!m_useBell->isChecked()) { - KConfig config("kaccessrc", false); + TDEConfig config("kaccessrc", false); config.setGroup("Bell"); config.writeEntry("SystemBell", false); diff --git a/kcontrol/bell/bell.h b/kcontrol/bell/bell.h index 0abc1a371..da7d184bc 100644 --- a/kcontrol/bell/bell.h +++ b/kcontrol/bell/bell.h @@ -27,7 +27,7 @@ class TQCheckBox; class KIntNumInput; class TQPushButton; -class KBellConfig : public KCModule +class KBellConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index e291387c0..663b4735e 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -240,7 +240,7 @@ void Dtime::configChanged(){ void Dtime::load() { - KConfig config("kcmclockrc", true, false); + TDEConfig config("kcmclockrc", true, false); config.setGroup("NTP"); timeServerList->insertStringList(TQStringList::split(',', config.readEntry("servers", i18n("Public Time Server (pool.ntp.org),\ @@ -263,7 +263,7 @@ oceania.pool.ntp.org")))); void Dtime::save() { - KConfig config("kcmclockrc", false, false); + TDEConfig config("kcmclockrc", false, false); config.setGroup("NTP"); // Save the order, but don't duplicate! diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 5885c2594..1908e8010 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -40,7 +40,7 @@ typedef KGenericFactory<KclockModule, TQWidget> KlockModuleFactory; K_EXPORT_COMPONENT_FACTORY( kcm_clock, KlockModuleFactory("kcmkclock")) KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KlockModuleFactory::instance(), parent, name) + : TDECModule(KlockModuleFactory::instance(), parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmclock"), I18N_NOOP("TDE Clock Control Module"), diff --git a/kcontrol/clock/main.h b/kcontrol/clock/main.h index 8e178291a..82e501dfc 100644 --- a/kcontrol/clock/main.h +++ b/kcontrol/clock/main.h @@ -28,7 +28,7 @@ class Tzone; class TQTabWidget; -class KclockModule : public KCModule +class KclockModule : public TDECModule { Q_OBJECT diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 9498a062a..541f0cf83 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -176,7 +176,7 @@ void Tzone::save() //After the KDE 3.2 release, need to add an error message } else - if (!KIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime"))) + if (!TDEIO::NetAccess::file_copy(KURL(tz),KURL("/etc/localtime"))) KMessageBox::error( 0, i18n("Error setting new timezone."), i18n("Timezone Error")); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 8bf7607ce..32fa1125f 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -93,7 +93,7 @@ TQPixmap mkColorPreview(const WidgetCanvas *cs) /**** KColorScheme ****/ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KolorFactory::instance(), parent, name) + : TDECModule(KolorFactory::instance(), parent, name) { nSysSchemes = 2; @@ -110,7 +110,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " Non-TDE applications may also obey some or all of the color" " settings, if this option is enabled.")); - KConfig *cfg = new KConfig("kcmdisplayrc"); + TDEConfig *cfg = new TDEConfig("kcmdisplayrc"); cfg->setGroup("X11"); useRM = cfg->readBoolEntry("useResourceManager", true); delete cfg; @@ -308,7 +308,7 @@ void KColorScheme::load() } void KColorScheme::load( bool useDefaults ) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setReadDefaults( useDefaults ); config->setGroup("KDE"); sCurrentScheme = config->readEntry("colorScheme"); @@ -324,7 +324,7 @@ void KColorScheme::load( bool useDefaults ) sb->setValue(cs->contrast); sb->blockSignals(false); - KConfig cfg("kcmdisplayrc", true, false); + TDEConfig cfg("kcmdisplayrc", true, false); cfg.setGroup("X11"); bool exportColors = cfg.readBoolEntry("exportKDEColors", true); cbExportColors->setChecked(exportColors); @@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults ) void KColorScheme::save() { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "General" ); cfg->writeEntry("background", cs->back, true, true); cfg->writeEntry("selectBackground", cs->select, true, true); @@ -383,7 +383,7 @@ void KColorScheme::save() config->sync(); delete config; - KConfig cfg2("kcmdisplayrc", false, false); + TDEConfig cfg2("kcmdisplayrc", false, false); cfg2.setGroup("X11"); bool exportColors = cbExportColors->isChecked(); cfg2.writeEntry("exportKDEColors", exportColors); @@ -587,9 +587,9 @@ void KColorScheme::slotImport() return; //kdDebug() << "Location: " << location << endl; - if (!KIO::NetAccess::file_copy(file, KURL( location+file.fileName( false ) ) ) ) + if (!TDEIO::NetAccess::file_copy(file, KURL( location+file.fileName( false ) ) ) ) { - KMessageBox::error(this, KIO::NetAccess::lastErrorString(),i18n("Import failed.")); + KMessageBox::error(this, TDEIO::NetAccess::lastErrorString(),i18n("Import failed.")); return; } else @@ -700,7 +700,7 @@ void KColorScheme::slotWidgetColor(int indx) if (wcCombo->currentItem() != indx) wcCombo->setCurrentItem( indx ); - // Do not emit KCModule::changed() + // Do not emit TDECModule::changed() colorButton->blockSignals( true ); TQColor col = color(indx); @@ -734,7 +734,7 @@ void KColorScheme::slotShadeSortColumnChanged(bool b) */ void KColorScheme::readScheme( int index ) { - KConfigBase* config; + TDEConfigBase* config; TQColor widget(239, 239, 239); TQColor trinity4Blue(103,141,178); diff --git a/kcontrol/colors/colorscm.h b/kcontrol/colors/colorscm.h index c2e19d421..edc14325d 100644 --- a/kcontrol/colors/colorscm.h +++ b/kcontrol/colors/colorscm.h @@ -27,14 +27,14 @@ class KLineEdit; class TQPalette; class KListBox; class KColorButton; -class KConfig; +class TDEConfig; class KStdDirs; class KColorSchemeList; /** * The Desktop/Colors tab in kcontrol. */ -class KColorScheme: public KCModule +class KColorScheme: public TDECModule { Q_OBJECT diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index db39d21be..a0e59323d 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -278,7 +278,7 @@ void WidgetCanvas::drawSampleWidgets() int textLen, tmp; int highlightVal, lowlightVal; - KConfig * c = new KConfig("kcmfonts"); + TDEConfig * c = new TDEConfig("kcmfonts"); // Keep in sync with kglobalsettings. diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 616c98a50..c2d5305c5 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -61,13 +61,13 @@ void CfgComponent::slotComponentChanged(const TQString&) { emit changed(true); } -void CfgComponent::save(KConfig *cfg) { +void CfgComponent::save(TDEConfig *cfg) { // yes, this can happen if there are NO KTrader offers for this component if (!m_lookupDict[ComponentSelector->currentText()]) return; TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); - KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null")); + TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null")); store->setGroup(cfg->readEntry("valueSection")); store->writePathEntry(cfg->readEntry("valueName","kcm_componenchooser_null"),*m_lookupDict[ComponentSelector->currentText()]); store->sync(); @@ -75,7 +75,7 @@ void CfgComponent::save(KConfig *cfg) { emit changed(false); } -void CfgComponent::load(KConfig *cfg) { +void CfgComponent::load(TDEConfig *cfg) { ComponentSelector->clear(); m_lookupDict.clear(); @@ -93,7 +93,7 @@ void CfgComponent::load(KConfig *cfg) { m_revLookupDict.insert((*tit)->desktopEntryName(),new TQString((*tit)->name())); } - KConfig *store = new KConfig(cfg->readPathEntry("storeInFile","null")); + TDEConfig *store = new TDEConfig(cfg->readPathEntry("storeInFile","null")); store->setGroup(cfg->readEntry("valueSection")); TQString setting=store->readEntry(cfg->readEntry("valueName","kcm_componenchooser_null")); delete store; @@ -139,7 +139,7 @@ void CfgEmailClient::defaults() load(0L); } -void CfgEmailClient::load(KConfig *) +void CfgEmailClient::load(TDEConfig *) { TQString emailClient = pSettings->getSetting(KEMailSettings::ClientProgram); bool useKMail = (emailClient.isEmpty()); @@ -169,7 +169,7 @@ void CfgEmailClient::selectEmailClient() TQString client = dlg.text(); // get the preferred Terminal Application - KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); + TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); preferredTerminal += TQString::fromLatin1(" -e "); @@ -184,7 +184,7 @@ void CfgEmailClient::selectEmailClient() } -void CfgEmailClient::save(KConfig *) +void CfgEmailClient::save(TDEConfig *) { if (kmailCB->isChecked()) { @@ -234,8 +234,8 @@ void CfgTerminalEmulator::defaults() } -void CfgTerminalEmulator::load(KConfig *) { - KConfig *config = new KConfig("kdeglobals", true); +void CfgTerminalEmulator::load(TDEConfig *) { + TDEConfig *config = new TDEConfig("kdeglobals", true); config->setGroup("General"); TQString terminal = config->readPathEntry("TerminalApplication","konsole"); if (terminal == "konsole") @@ -253,9 +253,9 @@ void CfgTerminalEmulator::load(KConfig *) { emit changed(false); } -void CfgTerminalEmulator::save(KConfig *) { +void CfgTerminalEmulator::save(TDEConfig *) { - KConfig *config = new KConfig("kdeglobals"); + TDEConfig *config = new TDEConfig("kdeglobals"); config->setGroup("General"); config->writePathEntry("TerminalApplication",terminalCB->isChecked()?"konsole":terminalLE->text(), true, true); config->sync(); @@ -306,8 +306,8 @@ void CfgBrowser::defaults() } -void CfgBrowser::load(KConfig *) { - KConfig *config = new KConfig("kdeglobals", true); +void CfgBrowser::load(TDEConfig *) { + TDEConfig *config = new TDEConfig("kdeglobals", true); config->setGroup("General"); TQString exec = config->readEntry("BrowserApplication"); if (exec.isEmpty()) @@ -340,9 +340,9 @@ void CfgBrowser::load(KConfig *) { emit changed(false); } -void CfgBrowser::save(KConfig *) { +void CfgBrowser::save(TDEConfig *) { - KConfig *config = new KConfig("kdeglobals"); + TDEConfig *config = new TDEConfig("kdeglobals"); config->setGroup("General"); TQString exec; if (radioExec->isChecked()) diff --git a/kcontrol/componentchooser/componentchooser.h b/kcontrol/componentchooser/componentchooser.h index af5d688ab..0407989cf 100644 --- a/kcontrol/componentchooser/componentchooser.h +++ b/kcontrol/componentchooser/componentchooser.h @@ -28,7 +28,7 @@ class TQListBoxItem; class KEMailSettings; -class KConfig; +class TDEConfig; /* The CfgPlugin class is an exception. It is LGPL. It will be parted of the plugin interface which I plan for KDE 3.2. @@ -38,8 +38,8 @@ class CfgPlugin public: CfgPlugin(){}; virtual ~CfgPlugin(){}; - virtual void load(KConfig *cfg)=0; - virtual void save(KConfig *cfg)=0; + virtual void load(TDEConfig *cfg)=0; + virtual void save(TDEConfig *cfg)=0; virtual void defaults()=0; }; @@ -50,8 +50,8 @@ Q_OBJECT public: CfgComponent(TQWidget *parent); virtual ~CfgComponent(); - virtual void load(KConfig *cfg); - virtual void save(KConfig *cfg); + virtual void load(TDEConfig *cfg); + virtual void save(TDEConfig *cfg); virtual void defaults(); protected: @@ -70,8 +70,8 @@ Q_OBJECT public: CfgEmailClient(TQWidget *parent); virtual ~CfgEmailClient(); - virtual void load(KConfig *cfg); - virtual void save(KConfig *cfg); + virtual void load(TDEConfig *cfg); + virtual void save(TDEConfig *cfg); virtual void defaults(); private: @@ -90,8 +90,8 @@ Q_OBJECT public: CfgTerminalEmulator(TQWidget *parent); virtual ~CfgTerminalEmulator(); - virtual void load(KConfig *cfg); - virtual void save(KConfig *cfg); + virtual void load(TDEConfig *cfg); + virtual void save(TDEConfig *cfg); virtual void defaults(); protected slots: @@ -108,8 +108,8 @@ Q_OBJECT public: CfgBrowser(TQWidget *parent); virtual ~CfgBrowser(); - virtual void load(KConfig *cfg); - virtual void save(KConfig *cfg); + virtual void load(TDEConfig *cfg); + virtual void save(TDEConfig *cfg); virtual void defaults(); protected slots: diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 2e80ad145..84425a7b1 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -23,7 +23,7 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ): - KCModule(parent,name) { + TDECModule(parent,name) { (new TQVBoxLayout(this))->setAutoAdd(true); m_chooser=new ComponentChooser(this,"ComponentChooser"); @@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){ extern "C" { - KDE_EXPORT KCModule *create_componentchooser( TQWidget *parent, const char * ) + KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * ) { TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser"); return new KCMComponentChooser( parent, "kcmcomponentchooser" ); diff --git a/kcontrol/componentchooser/kcm_componentchooser.h b/kcontrol/componentchooser/kcm_componentchooser.h index f2c68b3bd..905c0a9b5 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.h +++ b/kcontrol/componentchooser/kcm_componentchooser.h @@ -22,7 +22,7 @@ class TDEAboutData; -class KCMComponentChooser : public KCModule +class KCMComponentChooser : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 6bdc6478f..c718184ba 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -217,7 +217,7 @@ TQString CAItem::configName() const KCryptoConfig::KCryptoConfig(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KryptoFactory::instance(), parent, name) + : TDECModule(KryptoFactory::instance(), parent, name) { TQGridLayout *grid; TQBoxLayout *top = new TQVBoxLayout(this); @@ -307,7 +307,7 @@ TQString whatstr; #endif // no need to parse kdeglobals. - config = new KConfig("cryptodefaults", false, false); + config = new TDEConfig("cryptodefaults", false, false); policies = new KSimpleConfig("ksslpolicies", false); pcerts = new KSimpleConfig("ksslcertificates", false); authcfg = new KSimpleConfig("ksslauthmap", false); @@ -1009,7 +1009,7 @@ void KCryptoConfig::load( bool useDefaults ) } groups = _signers->list(); - KConfig sigcfg("ksslcalist", true, false); + TDEConfig sigcfg("ksslcalist", true, false); caList->clear(); for (TQStringList::Iterator i = groups.begin(); i != groups.end(); @@ -2066,7 +2066,7 @@ void KCryptoConfig::slotCARestore() { TQStringList groups = _signers->list(); - KConfig sigcfg("ksslcalist", true, false); + TDEConfig sigcfg("ksslcalist", true, false); for (TQStringList::Iterator i = groups.begin(); i != groups.end(); diff --git a/kcontrol/crypto/crypto.h b/kcontrol/crypto/crypto.h index 514012e71..efcef6072 100644 --- a/kcontrol/crypto/crypto.h +++ b/kcontrol/crypto/crypto.h @@ -215,7 +215,7 @@ private: -class KCryptoConfig : public KCModule +class KCryptoConfig : public TDECModule { Q_OBJECT public: @@ -352,9 +352,9 @@ private: KSSLSigners *_signers; TQLabel *cHash; - KConfig *config; + TDEConfig *config; KSimpleConfig *policies, *pcerts, *authcfg; - KConfig *cacfg; + TDEConfig *cacfg; bool ___lehack; // to hack around a lineedit problem }; diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index e956edccb..4b1ba47ea 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -26,7 +26,7 @@ typedef KGenericFactory<CSSConfig, TQWidget> CSSFactory; K_EXPORT_COMPONENT_FACTORY( kcm_css, CSSFactory("kcmcss") ) CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(CSSFactory::instance(), parent, name) + : TDECModule(CSSFactory::instance(), parent, name) { customDialogBase = new KDialogBase(this, "customCSSDialog", true, TQString::null, KDialogBase::Close, KDialogBase::Close, true ); @@ -104,7 +104,7 @@ void CSSConfig::load() void CSSConfig::load( bool useDefaults ) { - KConfig *c = new KConfig("kcmcssrc", false, false); + TDEConfig *c = new TDEConfig("kcmcssrc", false, false); c->setReadDefaults( useDefaults ); c->setGroup("Stylesheet"); @@ -151,7 +151,7 @@ void CSSConfig::load( bool useDefaults ) void CSSConfig::save() { // write to config file - KConfig *c = new KConfig("kcmcssrc", false, false); + TDEConfig *c = new TDEConfig("kcmcssrc", false, false); c->setGroup("Stylesheet"); if (configDialog->useDefault->isChecked()) @@ -200,7 +200,7 @@ void CSSConfig::save() } // make konqueror use the right stylesheet - c = new KConfig("konquerorrc", false, false); + c = new TDEConfig("konquerorrc", false, false); c->setGroup("HTML Settings"); c->writeEntry("UserStyleSheetEnabled", !configDialog->useDefault->isChecked()); diff --git a/kcontrol/css/kcmcss.h b/kcontrol/css/kcmcss.h index 164f22dae..585452b3e 100644 --- a/kcontrol/css/kcmcss.h +++ b/kcontrol/css/kcmcss.h @@ -29,7 +29,7 @@ class CSSCustomDialog; class KDialogBase; -class CSSConfig : public KCModule +class CSSConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp index 189d4723b..f9a27ca92 100644 --- a/kcontrol/display/display.cpp +++ b/kcontrol/display/display.cpp @@ -31,7 +31,7 @@ typedef KGenericFactory<KCMDisplay, TQWidget> DisplayFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_display, DisplayFactory( "display" ) ) KCMDisplay::KCMDisplay( TQWidget *parent, const char *name, const TQStringList& ) - : KCModule( parent, name ) + : TDECModule( parent, name ) , m_changed(false) { m_tabs = new TQTabWidget( this ); @@ -56,7 +56,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label ) TQWidget *page = new TQWidget( m_tabs, name.latin1() ); TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() ); - KCModule *kcm = KCModuleLoader::loadModule( name, page ); + TDECModule *kcm = TDECModuleLoader::loadModule( name, page ); if ( kcm ) { @@ -72,20 +72,20 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label ) void KCMDisplay::load() { - for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) + for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) it.key()->load(); } void KCMDisplay::save() { - for (TQMap<KCModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it) + for (TQMap<TDECModule*, bool>::Iterator it = m_modules.begin(); it != m_modules.end(); ++it) if (it.data()) it.key()->save(); } void KCMDisplay::moduleChanged( bool isChanged ) { - TQMap<KCModule*, bool>::Iterator currentModule = m_modules.find(static_cast<KCModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))))); + TQMap<TDECModule*, bool>::Iterator currentModule = m_modules.find(static_cast<TDECModule*>(TQT_TQWIDGET(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()))))); Q_ASSERT(currentModule != m_modules.end()); if (currentModule.data() == isChanged) return; @@ -94,7 +94,7 @@ void KCMDisplay::moduleChanged( bool isChanged ) bool c = false; - for (TQMap<KCModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) { + for (TQMap<TDECModule*, bool>::ConstIterator it = m_modules.begin(); it != m_modules.end(); ++it) { if (it.data()) { c = true; break; diff --git a/kcontrol/display/display.h b/kcontrol/display/display.h index 5696717ff..bb5d44e6f 100644 --- a/kcontrol/display/display.h +++ b/kcontrol/display/display.h @@ -24,7 +24,7 @@ class TQTabWidget; -class KCMDisplay : public KCModule +class KCMDisplay : public TDECModule { Q_OBJECT @@ -40,7 +40,7 @@ class KCMDisplay : public KCModule void addTab( const TQString &name, const TQString &label ); TQTabWidget *m_tabs; - TQMap<KCModule*, bool> m_modules; + TQMap<TDECModule*, bool> m_modules; bool m_changed; }; diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 7a7ccc318..046ad9e16 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -740,7 +740,7 @@ void KDisplayConfig::setRealResolutionSliderValue(int index) { /**** KDisplayConfig ****/ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) + : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0) { TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); @@ -1905,13 +1905,13 @@ void KDisplayConfig::processLockoutControls() { base->loadExistingProfile->hide(); // Same as above } -KCModule* KDisplayConfig::addTab( const TQString name, const TQString label ) +TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label ) { // [FIXME] This is incomplete...Apply may not work... TQWidget *page = new TQWidget( base->mainTabContainerWidget, name.latin1() ); TQVBoxLayout *top = new TQVBoxLayout( page, KDialog::marginHint() ); - KCModule *kcm = KCModuleLoader::loadModule( name, page ); + TDECModule *kcm = TDECModuleLoader::loadModule( name, page ); if ( kcm ) { diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h index 62e53209f..af3e971ee 100644 --- a/kcontrol/displayconfig/displayconfig.h +++ b/kcontrol/displayconfig/displayconfig.h @@ -40,13 +40,13 @@ #include "monitorworkspace.h" #include "displayconfigbase.h" -class KConfig; +class TDEConfig; class KPopupMenu; class KListViewItem; typedef TQMap< TQString, TQPtrList< SingleScreenData > > ScreenConfigurationMap; -class KDisplayConfig : public KCModule, public DCOPObject +class KDisplayConfig : public TDECModule, public DCOPObject { K_DCOP Q_OBJECT @@ -70,8 +70,8 @@ k_dcop: private: - KConfig *config; - KCModule *iccTab; + TDEConfig *config; + TDECModule *iccTab; bool _ok; Display *randr_display; ScreenInfo *randr_screen_info; @@ -91,7 +91,7 @@ private: TQString startupProfileName; int realResolutionSliderValue(); void setRealResolutionSliderValue(int index); - KCModule* addTab( const TQString name, const TQString label ); + TDECModule* addTab( const TQString name, const TQString label ); void moveMonitor(DraggableMonitor* monitor, int realx, int realy); bool applyMonitorLayoutRules(void); bool applyMonitorLayoutRules(DraggableMonitor* primary_monitor); diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index 67ddea42e..fdb6ebf6f 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDialog</class> -<widget class="KCModule"> +<widget class="TDECModule"> <property name="name"> <cstring>ConfigDialog</cstring> </property> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 8cb993476..37940be95 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -85,7 +85,7 @@ KCMDnssd::~KCMDnssd() void KCMDnssd::save() { setCursor(TQCursor(Qt::BusyCursor)); - KCModule::save(); + TDECModule::save(); if (geteuid()==0 && m_wdchanged) saveMdnsd(); domain->setFileWriteMode(0644); // this should be readable for everyone domain->writeEntry("PublishDomain",domainedit->text()); @@ -132,7 +132,7 @@ void KCMDnssd::load() } else if (exitStatus == 2) { // custom setup enableZeroconf->setEnabled(false); } - KCModule::load(); + TDECModule::load(); } // hack to work around not working isModified() for KPasswordEdit diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp index a9c7801d6..d2f0f66f8 100644 --- a/kcontrol/ebrowsing/filteropts.cpp +++ b/kcontrol/ebrowsing/filteropts.cpp @@ -30,7 +30,7 @@ #include "filteropts.h" FilterOptions::FilterOptions(TQWidget *parent, const char *name) - :KCModule(parent, name) + :TDECModule(parent, name) { TQGridLayout *lay = new TQGridLayout(this, 1, 1, 10, 5); diff --git a/kcontrol/ebrowsing/filteropts.h b/kcontrol/ebrowsing/filteropts.h index c8338c031..144525e9b 100644 --- a/kcontrol/ebrowsing/filteropts.h +++ b/kcontrol/ebrowsing/filteropts.h @@ -27,7 +27,7 @@ class TQListBox; -class FilterOptions : public KCModule +class FilterOptions : public TDECModule { Q_OBJECT diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp index 7e259a26b..9eeec46e1 100644 --- a/kcontrol/ebrowsing/main.cpp +++ b/kcontrol/ebrowsing/main.cpp @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kurifilt, KURIFactory("kcmkurifilt") ) class FilterOptions; KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQStringList &) - :KCModule(KURIFactory::instance(), parent, name) + :TDECModule(KURIFactory::instance(), parent, name) { filter = KURIFilter::self(); @@ -66,11 +66,11 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS modules.setAutoDelete(true); - TQMap<TQString,KCModule*> helper; + TQMap<TQString,TDECModule*> helper; TQPtrListIterator<KURIFilterPlugin> it = filter->pluginsIterator(); for (; it.current(); ++it) { - KCModule *module = it.current()->configModule(this, 0); + TDECModule *module = it.current()->configModule(this, 0); if (module) { modules.append(module); @@ -83,7 +83,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS { TQTabWidget *tab = new TQTabWidget(this); - TQMapIterator<TQString,KCModule*> it2; + TQMapIterator<TQString,TDECModule*> it2; for (it2 = helper.begin(); it2 != helper.end(); ++it2) { tab->addTab(it2.data(), it2.key()); @@ -103,7 +103,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS void KURIFilterModule::load() { - TQPtrListIterator<KCModule> it(modules); + TQPtrListIterator<TDECModule> it(modules); for (; it.current(); ++it) { it.current()->load(); @@ -112,7 +112,7 @@ void KURIFilterModule::load() void KURIFilterModule::save() { - TQPtrListIterator<KCModule> it(modules); + TQPtrListIterator<TDECModule> it(modules); for (; it.current(); ++it) { it.current()->save(); @@ -121,7 +121,7 @@ void KURIFilterModule::save() void KURIFilterModule::defaults() { - TQPtrListIterator<KCModule> it(modules); + TQPtrListIterator<TDECModule> it(modules); for (; it.current(); ++it) { it.current()->defaults(); diff --git a/kcontrol/ebrowsing/main.h b/kcontrol/ebrowsing/main.h index 8508b0a0b..94780c995 100644 --- a/kcontrol/ebrowsing/main.h +++ b/kcontrol/ebrowsing/main.h @@ -29,7 +29,7 @@ class KURIFilter; -class KURIFilterModule : public KCModule { +class KURIFilterModule : public TDECModule { Q_OBJECT public: @@ -45,7 +45,7 @@ private: TQWidget *widget; FilterOptions *opts; - TQPtrList<KCModule> modules; + TQPtrList<TDECModule> modules; }; #endif diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 2c04835c9..3073250f7 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -76,7 +76,7 @@ private: }; FilterOptions::FilterOptions(TDEInstance *instance, TQWidget *parent, const char *name) - :KCModule(instance, parent, name) + :TDECModule(instance, parent, name) { TQVBoxLayout *mainLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint()); @@ -114,7 +114,7 @@ void FilterOptions::load( bool useDefaults ) // Clear state first. m_dlg->lvSearchProviders->clear(); - KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); + TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); config.setReadDefaults( useDefaults ); @@ -207,7 +207,7 @@ void FilterOptions::setDelimiter (char sep) void FilterOptions::save() { - KConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); + TDEConfig config( KURISearchFilterEngine::self()->name() + "rc", false, false ); config.setGroup("General"); config.writeEntry("EnableWebShortcuts", m_dlg->cbEnableShortcuts->isChecked()); diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h index 6352dfea5..2150e4883 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.h @@ -30,7 +30,7 @@ class FilterOptionsUI; class SearchProvider; class SearchProviderItem; -class FilterOptions : public KCModule +class FilterOptions : public TDECModule { Q_OBJECT diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index f46b5c8ac..c57d3e080 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -521,7 +521,7 @@ void KURISearchFilterEngine::loadConfig() PIDDBG << "Keywords Engine: Loading config..." << endl; // Load the config. - KConfig config( name() + "rc", false, false ); + TDEConfig config( name() + "rc", false, false ); config.setGroup( "General" ); m_cKeywordDelimiter = config.readNumEntry("KeywordDelimiter", ':'); diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 8f56a0538..a8c8dbda9 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -77,7 +77,7 @@ bool KURISearchFilter::filterURI( KURIFilterData &data ) const return false; } -KCModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const +TDECModule *KURISearchFilter::configModule(TQWidget *parent, const char *) const { return new FilterOptions( KURISearchFilterFactory::instance(), parent, "kcmkurifilt"); } diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h index 7ad52849b..f72d38340 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.h @@ -39,7 +39,7 @@ public: ~KURISearchFilter(); virtual bool filterURI( KURIFilterData& ) const; - virtual KCModule *configModule(TQWidget *parent = 0, const char *name = 0) const; + virtual TDECModule *configModule(TQWidget *parent = 0, const char *name = 0) const; virtual TQString configName() const; k_dcop: diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 7e077ecb0..c394de693 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -533,7 +533,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const return false; } -KCModule* KShortURIFilter::configModule( TQWidget*, const char* ) const +TDECModule* KShortURIFilter::configModule( TQWidget*, const char* ) const { return 0; //new KShortURIOptions( parent, name ); } @@ -545,7 +545,7 @@ TQString KShortURIFilter::configName() const void KShortURIFilter::configure() { - KConfig config( name() + QFL1("rc"), false, false ); + TDEConfig config( name() + QFL1("rc"), false, false ); m_bVerbose = config.readBoolEntry( "Verbose", false ); if ( m_bVerbose ) diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h index db5f9027d..33ba20cad 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.h @@ -84,7 +84,7 @@ public: * * @return the config module */ - virtual KCModule* configModule( TQWidget*, const char* ) const; + virtual TDECModule* configModule( TQWidget*, const char* ) const; public: k_dcop: diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 40495aaa3..a6fb21887 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -85,13 +85,13 @@ static const int DFLT_OFF = 60; extern "C" { - KDE_EXPORT KCModule *create_energy(TQWidget *parent, char *) { + KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) { return new KEnergy(parent, "kcmenergy"); } KDE_EXPORT void init_energy() { #ifdef HAVE_DPMS - KConfig *cfg = new KConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); + TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); cfg->setGroup("DisplayEnergy"); Display *dpy = tqt_xdisplay(); @@ -132,7 +132,7 @@ extern "C" { /**** KEnergy ****/ KEnergy::KEnergy(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { m_bChanged = false; m_bEnabled = false; @@ -221,11 +221,11 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons top->addStretch(); if (m_bDPMS) - setButtons( KCModule::Help | KCModule::Default | KCModule::Apply ); + setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply ); else - setButtons( KCModule::Help ); + setButtons( TDECModule::Help ); - m_pConfig = new KConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/); + m_pConfig = new TDEConfig("kcmdisplayrc", false /*readwrite*/, false /*no globals*/); m_pConfig->setGroup("DisplayEnergy"); load(); diff --git a/kcontrol/energy/energy.h b/kcontrol/energy/energy.h index c50d027ba..8faeaca1a 100644 --- a/kcontrol/energy/energy.h +++ b/kcontrol/energy/energy.h @@ -19,14 +19,14 @@ class TQCheckBox; class KIntNumInput; -class KConfig; +class TDEConfig; extern "C" void init_energy(); /** * The Desktop/Energy tab in kcontrol. */ -class KEnergy: public KCModule +class KEnergy: public TDECModule { Q_OBJECT @@ -62,7 +62,7 @@ private: KIntNumInput *m_pStandbySlider; KIntNumInput *m_pSuspendSlider; KIntNumInput *m_pOffSlider; - KConfig *m_pConfig; + TDEConfig *m_pConfig; }; #endif // __Energy_h_Included__ diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp index 9736e9c9b..5a0fd097b 100644 --- a/kcontrol/filetypes/control.cpp +++ b/kcontrol/filetypes/control.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT KCModule *create_filetypes(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *) { return new FileTypesView(parent, "filetypes"); } diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 6d8ee9860..07b023532 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -25,7 +25,7 @@ #include <ksycoca.h> FileTypesView::FileTypesView(TQWidget *p, const char *name) - : KCModule(p, name) + : TDECModule(p, name) { m_konqConfig = KSharedConfig::openConfig("konquerorrc", false, false); diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h index 2db123398..db1116b29 100644 --- a/kcontrol/filetypes/filetypesview.h +++ b/kcontrol/filetypes/filetypesview.h @@ -21,7 +21,7 @@ class FileTypeDetails; class FileGroupDetails; class TQWidgetStack; -class FileTypesView : public KCModule +class FileTypesView : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index 618c8d825..df59d4b31 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -273,9 +273,9 @@ void TypesListItem::sync() if (isMimeTypeDirty()) { - // We must use KConfig otherwise config.deleteEntry doesn't + // We must use TDEConfig otherwise config.deleteEntry doesn't // properly cancel out settings already present in system files. - KConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" ); + TDEConfig config( m_mimetype->desktopEntryPath(), false, false, "mime" ); config.setDesktopGroup(); config.writeEntry("Type", "MimeType"); @@ -293,7 +293,7 @@ void TypesListItem::sync() m_bNewItem = false; } - KConfig profile("profilerc", false, false); + TDEConfig profile("profilerc", false, false); // Deleting current contents in profilerc relating to // this service type @@ -357,15 +357,15 @@ void TypesListItem::sync() if ( mimeTypeList.contains( name() ) ) { // The mimetype is listed explicitly in the .desktop files, so // just remove it and we're done - KConfig *desktop; + TDEConfig *desktop; if ( !isApplication ) { - desktop = new KConfig(pService->desktopEntryPath(), false, false, "services"); + desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services"); } else { TQString path = pService->locateLocal(); - KConfig orig(pService->desktopEntryPath(), true, false, "apps"); + TDEConfig orig(pService->desktopEntryPath(), true, false, "apps"); desktop = orig.copyTo(path); } desktop->setDesktopGroup(); @@ -452,7 +452,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop) return 0; } -void TypesListItem::saveServices( KConfig & profile, TQStringList services, const TQString & genericServiceType ) +void TypesListItem::saveServices( TDEConfig & profile, TQStringList services, const TQString & genericServiceType ) { TQStringList::Iterator it(services.begin()); for (int i = services.count(); it != services.end(); ++it, i--) { @@ -482,15 +482,15 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList)) { - KConfig *desktop; + TDEConfig *desktop; if ( pService->type() == TQString("Service") ) { - desktop = new KConfig(pService->desktopEntryPath(), false, false, "services"); + desktop = new TDEConfig(pService->desktopEntryPath(), false, false, "services"); } else { TQString path = pService->locateLocal(); - KConfig orig(pService->desktopEntryPath(), true, false, "apps"); + TDEConfig orig(pService->desktopEntryPath(), true, false, "apps"); desktop = orig.copyTo(path); } diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h index 1946d9ab7..671604961 100644 --- a/kcontrol/filetypes/typeslistitem.h +++ b/kcontrol/filetypes/typeslistitem.h @@ -96,7 +96,7 @@ public: private: void getServiceOffers( TQStringList & appServices, TQStringList & embedServices ) const; - void saveServices( KConfig & profile, TQStringList services, const TQString & servicetype2 ); + void saveServices( TDEConfig & profile, TQStringList services, const TQString & servicetype2 ); void initMeta( const TQString & major ); void init(KMimeType::Ptr mimetype); static int readAutoEmbed( KMimeType::Ptr mimetype ); diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 93d76c28e..7efe76b6d 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -158,14 +158,14 @@ void FontUseItem::setDefault() void FontUseItem::readFont( bool useDefaults ) { - KConfigBase *config; + TDEConfigBase *config; bool deleteme = false; if (_rcfile.isEmpty()) config = TDEGlobal::config(); else { - config = new KConfig(_rcfile, true); + config = new TDEConfig(_rcfile, true); deleteme = true; } @@ -179,7 +179,7 @@ void FontUseItem::readFont( bool useDefaults ) void FontUseItem::writeFont() { - KConfigBase *config; + TDEConfigBase *config; if (_rcfile.isEmpty()) { config = TDEGlobal::config(); @@ -326,7 +326,7 @@ bool FontAASettings::load( bool useDefaults ) if(!xft.getHintStyle(hStyle) || KXftConfig::Hint::NotSet==hStyle) { - KConfig kglobals("kdeglobals", false, false); + TDEConfig kglobals("kdeglobals", false, false); kglobals.setReadDefaults( useDefaults ); @@ -350,7 +350,7 @@ bool FontAASettings::load( bool useDefaults ) bool FontAASettings::save( bool useAA ) { KXftConfig xft(KXftConfig::constStyleSettings); - KConfig kglobals("kdeglobals", false, false); + TDEConfig kglobals("kdeglobals", false, false); kglobals.setGroup("General"); @@ -507,7 +507,7 @@ static TQCString desktopConfigName() } KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(FontFactory::instance(), parent, name) + : TDECModule(FontFactory::instance(), parent, name) { TQStringList nameGroupKeyRc; @@ -693,7 +693,7 @@ void KFonts::load( bool useDefaults ) useAA_original = useAA = aaSettings->load( useDefaults ) ? AAEnabled : AADisabled; cbAA->setCurrentItem( useAA ); - KConfig cfgfonts("kcmfonts", true); + TDEConfig cfgfonts("kcmfonts", true); cfgfonts.setGroup("General"); int dpicfg = cfgfonts.readNumEntry( "forceFontDPI", 0 ); DPISetting dpi = dpicfg == 120 ? DPI120 : dpicfg == 96 ? DPI96 : DPINone; @@ -715,7 +715,7 @@ void KFonts::save() i->writeFont(); TDEGlobal::config()->sync(); - KConfig cfgfonts("kcmfonts"); + TDEConfig cfgfonts("kcmfonts"); cfgfonts.setGroup("General"); DPISetting dpi = static_cast< DPISetting >( comboForceDpi->currentItem()); const int dpi2value[] = { 0, 96, 120 }; diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index b75a82fa4..d69035b4c 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -89,7 +89,7 @@ private: /** * The Desktop/fonts tab in kcontrol. */ -class KFonts : public KCModule +class KFonts : public TDECModule { Q_OBJECT diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index a63eb84ea..b1bae281a 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -61,7 +61,7 @@ KSimpleConfig *systemconfig; /**** TDEHWManager ****/ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(TDEHWManagerFactory::instance(), parent, name) + : TDECModule(TDEHWManagerFactory::instance(), parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index 1847f4f33..7e395d0a3 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -34,11 +34,11 @@ #include "devicepropsdlg.h" #include "deviceiconview.h" -class KConfig; +class TDEConfig; class KPopupMenu; class KListViewItem; -class TDEHWManager : public KCModule, public DCOPObject +class TDEHWManager : public TDECModule, public DCOPObject { K_DCOP Q_OBJECT @@ -65,7 +65,7 @@ private slots: private: TDEHWManagerBase *base; - KConfig *config; + TDEConfig *config; }; #endif diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 56af11adc..c65699489 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -61,7 +61,7 @@ KSimpleConfig *systemconfig; /**** KICCConfig ****/ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL) + : TDECModule(KICCCFactory::instance(), parent, name), iccFileArray(NULL) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h index d113e5d84..74fe1b49d 100644 --- a/kcontrol/iccconfig/iccconfig.h +++ b/kcontrol/iccconfig/iccconfig.h @@ -31,11 +31,11 @@ #include "iccconfigbase.h" -class KConfig; +class TDEConfig; class KPopupMenu; class KListViewItem; -class KICCConfig : public KCModule, public DCOPObject +class KICCConfig : public TDECModule, public DCOPObject { K_DCOP Q_OBJECT @@ -59,7 +59,7 @@ public: private: - KConfig *config; + TDEConfig *config; bool _ok; Display *randr_display; ScreenInfo *randr_screen_info; diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 8f9e46fbc..cd529485c 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -35,7 +35,7 @@ /**** KIconConfig ****/ KIconConfig::KIconConfig(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQGridLayout *top = new TQGridLayout(this, 4, 2, @@ -289,7 +289,7 @@ void KIconConfig::read() mpKickerConfig->setGroup("General"); mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge); - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED)); mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT)); } @@ -473,7 +473,7 @@ void KIconConfig::save() mpKickerConfig->setGroup("General"); mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize); - KConfigGroup g( TDEGlobal::config(), "KDE" ); + TDEConfigGroup g( TDEGlobal::config(), "KDE" ); g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true); g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true); diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h index cc94b6e8b..3c824af33 100644 --- a/kcontrol/icons/icons.h +++ b/kcontrol/icons/icons.h @@ -35,7 +35,7 @@ class TQTabWidget; class TQWidget; class KColorButton; -class KConfig; +class TDEConfig; class KIconEffect; class KIconLoader; class KIconTheme; @@ -53,7 +53,7 @@ struct Effect /** * The General Icons tab in kcontrol. */ -class KIconConfig: public KCModule +class KIconConfig: public TDECModule { Q_OBJECT @@ -106,7 +106,7 @@ private: KIconEffect *mpEffect; KIconTheme *mpTheme; KIconLoader *mpLoader; - KConfig *mpConfig; + TDEConfig *mpConfig; KSimpleConfig *mpSystrayConfig; KSimpleConfig *mpKickerConfig; diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 6e8824cce..835962ff6 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -52,7 +52,7 @@ #include "iconthemes.h" IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -160,7 +160,7 @@ void IconThemesConfig::installNewTheme() TQString themeTmpFile; // themeTmpFile contains the name of the downloaded file - if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) { + if (!TDEIO::NetAccess::download(themeURL, themeTmpFile, this)) { TQString sorryText; if (themeURL.isLocalFile()) sorryText = i18n("Unable to find the icon theme archive %1."); @@ -176,7 +176,7 @@ void IconThemesConfig::installNewTheme() TQString invalidArch(i18n("The file is not a valid icon theme archive.")); KMessageBox::error(this, invalidArch); - KIO::NetAccess::removeTempFile(themeTmpFile); + TDEIO::NetAccess::removeTempFile(themeTmpFile); return; } @@ -189,7 +189,7 @@ void IconThemesConfig::installNewTheme() KMessageBox::error(this, somethingWrong); } - KIO::NetAccess::removeTempFile(themeTmpFile); + TDEIO::NetAccess::removeTempFile(themeTmpFile); TDEGlobal::instance()->newIconLoader(); loadThemes(); @@ -296,11 +296,11 @@ void IconThemesConfig::removeSelectedTheme() KIconTheme icontheme(m_themeNames[selected->text(0)]); - // delete the index file before the async KIO::del so loadThemes() will + // delete the index file before the async TDEIO::del so loadThemes() will // ignore that dir. unlink(TQFile::encodeName(icontheme.dir()+"/index.theme").data()); unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data()); - KIO::del(KURL( icontheme.dir() )); + TDEIO::del(KURL( icontheme.dir() )); TDEGlobal::instance()->newIconLoader(); diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h index 6c13bba98..8eb9716fe 100644 --- a/kcontrol/icons/iconthemes.h +++ b/kcontrol/icons/iconthemes.h @@ -30,7 +30,7 @@ class TQCheckBox; class TQStringList; -class IconThemesConfig : public KCModule +class IconThemesConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp index 2ced51361..8a9b564ac 100644 --- a/kcontrol/icons/main.cpp +++ b/kcontrol/icons/main.cpp @@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") ) /**** IconModule ****/ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(IconsFactory::instance(), parent, name) + : TDECModule(IconsFactory::instance(), parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h index f9c1efc27..431f40254 100644 --- a/kcontrol/icons/main.h +++ b/kcontrol/icons/main.h @@ -29,7 +29,7 @@ #include <tqtabwidget.h> #include <kcmodule.h> -class IconModule : public KCModule +class IconModule : public TDECModule { Q_OBJECT @@ -47,8 +47,8 @@ protected slots: private: TQTabWidget *tab; - KCModule *tab1; - KCModule *tab2; + TDECModule *tab1; + TDECModule *tab2; }; diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 0837209d6..666b914ab 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -399,7 +399,7 @@ TQString KInfoListWidget::quickHelp() const KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name, bool _getlistbox(TQListView *lbox)) - : KCModule(parent, name), + : TDECModule(parent, name), title(_title) { TDEAboutData *about = @@ -411,7 +411,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const about->addAuthor("Helge Deller", 0, "[email protected]"); setAboutData( about ); - setButtons(KCModule::Help); + setButtons(TDECModule::Help); getlistbox = _getlistbox; GetInfo_ErrorString = 0; TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h index 80f200d2a..d26c7ba1f 100644 --- a/kcontrol/info/info.h +++ b/kcontrol/info/info.h @@ -32,7 +32,7 @@ bool GetInfo_XServer_and_Video( TQListView *lBox ); bool GetInfo_CD_ROM( TQListView *lBox ); /* New CD-ROM Info */ extern bool GetInfo_OpenGL( TQListView *lBox ); -class KInfoListWidget : public KCModule +class KInfoListWidget : public TDECModule { public: KInfoListWidget(const TQString &_title, TQWidget *parent, const char *name=0, bool _getlistbox (TQListView *)=0); diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index 02fd98b1d..22efcd6d3 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -43,7 +43,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <kio/global.h> /* for KIO::convertSize() */ +#include <kio/global.h> /* for TDEIO::convertSize() */ typedef struct { @@ -295,9 +295,9 @@ bool GetInfo_Partitions (TQListView *lbox) big[1] *= mnt->f_bavail; // FIXME: use f_bfree if root? // convert to strings - vv[0] = KIO::convertSize(big[0]); + vv[0] = TDEIO::convertSize(big[0]); vv[1] = TQString::fromLatin1("%1 (%2%%)") - .arg(KIO::convertSize(big[1])) + .arg(TDEIO::convertSize(big[1])) .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); // FIXME: these two are large enough to punctuate diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp index 689ac25b7..780b6532e 100644 --- a/kcontrol/info/main.cpp +++ b/kcontrol/info/main.cpp @@ -34,7 +34,7 @@ extern "C" { - KDE_EXPORT KCModule *create_cpu(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CPU_AVAILABLE return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU); @@ -43,7 +43,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_irq(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IRQ_AVAILABLE return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ); @@ -52,7 +52,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_pci(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PCI_AVAILABLE return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI); @@ -61,7 +61,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_dma(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DMA_AVAILABLE return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA); @@ -70,7 +70,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_ioports(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IOPORTS_AVAILABLE return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports); @@ -79,7 +79,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_sound(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SOUND_AVAILABLE return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound); @@ -88,7 +88,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_scsi(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SCSI_AVAILABLE return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI); @@ -97,7 +97,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_devices(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DEVICES_AVAILABLE return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices); @@ -106,7 +106,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_partitions(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PARTITIONS_AVAILABLE return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions); @@ -115,7 +115,7 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_xserver(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/) { #ifdef INFO_XSERVER_AVAILABLE return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video); @@ -124,12 +124,12 @@ extern "C" #endif } - KDE_EXPORT KCModule *create_memory(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/) { return new KMemoryWidget(parent, "kcminfo"); } - KDE_EXPORT KCModule *create_opengl(TQWidget *parent, const char * ) + KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * ) { #ifdef INFO_OPENGL_AVAILABLE return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL); @@ -139,7 +139,7 @@ extern "C" } /* create_cdinfo function for CD-ROM Info ~Jahshan */ - KDE_EXPORT KCModule *create_cdinfo(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CD_ROM_AVAILABLE return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 49cb03dde..d6cd750ec 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -88,7 +88,7 @@ static TQString formatted_unit(t_memsize value) } KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) -: KCModule(parent, name) +: TDECModule(parent, name) { TDEAboutData *about = diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h index 1387f5ac3..aaeb56f86 100644 --- a/kcontrol/info/memory.h +++ b/kcontrol/info/memory.h @@ -27,7 +27,7 @@ typedef unsigned long t_memsize; #define COLOR_USED_RAM TQColor(220,200,88) #define COLOR_FREE_MEMORY TQColor(127,255,212) -class KMemoryWidget:public KCModule { +class KMemoryWidget:public TDECModule { Q_OBJECT public: diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index ed3975fc9..dcef9b85e 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -93,7 +93,7 @@ void ThemePage::save() bool whiteCursor = selectedTheme.right( 5 ) == "White"; bool largeCursor = selectedTheme.left( 5 ) == "Large"; - KConfig c( "kcminputrc" ); + TDEConfig c( "kcminputrc" ); c.setGroup( "Mouse" ); c.writeEntry( "LargeCursor", largeCursor ); c.writeEntry( "WhiteCursor", whiteCursor ); @@ -116,7 +116,7 @@ void ThemePage::load( bool useDefaults ) { bool largeCursor, whiteCursor; - KConfig c( "kcminputrc" ); + TDEConfig c( "kcminputrc" ); c.setReadDefaults( useDefaults ); @@ -179,14 +179,14 @@ void ThemePage::fixCursorFile() // Run mkfontdir to update fonts.dir in that dir. TDEGlobal::dirs()->addResourceType( "font", "share/fonts/" ); - KIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") ); + TDEIO::mkdir( KURL::fromPathOrURL(TQDir::homeDirPath() + "/.fonts/kde-override") ); TQString overrideDir = TQDir::homeDirPath() + "/.fonts/kde-override/"; KURL installedFont; installedFont.setPath( overrideDir + "cursor.pcf.gz" ); if ( currentTheme == "SmallBlack" ) - KIO::NetAccess::del( installedFont, this ); + TDEIO::NetAccess::del( installedFont, this ); else { KURL source; @@ -197,7 +197,7 @@ void ThemePage::fixCursorFile() else if ( currentTheme == "SmallWhite" ) source.setPath( locate("data", "kcminput/cursor_small_white.pcf.gz") ); - KIO::NetAccess::file_copy( source, installedFont, -1, true ); + TDEIO::NetAccess::file_copy( source, installedFont, -1, true ); } TQString cmd = TDEGlobal::dirs()->findExe( "mkfontdir" ); diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 23defa614..39b8948ae 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -233,7 +233,7 @@ void LogitechMouse::applyChanges() } } -void LogitechMouse::save(KConfig * /*config*/) +void LogitechMouse::save(TDEConfig * /*config*/) { kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl; } diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index 1eae2d60f..60780758a 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -52,7 +52,7 @@ public: LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlags, TQWidget* parent = 0, const char* name = 0 ); ~LogitechMouse(); void applyChanges(); - void save(KConfig *config); + void save(TDEConfig *config); protected slots: void setChannel1(); diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 439e5f676..0ab009ec9 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -41,14 +41,14 @@ extern "C" { - KDE_EXPORT KCModule *create_mouse(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *) { return new MouseConfig(parent, "kcminput"); } KDE_EXPORT void init_mouse() { - KConfig *config = new KConfig("kcminputrc", true, false); // Read-only, no globals + TDEConfig *config = new TDEConfig("kcminputrc", true, false); // Read-only, no globals MouseSettings settings; settings.load(config); settings.apply(true); // force diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index ed43ef858..9253a1910 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -75,7 +75,7 @@ #undef Below MouseConfig::MouseConfig (TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { @@ -483,7 +483,7 @@ void MouseConfig::load() void MouseConfig::load( bool useDefaults ) { - KConfig config( "kcminputrc", true ); + TDEConfig config( "kcminputrc", true ); config.setReadDefaults( useDefaults ); @@ -516,7 +516,7 @@ void MouseConfig::load( bool useDefaults ) slotClick(); - KConfig ac("kaccessrc", true); + TDEConfig ac("kaccessrc", true); ac.setGroup("Mouse"); mouseKeys->setChecked(ac.readBoolEntry("MouseKeys", false)); @@ -568,10 +568,10 @@ void MouseConfig::save() settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked(); settings->apply(); - KConfig config( "kcminputrc" ); + TDEConfig config( "kcminputrc" ); settings->save(&config); - KConfig ac("kaccessrc", false); + TDEConfig ac("kaccessrc", false); ac.setGroup("Mouse"); @@ -593,7 +593,7 @@ void MouseConfig::save() // restart kaccess kapp->startServiceByDesktopName("kaccess"); - KCModule::changed(false); + TDECModule::changed(false); } @@ -624,7 +624,7 @@ void MouseConfig::slotHandedChanged(int val){ settings->m_handedNeedsApply = true; } -void MouseSettings::load(KConfig *config) +void MouseSettings::load(TDEConfig *config) { int accel_num, accel_den, threshold; double accel; @@ -799,7 +799,7 @@ void MouseSettings::apply(bool force) #endif } -void MouseSettings::save(KConfig *config) +void MouseSettings::save(TDEConfig *config) { config->setGroup("Mouse"); config->writeEntry("Acceleration",accelRate); diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index bee04d5ea..809ac4817 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -62,8 +62,8 @@ class TQTabWidget; class MouseSettings { public: - void save(KConfig *); - void load(KConfig *); + void save(TDEConfig *); + void load(TDEConfig *); void apply(bool force=false); public: int num_buttons; @@ -89,7 +89,7 @@ public: #endif }; -class MouseConfig : public KCModule +class MouseConfig : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index d716b9ab5..a0f0ef0cf 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -139,7 +139,7 @@ void ThemePage::save() if ( currentTheme == selectedTheme ) return; - KConfig c( "kcminputrc" ); + TDEConfig c( "kcminputrc" ); c.setGroup( "Mouse" ); c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null ); @@ -162,7 +162,7 @@ void ThemePage::load( bool useDefaults ) currentTheme = theme; // Get the name of the theme TDE is configured to use - KConfig c( "kcminputrc" ); + TDEConfig c( "kcminputrc" ); c.setReadDefaults( useDefaults ); c.setGroup( "Mouse" ); currentTheme = c.readEntry( "cursorTheme", currentTheme ); @@ -221,7 +221,7 @@ void ThemePage::installClicked() return; TQString tmpFile; - if ( !KIO::NetAccess::download( url, tmpFile, this ) ) { + if ( !TDEIO::NetAccess::download( url, tmpFile, this ) ) { TQString text; if ( url.isLocalFile() ) @@ -238,7 +238,7 @@ void ThemePage::installClicked() KMessageBox::error( this, i18n( "The file %1 does not appear to be a valid " "cursor theme archive.").arg( url.fileName() ) ); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } @@ -257,7 +257,7 @@ void ThemePage::removeClicked() // Delete the theme from the harddrive KURL u; u.setPath( themeInfo[ selectedTheme ]->path ); - KIO::del( u ); + TDEIO::del( u ); // Remove the theme from the listview and from the themeinfo dict delete listview->findItem( selectedTheme, DirColumn ); @@ -268,7 +268,7 @@ void ThemePage::removeClicked() // Since it's possible to substitute cursors in a system theme by adding a local // theme with the same name, we shouldn't remove the theme from the list if it's // still available elsewhere. This could be solved by calling insertThemes() here, - // but since KIO::del() is an asynchronos operation, the theme we're deleting will + // but since TDEIO::del() is an asynchronos operation, the theme we're deleting will // be readded to the list again before KIO has removed it. } diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index 6ed69774b..9ee3d93f9 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -49,12 +49,12 @@ typedef KGenericFactory<KCMIOSlaveInfo, TQWidget> SlaveFactory; K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") ) KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &) - :KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0) + :TDECModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0) { TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves.")); - setButtons( KCModule::Help ); + setButtons( TDECModule::Help ); TQLabel* label=new TQLabel(i18n("Available IO slaves:"),this); TQHBox *hbox=new TQHBox(this); @@ -80,7 +80,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin m_ioslavesLb->sort(); m_ioslavesLb->setSelected(0, true); - setButtons(KCModule::Help); + setButtons(TDECModule::Help); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmioslaveinfo"), @@ -94,7 +94,7 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin } -void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data) +void KCMIOSlaveInfo::slaveHelp( TDEIO::Job *, const TQByteArray &data) { if ( data.size() == 0 ) { // EOF int index = helpData.find( "<meta http-equiv=\"Content-Type\"" ); @@ -111,7 +111,7 @@ void KCMIOSlaveInfo::slaveHelp( KIO::Job *, const TQByteArray &data) helpData += data; } -void KCMIOSlaveInfo::slotResult(KIO::Job *) +void KCMIOSlaveInfo::slotResult(TDEIO::Job *) { m_tfj = 0; } @@ -129,9 +129,9 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol) if (!file.isEmpty()) { helpData.truncate( 0 ); - m_tfj = KIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false ); - connect( m_tfj, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( KIO::Job *, const TQByteArray &) ) ); - connect( m_tfj, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); + m_tfj = TDEIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false ); + connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); return; } m_info->setText(i18n("Some info about protocol %1:/ ...").arg(protocol)); diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index 9537d6cc7..b587c39ec 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h @@ -36,9 +36,9 @@ class KIOTimeoutControl; class TQTabWidget; class TQSpinBox; -class KConfig; +class TDEConfig; -class KCMIOSlaveInfo : public KCModule +class KCMIOSlaveInfo : public TDECModule { Q_OBJECT public: @@ -48,14 +48,14 @@ protected: KListBox *m_ioslavesLb; KTextBrowser *m_info; TQCString helpData; - KIO::Job *m_tfj; + TDEIO::Job *m_tfj; protected slots: void showInfo(const TQString& protocol); void showInfo(TQListBoxItem *item); - void slaveHelp( KIO::Job *, const TQByteArray &data); - void slotResult( KIO::Job * ); + void slaveHelp( TDEIO::Job *, const TQByteArray &data); + void slotResult( TDEIO::Job * ); }; #endif diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 9a622c667..f97fe8e51 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -67,7 +67,7 @@ extern "C" //--------------------------------------------------------------------------------------------- joystick::joystick(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(JoystickFactory::instance(), parent, name) + : TDECModule(JoystickFactory::instance(), parent, name) { setAboutData( new TDEAboutData("kcmjoystick", I18N_NOOP("TDE Joystick Control Module"), "1.0", I18N_NOOP("TDE Control Center Module to test Joysticks"), @@ -97,7 +97,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &) setMinimumSize(joyWidget->minimumSize()); - setButtons(KCModule::Default); + setButtons(TDECModule::Default); } //--------------------------------------------------------------------------------------------- diff --git a/kcontrol/joystick/joystick.h b/kcontrol/joystick/joystick.h index 0f412efb3..2a201b28f 100644 --- a/kcontrol/joystick/joystick.h +++ b/kcontrol/joystick/joystick.h @@ -25,7 +25,7 @@ class JoyWidget; -class joystick: public KCModule +class joystick: public TDECModule { Q_OBJECT diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h index 37a9b8537..af1dc3019 100644 --- a/kcontrol/kcontrol/aboutwidget.h +++ b/kcontrol/kcontrol/aboutwidget.h @@ -24,7 +24,7 @@ #include <tqlistview.h> #include <tqhbox.h> -class KCModuleInfo; +class TDECModuleInfo; class TQPixmap; class KPixmap; class ConfigModule; diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp index 723895de3..e99cfa799 100644 --- a/kcontrol/kcontrol/kcrootonly.cpp +++ b/kcontrol/kcontrol/kcrootonly.cpp @@ -24,7 +24,7 @@ #include "kcrootonly.h" KCRootOnly::KCRootOnly(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQVBoxLayout *layout=new TQVBoxLayout(this); TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>" diff --git a/kcontrol/kcontrol/kcrootonly.h b/kcontrol/kcontrol/kcrootonly.h index b52fab34b..e167c4452 100644 --- a/kcontrol/kcontrol/kcrootonly.h +++ b/kcontrol/kcontrol/kcrootonly.h @@ -4,7 +4,7 @@ #include <kcmodule.h> -class KCRootOnly: public KCModule { +class KCRootOnly: public TDECModule { public: KCRootOnly(TQWidget *parent, const char *name); }; diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 7edc8bd43..ad61b11c1 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -65,7 +65,7 @@ KControlApp::KControlApp() connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); // Initial size is: // never bigger than workspace as reported by desk @@ -88,7 +88,7 @@ KControlApp::~KControlApp() { if (toplevel) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index 687b3a412..98135a27f 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -43,7 +43,7 @@ TQPalette ModuleIface::getPalette(){ } TQString ModuleIface::getStyle() { - KConfig config( "kdeglobals" ); + TDEConfig config( "kdeglobals" ); config.setGroup( "General" ); return config.readEntry("widgetStyle"); } diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 592eb52c2..047fa75e6 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -47,7 +47,7 @@ template class TQPtrList<ConfigModule>; ConfigModule::ConfigModule(const KService::Ptr &s) - : KCModuleInfo(s), _changed(false), _module(0), _embedWidget(0), + : TDECModuleInfo(s), _changed(false), _module(0), _embedWidget(0), _rootProcess(0), _embedLayout(0), _embedFrame(0), _embedStack(0) { } @@ -64,12 +64,12 @@ ProxyWidget *ConfigModule::module() bool run_as_root = needsRootPrivileges() && (getuid() != 0); - KCModule *modWidget = 0; + TDECModule *modWidget = 0; if (run_as_root && isHiddenByDefault()) modWidget = new KCRootOnly(0, "root_only"); else - modWidget = KCModuleLoader::loadModule(*this); + modWidget = TDECModuleLoader::loadModule(*this); if (modWidget) { @@ -110,7 +110,7 @@ void ConfigModule::deleteClient() delete _embedLayout; _embedLayout = 0; - KCModuleLoader::unloadModule(*this); + TDECModuleLoader::unloadModule(*this); _changed = false; } diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index bb612e376..f2bce1d6d 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -28,7 +28,7 @@ template<class ConfigModule> class TQPtrList; class TQStringList; class TDEAboutData; -class KCModule; +class TDECModule; class ProxyWidget; class TDEProcess; class QXEmbed; @@ -36,7 +36,7 @@ class TQVBoxLayout; class TQVBox; class TQWidgetStack; -class ConfigModule : public TQObject, public KCModuleInfo +class ConfigModule : public TQObject, public TDECModuleInfo { Q_OBJECT diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 7e3f30de4..5d540d2c6 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -103,13 +103,13 @@ RootInfoWidget::RootInfoWidget(TQWidget *parent, const char *name = 0) class ProxyView : public TQScrollView { public: - ProxyView(KCModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name); + ProxyView(TDECModule *client, const TQString& title, TQWidget *parent, bool run_as_root, const char *name); private: virtual void resizeEvent(TQResizeEvent *); TQWidget *contentWidget; - KCModule *client; + TDECModule *client; bool scroll; }; @@ -124,7 +124,7 @@ public: }; -ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name) +ProxyView::ProxyView(TDECModule *_client, const TQString&, TQWidget *parent, bool run_as_root, const char *name) : TQScrollView(parent, name), client(_client) { setResizePolicy(TQScrollView::AutoOneFit); @@ -157,7 +157,7 @@ void ProxyView::resizeEvent(TQResizeEvent *e) //////////////////////////////////////////////////////////////////////////////////////////////////////// -ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name, +ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, bool run_as_root) : TQWidget(0, name) , _client(client) @@ -215,10 +215,10 @@ ProxyWidget::ProxyWidget(KCModule *client, TQString title, const char *name, // only enable the requested buttons int b = _client->buttons(); - trinity_setVisible(_handbook, (b & KCModule::Help)); - trinity_setVisible(_default, mayModify && (b & KCModule::Default)); - trinity_setVisible(_apply, mayModify && (b & KCModule::Apply)); - trinity_setVisible(_reset, mayModify && (b & KCModule::Apply)); + trinity_setVisible(_handbook, (b & TDECModule::Help)); + trinity_setVisible(_default, mayModify && (b & TDECModule::Default)); + trinity_setVisible(_apply, mayModify && (b & TDECModule::Apply)); + trinity_setVisible(_reset, mayModify && (b & TDECModule::Apply)); trinity_setVisible(_root, run_as_root); // disable initial buttons diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index e1cff0351..bb951ccdf 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -28,7 +28,7 @@ class TQWidget; class TQPushButton; class TQFrame; -class KCModule; +class TDECModule; class TDEAboutData; #include "dockcontainer.h" @@ -42,7 +42,7 @@ class ProxyWidget : public TQWidget public: - ProxyWidget(KCModule *client, TQString title, const char *name=0, bool run_as_root = false); + ProxyWidget(TDECModule *client, TQString title, const char *name=0, bool run_as_root = false); ~ProxyWidget(); TQString quickHelp() const; @@ -73,7 +73,7 @@ private: TQPushButton *_handbook, *_default, *_apply, *_reset, *_root; TQFrame *_sep; - KCModule *_client; + TDECModule *_client; ProxyView *view; }; diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 62b23591a..fbfc86cd7 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -57,7 +57,7 @@ TopLevel::TopLevel(const char* name) report_bug = 0; // read settings - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Index"); TQString viewmode = config->readEntry("ViewMode", "Tree"); @@ -196,7 +196,7 @@ TopLevel::TopLevel(const char* name) TopLevel::~TopLevel() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Index"); if (KCGlobal::viewMode() == Tree) config->writeEntry("ViewMode", "Tree"); diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index af606f5fd..eeccfb362 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kded, KDEDFactory( "kcmkded" ) ) KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) : - KCModule( KDEDFactory::instance(), parent, name ) + TDECModule( KDEDFactory::instance(), parent, name ) { TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkded" ), I18N_NOOP( "TDE Service Manager" ), @@ -110,7 +110,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) load(); } -void setModuleGroup(KConfig *config, const TQString &filename) +void setModuleGroup(TDEConfig *config, const TQString &filename) { TQString module = filename; int i = module.findRev('/'); @@ -123,13 +123,13 @@ void setModuleGroup(KConfig *config, const TQString &filename) config->setGroup(TQString("Module-%1").arg(module)); } -bool KDEDConfig::autoloadEnabled(KConfig *config, const TQString &filename) +bool KDEDConfig::autoloadEnabled(TDEConfig *config, const TQString &filename) { setModuleGroup(config, filename); return config->readBoolEntry("autoload", true); } -void KDEDConfig::setAutoloadEnabled(KConfig *config, const TQString &filename, bool b) +void KDEDConfig::setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b) { setModuleGroup(config, filename); return config->writeEntry("autoload", b); @@ -141,7 +141,7 @@ void KDEDConfig::load() { void KDEDConfig::load( bool useDefaults ) { - KConfig kdedrc("kdedrc", true, false); + TDEConfig kdedrc("kdedrc", true, false); kdedrc.setReadDefaults( useDefaults ); _lvStartup->clear(); @@ -190,13 +190,13 @@ void KDEDConfig::save() { TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); - KConfig kdedrc("kdedrc", false, false); + TDEConfig kdedrc("kdedrc", false, false); for ( TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it ) { if ( KDesktopFile::isDesktopFile( *it ) ) { - KConfig file( *it, false, false, "services" ); + TDEConfig file( *it, false, false, "services" ); file.setGroup("Desktop Entry"); if (file.readBoolEntry("X-TDE-Kded-autoload")){ diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index 1e9e42e72..86f5aaf94 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -28,7 +28,7 @@ class KListView; class TQStringList; class TQPushButton; -class KDEDConfig : public KCModule +class KDEDConfig : public TDECModule { Q_OBJECT public: @@ -49,8 +49,8 @@ protected slots: void slotItemChecked(TQCheckListItem *item); void getServiceStatus(); - bool autoloadEnabled(KConfig *config, const TQString &filename); - void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b); + bool autoloadEnabled(TDEConfig *config, const TQString &filename); + void setAutoloadEnabled(TDEConfig *config, const TQString &filename, bool b); private: KListView *_lvLoD; diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index ef8ff9f33..a50d7a41d 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -33,8 +33,8 @@ class KAccelBase; class TQObject; -class KConfig; -class KConfigBase; +class TDEConfig; +class TDEConfigBase; /* KAccelAction holds information an a given action, such as "Run Command" @@ -156,7 +156,7 @@ class KAccelActions void clear(); bool init( const KAccelActions& ); - bool init( KConfigBase& config, const TQString& sGroup ); + bool init( TDEConfigBase& config, const TQString& sGroup ); void updateShortcuts( KAccelActions& ); @@ -176,8 +176,8 @@ class KAccelActions KAccelAction* insert( const TQString& sName, const TQString& sLabel ); bool remove( const TQString& sAction ); - bool readActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0 ); - bool writeActions( const TQString& sConfigGroup = "Shortcuts", KConfigBase* pConfig = 0, + bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 ); + bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0, bool bWriteAll = false, bool bGlobal = false ) const; void emitKeycodeChanged(); diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 539c67215..88f3aabe0 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -179,7 +179,7 @@ KKeyModule::~KKeyModule (){ delete sFileList; } -bool KKeyModule::writeSettings( const TQString& sGroup, KConfig* pConfig ) +bool KKeyModule::writeSettings( const TQString& sGroup, TDEConfig* pConfig ) { kc->commitChanges(); actions.writeActions( sGroup, pConfig, true, false ); @@ -279,8 +279,8 @@ void KKeyModule::readScheme( int index ) //else if( index == 2 ) // kc->allDefault( true ); else { - KConfigBase* config = 0; - if( index == 0 ) config = new KConfig( "kdeglobals" ); + TDEConfigBase* config = 0; + if( index == 0 ) config = new TDEConfig( "kdeglobals" ); //else config = new KSimpleConfig( *sFileList->at( index ), true ); actions.readActions( (index == 0) ? KeySet : KeyScheme, config ); @@ -472,7 +472,7 @@ void KKeyModule::init() kdDebug(125) << "KKeyModule::init()\n"; /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); KAccel::useFourModifierKeys( fourMods == "true" ); bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index cecadf328..5595e76e2 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -41,7 +41,7 @@ public: virtual void defaults(); static void init(); - bool writeSettings( const TQString& sGroup, KConfig* pConfig ); + bool writeSettings( const TQString& sGroup, TDEConfig* pConfig ); bool writeSettingsGlobal( const TQString& sGroup ); public slots: diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index 456818bed..0c6d13c4d 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -49,7 +49,7 @@ o Pre-set scheme <Remove Scheme> Global Shortcuts */ KeyModule::KeyModule( TQWidget *parent, const char *name ) -: KCModule( parent, name ) +: TDECModule( parent, name ) { setQuickHelp( i18n("<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain actions to be" " triggered when you press a key or a combination of keys, e.g. Ctrl+C is normally bound to" @@ -129,7 +129,7 @@ void KeyModule::resizeEvent( TQResizeEvent * ) extern "C" { - KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 TDEGlobal::locale()->insertCatalogue("twin"); @@ -142,7 +142,7 @@ extern "C" { kdDebug(125) << "KeyModule::initModifiers()" << endl; - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false ); if( bMacSwap ) ModifiersModule::setupMacModifierKeys(); @@ -153,7 +153,7 @@ extern "C" kdDebug(125) << "KeyModule::init()\n"; /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); TQString fourMods = TDEGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); KAccel::useFourModifierKeys( fourMods == "true" ); bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); @@ -179,7 +179,7 @@ extern "C" // This is needed to be able to check for conflicts with global keys in app's keyconfig // dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys. // However, avoid writing at every KDE startup, just update them after every rebuild of this file. - KConfigGroup group( TDEGlobal::config(), "Global Shortcuts" ); + TDEConfigGroup group( TDEGlobal::config(), "Global Shortcuts" ); if( group.readEntry( "Defaults timestamp" ) != __DATE__ __TIME__ ) { kdDebug(125) << "KeyModule::init() - Read Config Bindings\n"; // Check for old group, diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h index f0b18c43d..eec44060f 100644 --- a/kcontrol/keys/main.h +++ b/kcontrol/keys/main.h @@ -31,7 +31,7 @@ class CommandShortcutsModule; class ShortcutsModule; class ModifiersModule; -class KeyModule : public KCModule +class KeyModule : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 05802de74..6da5c94f1 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -61,7 +61,7 @@ ModifiersModule::ModifiersModule( TQWidget *parent, const char *name ) void ModifiersModule::load( bool useDefaults ) { - KConfig *c = TDEGlobal::config(); + TDEConfig *c = TDEGlobal::config(); c->setReadDefaults( useDefaults ); @@ -82,7 +82,7 @@ void ModifiersModule::save() { kdDebug(125) << "ModifiersModule::save()" << endl; - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); if( m_plblCtrl->text() != "Ctrl" ) TDEGlobal::config()->writeEntry( "Label Ctrl", m_plblCtrl->text(), true, true ); diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 814703b0f..c5db61ecc 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -76,7 +76,7 @@ namespace KFI { CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) - : KCModule(parent, "kfontinst"), + : TDECModule(parent, "kfontinst"), #ifdef HAVE_XFT itsPreview(NULL), #endif @@ -464,8 +464,8 @@ void CKCmFontInst::removeFonts() if(doIt) { - KIO::DeleteJob *job = KIO::del(urls, false, true); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(delResult(KIO::Job *))); + TDEIO::DeleteJob *job = TDEIO::del(urls, false, true); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } @@ -558,7 +558,7 @@ static TQString family(const TQString &name) void CKCmFontInst::updateInformation(int, int fonts) { - KIO::filesize_t size=0; + TDEIO::filesize_t size=0; TQString text(i18n("One Font", "%n Fonts", fonts)); TQStringList families; @@ -579,14 +579,14 @@ void CKCmFontInst::updateInformation(int, int fonts) if(fonts>0) { text+=" "; - text+=i18n("(%1 Total)").arg(KIO::convertSize(size)); + text+=i18n("(%1 Total)").arg(TDEIO::convertSize(size)); } text+=" - "; text+=i18n("One Family", "%n Families", families.count()); itsStatusLabel->setText(text); } -void CKCmFontInst::delResult(KIO::Job *job) +void CKCmFontInst::delResult(TDEIO::Job *job) { // // To speed up font deletion, we dont rescan font list each time - so after this has completed, we need @@ -596,11 +596,11 @@ void CKCmFontInst::delResult(KIO::Job *job) stream << KFI::SPECIAL_RESCAN; - KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); + TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); jobResult(job); } -void CKCmFontInst::jobResult(KIO::Job *job) +void CKCmFontInst::jobResult(TDEIO::Job *job) { // // Force an update of the view. For some reason the view is not automatically updated when @@ -636,8 +636,8 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest) copy+=associatedUrls; } - KIO::CopyJob *job=KIO::copy(copy, dest, true); - connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(jobResult(KIO::Job *))); + TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index b304e0a1a..1483ee4de 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -56,7 +56,7 @@ class KFileItem; namespace KFI { -class CKCmFontInst : public KCModule +class CKCmFontInst : public TDECModule { Q_OBJECT @@ -84,8 +84,8 @@ class CKCmFontInst : public KCModule void dropped(const KFileItem *i, TQDropEvent *e, const KURL::List &urls); void infoMessage(const TQString &msg); void updateInformation(int dirs, int fonts); - void delResult(KIO::Job *job); - void jobResult(KIO::Job *job); + void delResult(TDEIO::Job *job); + void jobResult(TDEIO::Job *job); private: @@ -106,7 +106,7 @@ class CKCmFontInst : public KCModule KParts::ReadOnlyPart *itsPreview; #endif TQSplitter *itsSplitter; - KConfig itsConfig; + TDEConfig itsConfig; bool itsEmbeddedAdmin; TQLabel *itsStatusLabel; }; diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index df50e81a3..03158eff7 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -614,13 +614,13 @@ void CKFileFontView::contentsDropEvent(TQDropEvent *e) } } -void CKFileFontView::readConfig(KConfig *kc, const TQString &group) +void CKFileFontView::readConfig(TDEConfig *kc, const TQString &group) { restoreLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group); slotSortingChanged(sortColumn()); } -void CKFileFontView::writeConfig(KConfig *kc, const TQString &group) +void CKFileFontView::writeConfig(TDEConfig *kc, const TQString &group) { saveLayout(kc, group.isEmpty() ? TQString("CFileFontView") : group); } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index b4766c5c4..c160175be 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -142,8 +142,8 @@ class CKFileFontView : public KListView, public KFileView virtual KFileItem * prevItem(const KFileItem *i) const; virtual void insertItem( KFileItem *i); - void readConfig(KConfig *kc, const TQString &group); - void writeConfig(KConfig *kc, const TQString &group); + void readConfig(TDEConfig *kc, const TQString &group); + void writeConfig(TDEConfig *kc, const TQString &group); // implemented to get noticed about sorting changes (for sortingIndicator) virtual void setSorting(TQDir::SortSpec s); diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp index 8b8a88167..c4a0d26b1 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp @@ -63,7 +63,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent) "that this will also slow down the installation process.</p><p>As most applications can, and do, embed " "the fonts into the PostScript before sending this to Ghostscript, this option can safely be disabled.")); - KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE); + TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE); itsDoX->setChecked(cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X)); itsDoGs->setChecked(cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS)); @@ -71,7 +71,7 @@ CSettingsDialog::CSettingsDialog(TQWidget *parent) void CSettingsDialog::slotOk() { - KConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE); + TDEConfig cfg(Misc::root() ? KFI_ROOT_CFG_FILE : KFI_CFG_FILE); bool oldDoX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X), oldDoGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS); @@ -90,7 +90,7 @@ void CSettingsDialog::slotOk() stream << KFI::SPECIAL_RECONFIG; - KIO::NetAccess::synchronousRun(KIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); + TDEIO::NetAccess::synchronousRun(TDEIO::special(KFI_KIO_FONTS_PROTOCOL ":/", packedArgs), this); } hide(); diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp index a4f09cb56..46339fc4f 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp @@ -327,7 +327,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) what=0; - if(!fontsProt && !fileProt && KIO::NetAccess::download(url, fName, NULL)) + if(!fontsProt && !fileProt && TDEIO::NetAccess::download(url, fName, NULL)) { downloaded=true; url=KURL(fName); @@ -413,7 +413,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) } if(downloaded) - KIO::NetAccess::removeTempFile(fName); + TDEIO::NetAccess::removeTempFile(fName); } return status; diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index 15531901f..c7c03d107 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -231,16 +231,16 @@ static int getSize(TQValueList<FcPattern *> &patterns) return size; } -static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null) +static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s=TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; entry.append(atom); } -static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys) +static bool createFolderUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, const TQString &path, bool sys) { KFI_DBUG << "createFolderUDSEntry " << name << ' ' << path << ' ' << sys << ' ' << endl; @@ -251,7 +251,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con if(-1!=KDE_lstat(cPath, &buff)) { - addAtom(entry, KIO::UDS_NAME, 0, name); + addAtom(entry, TDEIO::UDS_NAME, 0, name); if (S_ISLNK(buff.st_mode)) { @@ -262,49 +262,49 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con if(n!= -1) buffer2[n]='\0'; - addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2)); + addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2)); if(-1==KDE_stat(cPath, &buff)) { // It is a link pointing to nowhere - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1); - addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO); - addAtom(entry, KIO::UDS_SIZE, 0); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1); + addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO); + addAtom(entry, TDEIO::UDS_SIZE, 0); goto notype; } } - addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT); - addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777); - addAtom(entry, KIO::UDS_SIZE, buff.st_size); + addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT); + addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777); + addAtom(entry, TDEIO::UDS_SIZE, buff.st_size); notype: - addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime); + addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime); struct passwd *user = getpwuid(buff.st_uid); - addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1()); + addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1()); struct group *grp = getgrgid(buff.st_gid); - addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1()); + addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1()); - addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, sys + addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, sys ? KFI_KIO_FONTS_PROTOCOL"/system-folder" : KFI_KIO_FONTS_PROTOCOL"/folder"); - addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); + addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); return true; } else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet! { KFI_DBUG << "Default system folder (" << path << ") does not yet exist, so create dummy entry" << endl; - addAtom(entry, KIO::UDS_NAME, 0, name); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0744); - addAtom(entry, KIO::UDS_USER, 0, "root"); - addAtom(entry, KIO::UDS_GROUP, 0, "root"); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder"); - addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); + addAtom(entry, TDEIO::UDS_NAME, 0, name); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0744); + addAtom(entry, TDEIO::UDS_USER, 0, "root"); + addAtom(entry, TDEIO::UDS_GROUP, 0, "root"); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KFI_KIO_FONTS_PROTOCOL"/system-folder"); + addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); return true; } @@ -313,7 +313,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con return false; } -static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys) +static bool createFontUDSEntry(TDEIO::UDSEntry &entry, const TQString &name, TQValueList<FcPattern *> &patterns, bool sys) { KFI_DBUG << "createFontUDSEntry " << name << ' ' << patterns.count() << endl; @@ -344,7 +344,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal end=sortedPatterns.end(); entry.clear(); - addAtom(entry, KIO::UDS_SIZE, getSize(patterns)); + addAtom(entry, TDEIO::UDS_SIZE, getSize(patterns)); for(it=sortedPatterns.begin(); it!=end; ++it) { @@ -354,7 +354,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal if(-1!=KDE_lstat(cPath, &buff)) { - addAtom(entry, KIO::UDS_NAME, 0, name); + addAtom(entry, TDEIO::UDS_NAME, 0, name); if (S_ISLNK(buff.st_mode)) { @@ -366,32 +366,32 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal if(n!= -1) buffer2[n]='\0'; - addAtom(entry, KIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2)); + addAtom(entry, TDEIO::UDS_LINK_DEST, 0, TQString::fromLocal8Bit(buffer2)); if(-1==KDE_stat(cPath, &buff)) { // It is a link pointing to nowhere - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFMT - 1); - addAtom(entry, KIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFMT - 1); + addAtom(entry, TDEIO::UDS_ACCESS, S_IRWXU | S_IRWXG | S_IRWXO); goto notype; } } - addAtom(entry, KIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT); - addAtom(entry, KIO::UDS_ACCESS, buff.st_mode&07777); + addAtom(entry, TDEIO::UDS_FILE_TYPE, buff.st_mode&S_IFMT); + addAtom(entry, TDEIO::UDS_ACCESS, buff.st_mode&07777); notype: - addAtom(entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime); + addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime); struct passwd *user = getpwuid(buff.st_uid); - addAtom(entry, KIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1()); + addAtom(entry, TDEIO::UDS_USER, 0, user ? user->pw_name : TQString::number(buff.st_uid).latin1()); struct group *grp = getgrgid(buff.st_gid); - addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1()); + addAtom(entry, TDEIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1()); - addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); - addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); + addAtom(entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); + addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); @@ -404,7 +404,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal url+=name+TQString::fromLatin1(constMultipleExtension); else url+=Misc::getFile(path); - addAtom(entry, KIO::UDS_URL, 0, url); + addAtom(entry, TDEIO::UDS_URL, 0, url); return true; // This file was OK, so use its values... } } @@ -706,7 +706,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma } CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app) - : KIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app), + : TDEIO::SlaveBase(KFI_KIO_FONTS_PROTOCOL, pool, app), itsRoot(Misc::root()), itsUsingFcFpe(false), itsUsingXfsFpe(false), @@ -830,7 +830,7 @@ void CKioFonts::listDir(const KURL &url) if(updateFontList() && checkUrl(url, true)) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; int size=0; if(itsRoot || TQStringList::split('/', url.path(), false).count()!=0) @@ -861,7 +861,7 @@ void CKioFonts::listDir(const KURL &url) listEntry(entry, false); } - listEntry(size ? entry : KIO::UDSEntry(), true); + listEntry(size ? entry : TDEIO::UDSEntry(), true); finished(); } @@ -878,12 +878,12 @@ void CKioFonts::stat(const KURL &url) if(path.isEmpty()) { - error(KIO::ERR_COULD_NOT_STAT, url.prettyURL()); + error(TDEIO::ERR_COULD_NOT_STAT, url.prettyURL()); return; } TQStringList pathList(TQStringList::split('/', path, false)); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; bool err=false; switch(pathList.count()) @@ -901,7 +901,7 @@ void CKioFonts::stat(const KURL &url) err=!createFolderUDSEntry(entry, i18n(KFI_KIO_FONTS_SYS), itsFolders[FOLDER_USER].location, true); else { - error(KIO::ERR_SLAVE_DEFINED, + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".").arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); return; } @@ -912,7 +912,7 @@ void CKioFonts::stat(const KURL &url) if(err) { - error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); return; } @@ -921,7 +921,7 @@ void CKioFonts::stat(const KURL &url) } } -bool CKioFonts::createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder) +bool CKioFonts::createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder) { KFI_DBUG << "createStatEntry " << url.path() << endl; @@ -1003,17 +1003,17 @@ void CKioFonts::get(const KURL &url) KFI_DBUG << "real: " << realPathC << endl; if (-2==KDE_stat(realPathC.data(), &buff)) - error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); else if (S_ISDIR(buff.st_mode)) - error(KIO::ERR_IS_DIRECTORY, url.prettyURL()); + error(TDEIO::ERR_IS_DIRECTORY, url.prettyURL()); else if (!S_ISREG(buff.st_mode)) - error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL()); + error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL()); else { int fd = KDE_open(realPathC.data(), O_RDONLY); if (fd < 0) - error(KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL()); + error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL()); else { // Determine the mimetype of the file to be retrieved, and emit it. @@ -1022,7 +1022,7 @@ void CKioFonts::get(const KURL &url) totalSize(buff.st_size); - KIO::filesize_t processed=0; + TDEIO::filesize_t processed=0; char buffer[MAX_IPC_SIZE]; TQByteArray array; @@ -1033,7 +1033,7 @@ void CKioFonts::get(const KURL &url) { if (errno == EINTR) continue; - error(KIO::ERR_COULD_NOT_READ, url.prettyURL()); + error(TDEIO::ERR_COULD_NOT_READ, url.prettyURL()); close(fd); if(multiple) ::unlink(realPathC); @@ -1068,7 +1068,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) if(isHidden(u)) { - error(KIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL()); + error(TDEIO::ERR_WRITE_ACCESS_DENIED, u.prettyURL()); return; } @@ -1088,7 +1088,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) if (destExists && !overwrite && !resume) { - error(KIO::ERR_FILE_ALREADY_EXIST, url.prettyURL()); + error(TDEIO::ERR_FILE_ALREADY_EXIST, url.prettyURL()); return; } @@ -1098,7 +1098,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) if(passwd.isEmpty()) { - error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); return; } } @@ -1150,7 +1150,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) } else { - error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); return; } } @@ -1165,7 +1165,7 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume) } else { - error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_USER))); return; } } @@ -1205,7 +1205,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo partExists = false; else { - error(KIO::ERR_CANNOT_DELETE_PARTIAL, destPart); + error(TDEIO::ERR_CANNOT_DELETE_PARTIAL, destPart); return false; } } @@ -1236,7 +1236,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo if (fd < 0) { - error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest); + error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest); return false; } @@ -1252,12 +1252,12 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo { if(ENOSPC==errno) // disk full { - error(KIO::ERR_DISK_FULL, destOrig); + error(TDEIO::ERR_DISK_FULL, destOrig); result = -2; // means: remove dest file } else { - error(KIO::ERR_COULD_NOT_WRITE, destOrig); + error(TDEIO::ERR_COULD_NOT_WRITE, destOrig); result = -1; } } @@ -1288,14 +1288,14 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo if (close(fd)) { - error(KIO::ERR_COULD_NOT_WRITE, destOrig); + error(TDEIO::ERR_COULD_NOT_WRITE, destOrig); return false; } // after full download rename the file back to original name if (markPartial && ::rename(destC.data(), destOrigC.data())) { - error(KIO::ERR_CANNOT_RENAME_PARTIAL, destOrig); + error(TDEIO::ERR_CANNOT_RENAME_PARTIAL, destOrig); return false; } @@ -1313,7 +1313,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) if(isHidden(d)) { - error(KIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL()); + error(TDEIO::ERR_WRITE_ACCESS_DENIED, d.prettyURL()); return; } @@ -1390,7 +1390,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) } else { - error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); return; } } @@ -1407,7 +1407,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) if(-1==KDE_stat(realSrc.data(), &buffSrc)) { - error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL()); + error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL()); return; } @@ -1415,7 +1415,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) if (srcFd<0) { - error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL()); + error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL()); return; } @@ -1428,14 +1428,14 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) if (destFd<0) { - error(EACCES==errno ? KIO::ERR_WRITE_ACCESS_DENIED : KIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL()); + error(EACCES==errno ? TDEIO::ERR_WRITE_ACCESS_DENIED : TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, dest.prettyURL()); close(srcFd); return; } totalSize(buffSrc.st_size); - KIO::filesize_t processed = 0; + TDEIO::filesize_t processed = 0; char buffer[MAX_IPC_SIZE]; TQByteArray array; @@ -1447,7 +1447,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) { if (errno == EINTR) continue; - error(KIO::ERR_COULD_NOT_READ, src.prettyURL()); + error(TDEIO::ERR_COULD_NOT_READ, src.prettyURL()); close(srcFd); close(destFd); return; @@ -1461,11 +1461,11 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) close(destFd); if (ENOSPC==errno) // disk full { - error(KIO::ERR_DISK_FULL, dest.prettyURL()); + error(TDEIO::ERR_DISK_FULL, dest.prettyURL()); remove(realDest.data()); } else - error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL()); + error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL()); return; } @@ -1477,7 +1477,7 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite) if(close(destFd)) { - error(KIO::ERR_COULD_NOT_WRITE, dest.prettyURL()); + error(TDEIO::ERR_COULD_NOT_WRITE, dest.prettyURL()); return; } @@ -1512,9 +1512,9 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) KFI_DBUG << "rename " << src.prettyURL() << " - " << d.prettyURL() << ", " << overwrite << endl; if(src.directory()==d.directory()) - error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed.")); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, fonts cannot be renamed.")); else if(itsRoot) // Should never happen... - error(KIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, KIO::CMD_RENAME)); + error(TDEIO::ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, TDEIO::CMD_RENAME)); else { // @@ -1595,7 +1595,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite) } else { - error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); return; } } @@ -1656,7 +1656,7 @@ void CKioFonts::del(const KURL &url, bool) if(doRootCmd(cmd)) modified(FOLDER_SYS, clearList, modifiedDirs); else - error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\" folder.").arg(i18n(KFI_KIO_FONTS_SYS))); } else { @@ -1666,10 +1666,10 @@ void CKioFonts::del(const KURL &url, bool) if (0!=unlink(TQFile::encodeName(file).data())) error(EACCES==errno || EPERM==errno - ? KIO::ERR_ACCESS_DENIED + ? TDEIO::ERR_ACCESS_DENIED : EISDIR==errno - ? KIO::ERR_IS_DIRECTORY - : KIO::ERR_CANNOT_DELETE, + ? TDEIO::ERR_IS_DIRECTORY + : TDEIO::ERR_CANNOT_DELETE, file); else { @@ -1760,7 +1760,7 @@ void CKioFonts::special(const TQByteArray &a) finished(); break; default: - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd)); + error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd)); } } else @@ -1899,7 +1899,7 @@ void CKioFonts::doModified() TQString CKioFonts::getRootPasswd(bool askPasswd) { KFI_DBUG << "getRootPasswd" << endl; - KIO::AuthInfo authInfo; + TDEIO::AuthInfo authInfo; SuProcess proc(SYS_USER); bool error=false; int attempts=0; @@ -2064,7 +2064,7 @@ bool CKioFonts::updateFontList() if(NULL==itsFontList) { - error(KIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error.")); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Internal fontconfig error.")); return false; } @@ -2099,7 +2099,7 @@ TQValueList<FcPattern *> * CKioFonts::getEntries(const KURL &url) if(it!=itsFolders[getFolder(url)].fontMap.end()) return &(it.data()); - error(KIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL())); + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access \"%1\".").arg(url.prettyURL())); return NULL; } @@ -2143,7 +2143,7 @@ bool CKioFonts::checkFile(const TQString &file) return true; } - error(KIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then " + error(TDEIO::ERR_SLAVE_DEFINED, i18n("<p>Only fonts may be installed.</p><p>If installing a fonts package (*%1), then " "extract the components, and install individually.</p>").arg(constMultipleExtension)); return false; } @@ -2205,24 +2205,24 @@ bool CKioFonts::getSourceFiles(const KURL &src, TQStringList &files) if (-1==KDE_stat(realSrc.data(), &buffSrc)) { - error(EACCES==errno ? KIO::ERR_ACCESS_DENIED : KIO::ERR_DOES_NOT_EXIST, src.prettyURL()); + error(EACCES==errno ? TDEIO::ERR_ACCESS_DENIED : TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL()); return false; } if(S_ISDIR(buffSrc.st_mode)) { - error(KIO::ERR_IS_DIRECTORY, src.prettyURL()); + error(TDEIO::ERR_IS_DIRECTORY, src.prettyURL()); return false; } if(S_ISFIFO(buffSrc.st_mode) || S_ISSOCK(buffSrc.st_mode)) { - error(KIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL()); + error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, src.prettyURL()); return false; } } } else { - error(KIO::ERR_DOES_NOT_EXIST, src.prettyURL()); + error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL()); return false; } @@ -2234,7 +2234,7 @@ bool CKioFonts::checkDestFile(const KURL &src, const KURL &dest, EFolder destFol if(!overwrite && (Misc::fExists(itsFolders[destFolder].location+src.fileName()) || Misc::fExists(itsFolders[destFolder].location+modifyName(src.fileName())) ) ) { - error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL()); + error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL()); return false; } @@ -2250,7 +2250,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map, dest.directory()==src.directory()) // Check whether confirmUrl changed a "cp fonts:/System fonts:/" // to "cp fonts:/System fonts:/System" { - error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL()); + error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL()); return false; } @@ -2262,7 +2262,7 @@ bool CKioFonts::checkDestFiles(const KURL &src, TQMap<TQString, TQString> &map, for(; fIt!=fEnd; ++fIt) if(NULL!=getEntry(destFolder, fIt.data()) || NULL!=getEntry(destFolder, modifyName(fIt.data()))) { - error(KIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL()); + error(TDEIO::ERR_FILE_ALREADY_EXIST, dest.prettyURL()); return false; } } @@ -2320,7 +2320,7 @@ bool CKioFonts::confirmMultiple(const KURL &url, const TQStringList &files, EFol "The other affected fonts are:</p><ul>%1</ul><p>\n Do you wish to " "delete all of these?</p>").arg(out))) { - error(KIO::ERR_USER_CANCELED, url.prettyURL()); + error(TDEIO::ERR_USER_CANCELED, url.prettyURL()); return false; } } @@ -2368,7 +2368,7 @@ bool CKioFonts::checkUrl(const KURL &u, bool rootOk) else if(!isSysFolder(sect) && !isUserFolder(sect)) { - error(KIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".") + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Please specify \"%1\" or \"%2\".") .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); return false; } @@ -2388,7 +2388,7 @@ bool CKioFonts::checkAllowed(const KURL &u) ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) { - error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") + error(TDEIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \ return false; } @@ -2460,7 +2460,7 @@ void CKioFonts::reparseConfig() if(itsRoot) { - KConfig cfg(KFI_ROOT_CFG_FILE); + TDEConfig cfg(KFI_ROOT_CFG_FILE); bool doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X), doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS); @@ -2483,7 +2483,7 @@ void CKioFonts::reparseConfig() } else { - KConfig rootCfg(KFI_ROOT_CFG_FILE); + TDEConfig rootCfg(KFI_ROOT_CFG_FILE); bool rootDoX=rootCfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X), rootDoGs=rootCfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS); @@ -2517,7 +2517,7 @@ void CKioFonts::reparseConfig() if(0==itsNrsKfiParams[1]) itsNrsKfiParams[0]=0; - KConfig cfg(KFI_CFG_FILE); + TDEConfig cfg(KFI_CFG_FILE); bool doX=cfg.readBoolEntry(KFI_CFG_X_KEY, KFI_DEFAULT_CFG_X), doGs=cfg.readBoolEntry(KFI_CFG_GS_KEY, KFI_DEFAULT_CFG_GS); diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index 66a2b01b9..1de87f5f1 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -44,7 +44,7 @@ namespace KFI { -class CKioFonts : public KIO::SlaveBase +class CKioFonts : public TDEIO::SlaveBase { private: @@ -101,7 +101,7 @@ class CKioFonts : public KIO::SlaveBase void listDir(const KURL &url); void stat(const KURL &url); - bool createStatEntry(KIO::UDSEntry &entry, const KURL &url, EFolder folder); + bool createStatEntry(TDEIO::UDSEntry &entry, const KURL &url, EFolder folder); void get(const KURL &url); void put(const KURL &url, int mode, bool overwrite, bool resume); void copy(const KURL &src, const KURL &dest, int mode, bool overwrite); diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 3c2320588..57fb765f1 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -687,7 +687,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b TQString CFcEngine::getPreviewString() { - KConfig cfg(KFI_UI_CFG_FILE); + TDEConfig cfg(KFI_UI_CFG_FILE); cfg.setGroup(KFI_PREVIEW_GROUP); @@ -700,7 +700,7 @@ TQString CFcEngine::getPreviewString() void CFcEngine::setPreviewString(const TQString &str) { - KConfig cfg(KFI_UI_CFG_FILE); + TDEConfig cfg(KFI_UI_CFG_FILE); cfg.setGroup(KFI_PREVIEW_GROUP); cfg.writeEntry(KFI_PREVIEW_STRING_KEY, str); @@ -911,17 +911,17 @@ bool CFcEngine::parseUrl(const KURL &url, int faceNo, bool all) // if(KFI_KIO_FONTS_PROTOCOL==url.protocol()) { - KIO::UDSEntry udsEntry; + TDEIO::UDSEntry udsEntry; TQString name; FcInitReinitialize(); - if(KIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name... + if(TDEIO::NetAccess::stat(url, udsEntry, NULL)) // Need to stat the url to get its font name... { - KIO::UDSEntry::Iterator it(udsEntry.begin()), + TDEIO::UDSEntry::Iterator it(udsEntry.begin()), end(udsEntry.end()); for( ; it != end; ++it) - if (KIO::UDS_NAME==(*it).m_uds) + if (TDEIO::UDS_NAME==(*it).m_uds) { name=(*it).m_str; break; diff --git a/kcontrol/kfontinst/lib/KfiConstants.h b/kcontrol/kfontinst/lib/KfiConstants.h index fa7f6f1a0..e50acb5fb 100644 --- a/kcontrol/kfontinst/lib/KfiConstants.h +++ b/kcontrol/kfontinst/lib/KfiConstants.h @@ -21,7 +21,7 @@ #define KFI_DEFAULT_CFG_X true #define KFI_DEFAULT_CFG_GS false -// KIO::special +// TDEIO::special namespace KFI { diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index fe6054cd5..a2c150a08 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -190,11 +190,11 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg for(e=0; afm[e]; ++e) { KURL statUrl(url); - KIO::UDSEntry uds; + TDEIO::UDSEntry uds; statUrl.setPath(changeExt(url.path(), afm[e])); - if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget)) + if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget)) { list.append(statUrl); gotAfm=true; @@ -206,10 +206,10 @@ void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm, TQWidg for(e=0; pfm[e]; ++e) { KURL statUrl(url); - KIO::UDSEntry uds; + TDEIO::UDSEntry uds; statUrl.setPath(changeExt(url.path(), pfm[e])); - if(localFile ? fExists(statUrl.path()) : KIO::NetAccess::stat(statUrl, uds, widget)) + if(localFile ? fExists(statUrl.path()) : TDEIO::NetAccess::stat(statUrl, uds, widget)) { list.append(statUrl); break; diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 7d9d9d3f4..1eeb2396c 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -141,7 +141,7 @@ bool CFontViewPart::openURL(const KURL &url) bool CFontViewPart::openFile() { - // NOTE: Cant do the real open here, as dont seem to be able to use KIO::NetAccess functions during initial start-up. + // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up. // Bug report 111535 indicates that calling "konqueror <font>" crashes. TQTimer::singleShot(0, this, TQT_SLOT(timeout())); return true; @@ -165,17 +165,17 @@ void CFontViewPart::timeout() if(Misc::root()) { destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); } else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); - if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) + if(TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) itsShowInstallButton=false; else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); + itsShowInstallButton=!TDEIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); } } } @@ -220,7 +220,7 @@ void CFontViewPart::install() { KURL destUrl(getDest(m_url, KMessageBox::No==resp)); - if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget())) + if(TDEIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget())) { // // OK file copied, now look for any AFM or PFM file... @@ -236,7 +236,7 @@ void CFontViewPart::install() for(it=urls.begin(); it!=end; ++it) { destUrl=getDest(*it, KMessageBox::No==resp); - KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget()); + TDEIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget()); } } diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index 28dbd0f1f..f4b57bde0 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -72,7 +72,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() itsPreview->openURL(openURL); TQSize defSize(450, 380); - KConfigGroupSaver saver(kapp->config(), CFG_GROUP); + TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); resize(kapp->config()->readSizeEntry(CFG_SIZE_KEY, &defSize)); show(); @@ -83,7 +83,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() CFontViewerAppMainWindow::~CFontViewerAppMainWindow() { - KConfigGroupSaver saver(kapp->config(), CFG_GROUP); + TDEConfigGroupSaver saver(kapp->config(), CFG_GROUP); kapp->config()->writeEntry(CFG_SIZE_KEY, size()); kapp->config()->sync(); } diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index 7e02b0da9..a56625e4a 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -78,7 +78,7 @@ advancedDialog::~advancedDialog() void advancedDialog::load() { - KConfig c(KickerConfig::the()->configName(), false, false); + TDEConfig c(KickerConfig::the()->configName(), false, false); c.setGroup("General"); bool fadedOut = c.readBoolEntry("FadeOutAppletHandles", true); @@ -112,7 +112,7 @@ void advancedDialog::load() void advancedDialog::save() { - KConfig c(KickerConfig::the()->configName(), false, false); + TDEConfig c(KickerConfig::the()->configName(), false, false); c.setGroup("General"); c.writeEntry("FadeOutAppletHandles", @@ -149,7 +149,7 @@ void advancedDialog::save() // set config group c.setGroup(group); - KConfig extConfig(c.readEntry("ConfigFile")); + TDEConfig extConfig(c.readEntry("ConfigFile")); extConfig.setGroup("General"); extConfig.writeEntry("FadeOutAppletHandles", m_advancedWidget->fadeOutHandles->isChecked()); diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index f2b7cc1b4..73fa16d5c 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -94,7 +94,7 @@ void AppletTab::load() void AppletTab::load( bool useDefaults ) { - KConfig c(KickerConfig::the()->configName(), false, false); + TDEConfig c(KickerConfig::the()->configName(), false, false); c.setReadDefaults( useDefaults ); c.setGroup("General"); @@ -153,7 +153,7 @@ void AppletTab::load( bool useDefaults ) void AppletTab::save() { - KConfig c(KickerConfig::the()->configName(), false, false); + TDEConfig c(KickerConfig::the()->configName(), false, false); c.setGroup("General"); int level = 0; diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index 91e19e2d3..037159d93 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -121,7 +121,7 @@ void ExtensionInfo::load() if (_customSizeMax < _customSizeMin) _customSizeMax = _customSizeMin; if (_customSize < _customSizeMin) _customSize = _customSizeMin; - KConfig c(_configFile); + TDEConfig c(_configFile); c.setGroup("General"); _position = c.readNumEntry ("Position", _position); @@ -159,7 +159,7 @@ void ExtensionInfo::load() void ExtensionInfo::configChanged() { - KConfig c(_configFile); + TDEConfig c(_configFile); c.setGroup("General"); // check to see if the new value is different from both @@ -223,7 +223,7 @@ void ExtensionInfo::setDefaults() void ExtensionInfo::save() { - KConfig c(_configFile); + TDEConfig c(_configFile); c.setGroup("General"); c.writeEntry("Position", _position); diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 935fa5902..810024479 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -29,7 +29,7 @@ #include "hidingconfig.moc" HidingConfig::HidingConfig(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new HidingTab(this); @@ -58,7 +58,7 @@ void HidingConfig::notChanged() void HidingConfig::load() { m_widget->load(); - KCModule::load(); + TDECModule::load(); } void HidingConfig::aboutToNotifyKicker() @@ -69,7 +69,7 @@ void HidingConfig::aboutToNotifyKicker() // which is send before Kicker is notified. // See comment in save(). m_widget->save(); - KCModule::save(); + TDECModule::save(); } void HidingConfig::save() @@ -85,9 +85,9 @@ void HidingConfig::save() void HidingConfig::defaults() { m_widget->defaults(); - KCModule::defaults(); + TDECModule::defaults(); - // KConfigDialogManager may queue an changed(false) signal, + // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves TQTimer::singleShot(0, this, TQT_SLOT(changed())); diff --git a/kcontrol/kicker/hidingconfig.h b/kcontrol/kicker/hidingconfig.h index 647be9631..342da29b9 100644 --- a/kcontrol/kicker/hidingconfig.h +++ b/kcontrol/kicker/hidingconfig.h @@ -22,7 +22,7 @@ class HidingTab; -class HidingConfig : public KCModule +class HidingConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index 7475ad7b0..49c0cf56a 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -29,7 +29,7 @@ #include "lookandfeelconfig.moc" LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new LookAndFeelTab(this); @@ -57,7 +57,7 @@ void LookAndFeelConfig::notChanged() void LookAndFeelConfig::load() { - KCModule::load(); + TDECModule::load(); m_widget->load(); } @@ -68,7 +68,7 @@ void LookAndFeelConfig::aboutToNotifyKicker() // This slot is triggered by the signal, // which is send before Kicker is notified. // See comment in save(). - KCModule::save(); + TDECModule::save(); m_widget->save(); } @@ -84,10 +84,10 @@ void LookAndFeelConfig::save() void LookAndFeelConfig::defaults() { - KCModule::defaults(); + TDECModule::defaults(); m_widget->defaults(); - // KConfigDialogManager may queue an changed(false) signal, + // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves TQTimer::singleShot(0, this, TQT_SLOT(changed())); diff --git a/kcontrol/kicker/lookandfeelconfig.h b/kcontrol/kicker/lookandfeelconfig.h index 7b91cc52f..c3190ce08 100644 --- a/kcontrol/kicker/lookandfeelconfig.h +++ b/kcontrol/kicker/lookandfeelconfig.h @@ -22,7 +22,7 @@ class LookAndFeelTab; -class LookAndFeelConfig : public KCModule +class LookAndFeelConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index b2e6a79dc..4d063b54e 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -129,7 +129,7 @@ void LookAndFeelTab::previewBackground(const TQString& themepath, bool isNew) KickerLib::colorize(tmpImg); theme_preview.convertFromImage(tmpImg); if(!theme_preview.isNull()) { - // avoid getting changed(true) from KConfigDialogManager for the default value + // avoid getting changed(true) from TDEConfigDialogManager for the default value if( KickerSettings::backgroundTheme() == themepath ) KickerSettings::setBackgroundTheme( theme ); kcfg_BackgroundTheme->lineEdit()->setText(theme); @@ -154,7 +154,7 @@ void LookAndFeelTab::load() void LookAndFeelTab::load(bool useDefaults) { - KConfig config(KickerConfig::the()->configName(), false, false); + TDEConfig config(KickerConfig::the()->configName(), false, false); config.setReadDefaults( useDefaults ); @@ -227,7 +227,7 @@ void LookAndFeelTab::load(bool useDefaults) void LookAndFeelTab::save() { - KConfig config(KickerConfig::the()->configName(), false, false); + TDEConfig config(KickerConfig::the()->configName(), false, false); config.setGroup("General"); diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 16e52c8ec..23766ce28 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -29,7 +29,7 @@ #include <kdialog.h> LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEAboutData *about = diff --git a/kcontrol/kicker/lookandfeeltab_kcm.h b/kcontrol/kicker/lookandfeeltab_kcm.h index 085f87e43..ecf7ff0e6 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.h +++ b/kcontrol/kicker/lookandfeeltab_kcm.h @@ -22,7 +22,7 @@ class LookAndFeelTab; -class LookAndFeelConfig : public KCModule +class LookAndFeelConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index 5fa5ceb06..dda2f08db 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -171,7 +171,7 @@ void KickerConfig::notifyKicker() kapp->dcopClient()->send(appname, appname, "configure()", data); } -void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool reloadIfExists) +void KickerConfig::setupExtensionInfo(TDEConfig& config, bool checkExists, bool reloadIfExists) { config.setGroup("General"); TQStringList elist = config.readListEntry("Extensions2"); @@ -353,7 +353,7 @@ TQString KickerConfig::quickHelp() const TDEAboutData *KickerConfig::aboutData() { - // the TDEAboutDatas are deleted by the KCModules + // the TDEAboutDatas are deleted by the TDECModules TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmkicker"), I18N_NOOP("TDE Panel Control Module"), @@ -371,9 +371,9 @@ TDEAboutData *KickerConfig::aboutData() extern "C" { - KDE_EXPORT KCModule *create_kicker(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name) { - KCModuleContainer *container = new KCModuleContainer(parent, "kcmkicker"); + TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker"); container->addModule("kicker_config_arrangement"); container->addModule("kicker_config_hiding"); container->addModule("kicker_config_menus"); @@ -381,26 +381,26 @@ extern "C" return container; } - KDE_EXPORT KCModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); return new PositionConfig(parent, "kcmkicker"); } - KDE_EXPORT KCModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); return new HidingConfig(parent, "kcmkicker"); } - KDE_EXPORT KCModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) { return new MenuConfig(parent, "kcmkicker"); } - KDE_EXPORT KCModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) { KImageIO::registerFormats(); TDEGlobal::dirs()->addResourceType("tiles", KStandardDirs::kde_default("data") + diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h index bbc567273..45364c366 100644 --- a/kcontrol/kicker/main.h +++ b/kcontrol/kicker/main.h @@ -65,7 +65,7 @@ signals: protected: void init(); - void setupExtensionInfo(KConfig& c, bool checkExists, bool reloadIfExists = false); + void setupExtensionInfo(TDEConfig& c, bool checkExists, bool reloadIfExists = false); protected slots: void configChanged(const TQString&); diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index 03ca57582..b477cd76d 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -29,7 +29,7 @@ #include "menuconfig.moc" MenuConfig::MenuConfig(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new MenuTab(this); @@ -58,7 +58,7 @@ void MenuConfig::notChanged() void MenuConfig::load() { m_widget->load(); - KCModule::load(); + TDECModule::load(); } void MenuConfig::aboutToNotifyKicker() @@ -69,7 +69,7 @@ void MenuConfig::aboutToNotifyKicker() // which is send before Kicker is notified. // See comment in save(). m_widget->save(); - KCModule::save(); + TDECModule::save(); } void MenuConfig::save() @@ -85,9 +85,9 @@ void MenuConfig::save() void MenuConfig::defaults() { m_widget->defaults(); - KCModule::defaults(); + TDECModule::defaults(); - // KConfigDialogManager may queue an changed(false) signal, + // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changedm, // while we manage some of the widgets ourselves TQTimer::singleShot(0, this, TQT_SLOT(changed())); diff --git a/kcontrol/kicker/menuconfig.h b/kcontrol/kicker/menuconfig.h index 490684076..30178b18c 100644 --- a/kcontrol/kicker/menuconfig.h +++ b/kcontrol/kicker/menuconfig.h @@ -22,7 +22,7 @@ class MenuTab; -class MenuConfig : public KCModule +class MenuConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 5b08627cb..652f75aa7 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -93,8 +93,8 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall); btnCustomKMenuIcon->setPixmap(kmenu_icon); - KConfig *config; - config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + TDEConfig *config; + config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false); config->setGroup(TQString::fromLatin1("RecentDocuments")); maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10)); @@ -267,8 +267,8 @@ void MenuTab::save() c->sync(); // Save recent documents - KConfig *config; - config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + TDEConfig *config; + config = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false); config->setGroup(TQString::fromLatin1("RecentDocuments")); config->writeEntry("MaxEntries", maxrecentdocs->value()); config->sync(); diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 6e5dcdeb2..4eafcf677 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -29,7 +29,7 @@ #include "positionconfig.moc" PositionConfig::PositionConfig(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new PositionTab(this); @@ -58,7 +58,7 @@ void PositionConfig::notChanged() void PositionConfig::load() { m_widget->load(); - KCModule::load(); + TDECModule::load(); } void PositionConfig::aboutToNotifyKicker() @@ -69,7 +69,7 @@ void PositionConfig::aboutToNotifyKicker() // which is send before Kicker is notified. // See comment in save(). m_widget->save(); - KCModule::save(); + TDECModule::save(); } void PositionConfig::save() @@ -85,9 +85,9 @@ void PositionConfig::save() void PositionConfig::defaults() { m_widget->defaults(); - KCModule::defaults(); + TDECModule::defaults(); - // KConfigDialogManager may queue an changed(false) signal, + // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves TQTimer::singleShot(0, this, TQT_SLOT(changed())); diff --git a/kcontrol/kicker/positionconfig.h b/kcontrol/kicker/positionconfig.h index bf29473b4..13d026f3b 100644 --- a/kcontrol/kicker/positionconfig.h +++ b/kcontrol/kicker/positionconfig.h @@ -22,7 +22,7 @@ class PositionTab; -class PositionConfig : public KCModule +class PositionConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp index 1537ade1d..eab4e54dd 100644 --- a/kcontrol/kio/cache.cpp +++ b/kcontrol/kio/cache.cpp @@ -39,7 +39,7 @@ #include "cache_ui.h" KCacheConfigDialog::KCacheConfigDialog( TQWidget* parent ) - :KCModule( parent, "kcmkio" ) + :TDECModule( parent, "kcmkio" ) { TQVBoxLayout* mainLayout = new TQVBoxLayout(this, 0, 0); m_dlg = new CacheDlgUI(this); @@ -54,15 +54,15 @@ void KCacheConfigDialog::load() m_dlg->cbUseCache->setChecked(KProtocolManager::useCache()); m_dlg->sbMaxCacheSize->setValue( KProtocolManager::maxCacheSize() ); - KIO::CacheControl cc = KProtocolManager::cacheControl(); + TDEIO::CacheControl cc = KProtocolManager::cacheControl(); - if (cc==KIO::CC_Verify) + if (cc==TDEIO::CC_Verify) m_dlg->rbVerifyCache->setChecked( true ); - else if (cc==KIO::CC_Refresh) + else if (cc==TDEIO::CC_Refresh) m_dlg->rbVerifyCache->setChecked( true ); - else if (cc==KIO::CC_CacheOnly) + else if (cc==TDEIO::CC_CacheOnly) m_dlg->rbOfflineMode->setChecked( true ); - else if (cc==KIO::CC_Cache) + else if (cc==TDEIO::CC_Cache) m_dlg->rbCacheIfPossible->setChecked( true ); // Config changed notifications... @@ -79,13 +79,13 @@ void KCacheConfigDialog::save() KSaveIOConfig::setMaxCacheSize( m_dlg->sbMaxCacheSize->value() ); if ( !m_dlg->cbUseCache->isChecked() ) - KSaveIOConfig::setCacheControl(KIO::CC_Refresh); + KSaveIOConfig::setCacheControl(TDEIO::CC_Refresh); else if ( m_dlg->rbVerifyCache->isChecked() ) - KSaveIOConfig::setCacheControl(KIO::CC_Refresh); + KSaveIOConfig::setCacheControl(TDEIO::CC_Refresh); else if ( m_dlg->rbOfflineMode->isChecked() ) - KSaveIOConfig::setCacheControl(KIO::CC_CacheOnly); + KSaveIOConfig::setCacheControl(TDEIO::CC_CacheOnly); else if ( m_dlg->rbCacheIfPossible->isChecked() ) - KSaveIOConfig::setCacheControl(KIO::CC_Cache); + KSaveIOConfig::setCacheControl(TDEIO::CC_Cache); // Update running io-slaves... KSaveIOConfig::updateRunningIOSlaves (this); diff --git a/kcontrol/kio/cache.h b/kcontrol/kio/cache.h index 07ff0a6c8..f7d0dd695 100644 --- a/kcontrol/kio/cache.h +++ b/kcontrol/kio/cache.h @@ -26,7 +26,7 @@ class CacheDlgUI; -class KCacheConfigDialog : public KCModule +class KCacheConfigDialog : public TDECModule { Q_OBJECT diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp index 06629ee22..a17c70603 100644 --- a/kcontrol/kio/kcookiesmain.cpp +++ b/kcontrol/kio/kcookiesmain.cpp @@ -17,7 +17,7 @@ #include "kcookiesmanagement.h" KCookiesMain::KCookiesMain(TQWidget *parent) - : KCModule(parent, "kcmkio") + : TDECModule(parent, "kcmkio") { management = 0; bool managerOK = true; @@ -70,7 +70,7 @@ void KCookiesMain::save() void KCookiesMain::defaults() { - KCModule* module = static_cast<KCModule*>(tab->currentPage()); + TDECModule* module = static_cast<TDECModule*>(tab->currentPage()); if ( module == policies ) policies->defaults(); diff --git a/kcontrol/kio/kcookiesmain.h b/kcontrol/kio/kcookiesmain.h index 285c9e87a..e11cf1a52 100644 --- a/kcontrol/kio/kcookiesmain.h +++ b/kcontrol/kio/kcookiesmain.h @@ -13,7 +13,7 @@ class DCOPClient; class KCookiesPolicies; class KCookiesManagement; -class KCookiesMain : public KCModule +class KCookiesMain : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index e825fd2a4..c5a98fcc2 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -100,7 +100,7 @@ TQString CookieListViewItem::text(int f) const } KCookiesManagement::KCookiesManagement(TQWidget *parent) - : KCModule(parent, "kcmkio") + : TDECModule(parent, "kcmkio") { // Toplevel layout TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(), diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h index 3e7588282..3b8696e2c 100644 --- a/kcontrol/kio/kcookiesmanagement.h +++ b/kcontrol/kio/kcookiesmanagement.h @@ -59,7 +59,7 @@ private: bool mCookiesLoaded; }; -class KCookiesManagement : public KCModule +class KCookiesManagement : public TDECModule { Q_OBJECT diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 0c3641355..30f1859c4 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -47,7 +47,7 @@ #include "kcookiespoliciesdlg_ui.h" KCookiesPolicies::KCookiesPolicies(TQWidget *parent) - :KCModule(parent, "kcmkio") + :TDECModule(parent, "kcmkio") { TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, 0); @@ -283,7 +283,7 @@ void KCookiesPolicies::load() d_itemsSelected = 0; d_configChanged = false; - KConfig cfg ("kcookiejarrc", true); + TDEConfig cfg ("kcookiejarrc", true); cfg.setGroup ("Cookie Policy"); bool enableCookies = cfg.readBoolEntry("Cookies", true); @@ -365,7 +365,7 @@ void KCookiesPolicies::save() if (!d_configChanged) return; - KConfig cfg ( "kcookiejarrc" ); + TDEConfig cfg ( "kcookiejarrc" ); cfg.setGroup( "Cookie Policy" ); bool state = dlg->cbEnableCookies->isChecked(); diff --git a/kcontrol/kio/kcookiespolicies.h b/kcontrol/kio/kcookiespolicies.h index d59903a63..04a45672a 100644 --- a/kcontrol/kio/kcookiespolicies.h +++ b/kcontrol/kio/kcookiespolicies.h @@ -36,7 +36,7 @@ class TQListViewItem; class DCOPClient; class KCookiesPolicyDlgUI; -class KCookiesPolicies : public KCModule +class KCookiesPolicies : public TDECModule { Q_OBJECT diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp index bbe7a76bd..f3cb65bff 100644 --- a/kcontrol/kio/kproxydlg.cpp +++ b/kcontrol/kio/kproxydlg.cpp @@ -41,7 +41,7 @@ #include "kproxydlg_ui.h" KProxyOptions::KProxyOptions (TQWidget* parent ) - :KCModule (parent, "kcmkio") + :TDECModule (parent, "kcmkio") { TQVBoxLayout *layout = new TQVBoxLayout(this); @@ -85,9 +85,9 @@ TQString KProxyOptions::quickHelp() const { TQWidget *w = mTab->currentPage(); - if (w && w->inherits("KCModule")) + if (w && w->inherits("TDECModule")) { - KCModule *m = static_cast<KCModule *>(w); + TDECModule *m = static_cast<TDECModule *>(w); return m->quickHelp(); } @@ -96,7 +96,7 @@ TQString KProxyOptions::quickHelp() const KProxyDialog::KProxyDialog( TQWidget* parent) - :KCModule( parent, "kcmkio" ) + :TDECModule( parent, "kcmkio" ) { TQVBoxLayout* mainLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kcontrol/kio/kproxydlg.h b/kcontrol/kio/kproxydlg.h index f7de6913c..ecb99a77a 100644 --- a/kcontrol/kio/kproxydlg.h +++ b/kcontrol/kio/kproxydlg.h @@ -31,7 +31,7 @@ class TQTabWidget; class KProxyData; class KProxyDialogUI; -class KProxyOptions : public KCModule +class KProxyOptions : public TDECModule { Q_OBJECT @@ -45,12 +45,12 @@ public: virtual TQString quickHelp() const; private: - KCModule* mProxy; - KCModule* mSocks; + TDECModule* mProxy; + TDECModule* mSocks; TQTabWidget* mTab; }; -class KProxyDialog : public KCModule +class KProxyDialog : public TDECModule { Q_OBJECT diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index a52f92d3a..63e444b3b 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -32,8 +32,8 @@ public: KSaveIOConfigPrivate (); ~KSaveIOConfigPrivate (); - KConfig* config; - KConfig* http_config; + TDEConfig* config; + TDEConfig* http_config; }; static KSaveIOConfigPrivate *ksiocpref = 0; @@ -51,24 +51,24 @@ KSaveIOConfigPrivate::~KSaveIOConfigPrivate () KSaveIOConfigPrivate* KSaveIOConfig::d = 0; -KConfig* KSaveIOConfig::config() +TDEConfig* KSaveIOConfig::config() { if (!d) d = new KSaveIOConfigPrivate; if (!d->config) - d->config = new KConfig("kioslaverc", false, false); + d->config = new TDEConfig("kioslaverc", false, false); return d->config; } -KConfig* KSaveIOConfig::http_config() +TDEConfig* KSaveIOConfig::http_config() { if (!d) d = new KSaveIOConfigPrivate; if (!d->http_config) - d->http_config = new KConfig("kio_httprc", false, false); + d->http_config = new TDEConfig("kio_httprc", false, false); return d->http_config; } @@ -81,7 +81,7 @@ void KSaveIOConfig::reparseConfiguration () void KSaveIOConfig::setReadTimeout( int _timeout ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); @@ -89,7 +89,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout ) void KSaveIOConfig::setConnectTimeout( int _timeout ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); @@ -97,7 +97,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout ) void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); @@ -105,7 +105,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) void KSaveIOConfig::setResponseTimeout( int _timeout ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); @@ -114,7 +114,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout ) void KSaveIOConfig::setMarkPartial( bool _mode ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry( "MarkPartial", _mode ); cfg->sync(); @@ -122,7 +122,7 @@ void KSaveIOConfig::setMarkPartial( bool _mode ) void KSaveIOConfig::setMinimumKeepSize( int _size ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry( "MinimumKeepSize", _size ); cfg->sync(); @@ -130,7 +130,7 @@ void KSaveIOConfig::setMinimumKeepSize( int _size ) void KSaveIOConfig::setAutoResume( bool _mode ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry( "AutoResume", _mode ); cfg->sync(); @@ -138,36 +138,36 @@ void KSaveIOConfig::setAutoResume( bool _mode ) void KSaveIOConfig::setUseCache( bool _mode ) { - KConfig* cfg = http_config (); + TDEConfig* cfg = http_config (); cfg->writeEntry( "UseCache", _mode ); cfg->sync(); } void KSaveIOConfig::setMaxCacheSize( int cache_size ) { - KConfig* cfg = http_config (); + TDEConfig* cfg = http_config (); cfg->writeEntry( "MaxCacheSize", cache_size ); cfg->sync(); } -void KSaveIOConfig::setCacheControl(KIO::CacheControl policy) +void KSaveIOConfig::setCacheControl(TDEIO::CacheControl policy) { - KConfig* cfg = http_config (); - TQString tmp = KIO::getCacheControlString(policy); + TDEConfig* cfg = http_config (); + TQString tmp = TDEIO::getCacheControlString(policy); cfg->writeEntry("cache", tmp); cfg->sync(); } void KSaveIOConfig::setMaxCacheAge( int cache_age ) { - KConfig* cfg = http_config (); + TDEConfig* cfg = http_config (); cfg->writeEntry( "MaxCacheAge", cache_age ); cfg->sync(); } void KSaveIOConfig::setUseReverseProxy( bool mode ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); cfg->writeEntry("ReversedException", mode); cfg->sync(); @@ -175,7 +175,7 @@ void KSaveIOConfig::setUseReverseProxy( bool mode ) void KSaveIOConfig::setProxyType(KProtocolManager::ProxyType type) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); cfg->writeEntry( "ProxyType", static_cast<int>(type) ); cfg->sync(); @@ -183,7 +183,7 @@ void KSaveIOConfig::setProxyType(KProtocolManager::ProxyType type) void KSaveIOConfig::setProxyAuthMode(KProtocolManager::ProxyAuthMode mode) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); cfg->writeEntry( "AuthMode", static_cast<int>(mode) ); cfg->sync(); @@ -191,7 +191,7 @@ void KSaveIOConfig::setProxyAuthMode(KProtocolManager::ProxyAuthMode mode) void KSaveIOConfig::setNoProxyFor( const TQString& _noproxy ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); cfg->writeEntry( "NoProxyFor", _noproxy ); cfg->sync(); @@ -200,7 +200,7 @@ void KSaveIOConfig::setNoProxyFor( const TQString& _noproxy ) void KSaveIOConfig::setProxyFor( const TQString& protocol, const TQString& _proxy ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); cfg->writeEntry( protocol.lower() + "Proxy", _proxy ); cfg->sync(); @@ -208,7 +208,7 @@ void KSaveIOConfig::setProxyFor( const TQString& protocol, void KSaveIOConfig::setProxyConfigScript( const TQString& _url ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( "Proxy Settings" ); cfg->writeEntry( "Proxy Config Script", _url ); cfg->sync(); @@ -216,7 +216,7 @@ void KSaveIOConfig::setProxyConfigScript( const TQString& _url ) void KSaveIOConfig::setPersistentProxyConnection( bool enable ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry( "PersistentProxyConnection", enable ); cfg->sync(); @@ -224,7 +224,7 @@ void KSaveIOConfig::setPersistentProxyConnection( bool enable ) void KSaveIOConfig::setPersistentConnections( bool enable ) { - KConfig* cfg = config (); + TDEConfig* cfg = config (); cfg->setGroup( TQString() ); cfg->writeEntry( "PersistentConnections", enable ); cfg->sync(); @@ -234,7 +234,7 @@ void KSaveIOConfig::updateRunningIOSlaves (TQWidget *parent) { // Inform all running io-slaves about the changes... // if we cannot update, ioslaves inform the end user... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString())) + if (!DCOPRef("*", "TDEIO::Scheduler").send("reparseSlaveConfiguration", TQString())) { TQString caption = i18n("Update Failed"); TQString message = i18n("You have to restart the running applications " diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h index c5efc5525..27df8c51d 100644 --- a/kcontrol/kio/ksaveioconfig.h +++ b/kcontrol/kio/ksaveioconfig.h @@ -50,7 +50,7 @@ public: static void setMaxCacheSize( int ); - static void setCacheControl( KIO::CacheControl ); + static void setCacheControl( TDEIO::CacheControl ); /** Proxy Settings */ @@ -86,8 +86,8 @@ public: static void updateProxyScout( TQWidget * parent = 0L ); protected: - static KConfig* config (); - static KConfig* http_config (); + static TDEConfig* config (); + static TDEConfig* http_config (); KSaveIOConfig (); private: diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp index 96821defa..06d02d4f1 100644 --- a/kcontrol/kio/main.cpp +++ b/kcontrol/kio/main.cpp @@ -40,37 +40,37 @@ extern "C" { - KDE_EXPORT KCModule *create_cookie(TQWidget *parent, const char /**name*/) + KDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/) { return new KCookiesMain(parent); } - KDE_EXPORT KCModule *create_smb(TQWidget *parent, const char /**name*/) + KDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/) { return new SMBRoOptions(parent); } - KDE_EXPORT KCModule *create_useragent(TQWidget *parent, const char /**name*/) + KDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/) { return new UserAgentDlg(parent); } - KDE_EXPORT KCModule *create_proxy(TQWidget *parent, const char /**name*/) + KDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/) { return new KProxyOptions(parent); } - KDE_EXPORT KCModule *create_cache(TQWidget *parent, const char /**name*/) + KDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/) { return new KCacheConfigDialog( parent ); } - KDE_EXPORT KCModule *create_netpref(TQWidget *parent, const char /**name*/) + KDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/) { return new KIOPreferences(parent); } - KDE_EXPORT KCModule *create_lanbrowser(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *) { return new LanBrowser(parent); } @@ -78,7 +78,7 @@ extern "C" } LanBrowser::LanBrowser(TQWidget *parent) -:KCModule(parent,"kcmkio") +:TDECModule(parent,"kcmkio") ,layout(this) ,tabs(this) { @@ -105,21 +105,21 @@ LanBrowser::LanBrowser(TQWidget *parent) tabs.addTab(smbPage, i18n("&Windows Shares")); connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() )); - lisaPage = KCModuleLoader::loadModule("kcmlisa", KCModuleLoader::None, &tabs); + lisaPage = TDECModuleLoader::loadModule("kcmlisa", TDECModuleLoader::None, &tabs); if (lisaPage) { tabs.addTab(lisaPage,i18n("&LISa Daemon")); connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); } -// resLisaPage = KCModuleLoader::loadModule("kcmreslisa", &tabs); +// resLisaPage = TDECModuleLoader::loadModule("kcmreslisa", &tabs); // if (resLisaPage) // { // tabs.addTab(resLisaPage,i18n("R&esLISa Daemon")); // connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); // } - kioLanPage = KCModuleLoader::loadModule("kcmkiolan", KCModuleLoader::None, &tabs); + kioLanPage = TDECModuleLoader::loadModule("kcmkiolan", TDECModuleLoader::None, &tabs); if (kioLanPage) { tabs.addTab(kioLanPage,i18n("lan:/ Iosla&ve")); diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h index 5c6d35ef9..1122af019 100644 --- a/kcontrol/kio/main.h +++ b/kcontrol/kio/main.h @@ -26,7 +26,7 @@ class TQTabWidget; -class LanBrowser:public KCModule +class LanBrowser:public TDECModule { Q_OBJECT public: @@ -37,10 +37,10 @@ class LanBrowser:public KCModule private: TQVBoxLayout layout; TQTabWidget tabs; - KCModule *smbPage; - KCModule *lisaPage; -// KCModule *resLisaPage; - KCModule *kioLanPage; + TDECModule *smbPage; + TDECModule *lisaPage; +// TDECModule *resLisaPage; + TDECModule *kioLanPage; }; #endif diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp index 73cdb2123..b5788c973 100644 --- a/kcontrol/kio/netpref.cpp +++ b/kcontrol/kio/netpref.cpp @@ -15,7 +15,7 @@ #define MAX_TIMEOUT_VALUE 3600 KIOPreferences::KIOPreferences( TQWidget* parent ) - :KCModule( parent, "kcmkio" ) + :TDECModule( parent, "kcmkio" ) { TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -90,7 +90,7 @@ void KIOPreferences::load() sb_serverConnect->setValue( proto.connectTimeout() ); sb_proxyConnect->setValue( proto.proxyConnectTimeout() ); - KConfig config( "kio_ftprc", true, false ); + TDEConfig config( "kio_ftprc", true, false ); cb_ftpEnablePasv->setChecked( !config.readBoolEntry( "DisablePassiveMode", false ) ); cb_ftpMarkPartial->setChecked( config.readBoolEntry( "MarkPartial", true ) ); emit changed( false ); @@ -103,7 +103,7 @@ void KIOPreferences::save() KSaveIOConfig::setConnectTimeout( sb_serverConnect->value() ); KSaveIOConfig::setProxyConnectTimeout( sb_proxyConnect->value() ); - KConfig config( "kio_ftprc", false, false ); + TDEConfig config( "kio_ftprc", false, false ); config.writeEntry( "DisablePassiveMode", !cb_ftpEnablePasv->isChecked() ); config.writeEntry( "MarkPartial", cb_ftpMarkPartial->isChecked() ); config.sync(); diff --git a/kcontrol/kio/netpref.h b/kcontrol/kio/netpref.h index 4a48b30cb..ebe9ee3b6 100644 --- a/kcontrol/kio/netpref.h +++ b/kcontrol/kio/netpref.h @@ -12,7 +12,7 @@ class TQGridLayout; class KIntNumInput; -class KIOPreferences : public KCModule +class KIOPreferences : public TDECModule { Q_OBJECT diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 1b0a4fea8..8ad181df6 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -36,7 +36,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) - : KCModule(parent, "kcmkio") + : TDECModule(parent, "kcmkio") { TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(), KDialog::spacingHint()); @@ -91,7 +91,7 @@ SMBRoOptions::~SMBRoOptions() void SMBRoOptions::load() { - KConfig *cfg = new KConfig("kioslaverc"); + TDEConfig *cfg = new TDEConfig("kioslaverc"); TQString tmp; cfg->setGroup( "Browser Settings/SMBro" ); @@ -124,7 +124,7 @@ void SMBRoOptions::load() void SMBRoOptions::save() { - KConfig *cfg = new KConfig("kioslaverc"); + TDEConfig *cfg = new TDEConfig("kioslaverc"); cfg->setGroup( "Browser Settings/SMBro" ); cfg->writeEntry( "User", m_userLe->text()); @@ -163,7 +163,7 @@ void SMBRoOptions::defaults() void SMBRoOptions::changed() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } TQString SMBRoOptions::quickHelp() const diff --git a/kcontrol/kio/smbrodlg.h b/kcontrol/kio/smbrodlg.h index b1696e1e2..2174cfc18 100644 --- a/kcontrol/kio/smbrodlg.h +++ b/kcontrol/kio/smbrodlg.h @@ -29,7 +29,7 @@ class KComboBox; -class SMBRoOptions : public KCModule +class SMBRoOptions : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index 80453b75b..ef77a93c3 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -35,7 +35,7 @@ #include <kaboutdata.h> KSocksConfig::KSocksConfig(TQWidget *parent) - : KCModule(parent, "kcmkio") + : TDECModule(parent, "kcmkio") { TDEAboutData *about = @@ -194,7 +194,7 @@ void KSocksConfig::libSelection() void KSocksConfig::load() { - KConfigGroup config(kapp->config(), "Socks"); + TDEConfigGroup config(kapp->config(), "Socks"); base->_c_enableSocks->setChecked(config.readBoolEntry("SOCKS_enable", false)); int id = config.readNumEntry("SOCKS_method", 1); base->bg->setButton(id); @@ -228,7 +228,7 @@ void KSocksConfig::load() void KSocksConfig::save() { - KConfigGroup config(kapp->config(), "Socks"); + TDEConfigGroup config(kapp->config(), "Socks"); config.writeEntry("SOCKS_enable",base-> _c_enableSocks->isChecked(), true, true); config.writeEntry("SOCKS_method", base->bg->id(base->bg->selected()), true, true); config.writePathEntry("SOCKS_lib", base->_c_customPath->url(), true, true); diff --git a/kcontrol/kio/socks.h b/kcontrol/kio/socks.h index a18c85758..165d1d329 100644 --- a/kcontrol/kio/socks.h +++ b/kcontrol/kio/socks.h @@ -33,7 +33,7 @@ class TQVButtonGroup; -class KSocksConfig : public KCModule +class KSocksConfig : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index c34d5cadc..29181f0a9 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -47,7 +47,7 @@ #include "useragentdlg_ui.h" UserAgentDlg::UserAgentDlg( TQWidget * parent ) - :KCModule( parent, "kcmkio" ) + :TDECModule( parent, "kcmkio" ) { TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -87,7 +87,7 @@ void UserAgentDlg::load() d_itemsSelected = 0; dlg->lvDomainPolicyList->clear(); - m_config = new KConfig("kio_httprc", false, false); + m_config = new TDEConfig("kio_httprc", false, false); m_provider = new FakeUASProvider(); TQStringList list = m_config->groupList(); diff --git a/kcontrol/kio/useragentdlg.h b/kcontrol/kio/useragentdlg.h index f5b20ac0d..39885956d 100644 --- a/kcontrol/kio/useragentdlg.h +++ b/kcontrol/kio/useragentdlg.h @@ -27,11 +27,11 @@ #include <kcmodule.h> -class KConfig; +class TDEConfig; class FakeUASProvider; class UserAgentDlgUI; -class UserAgentDlg : public KCModule +class UserAgentDlg : public TDECModule { Q_OBJECT @@ -76,7 +76,7 @@ private: // int d_itemsSelected; - KConfig *m_config; + TDEConfig *m_config; UserAgentDlgUI* dlg; }; diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index 63438cbf2..bc9c63cc5 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -48,7 +48,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_knotify, NotifyFactory("kcmnotify") ) using namespace KNotify; KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & ) - : KCModule(NotifyFactory::instance(), parent, name), + : TDECModule(NotifyFactory::instance(), parent, name), m_playerSettings( 0L ) { setButtons( Help | Default | Apply ); @@ -98,7 +98,7 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & KCMKNotify::~KCMKNotify() { - KConfig config( "knotifyrc", false, false ); + TDEConfig config( "knotifyrc", false, false ); config.setGroup( "Misc" ); ApplicationList allApps = m_notifyWidget->allApps(); ApplicationListIterator appIt( allApps ); @@ -173,7 +173,7 @@ void KCMKNotify::load( bool useDefaults ) allApps.sort(); m_notifyWidget->setEnabled( !allApps.isEmpty() ); - KConfig config( "knotifyrc", true, false ); + TDEConfig config( "knotifyrc", true, false ); config.setReadDefaults( useDefaults ); config.setGroup( "Misc" ); TQString select = config.readEntry( "LastConfiguredApp" ); @@ -239,7 +239,7 @@ PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal ) void PlayerSettingsDialog::load( bool useDefaults ) { - KConfig config( "knotifyrc", true, false ); + TDEConfig config( "knotifyrc", true, false ); config.setReadDefaults( useDefaults ); config.setGroup( "Misc" ); bool useExternal = config.readBoolEntry( "Use external player", false ); @@ -264,7 +264,7 @@ void PlayerSettingsDialog::load( bool useDefaults ) void PlayerSettingsDialog::save() { // see tdelibs/arts/knotify/knotify.cpp - KConfig config( "knotifyrc", false, false ); + TDEConfig config( "knotifyrc", false, false ); config.setGroup( "Misc" ); config.writePathEntry( "External player", m_ui->reqExternal->url() ); diff --git a/kcontrol/knotify/knotify.h b/kcontrol/knotify/knotify.h index 5af670bbe..a37393f97 100644 --- a/kcontrol/knotify/knotify.h +++ b/kcontrol/knotify/knotify.h @@ -44,7 +44,7 @@ namespace KNotify class KNotifyWidget; } -class KCMKNotify : public KCModule +class KCMKNotify : public TDECModule { Q_OBJECT diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index af6c12cc4..12bf6159c 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -38,8 +38,8 @@ #include "behaviour.h" -KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent, const char * ) - : KCModule(parent, "kcmkonq"), g_pConfig(config), groupname(group) +KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent, const char * ) + : TDECModule(parent, "kcmkonq"), g_pConfig(config), groupname(group) { TQLabel * label; @@ -203,7 +203,7 @@ void KBehaviourOptions::load( bool useDefaults ) cbRenameDirectlyIcon->setChecked( g_pConfig->readBoolEntry("RenameIconDirectly", DEFAULT_RENAMEICONDIRECTLY ) ); - KConfig globalconfig("kdeglobals", true, false); + TDEConfig globalconfig("kdeglobals", true, false); globalconfig.setGroup( "KDE" ); cbShowDeleteCommand->setChecked( globalconfig.readBoolEntry("ShowDeleteCommand", false) ); @@ -212,7 +212,7 @@ void KBehaviourOptions::load( bool useDefaults ) // sbToolTip->setValue( g_pConfig->readNumEntry( "FileTipItems", 6 ) ); - KConfig config("uiserverrc"); + TDEConfig config("uiserverrc"); config.setGroup( "UIServer" ); cbListProgress->setChecked( config.readBoolEntry( "ShowList", false ) ); @@ -242,7 +242,7 @@ void KBehaviourOptions::save() g_pConfig->writeEntry( "RenameIconDirectly", cbRenameDirectlyIcon->isChecked()); - KConfig globalconfig("kdeglobals", false, false); + TDEConfig globalconfig("kdeglobals", false, false); globalconfig.setGroup( "KDE" ); globalconfig.writeEntry( "ShowDeleteCommand", cbShowDeleteCommand->isChecked()); globalconfig.sync(); @@ -253,7 +253,7 @@ void KBehaviourOptions::save() g_pConfig->sync(); // UIServer setting - KConfig config("uiserverrc"); + TDEConfig config("uiserverrc"); config.setGroup( "UIServer" ); config.writeEntry( "ShowList", cbListProgress->isChecked() ); config.sync(); diff --git a/kcontrol/konq/behaviour.h b/kcontrol/konq/behaviour.h index dd486cf8d..e9bded291 100644 --- a/kcontrol/konq/behaviour.h +++ b/kcontrol/konq/behaviour.h @@ -27,17 +27,17 @@ class TQRadioButton; class TQSpinBox; class TQVButtonGroup; -class KConfig; +class TDEConfig; class KURLRequester; //----------------------------------------------------------------------------- -class KBehaviourOptions : public KCModule +class KBehaviourOptions : public TDECModule { Q_OBJECT public: - KBehaviourOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); + KBehaviourOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0); ~KBehaviourOptions(); virtual void load(); virtual void load( bool useDefaults ); @@ -50,7 +50,7 @@ protected slots: void slotShowTips(bool); private: - KConfig *g_pConfig; + TDEConfig *g_pConfig; TQString groupname; TQCheckBox *cbNewWin; diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index cb1b5c47e..e25b6143d 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -30,8 +30,8 @@ #include "previews.h" #include "browser.h" -KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name) - : KCModule( parent, "kcmkonq" ) +KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *name) + : TDECModule( parent, "kcmkonq" ) { TQVBoxLayout *layout = new TQVBoxLayout(this); TQTabWidget *tab = new TQTabWidget(this); @@ -46,7 +46,7 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *pare previews = new KPreviewOptions(tab, name); previews->layout()->setMargin( KDialog::marginHint() ); - kuick = KCModuleLoader::loadModule("kcmkuick", tab); + kuick = TDECModuleLoader::loadModule("kcmkuick", tab); tab->addTab(appearance, i18n("&Appearance")); tab->addTab(behavior, i18n("&Behavior")); @@ -98,9 +98,9 @@ void KBrowserOptions::save() TQString KBrowserOptions::quickHelp() const { TQWidget *w = m_tab->currentPage(); - if (w->inherits("KCModule")) + if (w->inherits("TDECModule")) { - KCModule *m = static_cast<KCModule *>(w); + TDECModule *m = static_cast<TDECModule *>(w); return m->quickHelp(); } return TQString::null; diff --git a/kcontrol/konq/browser.h b/kcontrol/konq/browser.h index 7fc34725c..5e4aadebf 100644 --- a/kcontrol/konq/browser.h +++ b/kcontrol/konq/browser.h @@ -22,16 +22,16 @@ #include <kcmodule.h> -class KConfig; +class TDEConfig; class TQTabWidget; //----------------------------------------------------------------------------- -class KBrowserOptions : public KCModule +class KBrowserOptions : public TDECModule { Q_OBJECT public: - KBrowserOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); + KBrowserOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0); virtual void load(); virtual void save(); @@ -40,10 +40,10 @@ public: private: - KCModule *appearance; - KCModule *behavior; - KCModule *previews; - KCModule *kuick; + TDECModule *appearance; + TDECModule *behavior; + TDECModule *previews; + TDECModule *kuick; TQTabWidget *m_tab; }; diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index dcd0d7eeb..3b4bcb32a 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -40,7 +40,7 @@ extern "C" { - KDE_EXPORT KCModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) { return new KDesktopConfig(parent, "kcmkonq"); } @@ -52,7 +52,7 @@ extern "C" // asking why I did not implement a more intelligent/smaller GUI. KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) - : KCModule(parent, "kcmkonq") + : TDECModule(parent, "kcmkonq") { setQuickHelp( i18n("<h1>Multiple Desktops</h1>In this module, you can configure how many virtual desktops you want and how these should be labeled.")); @@ -141,7 +141,7 @@ void KDesktopConfig::load( bool useDefaults ) else groupname.sprintf("Desktops-screen-%d", konq_screen_number); - KConfig * twinconfig = new KConfig("twinrc"); + TDEConfig * twinconfig = new TDEConfig("twinrc"); twinconfig->setReadDefaults( useDefaults ); @@ -172,7 +172,7 @@ void KDesktopConfig::load( bool useDefaults ) else configfile.sprintf("kdesktop-screen-%drc", konq_screen_number); - KConfig *config = new KConfig(configfile, false, false); + TDEConfig *config = new TDEConfig(configfile, false, false); config->setReadDefaults( useDefaults ); @@ -216,7 +216,7 @@ void KDesktopConfig::save() else appname.sprintf("kdesktop-screen-%d", konq_screen_number); - KConfig *config = new KConfig(appname + "rc"); + TDEConfig *config = new TDEConfig(appname + "rc"); config->setGroup("Mouse Buttons"); config->writeEntry("WheelSwitchesWorkspace", _wheelOption->isChecked()); delete config; diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h index 938049628..c7c10de0a 100644 --- a/kcontrol/konq/desktop.h +++ b/kcontrol/konq/desktop.h @@ -30,7 +30,7 @@ class KIntNumInput; // if you change this, update also the number of keyboard shortcuts in twin/twinbindings.cpp static const int maxDesktops = 20; -class KDesktopConfig : public KCModule +class KDesktopConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 757385cd0..3ae4cf41b 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -46,8 +46,8 @@ const int customMenu1ID = 5; const int customMenu2ID = 6; -DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * ) - : KCModule( parent, "kcmkonq" ) +DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent, const char * ) + : TDECModule( parent, "kcmkonq" ) { TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); @@ -57,7 +57,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, void DesktopBehaviorModule::changed() { - emit KCModule::changed( true ); + emit TDECModule::changed( true ); } class DesktopBehaviorPreviewItem : public TQCheckListItem @@ -112,7 +112,7 @@ private: static const int choiceCount=7; static const char * s_choices[7] = { "", "WindowListMenu", "DesktopMenu", "AppMenu", "BookmarksMenu", "CustomMenu1", "CustomMenu2" }; -DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * ) +DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char * ) : DesktopBehaviorBase( parent, "kcmkonq" ), g_pConfig(config) { TQString strMouseButton1, strMouseButton3, strButtonTxt1, strButtonTxt3; @@ -315,7 +315,7 @@ void DesktopBehavior::load( bool useDefaults ) g_pConfig->setGroup( "FMSettings" ); toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) ); g_pConfig->setGroup( "Menubar" ); - KConfig config( "kdeglobals" ); + TDEConfig config( "kdeglobals" ); config.setGroup("KDE"); bool globalMenuBar = config.readBoolEntry("macStyle", false); bool desktopMenuBar = g_pConfig->readBoolEntry("ShowMenubar", false); @@ -373,7 +373,7 @@ void DesktopBehavior::save() g_pConfig->writeEntry( "ShowFileTips", toolTipBox->isChecked() ); g_pConfig->setGroup( "Menubar" ); g_pConfig->writeEntry("ShowMenubar", desktopMenuGroup->selectedId() == 1); - KConfig config( "kdeglobals" ); + TDEConfig config( "kdeglobals" ); config.setGroup("KDE"); bool globalMenuBar = desktopMenuGroup->selectedId() == 2; if ( globalMenuBar != config.readBoolEntry("macStyle", false) ) @@ -460,7 +460,7 @@ void DesktopBehavior::editButtonPressed() return; KCustomMenuEditor editor(this); - KConfig cfg(cfgFile, false, false); + TDEConfig cfg(cfgFile, false, false); editor.load(&cfg); if (editor.exec()) diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index ba9904d37..1dcb3bee1 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -30,7 +30,7 @@ class DesktopBehavior : public DesktopBehaviorBase { Q_OBJECT public: - DesktopBehavior(KConfig *config, TQWidget *parent = 0L, const char *name = 0L ); + DesktopBehavior(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L ); virtual void load(); virtual void load( bool useDefaults ); virtual void save(); @@ -49,7 +49,7 @@ private slots: void mediaListViewChanged(TQListViewItem * item); private: - KConfig *g_pConfig; + TDEConfig *g_pConfig; void fillMediaListView(); void saveMediaListView(); @@ -62,15 +62,15 @@ private: bool m_bHasMedia; }; -class DesktopBehaviorModule : public KCModule +class DesktopBehaviorModule : public TDECModule { Q_OBJECT public: - DesktopBehaviorModule(KConfig *config, TQWidget *parent = 0L, const char *name = 0L ); - virtual void load() { m_behavior->load(); emit KCModule::changed( false ); } - virtual void save() { m_behavior->save(); emit KCModule::changed( false ); } - virtual void defaults() { m_behavior->defaults(); emit KCModule::changed( true ); } + DesktopBehaviorModule(TDEConfig *config, TQWidget *parent = 0L, const char *name = 0L ); + virtual void load() { m_behavior->load(); emit TDECModule::changed( false ); } + virtual void save() { m_behavior->save(); emit TDECModule::changed( false ); } + virtual void defaults() { m_behavior->defaults(); emit TDECModule::changed( true ); } private slots: void changed(); diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index a01cdc06d..c1f610a46 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -40,8 +40,8 @@ //----------------------------------------------------------------------------- -KonqFontOptions::KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent, const char* /*name*/) - : KCModule( parent, "kcmkonq" ), g_pConfig(config), groupname(group), m_bDesktop(desktop) +KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent, const char* /*name*/) + : TDECModule( parent, "kcmkonq" ), g_pConfig(config), groupname(group), m_bDesktop(desktop) { TQLabel *label; TQString wtstr; @@ -283,7 +283,7 @@ void KonqFontOptions::load( bool useDefaults ) } cbUnderline->setChecked( g_pConfig->readBoolEntry("UnderlineLinks", DEFAULT_UNDERLINELINKS ) ); - KConfig cfg("kdeglobals"); + TDEConfig cfg("kdeglobals"); cfg.setGroup("DesktopIcons"); updateGUI(); @@ -324,7 +324,7 @@ void KonqFontOptions::save() g_pConfig->writeEntry( "UnderlineLinks", cbUnderline->isChecked() ); g_pConfig->sync(); - KConfig cfg("kdeglobals"); + TDEConfig cfg("kdeglobals"); cfg.setGroup("DesktopIcons"); // Send signal to konqueror diff --git a/kcontrol/konq/fontopts.h b/kcontrol/konq/fontopts.h index 49c34b923..4e1575652 100644 --- a/kcontrol/konq/fontopts.h +++ b/kcontrol/konq/fontopts.h @@ -43,17 +43,17 @@ class TQCheckBox; class TQRadioButton; class KColorButton; -class KConfig; +class TDEConfig; class KFontCombo; //----------------------------------------------------------------------------- -class KonqFontOptions : public KCModule +class KonqFontOptions : public TDECModule { Q_OBJECT public: - KonqFontOptions(KConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0); + KonqFontOptions(TDEConfig *config, TQString group, bool desktop, TQWidget *parent=0, const char *name=0); TQString quickHelp() const; virtual void load(); @@ -79,7 +79,7 @@ private: private: - KConfig *g_pConfig; + TDEConfig *g_pConfig; TQString groupname; bool m_bDesktop; diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index e0a0d0780..e57a84859 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -48,48 +48,48 @@ static TQCString configname() extern "C" { - KDE_EXPORT KCModule *create_browser(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name) { - KConfig *config = new KConfig("konquerorrc", false, true); + TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBrowserOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_behavior(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name) { - KConfig *config = new KConfig("konquerorrc", false, true); + TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBehaviourOptions(config, "FMSettings", parent, name); } - KDE_EXPORT KCModule *create_appearance(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name) { - KConfig *config = new KConfig("konquerorrc", false, true); + TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KonqFontOptions(config, "FMSettings", false, parent, name); } - KDE_EXPORT KCModule *create_previews(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name) { return new KPreviewOptions(parent, name); } - KDE_EXPORT KCModule *create_dbehavior(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/) { - KConfig *config = new KConfig(configname(), false, false); + TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopBehaviorModule(config, parent); } - KDE_EXPORT KCModule *create_dappearance(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/) { - KConfig *config = new KConfig(configname(), false, false); + TDEConfig *config = new TDEConfig(configname(), false, false); return new KonqFontOptions(config, "FMSettings", true, parent); } - KDE_EXPORT KCModule *create_dpath(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/) { - //KConfig *config = new KConfig(configname(), false, false); + //TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopPathConfig(parent); } - KDE_EXPORT KCModule *create_ddesktop(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/) { return new KDesktopConfig(parent, "VirtualDesktops"); } diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index cfa367448..0a6521a67 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -58,7 +58,7 @@ class PreviewCheckListItem : public TQCheckListItem }; KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ ) - : KCModule( parent, "kcmkonq" ) + : TDECModule( parent, "kcmkonq" ) { TQVBoxLayout *lay = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -159,7 +159,7 @@ void KPreviewOptions::load(bool useDefaults) { // *** load and apply to GUI *** TDEGlobal::config()->setReadDefaults(useDefaults); - KConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); + TDEConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); TQPtrListIterator<TQCheckListItem> it( m_items ); for ( ; it.current() ; ++it ) { @@ -191,7 +191,7 @@ void KPreviewOptions::defaults() void KPreviewOptions::save() { - KConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); + TDEConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); TQPtrListIterator<TQCheckListItem> it( m_items ); for ( ; it.current() ; ++it ) { TQString protocol( it.current()->text() ); @@ -213,7 +213,7 @@ void KPreviewOptions::save() void KPreviewOptions::changed() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } #include "previews.moc" diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index 8cf3ceade..10c5e32a7 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -35,12 +35,12 @@ Configuration of the maximum image size #include <kcmodule.h> -class KConfig; +class TDEConfig; class TQCheckBox; class TQCheckListItem; class KDoubleNumInput; -class KPreviewOptions : public KCModule +class KPreviewOptions : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index ea3c5baa4..a3234dba4 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -44,7 +44,7 @@ //----------------------------------------------------------------------------- DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) - : KCModule( parent, "kcmkonq" ) + : TDECModule( parent, "kcmkonq" ) { TQLabel * tmpLabel; @@ -127,13 +127,13 @@ void DesktopPathConfig::load() void DesktopPathConfig::load( bool useDefaults ) { - KConfig config("kdeglobals", true, false); + TDEConfig config("kdeglobals", true, false); // Desktop Paths config.setReadDefaults( useDefaults ); config.setGroup("Paths"); urAutostart->setURL( config.readPathEntry( "Autostart" , TDEGlobalSettings::autostartPath() )); - KConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); + TDEConfig xdguserconfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); urDesktop->setURL( xdguserconfig.readPathEntry( "XDG_DESKTOP_DIR" , TQDir::homeDirPath() + "/Desktop" ).remove( "\"" )); urDocument->setURL( xdguserconfig.readPathEntry( "XDG_DOCUMENTS_DIR", TQDir::homeDirPath()).remove( "\"" )); @@ -148,9 +148,9 @@ void DesktopPathConfig::defaults() void DesktopPathConfig::save() { - KConfig *config = TDEGlobal::config(); - KConfig *xdgconfig = new KConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); - KConfigGroupSaver cgs( config, "Paths" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfig *xdgconfig = new TDEConfig( TQDir::homeDirPath()+"/.config/user-dirs.dirs" ); + TDEConfigGroupSaver cgs( config, "Paths" ); bool pathChanged = false; bool autostartMoved = false; @@ -232,7 +232,7 @@ void DesktopPathConfig::save() { if (!KStandardDirs::makeDir(path)) { - KMessageBox::sorry(this, KIO::buildErrorString(KIO::ERR_COULD_NOT_MKDIR, path)); + KMessageBox::sorry(this, TDEIO::buildErrorString(TDEIO::ERR_COULD_NOT_MKDIR, path)); urDocument->setURL(documentURL.path()); pathOk = false; } @@ -283,20 +283,20 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt { m_copyToDest = dest; m_copyFromSrc = src; - KIO::ListJob* job = KIO::listDir( src ); - connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), - this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); + TDEIO::ListJob* job = TDEIO::listDir( src ); + connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) ); tqApp->enter_loop(); if (m_ok) { - KIO::del( src ); + TDEIO::del( src ); } } else { - KIO::Job * job = KIO::move( src, dest ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + TDEIO::Job * job = TDEIO::move( src, dest ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); // wait for job tqApp->enter_loop(); } @@ -305,7 +305,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt return m_ok; } -void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& list) +void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList& list) { if (job->error()) { @@ -313,8 +313,8 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li return; } - KIO::UDSEntryListConstIterator it = list.begin(); - KIO::UDSEntryListConstIterator end = list.end(); + TDEIO::UDSEntryListConstIterator it = list.begin(); + TDEIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { KFileItem file(*it, m_copyFromSrc, true, true); @@ -323,18 +323,18 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li continue; } - KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest ); - connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest ); + connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); tqApp->enter_loop(); } tqApp->exit_loop(); } -void DesktopPathConfig::slotResult( KIO::Job * job ) +void DesktopPathConfig::slotResult( TDEIO::Job * job ) { if (job->error()) { - if ( job->error() != KIO::ERR_DOES_NOT_EXIST ) + if ( job->error() != TDEIO::ERR_DOES_NOT_EXIST ) m_ok = false; // If the source doesn't exist, no wonder we couldn't move the dir. // In that case, trust the user and set the new setting in any case. diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index 7af18f1ae..d4429c1dd 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -23,17 +23,17 @@ class TQCheckBox; class TQComboBox; class TQPushButton; -class KConfig; +class TDEConfig; class KListView; class KURLRequester; -namespace KIO { class Job; } +namespace TDEIO { class Job; } //----------------------------------------------------------------------------- // The "Path" Tab contains : // The paths for Desktop, Autostart and Documents -class DesktopPathConfig : public KCModule +class DesktopPathConfig : public TDECModule { Q_OBJECT public: @@ -44,7 +44,7 @@ public: virtual void defaults(); private slots: - void slotEntries( KIO::Job * job, const KIO::UDSEntryList& list); + void slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList& list); private: // Desktop Paths @@ -58,7 +58,7 @@ private: KURL m_copyFromSrc; private slots: - void slotResult( KIO::Job * job ); + void slotResult( TDEIO::Job * job ); }; #endif // __ROOT_OPTIONS_H diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index c2c411b3e..0464f39bd 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -34,7 +34,7 @@ #include "advancedTabOptions.h" #include "main.h" -advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const char* name) +advancedTabDialog::advancedTabDialog(TQWidget* parent, TDEConfig* config, const char* name) : KDialogBase(KDialogBase::Plain, i18n("Advanced Options"), KDialogBase::Ok | diff --git a/kcontrol/konqhtml/advancedTabDialog.h b/kcontrol/konqhtml/advancedTabDialog.h index 3e340b5b8..8951b01e1 100644 --- a/kcontrol/konqhtml/advancedTabDialog.h +++ b/kcontrol/konqhtml/advancedTabDialog.h @@ -29,7 +29,7 @@ class advancedTabDialog : public KDialogBase Q_OBJECT public: - advancedTabDialog(TQWidget* parent, KConfig *config, const char* name); + advancedTabDialog(TQWidget* parent, TDEConfig *config, const char* name); ~advancedTabDialog(); protected slots: @@ -38,7 +38,7 @@ class advancedTabDialog : public KDialogBase void changed(); private: - KConfig* m_pConfig; + TDEConfig* m_pConfig; advancedTabOptions* m_advancedWidget; }; diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index fa22ab533..78619d818 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -25,8 +25,8 @@ #include "appearance.moc" -KAppearanceOptions::KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent, const char *) - : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group), +KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *) + : TDECModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group), fSize( 10 ), fMinSize( HTML_DEFAULT_MIN_FONT_SIZE ) { @@ -320,7 +320,7 @@ void KAppearanceOptions::load() void KAppearanceOptions::load( bool useDefaults ) { - KConfig khtmlrc("khtmlrc", true, false); + TDEConfig khtmlrc("khtmlrc", true, false); m_pConfig->setReadDefaults( useDefaults ); khtmlrc.setReadDefaults( useDefaults ); diff --git a/kcontrol/konqhtml/appearance.h b/kcontrol/konqhtml/appearance.h index ea85322db..6bca1908f 100644 --- a/kcontrol/konqhtml/appearance.h +++ b/kcontrol/konqhtml/appearance.h @@ -19,11 +19,11 @@ class TQSpinBox; class KFontCombo; -class KAppearanceOptions : public KCModule +class KAppearanceOptions : public TDECModule { Q_OBJECT public: - KAppearanceOptions(KConfig *config, TQString group, TQWidget *parent=0, const char *name=0); + KAppearanceOptions(TDEConfig *config, TQString group, TQWidget *parent=0, const char *name=0); ~KAppearanceOptions(); virtual void load(); @@ -48,7 +48,7 @@ private: private: - KConfig *m_pConfig; + TDEConfig *m_pConfig; TQString m_groupname; TQStringList m_families; diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 29dccb14b..b61abd99b 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -32,7 +32,7 @@ #include "policies.h" #include "policydlg.h" -DomainListView::DomainListView(KConfig *config,const TQString &title, +DomainListView::DomainListView(TDEConfig *config,const TQString &title, TQWidget *parent,const char *name) : TQGroupBox(title, parent, name), config(config) { setColumnLayout(0, Qt::Vertical); diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h index a8238bbb4..f62b2e46a 100644 --- a/kcontrol/konqhtml/domainlistview.h +++ b/kcontrol/konqhtml/domainlistview.h @@ -29,7 +29,7 @@ class TQListViewItem; class TQPushButton; class TQStringList; -class KConfig; +class TDEConfig; class KListView; class Policies; @@ -67,7 +67,7 @@ public: * @param parent parent widget * @param name internal name for debugging */ - DomainListView(KConfig *config,const TQString &title,TQWidget *parent, + DomainListView(TDEConfig *config,const TQString &title,TQWidget *parent, const char *name = 0); virtual ~DomainListView(); @@ -191,7 +191,7 @@ private slots: protected: - KConfig *config; + TDEConfig *config; KListView *domainSpecificLV; diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 731bae2ec..1bb71d4db 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -38,9 +38,9 @@ #include "filteropts.h" #include "filteropts.moc" -KCMFilter::KCMFilter(KConfig *config, TQString group, +KCMFilter::KCMFilter(TDEConfig *config, TQString group, TQWidget *parent, const char * ) - : KCModule( parent, "kcmkonqhtml" ), + : TDECModule( parent, "kcmkonqhtml" ), mConfig( config ), mGroupname( group ), mSelCount(0) diff --git a/kcontrol/konqhtml/filteropts.h b/kcontrol/konqhtml/filteropts.h index 1678e5333..fae52b53f 100644 --- a/kcontrol/konqhtml/filteropts.h +++ b/kcontrol/konqhtml/filteropts.h @@ -26,13 +26,13 @@ class TQLineEdit; class TQListBoxItem; class TQCheckBox; -class KConfig; +class TDEConfig; -class KCMFilter : public KCModule +class KCMFilter : public TDECModule { Q_OBJECT public: - KCMFilter( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); + KCMFilter( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); ~KCMFilter(); void load(); @@ -66,7 +66,7 @@ private: TQPushButton *mImportButton; TQPushButton *mExportButton; - KConfig *mConfig; + TDEConfig *mConfig; TQString mGroupname; int mSelCount; }; diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index 9e199cbe4..153692082 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -32,8 +32,8 @@ enum AnimationsType { AnimationsAlways=0, AnimationsNever=1, AnimationsLoopOnce= enum SmoothScrollingType { SmoothScrollingAlways=0, SmoothScrollingNever=1, SmoothScrollingWhenEfficient=2 }; //----------------------------------------------------------------------------- -KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent, const char *) - : KCModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group) +KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *) + : TDECModule( parent, "kcmkonqhtml" ), m_pConfig(config), m_groupname(group) { int row = 0; TQGridLayout *lay = new TQGridLayout(this, 10, 2, 0, KDialog::spacingHint()); @@ -230,7 +230,7 @@ void KMiscHTMLOptions::load() void KMiscHTMLOptions::load( bool useDefaults ) { - KConfig khtmlrc("khtmlrc", true, false); + TDEConfig khtmlrc("khtmlrc", true, false); khtmlrc.setReadDefaults( useDefaults ); m_pConfig->setReadDefaults( useDefaults ); @@ -290,13 +290,13 @@ void KMiscHTMLOptions::load( bool useDefaults ) m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) ); m_pDynamicTabbarHide->setChecked( ! (m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) ); - KConfig config("kbookmarkrc", true, false); + TDEConfig config("kbookmarkrc", true, false); config.setReadDefaults( useDefaults ); config.setGroup("Bookmarks"); m_pAdvancedAddBookmarkCheckBox->setChecked( config.readBoolEntry("AdvancedAddBookmarkDialog", false) ); m_pOnlyMarkedBookmarksCheckBox->setChecked( config.readBoolEntry("FilteredToolbar", false) ); - KConfig kdeglobals("kdeglobals", true, false); + TDEConfig kdeglobals("kdeglobals", true, false); kdeglobals.setReadDefaults( useDefaults ); kdeglobals.setGroup("KDE"); bool smoothScrolling = kdeglobals.readBoolEntry("SmoothScrolling", DEFAULT_SMOOTHSCROLL); @@ -363,13 +363,13 @@ void KMiscHTMLOptions::save() m_pConfig->writeEntry( "AlwaysTabbedMode", !(m_pDynamicTabbarHide->isChecked()) ); m_pConfig->sync(); - KConfig config("kbookmarkrc", false, false); + TDEConfig config("kbookmarkrc", false, false); config.setGroup("Bookmarks"); config.writeEntry("AdvancedAddBookmarkDialog", m_pAdvancedAddBookmarkCheckBox->isChecked()); config.writeEntry("FilteredToolbar", m_pOnlyMarkedBookmarksCheckBox->isChecked()); config.sync(); - KConfig kdeglobals("kdeglobals", false, false); + TDEConfig kdeglobals("kdeglobals", false, false); kdeglobals.setGroup("KDE"); switch(m_pSmoothScrollingCombo->currentItem()) { diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index 42024f71b..151607419 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -30,12 +30,12 @@ class TQRadioButton; class KIntNumInput; -class KMiscHTMLOptions : public KCModule +class KMiscHTMLOptions : public TDECModule { Q_OBJECT public: - KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L ); + KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L ); ~KMiscHTMLOptions(); virtual void load(); virtual void load( bool useDefaults ); @@ -47,7 +47,7 @@ private slots: void launchAdvancedTabDialog(); private: - KConfig* m_pConfig; + TDEConfig* m_pConfig; TQString m_groupname; TQComboBox* m_pUnderlineCombo; diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index af168ed1f..68b20fd2f 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -31,7 +31,7 @@ // == class JavaPolicies ===== -JavaPolicies::JavaPolicies(KConfig* config, const TQString &group, bool global, +JavaPolicies::JavaPolicies(TDEConfig* config, const TQString &group, bool global, const TQString &domain) : Policies(config,group,global,domain,"java.","EnableJava") { } @@ -45,9 +45,9 @@ JavaPolicies::~JavaPolicies() { // == class KJavaOptions ===== -KJavaOptions::KJavaOptions( KConfig* config, TQString group, +KJavaOptions::KJavaOptions( TDEConfig* config, TQString group, TQWidget *parent, const char *name ) - : KCModule( parent, name ), + : TDECModule( parent, name ), _removeJavaScriptDomainAdvice(false), m_pConfig( config ), m_groupname( group ), @@ -278,7 +278,7 @@ void KJavaOptions::toggleJavaControls() // == class JavaDomainListView ===== -JavaDomainListView::JavaDomainListView(KConfig *config,const TQString &group, +JavaDomainListView::JavaDomainListView(TDEConfig *config,const TQString &group, KJavaOptions *options,TQWidget *parent,const char *name) : DomainListView(config,i18n( "Doma&in-Specific" ), parent, name), group(group), options(options) { diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index de8f7c7eb..b93a77e86 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -21,7 +21,7 @@ #include "policies.h" class KColorButton; -class KConfig; +class TDEConfig; class KListView; class KURLRequester; class KIntNumInput; @@ -48,7 +48,7 @@ public: * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ - JavaPolicies(KConfig* config, const TQString &group, bool global, + JavaPolicies(TDEConfig* config, const TQString &group, bool global, const TQString &domain = TQString::null); /** empty constructur to make TQMap happy @@ -65,7 +65,7 @@ public: class JavaDomainListView : public DomainListView { Q_OBJECT public: - JavaDomainListView(KConfig *config,const TQString &group,KJavaOptions *opt, + JavaDomainListView(TDEConfig *config,const TQString &group,KJavaOptions *opt, TQWidget *parent,const char *name = 0); virtual ~JavaDomainListView(); @@ -84,12 +84,12 @@ private: KJavaOptions *options; }; -class KJavaOptions : public KCModule +class KJavaOptions : public TDECModule { Q_OBJECT public: - KJavaOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); + KJavaOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); virtual void load(); virtual void load( bool useDefaults ); @@ -104,7 +104,7 @@ private slots: private: - KConfig* m_pConfig; + TDEConfig* m_pConfig; TQString m_groupname; JavaPolicies java_global_policies; diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index e50224f53..e36743783 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -34,9 +34,9 @@ // == class KJavaScriptOptions ===== -KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidget *parent, +KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget *parent, const char *name ) : - KCModule( parent, name ), + TDECModule( parent, name ), _removeJavaScriptDomainAdvice(false), m_pConfig( config ), m_groupname( group ), js_global_policies(config,group,true,TQString::null), @@ -165,7 +165,7 @@ void KJavaScriptOptions::slotChangeJSEnabled() { // == class JSDomainListView ===== -JSDomainListView::JSDomainListView(KConfig *config,const TQString &group, +JSDomainListView::JSDomainListView(TDEConfig *config,const TQString &group, KJavaScriptOptions *options, TQWidget *parent,const char *name) : DomainListView(config,i18n( "Do&main-Specific" ), parent, name), group(group), options(options) { diff --git a/kcontrol/konqhtml/jsopts.h b/kcontrol/konqhtml/jsopts.h index 5c9aa74e3..f5735294d 100644 --- a/kcontrol/konqhtml/jsopts.h +++ b/kcontrol/konqhtml/jsopts.h @@ -16,7 +16,7 @@ #include "jspolicies.h" class KColorButton; -class KConfig; +class TDEConfig; class KURLRequester; class TQCheckBox; class TQComboBox; @@ -35,7 +35,7 @@ class KJavaScriptOptions; class JSDomainListView : public DomainListView { Q_OBJECT public: - JSDomainListView(KConfig *config,const TQString &group,KJavaScriptOptions *opt, + JSDomainListView(TDEConfig *config,const TQString &group,KJavaScriptOptions *opt, TQWidget *parent,const char *name = 0); virtual ~JSDomainListView(); @@ -54,11 +54,11 @@ private: KJavaScriptOptions *options; }; -class KJavaScriptOptions : public KCModule +class KJavaScriptOptions : public TDECModule { Q_OBJECT public: - KJavaScriptOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); + KJavaScriptOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); virtual void load(); virtual void load( bool useDefaults ); @@ -72,7 +72,7 @@ private slots: private: - KConfig *m_pConfig; + TDEConfig *m_pConfig; TQString m_groupname; JSPolicies js_global_policies; TQCheckBox *enableJavaScriptGloballyCB; diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 5196af8dd..c035c1857 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -33,7 +33,7 @@ // == class JSPolicies == -JSPolicies::JSPolicies(KConfig* config,const TQString &group, +JSPolicies::JSPolicies(TDEConfig* config,const TQString &group, bool global,const TQString &domain) : Policies(config,group,global,domain,"javascript.","EnableJavaScript") { } diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h index 45352fbb9..7f3e400fa 100644 --- a/kcontrol/konqhtml/jspolicies.h +++ b/kcontrol/konqhtml/jspolicies.h @@ -29,7 +29,7 @@ #include "policies.h" -class KConfig; +class TDEConfig; class TQRadioButton; class TQButtonGroup; @@ -63,7 +63,7 @@ public: * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ - JSPolicies(KConfig* config, const TQString &group, bool global, + JSPolicies(TDEConfig* config, const TQString &group, bool global, const TQString &domain = TQString::null); /** diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp index 93fb20d70..6e79a59ec 100644 --- a/kcontrol/konqhtml/khttpoptdlg.cpp +++ b/kcontrol/konqhtml/khttpoptdlg.cpp @@ -8,8 +8,8 @@ #include "khttpoptdlg.h" -KHTTPOptions::KHTTPOptions(KConfig *config, TQString group, TQWidget *parent, const char *name) - : KCModule( parent, name ), m_pConfig(config), m_groupname(group) +KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent, const char *name) + : TDECModule( parent, name ), m_pConfig(config), m_groupname(group) { TQVBoxLayout *lay = new TQVBoxLayout(this, 10, 5); diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h index f758be15c..0a3507085 100644 --- a/kcontrol/konqhtml/khttpoptdlg.h +++ b/kcontrol/konqhtml/khttpoptdlg.h @@ -15,11 +15,11 @@ * Dialog for configuring HTTP Options like charset and language negotiation * and assuming that file got from HTTP is HTML if no Content-Type is given */ -class KHTTPOptions : public KCModule +class KHTTPOptions : public TDECModule { Q_OBJECT public: - KHTTPOptions(KConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L); + KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent = 0L, const char *name = 0L); virtual void load(); virtual void load( bool useDefaults ); @@ -28,7 +28,7 @@ Q_OBJECT private: - KConfig *m_pConfig; + TDEConfig *m_pConfig; TQString m_groupname; // Acceptable languages "LANG" - locale selected languages diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index f1f28efca..35a958b46 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -43,40 +43,40 @@ extern "C" { - KDE_EXPORT KCModule *create_khtml_behavior(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name) { - KConfig *c = new KConfig( "konquerorrc", false, false ); + TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KMiscHTMLOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT KCModule *create_khtml_fonts(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name) { - KConfig *c = new KConfig( "konquerorrc", false, false ); + TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KAppearanceOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT KCModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/) + KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/) { - KConfig *c = new KConfig( "konquerorrc", false, false ); + TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KJSParts(c, parent, "kcmkonqhtml"); } - KDE_EXPORT KCModule *create_khtml_plugins(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name) { - KConfig *c = new KConfig( "konquerorrc", false, false ); + TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KPluginOptions(c, "Java/JavaScript Settings", parent, name); } - KDE_EXPORT KCModule *create_khtml_filter(TQWidget *parent, const char *name ) + KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name ) { - KConfig *c = new KConfig( "khtmlrc", false, false ); + TDEConfig *c = new TDEConfig( "khtmlrc", false, false ); return new KCMFilter(c, "Filter Settings", parent, name); } } -KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name) - : KCModule(parent, name), mConfig(config) +KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name) + : TDECModule(parent, name), mConfig(config) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmkonqhtml"), I18N_NOOP("Konqueror Browsing Control Module"), diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h index eeb9da311..182ac2756 100644 --- a/kcontrol/konqhtml/main.h +++ b/kcontrol/konqhtml/main.h @@ -33,13 +33,13 @@ class KJavaScriptOptions; class TQTabWidget; -class KJSParts : public KCModule +class KJSParts : public TDECModule { Q_OBJECT public: - KJSParts(KConfig *config,TQWidget *parent, const char *name); + KJSParts(TDEConfig *config,TQWidget *parent, const char *name); virtual ~KJSParts(); void load(); @@ -54,7 +54,7 @@ private: KJavaScriptOptions *javascript; KJavaOptions *java; - KConfig *mConfig; + TDEConfig *mConfig; }; #endif diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index c78a63eec..c8f9f760d 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -33,7 +33,7 @@ // == class PluginPolicies ===== -PluginPolicies::PluginPolicies(KConfig* config, const TQString &group, bool global, +PluginPolicies::PluginPolicies(TDEConfig* config, const TQString &group, bool global, const TQString &domain) : Policies(config,group,global,domain,"plugins.","EnablePlugins") { } @@ -43,9 +43,9 @@ PluginPolicies::~PluginPolicies() { // == class KPluginOptions ===== -KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *parent, +KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *parent, const char *) - : KCModule( parent, "kcmkonqhtml" ), + : TDECModule( parent, "kcmkonqhtml" ), m_pConfig( config ), m_groupname( group ), m_nspluginscan (0), @@ -190,7 +190,7 @@ void KPluginOptions::load( bool useDefaults ) /****************************************************************************/ - KConfig *config = new KConfig("kcmnspluginrc", true); + TDEConfig *config = new TDEConfig("kcmnspluginrc", true); config->setReadDefaults( useDefaults ); @@ -236,7 +236,7 @@ void KPluginOptions::save() /*****************************************************************************/ - KConfig *config= new KConfig("kcmnspluginrc", false); + TDEConfig *config= new TDEConfig("kcmnspluginrc", false); dirSave( config ); pluginSave( config ); @@ -364,7 +364,7 @@ void KPluginOptions::dirInit() } -void KPluginOptions::dirLoad( KConfig *config, bool useDefault ) +void KPluginOptions::dirLoad( TDEConfig *config, bool useDefault ) { TQStringList paths; @@ -406,7 +406,7 @@ void KPluginOptions::dirLoad( KConfig *config, bool useDefault ) } -void KPluginOptions::dirSave( KConfig *config ) +void KPluginOptions::dirSave( TDEConfig *config ) { // create stringlist TQStringList paths; @@ -506,7 +506,7 @@ void KPluginOptions::pluginInit() } -void KPluginOptions::pluginLoad( KConfig* /*config*/ ) +void KPluginOptions::pluginLoad( TDEConfig* /*config*/ ) { kdDebug() << "-> KPluginOptions::fillPluginList" << endl; m_widget->pluginList->clear(); @@ -583,7 +583,7 @@ void KPluginOptions::pluginLoad( KConfig* /*config*/ ) } -void KPluginOptions::pluginSave( KConfig* /*config*/ ) +void KPluginOptions::pluginSave( TDEConfig* /*config*/ ) { } @@ -623,7 +623,7 @@ void PluginDomainDialog::slotClose() { // == class PluginDomainListView ===== -PluginDomainListView::PluginDomainListView(KConfig *config,const TQString &group, +PluginDomainListView::PluginDomainListView(TDEConfig *config,const TQString &group, KPluginOptions *options,TQWidget *parent,const char *name) : DomainListView(config,i18n( "Doma&in-Specific" ), parent, name), group(group), options(options) { diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h index 8b61f8f16..37aeceeda 100644 --- a/kcontrol/konqhtml/pluginopts.h +++ b/kcontrol/konqhtml/pluginopts.h @@ -16,7 +16,7 @@ #include "domainlistview.h" #include "policies.h" -class KConfig; +class TDEConfig; class TQCheckBox; #include <kcmodule.h> @@ -44,7 +44,7 @@ public: * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ - PluginPolicies(KConfig* config, const TQString &group, bool global, + PluginPolicies(TDEConfig* config, const TQString &group, bool global, const TQString &domain = TQString::null); virtual ~PluginPolicies(); @@ -55,7 +55,7 @@ public: class PluginDomainListView : public DomainListView { Q_OBJECT public: - PluginDomainListView(KConfig *config,const TQString &group,KPluginOptions *opt, + PluginDomainListView(TDEConfig *config,const TQString &group,KPluginOptions *opt, TQWidget *parent,const char *name = 0); virtual ~PluginDomainListView(); @@ -90,12 +90,12 @@ private: TQBoxLayout *thisLayout; }; -class KPluginOptions : public KCModule +class KPluginOptions : public TDECModule { Q_OBJECT public: - KPluginOptions( KConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); + KPluginOptions( TDEConfig* config, TQString group, TQWidget* parent = 0, const char* name = 0 ); ~KPluginOptions(); virtual void load(); @@ -111,7 +111,7 @@ private slots: private: - KConfig* m_pConfig; + TDEConfig* m_pConfig; TQString m_groupname; TQCheckBox *enablePluginsGloballyCB, *enableHTTPOnly, *enableUserDemand; @@ -140,8 +140,8 @@ private: /******************************************************************************/ protected: void dirInit(); - void dirLoad( KConfig *config, bool useDefault = false ); - void dirSave( KConfig *config ); + void dirLoad( TDEConfig *config, bool useDefault = false ); + void dirSave( TDEConfig *config ); protected slots: void dirNew(); @@ -154,8 +154,8 @@ private: /******************************************************************************/ protected: void pluginInit(); - void pluginLoad( KConfig *config ); - void pluginSave( KConfig *config ); + void pluginLoad( TDEConfig *config ); + void pluginSave( TDEConfig *config ); friend class PluginDomainListView; }; diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp index 524bd4d15..0c1cd3bc5 100644 --- a/kcontrol/konqhtml/policies.cpp +++ b/kcontrol/konqhtml/policies.cpp @@ -26,7 +26,7 @@ // == class Policies == -Policies::Policies(KConfig* config,const TQString &group, +Policies::Policies(TDEConfig* config,const TQString &group, bool global,const TQString &domain, const TQString &prefix, const TQString &feature_key) : is_global(global), config(config), groupname(group), diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h index a9814396a..df2a97750 100644 --- a/kcontrol/konqhtml/policies.h +++ b/kcontrol/konqhtml/policies.h @@ -24,7 +24,7 @@ #include <tqstring.h> -class KConfig; +class TDEConfig; // special value for inheriting a global policy #define INHERIT_POLICY 32767 @@ -54,7 +54,7 @@ public: * @param feature_key key of the "feature enabled" policy. The final * key the policy is stored under will be prefix + featureKey. */ - Policies(KConfig* config, const TQString &group, bool global, + Policies(TDEConfig* config, const TQString &group, bool global, const TQString &domain, const TQString &prefix, const TQString &feature_key); @@ -123,7 +123,7 @@ protected: unsigned int feature_enabled; bool is_global; - KConfig *config; + TDEConfig *config; TQString groupname; TQString domain; TQString prefix; diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 8eb8747ce..3d4e00bdd 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -37,7 +37,7 @@ typedef KGenericFactory<KCMKonsole, TQWidget> ModuleFactory; K_EXPORT_COMPONENT_FACTORY( kcm_konsole, ModuleFactory("kcmkonsole") ) KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&) -:KCModule(ModuleFactory::instance(), parent, name) +:TDECModule(ModuleFactory::instance(), parent, name) { setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal" @@ -87,7 +87,7 @@ void KCMKonsole::load() void KCMKonsole::load(bool useDefaults) { - KConfig config("konsolerc", true); + TDEConfig config("konsolerc", true); config.setDesktopGroup(); config.setReadDefaults(useDefaults); @@ -126,7 +126,7 @@ void KCMKonsole::save() dialog->SessionEditor1->querySave(); } - KConfig config("konsolerc"); + TDEConfig config("konsolerc"); config.setDesktopGroup(); config.writeEntry("TerminalSizeHint", dialog->terminalSizeHintCB->isChecked()); diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h index 255a63e66..71b0fb7a7 100644 --- a/kcontrol/konsole/kcmkonsole.h +++ b/kcontrol/konsole/kcmkonsole.h @@ -26,7 +26,7 @@ class TQFont; class TQStringList; class KCMKonsole - : public KCModule + : public TDECModule { Q_OBJECT diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 1f8dfcc7d..72d9c1fe0 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -99,7 +99,7 @@ static void applyGtkStyles(bool active, int version) // ----------------------------------------------------------------------------- -static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& newPal ) +static void applyQtColors( TDEConfig& kglobals, TQSettings& settings, TQPalette& newPal ) { TQStringList actcg, inactcg, discg; @@ -162,7 +162,7 @@ static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& n // ----------------------------------------------------------------------------- -static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) +static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings ) { /* export kde's plugin library path to qtrc */ @@ -428,7 +428,7 @@ void runRdb( uint flags ) bool exportQtSettings = flags & KRdbExportQtSettings; bool exportXftSettings = flags & KRdbExportXftSettings; - KConfig kglobals("kdeglobals", true, false); + TDEConfig kglobals("kdeglobals", true, false); kglobals.setGroup("KDE"); KTempFile tmpFile; @@ -497,7 +497,7 @@ void runRdb( uint flags ) copyFile(tmp, homeDir + "/.Xdefaults", true); // Export the Xcursor theme & size settings - KConfig mousecfg( "kcminputrc" ); + TDEConfig mousecfg( "kcminputrc" ); mousecfg.setGroup( "Mouse" ); TQString theme = mousecfg.readEntry("cursorTheme", TQString()); TQString size = mousecfg.readEntry("cursorSize", TQString()); @@ -545,7 +545,7 @@ void runRdb( uint flags ) contents += "Xft.rgba: " + subPixel + '\n'; } - KConfig cfgfonts("kcmfonts", true); + TDEConfig cfgfonts("kcmfonts", true); cfgfonts.setGroup("General"); if( cfgfonts.readNumEntry( "forceFontDPI", 0 ) != 0 ) contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n'; diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index aebf467a0..faf6feb9c 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -89,7 +89,7 @@ bool KTheme::load( const KURL & url ) kdDebug() << "Loading theme from URL: " << url << endl; TQString tmpFile; - if ( !KIO::NetAccess::download( url, tmpFile, 0L ) ) + if ( !TDEIO::NetAccess::download( url, tmpFile, 0L ) ) return false; kdDebug() << "Theme is in temp file: " << tmpFile << endl; @@ -111,7 +111,7 @@ bool KTheme::load( const KURL & url ) file.close(); // remove the temp file - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); return true; } @@ -125,13 +125,13 @@ TQString KTheme::createYourself( bool pack ) // 1. General stuff set by methods setBlah() // 2. Background theme - KConfig * globalConf = TDEGlobal::config(); + TDEConfig * globalConf = TDEGlobal::config(); - KConfig twinConf( "twinrc", true ); + TDEConfig twinConf( "twinrc", true ); twinConf.setGroup( "Desktops" ); uint numDesktops = twinConf.readUnsignedNumEntry( "Number", 4 ); - KConfig desktopConf( "kdesktoprc", true ); + TDEConfig desktopConf( "kdesktoprc", true ); desktopConf.setGroup( "Background Common" ); bool common = desktopConf.readBoolEntry( "CommonDesktop", true ); @@ -197,7 +197,7 @@ TQString KTheme::createYourself( bool pack ) // 4. Sounds // 4.1 Global sounds - KConfig * soundConf = new KConfig( "knotify.eventsrc", true ); + TDEConfig * soundConf = new TDEConfig( "knotify.eventsrc", true ); TQStringList stdEvents; stdEvents << "cannotopenfile" << "catastrophe" << "exitkde" << "fatalerror" << "notification" << "printerror" << "starttde" << "warning" @@ -205,7 +205,7 @@ TQString KTheme::createYourself( bool pack ) << "messageboxQuestion"; // 4.2 KWin sounds - KConfig * twinSoundConf = new KConfig( "twin.eventsrc", true ); + TDEConfig * twinSoundConf = new TDEConfig( "twin.eventsrc", true ); TQStringList twinEvents; twinEvents << "activate" << "close" << "delete" << "desktop1" << "desktop2" << "desktop3" << "desktop4" << @@ -247,7 +247,7 @@ TQString KTheme::createYourself( bool pack ) m_root.appendChild( colorsElem ); // 6. Cursors - KConfig* mouseConf = new KConfig( "kcminputrc", true ); + TDEConfig* mouseConf = new TDEConfig( "kcminputrc", true ); mouseConf->setGroup( "Mouse" ); TQDomElement cursorsElem = m_dom.createElement( "cursors" ); cursorsElem.setAttribute( "name", mouseConf->readEntry( "cursorTheme" ) ); @@ -273,7 +273,7 @@ TQString KTheme::createYourself( bool pack ) m_root.appendChild( wmElem ); // 8. Konqueror - KConfig konqConf( "konquerorrc", true ); + TDEConfig konqConf( "konquerorrc", true ); konqConf.setGroup( "Settings" ); TQDomElement konqElem = m_dom.createElement( "konqueror" ); TQDomElement konqWallElem = m_dom.createElement( "wallpaper" ); @@ -286,7 +286,7 @@ TQString KTheme::createYourself( bool pack ) m_root.appendChild( konqElem ); // 9. Kicker (aka TDE Panel) - KConfig kickerConf( "kickerrc", true ); + TDEConfig kickerConf( "kickerrc", true ); kickerConf.setGroup( "General" ); TQDomElement panelElem = m_dom.createElement( "panel" ); @@ -396,7 +396,7 @@ void KTheme::apply() // 2. Background theme TQDomNodeList desktopList = m_dom.elementsByTagName( "desktop" ); - KConfig desktopConf( "kdesktoprc" ); + TDEConfig desktopConf( "kdesktoprc" ); desktopConf.setGroup( "Background Common" ); for ( uint i = 0; i <= desktopList.count(); i++ ) @@ -448,7 +448,7 @@ void KTheme::apply() TQDomElement iconElem = m_dom.elementsByTagName( "icons" ).item( 0 ).toElement(); if ( !iconElem.isNull() ) { - KConfig * iconConf = TDEGlobal::config(); + TDEConfig * iconConf = TDEGlobal::config(); iconConf->setGroup( "Icons" ); iconConf->writeEntry( "Theme", iconElem.attribute( "name", "crystalsvg" ), true, true ); @@ -492,8 +492,8 @@ void KTheme::apply() TQDomElement soundsElem = m_dom.elementsByTagName( "sounds" ).item( 0 ).toElement(); if ( !soundsElem.isNull() ) { - KConfig soundConf( "knotify.eventsrc" ); - KConfig twinSoundConf( "twin.eventsrc" ); + TDEConfig soundConf( "knotify.eventsrc" ); + TDEConfig twinSoundConf( "twin.eventsrc" ); TQDomNodeList eventList = soundsElem.elementsByTagName( "event" ); for ( uint i = 0; i < eventList.count(); i++ ) { @@ -526,7 +526,7 @@ void KTheme::apply() if ( !colorsElem.isNull() ) { TQDomNodeList colorList = colorsElem.childNodes(); - KConfig * colorConf = TDEGlobal::config(); + TDEConfig * colorConf = TDEGlobal::config(); TQString sCurrentScheme = locateLocal("data", "kdisplay/color-schemes/thememgr.kcsrc"); KSimpleConfig *colorScheme = new KSimpleConfig( sCurrentScheme ); @@ -562,7 +562,7 @@ void KTheme::apply() if ( !cursorsElem.isNull() ) { - KConfig mouseConf( "kcminputrc" ); + TDEConfig mouseConf( "kcminputrc" ); mouseConf.setGroup( "Mouse" ); mouseConf.writeEntry( "cursorTheme", cursorsElem.attribute( "name" )); // FIXME is there a way to notify KDE of cursor changes? @@ -573,7 +573,7 @@ void KTheme::apply() if ( !wmElem.isNull() ) { - KConfig twinConf( "twinrc" ); + TDEConfig twinConf( "twinrc" ); twinConf.setGroup( "Style" ); TQString type = wmElem.attribute( "type" ); if ( type == "builtin" ) @@ -601,7 +601,7 @@ void KTheme::apply() if ( !konqElem.isNull() ) { - KConfig konqConf( "konquerorrc" ); + TDEConfig konqConf( "konquerorrc" ); konqConf.setGroup( "Settings" ); konqConf.writeEntry( "BgImage", unprocessFilePath( "konqueror", getProperty( konqElem, "wallpaper", "url" ) ) ); konqConf.writeEntry( "BgColor", TQColor( getProperty( konqElem, "bgcolor", "rgb" ) ) ); @@ -615,7 +615,7 @@ void KTheme::apply() if ( !panelElem.isNull() ) { - KConfig kickerConf( "kickerrc" ); + TDEConfig kickerConf( "kickerrc" ); kickerConf.setGroup( "General" ); TQString kickerBgUrl = getProperty( panelElem, "background", "url" ); if ( !kickerBgUrl.isEmpty() ) @@ -643,7 +643,7 @@ void KTheme::apply() if ( !widgetsElem.isNull() ) { - KConfig * widgetConf = TDEGlobal::config(); + TDEConfig * widgetConf = TDEGlobal::config(); widgetConf->setGroup( "General" ); widgetConf->writeEntry( "widgetStyle", widgetsElem.attribute( "name" ), true, true ); widgetConf->sync(); @@ -654,8 +654,8 @@ void KTheme::apply() TQDomElement fontsElem = m_dom.elementsByTagName( "fonts" ).item( 0 ).toElement(); if ( !fontsElem.isNull() ) { - KConfig * fontsConf = TDEGlobal::config(); - KConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); + TDEConfig * fontsConf = TDEGlobal::config(); + TDEConfig * kde1xConf = new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); kde1xConf->setGroup( "General" ); TQDomNodeList fontList = fontsElem.childNodes(); @@ -688,7 +688,7 @@ void KTheme::apply() bool KTheme::remove( const TQString & name ) { kdDebug() << "Going to remove theme: " << name << endl; - return KIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L ); + return TDEIO::NetAccess::del( TDEGlobal::dirs()->saveLocation( "themes", name + "/" ), 0L ); } void KTheme::setProperty( const TQString & name, const TQString & value, TQDomElement parent ) @@ -726,7 +726,7 @@ TQString KTheme::getProperty( TQDomElement parent, const TQString & tag, } void KTheme::createIconElems( const TQString & group, const TQString & object, - TQDomElement parent, KConfig * cfg ) + TQDomElement parent, TDEConfig * cfg ) { cfg->setGroup( group ); TQStringList elemNames; @@ -759,7 +759,7 @@ void KTheme::createIconElems( const TQString & group, const TQString & object, } void KTheme::createColorElem( const TQString & name, const TQString & object, - TQDomElement parent, KConfig * cfg ) + TQDomElement parent, TDEConfig * cfg ) { TQColor color = cfg->readColorEntry( name ); if ( color.isValid() ) @@ -772,7 +772,7 @@ void KTheme::createColorElem( const TQString & name, const TQString & object, } void KTheme::createSoundList( const TQStringList & events, const TQString & object, - TQDomElement parent, KConfig * cfg ) + TQDomElement parent, TDEConfig * cfg ) { for ( TQStringList::ConstIterator it = events.begin(); it != events.end(); ++it ) { @@ -876,7 +876,7 @@ void KTheme::addPreview() bool KTheme::copyFile( const TQString & from, const TQString & to ) { // we overwrite b/c of restoring the "original" theme - return KIO::NetAccess::file_copy( from, to, -1, true /*overwrite*/ ); + return TDEIO::NetAccess::file_copy( from, to, -1, true /*overwrite*/ ); } TQString KTheme::findResource( const TQString & section, const TQString & path ) diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h index fd659d3c7..4efad8527 100644 --- a/kcontrol/kthememanager/ktheme.h +++ b/kcontrol/kthememanager/ktheme.h @@ -28,7 +28,7 @@ #include <kurl.h> class KStandardDirs; -class KConfig; +class TDEConfig; /// defines the syntax version used by the XML #define SYNTAX_VERSION 1 @@ -153,30 +153,30 @@ private: /** * Creates a list of "icon" elements based on: - * @param group The group in the KConfig object @p cfg + * @param group The group in the TDEConfig object @p cfg * @param object Specifier (similiar, but not identical to @p group) * @param parent Parent element to append to - * @param cfg The KConfig object to work with + * @param cfg The TDEConfig object to work with */ void createIconElems( const TQString & group, const TQString & object, - TQDomElement parent, KConfig * cfg ); + TQDomElement parent, TDEConfig * cfg ); /** * Creates a color DOM element @p name, with a specifier @p object, * appends it to @p parent; used when creating themes - * @param cfg The KConfig object to work with + * @param cfg The TDEConfig object to work with */ void createColorElem( const TQString & name, const TQString & object, - TQDomElement parent, KConfig * cfg ); + TQDomElement parent, TDEConfig * cfg ); /** * Creates a list of "event" elements based on: * @param events The list of events to work on * @param object Specifier (currently "global" or "twin") * @param parent Parent element to append to - * @param cfg The KConfig object to work with + * @param cfg The TDEConfig object to work with */ void createSoundList( const TQStringList & events, const TQString & object, - TQDomElement parent, KConfig * cfg ); + TQDomElement parent, TDEConfig * cfg ); /** * Tries to find out absolute path to a resource and copy it to the theme's temp dir; @@ -195,7 +195,7 @@ private: TQString unprocessFilePath( const TQString & section, TQString path ); /** - * Wrapper around KIO::NetAccess::file_copy + * Wrapper around TDEIO::NetAccess::file_copy */ bool copyFile( const TQString & from, const TQString & to ); diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 5489aedbf..f4b7835bb 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -43,7 +43,7 @@ #include "config.h" kthememanager::kthememanager( TQWidget *parent, const char *name ) - : KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 ) + : TDECModule( parent, name ), m_theme( 0 ), m_origTheme( 0 ) { TDEAboutData *about = new TDEAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"), @@ -56,7 +56,7 @@ kthememanager::kthememanager( TQWidget *parent, const char *name ) setQuickHelp( i18n("This control module handles installing, removing and " "creating visual TDE themes.")); - setButtons( KCModule::Default|KCModule::Apply|KCModule::Help ); + setButtons( TDECModule::Default|TDECModule::Apply|TDECModule::Help ); setAcceptDrops( true ); init(); @@ -130,7 +130,7 @@ void kthememanager::load(bool useDefaults) listThemes(); // Load the current theme name - KConfig conf("kcmthememanagerrc", false, false); + TDEConfig conf("kcmthememanagerrc", false, false); conf.setReadDefaults( useDefaults ); @@ -164,7 +164,7 @@ void kthememanager::save() m_theme->apply(); // Save the current theme name - KConfig conf("kcmthememanagerrc", false, false); + TDEConfig conf("kcmthememanagerrc", false, false); conf.setGroup( "General" ); conf.writeEntry( "CurrentTheme", themeName ); conf.sync(); @@ -415,7 +415,7 @@ void kthememanager::updatePreview( const TQString & pixFile ) extern "C" { - KDE_EXPORT KCModule *create_kthememanager(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue( "kthememanager" ); return new kthememanager( parent, "kthememanager" ); diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h index 0d7059729..3ca337300 100644 --- a/kcontrol/kthememanager/kthememanager.h +++ b/kcontrol/kthememanager/kthememanager.h @@ -59,7 +59,7 @@ private: * @brief The Theme Manager config module. * @author Lukas Tinkl <[email protected]> */ -class kthememanager: public KCModule +class kthememanager: public TDECModule { Q_OBJECT public: diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 2040dd868..b1d209a24 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_launch, LaunchFactory("kcmlaunch") ) LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringList &) - : KCModule(LaunchFactory::instance(), parent, name) + : TDECModule(LaunchFactory::instance(), parent, name) { TQVBoxLayout* Form1Layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -155,7 +155,7 @@ LaunchConfig::load() void LaunchConfig::load(bool useDefaults) { - KConfig c("klaunchrc", false, false); + TDEConfig c("klaunchrc", false, false); c.setReadDefaults( useDefaults ); @@ -194,7 +194,7 @@ LaunchConfig::load(bool useDefaults) void LaunchConfig::save() { - KConfig c("klaunchrc", false, false); + TDEConfig c("klaunchrc", false, false); c.setGroup("FeedbackStyle"); c.writeEntry("BusyCursor", cb_busyCursor->currentItem() != 0); @@ -228,7 +228,7 @@ LaunchConfig::defaults() void LaunchConfig::checkChanged() { - KConfig c("klaunchrc", false, false); + TDEConfig c("klaunchrc", false, false); c.setGroup("FeedbackStyle"); diff --git a/kcontrol/launch/kcmlaunch.h b/kcontrol/launch/kcmlaunch.h index c831182a6..13c980bf7 100644 --- a/kcontrol/launch/kcmlaunch.h +++ b/kcontrol/launch/kcmlaunch.h @@ -26,7 +26,7 @@ class TQGroupBox; class KIntNumInput; -class LaunchConfig : public KCModule +class LaunchConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 40bbf1ab7..c2f50eab7 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -413,7 +413,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, void KLocaleConfig::save() { - KConfigBase *config = TDEGlobal::config(); + TDEConfigBase *config = TDEGlobal::config(); config->setGroup("Locale"); diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index dc4cb2c2e..795524813 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -127,8 +127,8 @@ KLocaleConfigMoney::~KLocaleConfigMoney() void KLocaleConfigMoney::save() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index a940a7ef3..4d291f969 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -85,8 +85,8 @@ void KLocaleConfigNumber::save() KLocale *lsave = TDEGlobal::_locale; TDEGlobal::_locale = m_locale; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index cf92ea1fb..2231864ef 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -76,8 +76,8 @@ KLocaleConfigOther::~KLocaleConfigOther() void KLocaleConfigOther::save() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index df51ae8a4..c41bcba4d 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -249,8 +249,8 @@ void KLocaleConfigTime::save() KLocale *lsave = TDEGlobal::_locale; TDEGlobal::_locale = m_locale; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop") diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp index 74febe07e..63ca9da4b 100644 --- a/kcontrol/locale/main.cpp +++ b/kcontrol/locale/main.cpp @@ -30,7 +30,7 @@ extern "C" { /* extern "C" { - KCModule *create_locale(TQWidget *parent, const char* name) { + TDECModule *create_locale(TQWidget *parent, const char* name) { KLocale::setMainCatalogue("kcmlocale"); return new KLocaleApplication(parent, "kcmlocale"); } diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 5df0f5eb7..01e189fd4 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -47,7 +47,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule( KLocaleFactory::instance(), parent, args) + : TDECModule( KLocaleFactory::instance(), parent, args) { TDEAboutData* aboutData = new TDEAboutData("kcmlocale", I18N_NOOP("KCMLocale"), @@ -59,8 +59,8 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, 0, 0, "[email protected]"); setAboutData( aboutData ); - m_nullConfig = new KConfig(TQString::null, false, false); - m_globalConfig = new KConfig(TQString::null, false, true); + m_nullConfig = new TDEConfig(TQString::null, false, false); + m_globalConfig = new TDEConfig(TQString::null, false, true); m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -184,8 +184,8 @@ void KLocaleApplication::save() // restore the old global locale TDEGlobal::_locale = lsave; - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver saver(config, "Locale"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver saver(config, "Locale"); // ##### this doesn't make sense bool langChanged = config->readEntry("Language") diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h index 64cc89c2a..a999d64d0 100644 --- a/kcontrol/locale/toplevel.h +++ b/kcontrol/locale/toplevel.h @@ -31,7 +31,7 @@ class TQTabWidget; class TQGroupBox; -class KConfig; +class TDEConfig; class KLocale; class KLocaleConfig; class KLocaleConfigMoney; @@ -40,7 +40,7 @@ class KLocaleConfigTime; class KLocaleConfigOther; class KLocaleSample; -class KLocaleApplication : public KCModule +class KLocaleApplication : public TDECModule { Q_OBJECT @@ -78,8 +78,8 @@ private: TQGroupBox *m_gbox; KLocaleSample *m_sample; - KConfig * m_globalConfig; - KConfig * m_nullConfig; + TDEConfig * m_globalConfig; + TDEConfig * m_nullConfig; }; typedef KGenericFactory<KLocaleApplication, TQWidget > KLocaleFactory; diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 6d2acf1e9..d51bad54d 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -85,7 +85,7 @@ typedef TQPtrList<MyNIC> NICList; NICList* findNICs(); KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &) - :KCModule(KCMNicFactory::instance(), parent,name) + :TDECModule(KCMNicFactory::instance(), parent,name) { TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint()); m_list=new TQListView(this); diff --git a/kcontrol/nics/nic.h b/kcontrol/nics/nic.h index 9bc41ddbb..0c1939d46 100644 --- a/kcontrol/nics/nic.h +++ b/kcontrol/nics/nic.h @@ -27,7 +27,7 @@ class TQStringList; class TQPushButton; class TQListView; -class KCMNic:public KCModule +class KCMNic:public TDECModule { Q_OBJECT public: diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index 11ea51438..3795cc39a 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -28,12 +28,12 @@ extern "C" { - KDE_EXPORT KCModule* create_performance( TQWidget* parent_P, const char* name_P ) + KDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::Config( parent_P, name_P ); } - KDE_EXPORT KCModule* create_konqueror( TQWidget* parent_P, const char* name_P ) + KDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::KonquerorConfig( parent_P, name_P ); } @@ -43,7 +43,7 @@ namespace KCMPerformance { Config::Config( TQWidget* parent_P, const char* ) - : KCModule( parent_P, "kcmperformance" ) + : TDECModule( parent_P, "kcmperformance" ) { setQuickHelp( i18n( "<h1>TDE Performance</h1>" " You can configure settings that improve TDE performance here." )); @@ -86,7 +86,7 @@ void Config::defaults() } KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* ) - : KCModule( parent_P, "kcmperformance" ) + : TDECModule( parent_P, "kcmperformance" ) { setQuickHelp( i18n( "<h1>Konqueror Performance</h1>" " You can configure several settings that improve Konqueror performance here." diff --git a/kcontrol/performance/kcmperformance.h b/kcontrol/performance/kcmperformance.h index bb924b880..2ae868093 100644 --- a/kcontrol/performance/kcmperformance.h +++ b/kcontrol/performance/kcmperformance.h @@ -28,7 +28,7 @@ class Konqueror; class SystemWidget; class Config - : public KCModule + : public TDECModule { Q_OBJECT public: @@ -43,7 +43,7 @@ class Config }; class KonquerorConfig - : public KCModule + : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp index b9edc46f0..3c8bb6db3 100644 --- a/kcontrol/performance/konqueror.cpp +++ b/kcontrol/performance/konqueror.cpp @@ -96,7 +96,7 @@ void Konqueror::preload_count_changed( int count ) void Konqueror::load( bool useDefaults ) { - KConfig cfg( "konquerorrc", true ); + TDEConfig cfg( "konquerorrc", true ); cfg.setReadDefaults( useDefaults ); cfg.setGroup( "Reusing" ); allowed_parts = cfg.readEntry( "SafeParts", "SAFE" ); @@ -113,7 +113,7 @@ void Konqueror::load( bool useDefaults ) void Konqueror::save() { - KConfig cfg( "konquerorrc" ); + TDEConfig cfg( "konquerorrc" ); cfg.setGroup( "Reusing" ); if( rb_always_reuse->isChecked()) allowed_parts = "ALL"; diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp index 001e00abf..500178002 100644 --- a/kcontrol/performance/system.cpp +++ b/kcontrol/performance/system.cpp @@ -57,7 +57,7 @@ SystemWidget::SystemWidget( TQWidget* parent_P ) void SystemWidget::load(bool useDefaults ) { - KConfig cfg( "kdedrc", true ); + TDEConfig cfg( "kdedrc", true ); cfg.setReadDefaults( useDefaults ); cfg.setGroup( "General" ); cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false )); @@ -65,7 +65,7 @@ void SystemWidget::load(bool useDefaults ) void SystemWidget::save() { - KConfig cfg( "kdedrc" ); + TDEConfig cfg( "kdedrc" ); cfg.setGroup( "General" ); cfg.writeEntry( "DelayedCheck", cb_disable_kbuildsycoca->isChecked()); } diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index e8da79f48..3367bbaa1 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -87,10 +87,10 @@ bool KPrivacyManager::clearSavedClipboardContents() { if(!isApplicationRegistered("klipper")) { - KConfig *c = new KConfig("klipperrc", false, false); + TDEConfig *c = new TDEConfig("klipperrc", false, false); { - KConfigGroupSaver saver(c, "General"); + TDEConfigGroupSaver saver(c, "General"); c->deleteEntry("ClipboardData"); c->sync(); } diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index 55b4246cb..6b54baac6 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -38,12 +38,12 @@ #include "privacy.h" Privacy::Privacy(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { setQuickHelp( i18n("The privacy module allows a user to erase traces which TDE leaves on " "the system, such as command histories or browser caches.")); - setButtons( KCModule::Default|KCModule::Apply|KCModule::Help ); + setButtons( TDECModule::Default|TDECModule::Apply|TDECModule::Help ); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcm_privacy"), I18N_NOOP("TDE Privacy Control Module"), @@ -157,13 +157,13 @@ void Privacy::load() void Privacy::load(bool useDefaults) { - KConfig *c = new KConfig("kprivacyrc", false, false); + TDEConfig *c = new TDEConfig("kprivacyrc", false, false); c->setReadDefaults( useDefaults ); // get general privacy settings { - KConfigGroupSaver saver(c, "Cleaning"); + TDEConfigGroupSaver saver(c, "Cleaning"); clearThumbnails->setOn(c->readBoolEntry("ClearThumbnails", true)); clearRunCommandHistory->setOn(c->readBoolEntry("ClearRunCommandHistory", true)); @@ -178,7 +178,7 @@ void Privacy::load(bool useDefaults) } { - KConfigGroupSaver saver(c, "P3P"); + TDEConfigGroupSaver saver(c, "P3P"); // TODO: add P3P settings here } @@ -196,9 +196,9 @@ void Privacy::defaults() void Privacy::save() { - KConfig *c = new KConfig("kprivacyrc", false, false); + TDEConfig *c = new TDEConfig("kprivacyrc", false, false); { - KConfigGroupSaver saver(c, "Cleaning"); + TDEConfigGroupSaver saver(c, "Cleaning"); c->writeEntry("ClearThumbnails", clearThumbnails->isOn()); c->writeEntry("ClearRunCommandHistory", clearRunCommandHistory->isOn()); @@ -213,7 +213,7 @@ void Privacy::save() } { - KConfigGroupSaver saver(c, "P3P"); + TDEConfigGroupSaver saver(c, "P3P"); // TODO: add settings for P3P } @@ -309,7 +309,7 @@ void Privacy::cleanup() extern "C" { - KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/) + KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/) { TDEGlobal::locale()->insertCatalogue("privacy"); return new Privacy(parent, "Privacy"); diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h index 69b061f4c..1df7c4acc 100644 --- a/kcontrol/privacy/privacy.h +++ b/kcontrol/privacy/privacy.h @@ -28,7 +28,7 @@ #include "kprivacymanager.h" #include "kprivacysettings.h" -class Privacy: public KCModule +class Privacy: public TDECModule { Q_OBJECT diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index 03a063f4d..474bc0416 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -64,7 +64,7 @@ extern "C" void KRandRModule::performApplyOnStartup() { - KConfig config("kcmrandrrc", true); + TDEConfig config("kcmrandrrc", true); if (RandRDisplay::applyOnStartup(config)) { // Load settings and apply appropriate config @@ -75,7 +75,7 @@ void KRandRModule::performApplyOnStartup() } KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringList&) - : KCModule(parent, name) + : TDECModule(parent, name) , m_changed(false) { if (!isValid()) { @@ -146,7 +146,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis slotScreenChanged(TQApplication::desktop()->primaryScreen()); - setButtons(KCModule::Apply); + setButtons(TDECModule::Apply); } void KRandRModule::addRotationButton(int thisRotation, bool checkbox) @@ -272,7 +272,7 @@ void KRandRModule::load( bool useDefaults ) // It will be correct already if they wanted to retain their settings over TDE restarts, // and if it isn't correct they have changed a) their X configuration, b) the screen // with another program, or c) their hardware. - KConfig config("kcmrandrrc", true); + TDEConfig config("kcmrandrrc", true); config.setReadDefaults( useDefaults ); @@ -294,7 +294,7 @@ void KRandRModule::save() m_oldApply = m_applyOnStartup->isChecked(); m_oldSyncTrayApp = m_syncTrayApp->isChecked(); - KConfig config("kcmrandrrc"); + TDEConfig config("kcmrandrrc"); saveDisplay(config, m_oldApply, m_oldSyncTrayApp); setChanged(); diff --git a/kcontrol/randr/krandrmodule.h b/kcontrol/randr/krandrmodule.h index 40a94566a..53d428fe1 100644 --- a/kcontrol/randr/krandrmodule.h +++ b/kcontrol/randr/krandrmodule.h @@ -25,7 +25,7 @@ class TQButtonGroup; class KComboBox; class TQCheckBox; -class KRandRModule : public KCModule, public KRandrSimpleAPI +class KRandRModule : public TDECModule, public KRandrSimpleAPI { Q_OBJECT diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index 85a5e3f60..f30e3102a 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -476,7 +476,7 @@ void KRandRSystemTray::slotResolutionChanged(int parameter) currentScreen()->proposeRefreshRate(-1); if (currentScreen()->applyProposedAndConfirm()) { - KConfig config("kcmrandrrc"); + TDEConfig config("kcmrandrrc"); if (syncTrayApp(config)) currentScreen()->save(config); } @@ -497,7 +497,7 @@ void KRandRSystemTray::slotOrientationChanged(int parameter) currentScreen()->proposeRotation(propose); if (currentScreen()->applyProposedAndConfirm()) { - KConfig config("kcmrandrrc"); + TDEConfig config("kcmrandrrc"); if (syncTrayApp(config)) currentScreen()->save(config); } @@ -511,7 +511,7 @@ void KRandRSystemTray::slotRefreshRateChanged(int parameter) currentScreen()->proposeRefreshRate(parameter); if (currentScreen()->applyProposedAndConfirm()) { - KConfig config("kcmrandrrc"); + TDEConfig config("kcmrandrrc"); if (syncTrayApp(config)) currentScreen()->save(config); } diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index fd31f7800..caa785605 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -31,7 +31,7 @@ #include <stdio.h> -ImportsView::ImportsView(TQWidget * parent, KConfig *config, const char * name ) +ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name ) : TQWidget (parent, name) ,configFile(config) ,list(this) diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h index 51b83bd3c..bad8ab2fd 100644 --- a/kcontrol/samba/kcmsambaimports.h +++ b/kcontrol/samba/kcmsambaimports.h @@ -32,12 +32,12 @@ class ImportsView: public TQWidget { Q_OBJECT public: - ImportsView(TQWidget *parent, KConfig *config=0, const char * name=0); + ImportsView(TQWidget *parent, TDEConfig *config=0, const char * name=0); virtual ~ImportsView() {}; void saveSettings() {}; void loadSettings() {}; private: - KConfig *configFile; + TDEConfig *configFile; TQListView list; TQTimer timer; private slots: diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index 59f44cc56..b6bceb31f 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -34,7 +34,7 @@ #define LOG_SCREEN_XY_OFFSET 10 -LogView::LogView(TQWidget *parent,KConfig *config, const char *name) +LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) : TQWidget (parent, name) ,configFile(config) ,filesCount(0) diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h index ff2799ccc..05f6c3040 100644 --- a/kcontrol/samba/kcmsambalog.h +++ b/kcontrol/samba/kcmsambalog.h @@ -40,12 +40,12 @@ class LogView: public TQWidget { Q_OBJECT public: - LogView(TQWidget *parent=0, KConfig *config=0, const char *name=0); + LogView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0); virtual ~LogView() {}; void saveSettings(); void loadSettings(); private: - KConfig *configFile; + TDEConfig *configFile; int filesCount, connectionsCount; KURLRequester logFileName; TQLabel label; diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index 1e3fa2175..b4b32611c 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <kdialog.h> -StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *name) +StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *name) :TQWidget (parent, name) ,configFile(config) ,dataList(0) diff --git a/kcontrol/samba/kcmsambastatistics.h b/kcontrol/samba/kcmsambastatistics.h index 64c6026ad..4b6ad6211 100644 --- a/kcontrol/samba/kcmsambastatistics.h +++ b/kcontrol/samba/kcmsambastatistics.h @@ -33,7 +33,7 @@ class TQCheckBox; class TQLineEdit; class TQPushButton; -class KConfig; +class TDEConfig; class SmallLogItem { @@ -79,14 +79,14 @@ class StatisticsView: public TQWidget { Q_OBJECT public: - StatisticsView(TQWidget *parent=0, KConfig *config=0, const char *name=0); + StatisticsView(TQWidget *parent=0, TDEConfig *config=0, const char *name=0); virtual ~StatisticsView() {}; void saveSettings() {}; void loadSettings() {}; public slots: void setListInfo(TQListView *list, int nrOfFiles, int nrOfConnections); private: - KConfig *configFile; + TDEConfig *configFile; TQListView *dataList; TQListView* viewStatistics; TQLabel* connectionsL, *filesL; diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index effd67312..cd5457de1 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -34,7 +34,7 @@ #define Before(ttf,in) in.left(in.find(ttf)) #define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) -NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) +NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name ) : TQWidget(parent, name) ,configFile(config) ,showmountProc(0) diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index e256de067..2d6c10fba 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -36,11 +36,11 @@ class NetMon : public TQWidget { Q_OBJECT public: - NetMon(TQWidget *parent, KConfig * config=0, const char * name=0); + NetMon(TQWidget *parent, TDEConfig * config=0, const char * name=0); void saveSettings() {}; void loadSettings() {}; private: - KConfig *configFile; + TDEConfig *configFile; TDEProcess *showmountProc; TQListView *list; TQLabel *version; diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index 5c2856c32..2db372feb 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -29,7 +29,7 @@ #include "kcmsambastatistics.h" #include "ksmbstatus.h" -class SambaContainer:public KCModule +class SambaContainer:public TDECModule { public: SambaContainer(TQWidget *parent=0, const char * name=0, const TQStringList &list = TQStringList() ); @@ -38,7 +38,7 @@ class SambaContainer:public KCModule virtual void save(); private: - KConfig config; + TDEConfig config; TQTabWidget tabs; NetMon status; ImportsView imports; @@ -50,7 +50,7 @@ typedef KGenericFactory<SambaContainer, TQWidget > SambaFactory; K_EXPORT_COMPONENT_FACTORY (kcm_samba, SambaFactory("kcmsamba") ) SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStringList&) -:KCModule(SambaFactory::instance(), parent,name) +:TDECModule(SambaFactory::instance(), parent,name) ,config("kcmsambarc",false,true) ,tabs(this) ,status(&tabs,&config) diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp index 4a48eedfe..507255eea 100644 --- a/kcontrol/screensaver/advanceddialog.cpp +++ b/kcontrol/screensaver/advanceddialog.cpp @@ -43,7 +43,7 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c void KScreenSaverAdvancedDialog::readSettings() { - KConfig *config = new KConfig("kdesktoprc"); + TDEConfig *config = new TDEConfig("kdesktoprc"); config->setGroup("ScreenSaver"); mPriority = config->readNumEntry("Priority", 19); @@ -100,7 +100,7 @@ void KScreenSaverAdvancedDialog::slotOk() { if (mChanged) { - KConfig *config = new KConfig("kdesktoprc"); + TDEConfig *config = new TDEConfig("kdesktoprc"); config->setGroup( "ScreenSaver" ); config->writeEntry("Priority", mPriority); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index c9f1e8f2b..4efb38e90 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -71,7 +71,7 @@ static TQString findExe(const TQString &exe) { } KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringList&) - : KCModule(KSSFactory::instance(), parent, name) + : TDECModule(KSSFactory::instance(), parent, name) { mSetupProc = 0; mPreviewProc = 0; @@ -96,7 +96,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis " the \"Require password\" feature of the screen saver; if you do not, you can still" " explicitly lock the session using the desktop's \"Lock Session\" action.")); - setButtons( KCModule::Help | KCModule::Default | KCModule::Apply ); + setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply ); // Add KDE specific screensaver path TQString relPath="System/ScreenSavers/"; @@ -384,7 +384,7 @@ void KScreenSaver::load( bool useDefaults ) // void KScreenSaver::readSettings( bool useDefaults ) { - KConfig *config = new KConfig( "kdesktoprc"); + TDEConfig *config = new TDEConfig( "kdesktoprc"); config->setReadDefaults( useDefaults ); @@ -437,7 +437,7 @@ void KScreenSaver::save() if ( !mChanged ) return; - KConfig *config = new KConfig( "kdesktoprc"); + TDEConfig *config = new TDEConfig( "kdesktoprc"); config->setGroup( "ScreenSaver" ); config->writeEntry("Enabled", mEnabled); diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index afaa3450b..72a00c410 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -31,7 +31,7 @@ class KIntNumInput; class TDEProcess; //=========================================================================== -class KScreenSaver : public KCModule +class KScreenSaver : public TDECModule { Q_OBJECT public: diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index fcc70a66d..acc66880e 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -44,11 +44,11 @@ #include "smartcard.h" KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) - : KCModule(parent, name),DCOPObject(name) + : TDECModule(parent, name),DCOPObject(name) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KConfig("ksmartcardrc", false, false); + config = new TDEConfig("ksmartcardrc", false, false); DCOPClient *dc = TDEApplication::kApplication()->dcopClient(); @@ -372,14 +372,14 @@ TQString KSmartcardConfig::quickHelp() const extern "C" { - KDE_EXPORT KCModule *create_smartcard(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *) { return new KSmartcardConfig(parent, "kcmsmartcard"); } KDE_EXPORT void init_smartcard() { - KConfig *config = new KConfig("ksmartcardrc", false, false); + TDEConfig *config = new TDEConfig("ksmartcardrc", false, false); bool start = config->readBoolEntry("Enable Support", false); delete config; diff --git a/kcontrol/smartcard/smartcard.h b/kcontrol/smartcard/smartcard.h index 31fcea349..8a7367341 100644 --- a/kcontrol/smartcard/smartcard.h +++ b/kcontrol/smartcard/smartcard.h @@ -32,12 +32,12 @@ #include "smartcardbase.h" #include "nosmartcardbase.h" -class KConfig; +class TDEConfig; class KCardDB; class KPopupMenu; class KListViewItem; -class KSmartcardConfig : public KCModule, public DCOPObject +class KSmartcardConfig : public TDECModule, public DCOPObject { K_DCOP Q_OBJECT @@ -74,7 +74,7 @@ public: private: - KConfig *config; + TDEConfig *config; bool _ok; KCardDB * _cardDB; KPopupMenu * _popUpKardChooser; diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 1a312034d..11c09baf7 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -37,7 +37,7 @@ typedef KGenericFactory<SMServerConfig, TQWidget > SMSFactory; K_EXPORT_COMPONENT_FACTORY (kcm_smserver, SMSFactory("kcmsmserver") ) SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStringList & ) - : KCModule (SMSFactory::instance(), parent, name) + : TDECModule (SMSFactory::instance(), parent, name) { setQuickHelp( i18n("<h1>Session Manager</h1>" " You can configure the session manager here." @@ -63,7 +63,7 @@ void SMServerConfig::load() void SMServerConfig::load(bool useDefaults ) { - KConfig *c = new KConfig("ksmserverrc", false, false); + TDEConfig *c = new TDEConfig("ksmserverrc", false, false); c->setReadDefaults( useDefaults ); c->setGroup("General"); dialog->confirmLogoutCheck->setChecked(c->readBoolEntry("confirmLogout", true)); @@ -102,7 +102,7 @@ void SMServerConfig::load(bool useDefaults ) void SMServerConfig::save() { - KConfig *c = new KConfig("ksmserverrc", false, false); + TDEConfig *c = new TDEConfig("ksmserverrc", false, false); c->setGroup("General"); c->writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked()); c->writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked()); diff --git a/kcontrol/smserver/kcmsmserver.h b/kcontrol/smserver/kcmsmserver.h index c1ea4a362..c66caaa93 100644 --- a/kcontrol/smserver/kcmsmserver.h +++ b/kcontrol/smserver/kcmsmserver.h @@ -26,7 +26,7 @@ class SMServerConfigImpl; -class SMServerConfig : public KCModule +class SMServerConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 18bbbb5ed..68aa0cac8 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_spellchecking, SpellFactory("kcmspellchecking") KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &): - KCModule(SpellFactory::instance(), parent, name) + TDECModule(SpellFactory::instance(), parent, name) { TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGroupBox *box = new TQVGroupBox( i18n("Spell Checking Settings"), this ); diff --git a/kcontrol/spellchecking/spellchecking.h b/kcontrol/spellchecking/spellchecking.h index 130bf5e51..19aadbc76 100644 --- a/kcontrol/spellchecking/spellchecking.h +++ b/kcontrol/spellchecking/spellchecking.h @@ -23,7 +23,7 @@ class KSpellConfig; -class KSpellCheckingConfig : public KCModule +class KSpellCheckingConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 3a2025589..f540d7e75 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -73,7 +73,7 @@ // Danimo: Why do we use the old interface?! extern "C" { - KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*) + KDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*) { TDEGlobal::locale()->insertCatalogue("kcmstyle"); return new KCMStyle(parent, "kcmstyle"); @@ -82,7 +82,7 @@ extern "C" KDE_EXPORT void init_style() { uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings; - KConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/); + TDEConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/); config.setGroup("X11"); // This key is written by the "colors" module. @@ -116,7 +116,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kcmstyle, GeneralFactory ) KCMStyle::KCMStyle( TQWidget* parent, const char* name ) - : KCModule( parent, name ), appliedStyle(NULL) + : TDECModule( parent, name ), appliedStyle(NULL) { setQuickHelp( i18n("<h1>Style</h1>" "This module allows you to modify the visual appearance " @@ -489,7 +489,7 @@ void KCMStyle::load() void KCMStyle::load(bool useDefaults) { - KConfig config( "kdeglobals", true, false ); + TDEConfig config( "kdeglobals", true, false ); config.setReadDefaults( useDefaults ); @@ -562,7 +562,7 @@ void KCMStyle::save() // Save effects. - KConfig config( "kdeglobals" ); + TDEConfig config( "kdeglobals" ); config.setGroup("KDE"); config.writeEntry( "EffectsEnabled", cbEnableEffects->isChecked()); @@ -634,7 +634,7 @@ void KCMStyle::save() if (m_bStyleDirty | m_bEffectsDirty) // Export only if necessary { uint flags = KRdbExportQtSettings; - KConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); + TDEConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); kconfig.setGroup("X11"); bool exportKDEColors = kconfig.readBoolEntry("exportKDEColors", true); if (exportKDEColors) @@ -717,7 +717,7 @@ void KCMStyle::setStyleDirty() // All the Style Switching / Preview stuff // ---------------------------------------------------------------- -void KCMStyle::loadStyle( KConfig& config ) +void KCMStyle::loadStyle( TDEConfig& config ) { cbStyle->clear(); @@ -894,7 +894,7 @@ void KCMStyle::setStyleRecursive(TQWidget* w, TQStyle* s) // All the Effects stuff // ---------------------------------------------------------------- -void KCMStyle::loadEffects( KConfig& config ) +void KCMStyle::loadEffects( TDEConfig& config ) { // Load effects. config.setGroup("KDE"); @@ -1011,9 +1011,9 @@ void KCMStyle::menuEffectChanged( bool enabled ) // All the Miscellaneous stuff // ---------------------------------------------------------------- -void KCMStyle::loadMisc( KConfig& config ) +void KCMStyle::loadMisc( TDEConfig& config ) { - // TDE's Part via KConfig + // TDE's Part via TDEConfig config.setGroup("Toolbar style"); cbHoverButtons->setChecked(config.readBoolEntry("Highlighting", true)); cbTransparentToolbars->setChecked(config.readBoolEntry("TransparentMoving", true)); diff --git a/kcontrol/style/kcmstyle.h b/kcontrol/style/kcmstyle.h index ac3d56cb3..44fb68c0e 100644 --- a/kcontrol/style/kcmstyle.h +++ b/kcontrol/style/kcmstyle.h @@ -59,7 +59,7 @@ struct StyleEntry { bool hidden; }; -class KCMStyle : public KCModule +class KCMStyle : public TDECModule { Q_OBJECT @@ -77,9 +77,9 @@ protected: void switchStyle(const TQString& styleName, bool force = false); void setStyleRecursive(TQWidget* w, TQStyle* s); - void loadStyle( KConfig& config ); - void loadEffects( KConfig& config ); - void loadMisc( KConfig& config ); + void loadStyle( TDEConfig& config ); + void loadEffects( TDEConfig& config ); + void loadMisc( TDEConfig& config ); void addWhatsThis(); protected slots: diff --git a/kcontrol/style/main.cpp b/kcontrol/style/main.cpp index 252cee0fd..334229f4e 100644 --- a/kcontrol/style/main.cpp +++ b/kcontrol/style/main.cpp @@ -5,7 +5,7 @@ #include "kcmstyle.h" extern "C" { - KCModule *create_style(TQWidget *parent, const char *) { + TDECModule *create_style(TQWidget *parent, const char *) { return new KCMStyle(parent, "kcmstyle"); } } diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 053330367..2429b59bc 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -151,7 +151,7 @@ TQStringList TaskbarConfig::i18nShowTaskStatesList() } TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList& args) - : KCModule(TaskBarFactory::instance(), parent, name), + : TDECModule(TaskBarFactory::instance(), parent, name), m_settingsObject(NULL) { TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -175,8 +175,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL TQFile configFile(locateLocal("config", m_configFileName)); if (!configFile.exists()) { - KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); - KConfig localConfig(m_configFileName); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); } @@ -243,7 +243,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL I18N_NOOP("(c) 2000 - 2001 Matthias Elter")); about->addAuthor("Matthias Elter", 0, "[email protected]"); - about->addCredit("Stefan Nikolaus", I18N_NOOP("KConfigXT conversion"), + about->addCredit("Stefan Nikolaus", I18N_NOOP("TDEConfigXT conversion"), setAboutData(about); @@ -261,8 +261,8 @@ TaskbarConfig::~TaskbarConfig() void TaskbarConfig::slotReloadConfigurationFromGlobals() { - KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); - KConfig localConfig(m_configFileName); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig localConfig(m_configFileName); globalConfig.copyTo(m_configFileName, &localConfig); localConfig.sync(); m_settingsObject->readConfig(); @@ -338,7 +338,7 @@ void TaskbarConfig::appearanceChanged(int selected) void TaskbarConfig::load() { - KCModule::load(); + TDECModule::load(); slotUpdateComboBox(); updateAppearanceCombo(); m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly()); @@ -354,7 +354,7 @@ void TaskbarConfig::save() m_settingsObject->writeConfig(); } - KCModule::save(); + TDECModule::save(); TQByteArray data; kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); @@ -362,7 +362,7 @@ void TaskbarConfig::save() void TaskbarConfig::defaults() { - KCModule::defaults(); + TDECModule::defaults(); slotUpdateComboBox(); updateAppearanceCombo(); } diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h index 9aaec9664..8b313c0e6 100644 --- a/kcontrol/taskbar/kcmtaskbar.h +++ b/kcontrol/taskbar/kcmtaskbar.h @@ -50,7 +50,7 @@ class TaskbarAppearance TaskBarSettings* m_settingsObject; }; -class TaskbarConfig : public KCModule +class TaskbarConfig : public TDECModule { Q_OBJECT diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 8348a617b..13a0af19a 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -79,7 +79,7 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg) KSimpleConfig *config; TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(TDMFactory::instance(), parent, name) + : TDECModule(TDMFactory::instance(), parent, name) , minshowuid(0) , maxshowuid(0) , updateOK(false) diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h index d613f9c4e..dbfb936dc 100644 --- a/kcontrol/tdm/main.h +++ b/kcontrol/tdm/main.h @@ -36,7 +36,7 @@ class TDMUsersWidget; class TDMConvenienceWidget; class KBackground; -class TDModule : public KCModule +class TDModule : public TDECModule { Q_OBJECT diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index bcd7517aa..e549b38a1 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -431,7 +431,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) if(!url->isLocalFile()) { pixurl.setPath(TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/" + url->fileName()); - KIO::NetAccess::copy(*url, pixurl, parentWidget()); + TDEIO::NetAccess::copy(*url, pixurl, parentWidget()); istmp = true; } else { pixurl = *url; @@ -440,7 +440,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) // By now url should be "file:/..." if (!setLogo(pixurl.path())) { - KIO::NetAccess::del(pixurl, parentWidget()); + TDEIO::NetAccess::del(pixurl, parentWidget()); TQString msg = i18n("There was an error loading the image:\n" "%1\n" "It will not be saved.") diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index 3be482a17..d2fbcf002 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -346,9 +346,9 @@ void TDMUsersWidget::userButtonDropEvent(TQDropEvent *e) KURL *url = decodeImgDrop(e, this); if (url) { TQString pixpath; - KIO::NetAccess::download(*url, pixpath, parentWidget()); + TDEIO::NetAccess::download(*url, pixpath, parentWidget()); changeUserPix( pixpath ); - KIO::NetAccess::removeTempFile(pixpath); + TDEIO::NetAccess::removeTempFile(pixpath); delete url; } } diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index 8739783de..5c4a8983d 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -27,7 +27,7 @@ typedef KGenericFactory<USBViewer, TQWidget > USBFactory; K_EXPORT_COMPONENT_FACTORY (kcm_usb, USBFactory("kcmusb") ) USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(USBFactory::instance(), parent, name) + : TDECModule(USBFactory::instance(), parent, name) { setButtons(Help); diff --git a/kcontrol/usbview/kcmusb.h b/kcontrol/usbview/kcmusb.h index 33d7f31c1..3b81a3f80 100644 --- a/kcontrol/usbview/kcmusb.h +++ b/kcontrol/usbview/kcmusb.h @@ -21,7 +21,7 @@ class TQListViewItem; class TQTextView; -class USBViewer : public KCModule +class USBViewer : public TDECModule { Q_OBJECT diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index c1443b221..09214adbd 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -58,7 +58,7 @@ int my_reset_handler(raw1394handle_t handle, unsigned int ) View1394::View1394(TQWidget *parent, const char *name) -:KCModule(parent,name) +:TDECModule(parent,name) ,m_insideRescanBus(false) { setQuickHelp( i18n("On the right hand side you can see some information about " @@ -75,7 +75,7 @@ View1394::View1394(TQWidget *parent, const char *name) "<b>Acc</b>: the cycle clock accuracy of the node, valid from 0 to 100<br>" "<b>Speed</b>: the speed of the node<br>")); - setButtons( KCModule::Help ); + setButtons( TDECModule::Help ); m_ouiDb=new OuiDb(); TQVBoxLayout *box=new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -323,7 +323,7 @@ TQString OuiDb::vendor(octlet_t guid) extern "C" { - KDE_EXPORT KCModule *create_view1394(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmview1394"); return new View1394(parent, name); diff --git a/kcontrol/view1394/view1394.h b/kcontrol/view1394/view1394.h index 6d7a3b2c9..c88722b82 100644 --- a/kcontrol/view1394/view1394.h +++ b/kcontrol/view1394/view1394.h @@ -43,7 +43,7 @@ class OuiDb TQMap<TQString, TQString> m_vendorIds; }; -class View1394: public KCModule +class View1394: public TDECModule { Q_OBJECT public: diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index 607cd8754..9d1819223 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -41,7 +41,7 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) - : KCModule(parent, name) { + : TDECModule(parent, name) { _indicators.setAutoDelete(true); TDEAboutData *about = @@ -56,8 +56,8 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) setQuickHelp( i18n("<h1>Multiple Monitors</h1> This module allows you to configure TDE support" " for multiple monitors.")); - config = new KConfig("kdeglobals", false, false); - ksplashrc = new KConfig("ksplashrc", false, false); + config = new TDEConfig("kdeglobals", false, false); + ksplashrc = new TDEConfig("ksplashrc", false, false); connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator())); @@ -239,7 +239,7 @@ void KCMXinerama::clearIndicator() { } extern "C" { - KDE_EXPORT KCModule *create_xinerama(TQWidget *parent, const char *name) { + KDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmxinerama"); return new KCMXinerama(parent, name); } diff --git a/kcontrol/xinerama/kcmxinerama.h b/kcontrol/xinerama/kcmxinerama.h index 130fae78e..707bba28c 100644 --- a/kcontrol/xinerama/kcmxinerama.h +++ b/kcontrol/xinerama/kcmxinerama.h @@ -27,10 +27,10 @@ #include "xineramawidget.h" -class KConfig; +class TDEConfig; class TQWidget; -class KCMXinerama : public KCModule { +class KCMXinerama : public TDECModule { Q_OBJECT public: KCMXinerama(TQWidget *parent = 0L, const char *name = 0L); @@ -49,7 +49,7 @@ public slots: private: TQWidget* indicator(int dpy); - KConfig *config, *ksplashrc; + TDEConfig *config, *ksplashrc; XineramaWidget *xw; TQTimer _timer; TQPtrList<TQWidget> _indicators; diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp index bdf267dd1..cc91d2056 100644 --- a/kdebugdialog/kabstractdebugdialog.cpp +++ b/kdebugdialog/kabstractdebugdialog.cpp @@ -28,7 +28,7 @@ KAbstractDebugDialog::KAbstractDebugDialog( TQWidget *parent, const char *name, bool modal ) : KDialog( parent, name, modal ) { - pConfig = new KConfig( "kdebugrc" ); + pConfig = new TDEConfig( "kdebugrc" ); } KAbstractDebugDialog::~KAbstractDebugDialog() diff --git a/kdebugdialog/kabstractdebugdialog.h b/kdebugdialog/kabstractdebugdialog.h index 2dcc1a208..6e3655973 100644 --- a/kdebugdialog/kabstractdebugdialog.h +++ b/kdebugdialog/kabstractdebugdialog.h @@ -22,7 +22,7 @@ #include <kdialog.h> -class KConfig; +class TDEConfig; class TQVBoxLayout; class KPushButton; @@ -37,14 +37,14 @@ public: virtual void buildButtons(TQVBoxLayout * topLayout); virtual void save() = 0; - KConfig * config() { return pConfig; } + TDEConfig * config() { return pConfig; } protected slots: void slotShowHelp(); void slotApply(); protected: - KConfig* pConfig; + TDEConfig* pConfig; KPushButton* pOKButton; KPushButton* pCancelButton; KPushButton* pHelpButton; diff --git a/kdebugdialog/kdebugdialog.h b/kdebugdialog/kdebugdialog.h index 509a736e4..eabe46429 100644 --- a/kdebugdialog/kdebugdialog.h +++ b/kdebugdialog/kdebugdialog.h @@ -28,7 +28,7 @@ class TQGroupBox; class TQCheckBox; class TQPushButton; -class KConfig; +class TDEConfig; /** * Control debug/warning/error/fatal output of TDE applications diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp index 8344164db..512b7e55f 100644 --- a/kdepasswd/kcm/chfacedlg.cpp +++ b/kdepasswd/kcm/chfacedlg.cpp @@ -45,7 +45,7 @@ #include <kurl.h> #include "chfacedlg.h" -#include "settings.h" // KConfigXT +#include "settings.h" // TDEConfigXT diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index fc58dcea7..bc763243d 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_useraccount, Factory("useraccount") ) KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name, const TQStringList &) - : KCModule( parent, name) + : TDECModule( parent, name) { TQVBoxLayout *topLayout = new TQVBoxLayout(this); _mw = new MainWidget(this); @@ -192,13 +192,13 @@ void KCMUserAccount::load() _mw->btnChangeFace->setPixmap( _facePixmap ); } - KCModule::load(); /* KConfigXT */ + TDECModule::load(); /* TDEConfigXT */ } void KCMUserAccount::save() { - KCModule::save(); /* KConfigXT */ + TDECModule::save(); /* TDEConfigXT */ /* Save KDE's homebrewn settings */ _kes->setSetting( KEMailSettings::RealName, _mw->leRealname->text() ); @@ -305,9 +305,9 @@ bool KCMUserAccount::eventFilter(TQObject *, TQEvent *e) if (url) { TQString pixPath; - KIO::NetAccess::download(*url, pixPath, this); + TDEIO::NetAccess::download(*url, pixPath, this); changeFace( TQPixmap( pixPath ) ); - KIO::NetAccess::removeTempFile(pixPath); + TDEIO::NetAccess::removeTempFile(pixPath); delete url; } return true; diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h index 4ca6c77f9..a2b8b5ba9 100644 --- a/kdepasswd/kcm/main.h +++ b/kdepasswd/kcm/main.h @@ -34,7 +34,7 @@ class Config; /** * Please see the README */ -class KCMUserAccount : public KCModule +class KCMUserAccount : public TDECModule { Q_OBJECT diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index 17a3209f2..e73337db4 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -19,7 +19,7 @@ #define COMPOSITE #endif -class KConfig; +class TDEConfig; class TQTimer; class TQPixmap; class KPopupMenu; @@ -118,7 +118,7 @@ private: int m_CacheLimit; int m_Serial, m_Hash, m_Current; - KConfig *m_pConfig; + TDEConfig *m_pConfig; TQWidget *m_pDesktop; TQTimer *m_pTimer; diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index ebd031624..6c5c97eaf 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -696,7 +696,7 @@ void KDesktop::slotWindowAdded(WId w) if ((windowType == NET::Normal || windowType == NET::Unknown) && inf.mappingState() == NET::Visible) { - KConfig twincfg( "twinrc", true ); // see in twin + TDEConfig twincfg( "twinrc", true ); // see in twin twincfg.setGroup( "Windows" ); if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) { @@ -983,7 +983,7 @@ void KDesktop::handleImageDropEvent(TQDropEvent * e) src.setPath( tmpFile.name() ); KURL dest( KDIconView::desktopURL() ); dest.addPath( filename ); - KIO::NetAccess::copy( src, dest, 0 ); + TDEIO::NetAccess::copy( src, dest, 0 ); tmpFile.unlink(); } else if (result == 2) @@ -1013,7 +1013,7 @@ void KDesktop::slotNewWallpaper(const KURL &url) KTempFile tmpFile( TDEGlobal::dirs()->saveLocation("wallpaper"), "." + ext ); KURL localURL; localURL.setPath( tmpFile.name() ); // We pass 0 as parent window because passing the desktop is not a good idea - KIO::NetAccess::file_copy( url, localURL, -1, true /*overwrite*/ ); + TDEIO::NetAccess::file_copy( url, localURL, -1, true /*overwrite*/ ); bgMgr->setWallpaper( localURL.path() ); } } @@ -1162,14 +1162,14 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int { TQString filename = _url.mid(_url.findRev('/') + 1); - TQValueList<KIO::CopyInfo> files; - KIO::CopyInfo i; + TQValueList<TDEIO::CopyInfo> files; + TDEIO::CopyInfo i; i.uSource = KURL::fromPathOrURL( _url ); i.uDest = KURL::fromPathOrURL( _dest ); i.uDest.addPath( filename ); files.append(i); if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString()))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files ); - KIO::copy( i.uSource, i.uDest, false ); } + TDEIO::copy( i.uSource, i.uDest, false ); } // m_pIconView->addFuturePosition(filename, x, y); // tqDebug("addIcon %s %s %d %d", _url.latin1(), _dest.latin1(), x, y); diff --git a/kdesktop/init.cc b/kdesktop/init.cc index 27990245c..cf45c71d4 100644 --- a/kdesktop/init.cc +++ b/kdesktop/init.cc @@ -134,7 +134,7 @@ static TQString realDesktopPath() */ static void copyDesktopLinks() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); if (!config->readBoolEntry("CopyDesktopLinks", true)) return; @@ -230,8 +230,8 @@ void testLocalInstallation() TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)2; - KIO::Job* job = KIO::special( "trash:/", packedArgs ); - (void)KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( "trash:/", packedArgs ); + (void)TDEIO::NetAccess::synchronousRun( job, 0 ); // OK the only thing missing is to convert the icon position... KSimpleConfig cfg( locateLocal("appdata", "IconPositions") ); diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc index 4a51cefdb..b32c77096 100644 --- a/kdesktop/kcustommenu.cc +++ b/kdesktop/kcustommenu.cc @@ -37,7 +37,7 @@ KCustomMenu::KCustomMenu(const TQString &configfile, TQWidget *parent) { d = new KCustomMenuPrivate; - KConfig cfg(configfile, true, false); + TDEConfig cfg(configfile, true, false); int count = cfg.readNumEntry("NrOfItems"); for(int i = 0; i < count; i++) { diff --git a/kdesktop/kdesktopshadowsettings.cpp b/kdesktop/kdesktopshadowsettings.cpp index 0453a91e4..2d483840c 100644 --- a/kdesktop/kdesktopshadowsettings.cpp +++ b/kdesktop/kdesktopshadowsettings.cpp @@ -28,7 +28,7 @@ //#define DEBUG -KDesktopShadowSettings::KDesktopShadowSettings(KConfig *cfg) : +KDesktopShadowSettings::KDesktopShadowSettings(TDEConfig *cfg) : KShadowSettings(), m_textColor(TQColor("#FFFFFF")), _UID(0L) @@ -59,7 +59,7 @@ unsigned long KDesktopShadowSettings::UID() /** * Loads a new configuration */ -void KDesktopShadowSettings::setConfig(KConfig *val) +void KDesktopShadowSettings::setConfig(TDEConfig *val) { config = val; diff --git a/kdesktop/kdesktopshadowsettings.h b/kdesktop/kdesktopshadowsettings.h index f97e703ca..7e421c6d6 100644 --- a/kdesktop/kdesktopshadowsettings.h +++ b/kdesktop/kdesktopshadowsettings.h @@ -63,7 +63,7 @@ class KDesktopShadowSettings : public KShadowSettings * Constructor * @param cfg the configuration file */ - KDesktopShadowSettings(KConfig *cfg = NULL); + KDesktopShadowSettings(TDEConfig *cfg = NULL); virtual ~KDesktopShadowSettings(); @@ -71,7 +71,7 @@ class KDesktopShadowSettings : public KShadowSettings * Sets a specific configuration file after the object's creation * @param config new configuration object */ - void setConfig(KConfig *); + void setConfig(TDEConfig *); /** * Returns the text color as definied in the configuraiton @@ -104,7 +104,7 @@ class KDesktopShadowSettings : public KShadowSettings void setUID(unsigned long val = 0L); private: - KConfig *config; + TDEConfig *config; TQColor m_textColor; TQColor m_bgColor; bool m_isEnabled; diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index d461a6ecb..ad049256d 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -278,7 +278,7 @@ void KDIconView::initConfig( bool init ) KDesktopSettings::self()->readConfig(); } - KConfig * config = TDEGlobal::config(); + TDEConfig * config = TDEGlobal::config(); if ( !init ) { KDesktopShadowSettings *shadowSettings = static_cast<KDesktopShadowSettings *>(m_shadowEngine->shadowSettings()); @@ -444,7 +444,7 @@ void KDIconView::createActions() connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); - KConfig config("kdeglobals", true, false); + TDEConfig config("kdeglobals", true, false); config.setGroup( "KDE" ); (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" ); @@ -748,7 +748,7 @@ private: void KDIconView::fillMediaListView() { - g_pConfig = new KConfig("kdesktoprc"); + g_pConfig = new TDEConfig("kdesktoprc"); mMediaListView->hide(); mMediaListView->clear(); KMimeType::List mimetypes = KMimeType::allMimeTypes(); @@ -767,7 +767,7 @@ void KDIconView::fillMediaListView() void KDIconView::saveMediaListView() { - g_pConfig = new KConfig("kdesktoprc"); + g_pConfig = new TDEConfig("kdesktoprc"); g_pConfig->setGroup( "Media" ); TQStringList exclude; for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mMediaListView->firstChild()); @@ -1406,7 +1406,7 @@ void KDIconView::slotClipboardDataChanged() disableIcons( lst ); - TQString actionText = KIO::pasteActionText(); + TQString actionText = TDEIO::pasteActionText(); bool paste = !actionText.isEmpty(); if ( paste ) { KAction* pasteAction = m_actionCollection.action( "paste" ); @@ -1480,7 +1480,7 @@ void KDIconView::slotItemRenamed(TQIconViewItem* _item, const TQString &name) KonqIconViewWidget::slotItemRenamed(_item, newName); } -void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files) +void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files) { if (pos.isNull()) return; @@ -1493,7 +1493,7 @@ void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::Co TQString dir = url().path(-1); // Strip trailing / - TQValueList<KIO::CopyInfo>::ConstIterator it = files.begin(); + TQValueList<TDEIO::CopyInfo>::ConstIterator it = files.begin(); int gridX = gridXValue(); int gridY = 120; // 120 pixels should be enough for everyone (tm) @@ -1704,7 +1704,7 @@ void KDIconView::setupSortKeys() strKey = it->text().lower(); break; case Size: - strKey = KIO::number(static_cast<KFileIVI *>( it )->item()->size()).rightJustify(20, '0'); + strKey = TDEIO::number(static_cast<KFileIVI *>( it )->item()->size()).rightJustify(20, '0'); break; case Type: // Sort by Type + Name (#17014) @@ -1713,7 +1713,7 @@ void KDIconView::setupSortKeys() case Date: TQDateTime dayt; dayt.setTime_t( static_cast<KFileIVI *>( it )-> - item()->time( KIO::UDS_MODIFICATION_TIME ) ); + item()->time( TDEIO::UDS_MODIFICATION_TIME ) ); strKey = dayt.toString( "yyyyMMddhhmmss" ); break; } diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h index 34028d84c..f951765ba 100644 --- a/kdesktop/kdiconview.h +++ b/kdesktop/kdiconview.h @@ -124,7 +124,7 @@ protected slots: void slotContextMenuRequested(TQIconViewItem* _item, const TQPoint& _global); void slotEnableAction( const char * name, bool enabled ); public slots: - void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files); + void slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files); protected slots: void slotItemRenamed(TQIconViewItem*, const TQString &name); @@ -270,7 +270,7 @@ private: bool m_needDesktopAlign; TQListView *mMediaListView; - KConfig *g_pConfig; + TDEConfig *g_pConfig; }; #endif diff --git a/kdesktop/klaunch.kcfg b/kdesktop/klaunch.kcfg index 8f7800e92..f43592e70 100644 --- a/kdesktop/klaunch.kcfg +++ b/kdesktop/klaunch.kcfg @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > <kcfgfile name="klaunchrc" /> - <!-- generated by KConfig XTraKtor --> + <!-- generated by TDEConfig XTraKtor --> <group name="BusyCursorSettings"> <entry key="Timeout" type="Int"> diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 403c89f13..08db2eb95 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -530,7 +530,7 @@ void KRootWm::slotToggleAutoAlign( bool b ) else cfilename.sprintf("kdesktop-screen-%drc", desktop); - KConfig *kdg_config = new KConfig(cfilename, false, false); + TDEConfig *kdg_config = new TDEConfig(cfilename, false, false); kdg_config->setGroup( "General" ); kdg_config->writeEntry( "AutoLineUpIcons", b ); kdg_config->sync(); @@ -757,7 +757,7 @@ void KRootWm::slotOpenTerminal() TDEProcess* p = new TDEProcess; TQ_CHECK_PTR(p); - KConfigGroupSaver gs(TDEGlobal::config(), "General"); + TDEConfigGroupSaver gs(TDEGlobal::config(), "General"); TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole"); *p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/"; diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index e845750a1..58fd0b7b8 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -51,16 +51,16 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url ) : m_webDesktop(webDesktop), m_url(url) { kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl; - KIO::Job * job = KIO::get(m_url, false, false); - connect( job, TQT_SIGNAL( result( KIO::Job *)), - this, TQT_SLOT( slotFinished(KIO::Job *))); - connect( job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &)), - this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &))); + TDEIO::Job * job = TDEIO::get(m_url, false, false); + connect( job, TQT_SIGNAL( result( TDEIO::Job *)), + this, TQT_SLOT( slotFinished(TDEIO::Job *))); + connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), + this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &))); } -void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type ) +void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type ) { - KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job); + TDEIO::SimpleJob *sjob = static_cast<TDEIO::SimpleJob *>(job); // Update our URL in case of a redirection m_url = sjob->url(); TQString type = _type; // necessary copy if we plan to use it @@ -73,7 +73,7 @@ void KWebDesktopRun::slotMimetype( KIO::Job *job, const TQString &_type ) part->openURL( m_url ); } -void KWebDesktopRun::slotFinished( KIO::Job * job ) +void KWebDesktopRun::slotFinished( TDEIO::Job * job ) { // The whole point of all this is to abort silently on error if (job->error()) @@ -126,7 +126,7 @@ int main( int argc, char **argv ) int ret = app.exec(); - KIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold. + TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold. delete webDesktop; delete run; //khtml::Cache::clear(); diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h index b4b5cc0fc..089a25673 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.h +++ b/kdesktop/kwebdesktop/kwebdesktop.h @@ -24,7 +24,7 @@ #include <kparts/browserextension.h> #include <khtml_part.h> -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KWebDesktop : public TQObject { @@ -59,8 +59,8 @@ public: ~KWebDesktopRun() {} protected slots: - void slotMimetype( KIO::Job *job, const TQString &_type ); - void slotFinished( KIO::Job * job ); + void slotMimetype( TDEIO::Job *job, const TQString &_type ); + void slotFinished( TDEIO::Job * job ); private: KWebDesktop* m_webDesktop; diff --git a/kdesktop/kwebdesktop/kwebdesktop.kcfg b/kdesktop/kwebdesktop/kwebdesktop.kcfg index fad395a19..b0920f410 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.kcfg +++ b/kdesktop/kwebdesktop/kwebdesktop.kcfg @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > <kcfgfile name="kwebdesktoprc" /> - <!-- generated by KConfig XTraKtor --> + <!-- generated by TDEConfig XTraKtor --> <group name="Settings"> <entry key="URL" type="String"> diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 61f3cfd4f..05c5f4ef2 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -136,7 +136,7 @@ int main( int argc, char **argv) while (xdgModifiedDirectory.endsWith("/")) { xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1); } - KConfig config(TQDir::homeDirPath() + "/.config/user-dirs.dirs", false, false); + TDEConfig config(TQDir::homeDirPath() + "/.config/user-dirs.dirs", false, false); config.writeEntry("XDG_DOCUMENTS_DIR", TQString("\"") + xdgModifiedDirectory + TQString("\""), true); config.sync(); if (args->isSet( "getpath" ) == true) { diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 6533d51c3..1c18a9ce3 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -221,7 +221,7 @@ static int directCommand(TDECmdLineArgs *args) if ( !option.isEmpty() ) { - KConfig* dontagaincfg = NULL; + TDEConfig* dontagaincfg = NULL; // --dontagain TQString dontagain; // TQString::null if (args->isSet("dontagain")) @@ -230,7 +230,7 @@ static int directCommand(TDECmdLineArgs *args) TQStringList values = TQStringList::split( ':', value ); if( values.count() == 2 ) { - dontagaincfg = new KConfig( values[ 0 ] ); + dontagaincfg = new TDEConfig( values[ 0 ] ); KMessageBox::setDontShowAskAgainConfig( dontagaincfg ); dontagain = values[ 1 ]; } diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index 747f69811..bee2c062b 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -175,14 +175,14 @@ void KfindDlg::slotResult(int errorCode) { if (errorCode == 0) setStatusMsg(i18n("Ready.")); - else if (errorCode == KIO::ERR_USER_CANCELED) + else if (errorCode == TDEIO::ERR_USER_CANCELED) setStatusMsg(i18n("Aborted.")); - else if (errorCode == KIO::ERR_MALFORMED_URL) + else if (errorCode == TDEIO::ERR_MALFORMED_URL) { setStatusMsg(i18n("Error.")); KMessageBox::sorry( this, i18n("Please specify an absolute path in the \"Look in\" box.")); } - else if (errorCode == KIO::ERR_DOES_NOT_EXIST) + else if (errorCode == TDEIO::ERR_DOES_NOT_EXIST) { setStatusMsg(i18n("Error.")); KMessageBox::sorry( this, i18n("Could not find the specified folder.")); diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 913a915a7..482400d50 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -155,7 +155,7 @@ void KFindPart::slotResult(int errorCode) if (errorCode == 0) emit finished(); //setStatusMsg(i18n("Ready.")); - else if (errorCode == KIO::ERR_USER_CANCELED) + else if (errorCode == TDEIO::ERR_USER_CANCELED) emit canceled(); //setStatusMsg(i18n("Aborted.")); else diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 75e89a9a0..f5ec0a55b 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -380,7 +380,7 @@ KfindTabWidget::~KfindTabWidget() void KfindTabWidget::setURL( const KURL & url ) { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("History"); m_url = url; TQStringList sl = conf->readPathListEntry("Directories"); @@ -459,7 +459,7 @@ void KfindTabWidget::saveHistory() void KfindTabWidget::loadHistory() { // Load pattern history - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("History"); TQStringList sl = conf->readListEntry("Patterns"); if(!sl.isEmpty()) @@ -575,8 +575,8 @@ bool KfindTabWidget::isDateValid() void KfindTabWidget::setQuery(KQuery *query) { - KIO::filesize_t size; - KIO::filesize_t sizeunit; + TDEIO::filesize_t size; + TDEIO::filesize_t sizeunit; bool itemAlreadyContained(false); // only start if we have valid dates if (!isDateValid()) return; @@ -849,7 +849,7 @@ static void save_pattern(TQComboBox *obj, } } - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup(group); conf->writePathEntry(entry, sl); } diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 740c7ae39..d0f7fb513 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -64,7 +64,7 @@ KfFileLVI::KfFileLVI(KfindWindow* lv, const KFileItem &item, const TQString& mat TQString size = TDEGlobal::locale()->formatNumber(item.size(), 0); TQDateTime dt; - dt.setTime_t(item.time(KIO::UDS_MODIFICATION_TIME)); + dt.setTime_t(item.time(TDEIO::UDS_MODIFICATION_TIME)); TQString date = TDEGlobal::locale()->formatDateTime(dt); int perm_index; @@ -98,7 +98,7 @@ TQString KfFileLVI::key(int column, bool) const return TQString().sprintf("%010d", fileInfo->size()); case 3: // Returns time in secs from 1/1/1970. Used for sorting - return TQString().sprintf("%010ld", fileitem.time(KIO::UDS_MODIFICATION_TIME)); + return TQString().sprintf("%010ld", fileitem.time(TDEIO::UDS_MODIFICATION_TIME)); } return text(column); @@ -296,7 +296,7 @@ void KfindWindow::deleteFiles() KfFileLVI *item = (KfFileLVI *) selected.at(i); KFileItem file = item->fileitem; - KIO::NetAccess::del(file.url(), this); + TDEIO::NetAccess::del(file.url(), this); } selected.setAutoDelete(true); } diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index e6f8664fe..b889e3ba9 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -83,17 +83,17 @@ void KQuery::start() } if (m_recursive) - job = KIO::listRecursive( m_url, false ); + job = TDEIO::listRecursive( m_url, false ); else - job = KIO::listDir( m_url, false ); + job = TDEIO::listDir( m_url, false ); - connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), - TQT_SLOT(slotListEntries(KIO::Job *, const KIO::UDSEntryList &))); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *))); - connect(job, TQT_SIGNAL(canceled(KIO::Job *)), TQT_SLOT(slotCanceled(KIO::Job *))); + connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *))); } -void KQuery::slotResult( KIO::Job * _job ) +void KQuery::slotResult( TDEIO::Job * _job ) { if (job != _job) return; job = 0; @@ -102,21 +102,21 @@ void KQuery::slotResult( KIO::Job * _job ) checkEntries(); } -void KQuery::slotCanceled( KIO::Job * _job ) +void KQuery::slotCanceled( TDEIO::Job * _job ) { if (job != _job) return; job = 0; m_fileItems.clear(); - m_result=KIO::ERR_USER_CANCELED; + m_result=TDEIO::ERR_USER_CANCELED; checkEntries(); } -void KQuery::slotListEntries(KIO::Job*, const KIO::UDSEntryList& list) +void KQuery::slotListEntries(TDEIO::Job*, const TDEIO::UDSEntryList& list) { KFileItem * file = 0; - KIO::UDSEntryListConstIterator end = list.end(); - for (KIO::UDSEntryListConstIterator it = list.begin(); it != end; ++it) + TDEIO::UDSEntryListConstIterator end = list.end(); + for (TDEIO::UDSEntryListConstIterator it = list.begin(); it != end; ++it) { file = new KFileItem(*it, m_url, true, true); m_fileItems.enqueue(file); @@ -200,9 +200,9 @@ void KQuery::processQuery( KFileItem* file) // make sure it's in the correct date range // what about 0 times? - if ( m_timeFrom && m_timeFrom > file->time(KIO::UDS_MODIFICATION_TIME) ) + if ( m_timeFrom && m_timeFrom > file->time(TDEIO::UDS_MODIFICATION_TIME) ) return; - if ( m_timeTo && m_timeTo < file->time(KIO::UDS_MODIFICATION_TIME) ) + if ( m_timeTo && m_timeTo < file->time(TDEIO::UDS_MODIFICATION_TIME) ) return; // username / group match @@ -423,7 +423,7 @@ void KQuery::setFileType(int filetype) m_filetype = filetype; } -void KQuery::setSizeRange(int mode, KIO::filesize_t value1, KIO::filesize_t value2) +void KQuery::setSizeRange(int mode, TDEIO::filesize_t value1, TDEIO::filesize_t value2) { m_sizemode = mode; m_sizeboundary1 = value1; diff --git a/kfind/kquery.h b/kfind/kquery.h index 5ddc334fd..4b6a1c898 100644 --- a/kfind/kquery.h +++ b/kfind/kquery.h @@ -23,7 +23,7 @@ class KQuery : public TQObject KQuery(TQObject *parent = 0, const char * name = 0); ~KQuery(); - void setSizeRange( int mode, KIO::filesize_t value1, KIO::filesize_t value2 ); + void setSizeRange( int mode, TDEIO::filesize_t value1, TDEIO::filesize_t value2 ); void setTimeRange( time_t from, time_t to ); void setRegExp( const TQString ®exp, bool caseSensitive ); void setRecursive( bool recursive ); @@ -50,9 +50,9 @@ class KQuery : public TQObject void slotListEntries(TQStringList); protected slots: /* List of files found using KIO */ - void slotListEntries(KIO::Job *, const KIO::UDSEntryList &); - void slotResult(KIO::Job *); - void slotCanceled(KIO::Job *); + void slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &); + void slotResult(TDEIO::Job *); + void slotCanceled(TDEIO::Job *); void slotreceivedSdtout(TDEProcess*,char*,int); void slotreceivedSdterr(TDEProcess*,char*,int); void slotendProcessLocate(TDEProcess*); @@ -66,8 +66,8 @@ class KQuery : public TQObject int m_filetype; int m_sizemode; - KIO::filesize_t m_sizeboundary1; - KIO::filesize_t m_sizeboundary2; + TDEIO::filesize_t m_sizeboundary1; + TDEIO::filesize_t m_sizeboundary2; KURL m_url; time_t m_timeFrom; time_t m_timeTo; @@ -89,7 +89,7 @@ class KQuery : public TQObject TDEProcess *processLocate; TQPtrList<TQRegExp> m_regexps;// regexps for file name // TQValueList<bool> m_regexpsContainsGlobs; // what should this be good for ? Alex - KIO::ListJob *job; + TDEIO::ListJob *job; bool m_insideCheckEntries; TQPtrQueue<KFileItem> m_fileItems; TQRegExp* metaKeyRx; diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp index a63b473ce..1f99f22f6 100644 --- a/khelpcenter/docmetainfo.cpp +++ b/khelpcenter/docmetainfo.cpp @@ -132,7 +132,7 @@ void DocMetaInfo::scanMetaInfo( bool force ) mLanguageNames.insert( *it, languageName( *it ) ); } - KConfig config( "khelpcenterrc" ); + TDEConfig config( "khelpcenterrc" ); config.setGroup( "General" ); TQStringList metaInfos = config.readListEntry( "MetaInfoDirs" ); diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index 1919ce841..7699ddd49 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -148,9 +148,9 @@ void FontDialog::setupFontEncodingBox() void FontDialog::load() { - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); { - KConfigGroupSaver groupSaver( cfg, "HTML Settings" ); + TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" ); m_minFontSize->setValue( cfg->readNumEntry( "MinimumFontSize", HTML_DEFAULT_MIN_FONT_SIZE ) ); m_medFontSize->setValue( cfg->readNumEntry( "MediumFontSize", 10 ) ); @@ -178,13 +178,13 @@ void FontDialog::load() void FontDialog::save() { - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); { - KConfigGroupSaver groupSaver( cfg, "General" ); + TDEConfigGroupSaver groupSaver( cfg, "General" ); cfg->writeEntry( "UseKonqSettings", false ); } { - KConfigGroupSaver groupSaver( cfg, "HTML Settings" ); + TDEConfigGroupSaver groupSaver( cfg, "HTML Settings" ); cfg->writeEntry( "MinimumFontSize", m_minFontSize->value() ); cfg->writeEntry( "MediumFontSize", m_medFontSize->value() ); diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp index 892b2d0cd..9b35c4b09 100644 --- a/khelpcenter/formatter.cpp +++ b/khelpcenter/formatter.cpp @@ -42,7 +42,7 @@ Formatter:: ~Formatter() bool Formatter::readTemplates() { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Templates" ); TQString mainTemplate = cfg->readEntry( "MainTemplate" ); diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h index 37594811c..cb79e25b4 100644 --- a/khelpcenter/glossary.h +++ b/khelpcenter/glossary.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tqstringlist.h> -class KConfig; +class TDEConfig; class TDEProcess; class EntryItem; @@ -129,7 +129,7 @@ class Glossary : public KListView void buildGlossaryTree(); TQDomElement childElement( const TQDomElement &e, const TQString &name ); - KConfig *m_config; + TDEConfig *m_config; TQListViewItem *m_byTopicItem; TQListViewItem *m_alphabItem; TQString m_sourceFile; diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp index 3a130883a..f82516479 100644 --- a/khelpcenter/htmlsearch.cpp +++ b/khelpcenter/htmlsearch.cpp @@ -10,7 +10,7 @@ using namespace KHC; HTMLSearch::HTMLSearch() { - mConfig = new KConfig("khelpcenterrc", true); + mConfig = new TDEConfig("khelpcenterrc", true); mConfig->setGroup( "htdig" ); } diff --git a/khelpcenter/htmlsearch.h b/khelpcenter/htmlsearch.h index 6a98b5ec3..1ca97488f 100644 --- a/khelpcenter/htmlsearch.h +++ b/khelpcenter/htmlsearch.h @@ -4,7 +4,7 @@ #include <tqobject.h> #include <tqstring.h> -class KConfig; +class TDEConfig; namespace KHC { @@ -24,7 +24,7 @@ class HTMLSearch : public QObject TQString defaultIndexTestFile( KHC::DocEntry * ); private: - KConfig *mConfig; + TDEConfig *mConfig; }; } diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index a4bca7e52..a0f79c270 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -69,7 +69,7 @@ bool HTMLSearch::saveFilesList(const TQString& _lang) _files.clear(); // open config file - KConfig *config = new KConfig("khelpcenterrc"); + TDEConfig *config = new TDEConfig("khelpcenterrc"); config->setGroup("Scope"); // add KDE help dirs @@ -241,8 +241,8 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) progress->setState(1); // run htdig ------------------------------------------------------ - KConfig *config = new KConfig("khelpcenterrc", true); - KConfigGroupSaver saver(config, "htdig"); + TDEConfig *config = new TDEConfig("khelpcenterrc", true); + TDEConfigGroupSaver saver(config, "htdig"); TQString exe = config->readPathEntry("htdig", kapp->dirs()->findExe("htdig")); if (exe.isEmpty()) @@ -430,8 +430,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int TQString result = dataPath(_lang)+"/result.html"; // run htsearch ---------------------------------------------------- - KConfig *config = new KConfig("khelpcenterrc", true); - KConfigGroupSaver saver(config, "htdig"); + TDEConfig *config = new TDEConfig("khelpcenterrc", true); + TDEConfigGroupSaver saver(config, "htdig"); TQString exe = config->readPathEntry("htsearch", kapp->dirs()->findExe("htsearch")); if (exe.isEmpty()) { diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 7bb403b06..588be7142 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -35,7 +35,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name) - : KCModule(parent, name), indexProc(0) + : TDECModule(parent, name), indexProc(0) { TQVBoxLayout *vbox = new TQVBoxLayout(this, 5); @@ -253,7 +253,7 @@ void KHTMLSearchConfig::configChanged() void KHTMLSearchConfig::load() { - KConfig *config = new KConfig("khelpcenterrc", true); + TDEConfig *config = new TDEConfig("khelpcenterrc", true); config->setGroup("htdig"); htdigBin->lineEdit()->setText(config->readPathEntry("htdig", kapp->dirs()->findExe("htdig"))); @@ -281,7 +281,7 @@ void KHTMLSearchConfig::load() void KHTMLSearchConfig::save() { - KConfig *config= new KConfig("khelpcenterrc", false); + TDEConfig *config= new TDEConfig("khelpcenterrc", false); config->setGroup("htdig"); config->writePathEntry("htdig", htdigBin->lineEdit()->text()); @@ -362,7 +362,7 @@ void KHTMLSearchConfig::indexTerminated(TDEProcess *) extern "C" { - KDE_EXPORT KCModule *create_htmlsearch(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch"); return new KHTMLSearchConfig(parent, name); diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h index 1b9c0b0f8..c4073388f 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.h +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h @@ -33,7 +33,7 @@ class TDEProcess; class KLanguageCombo; class KURLRequester; -class KHTMLSearchConfig : public KCModule +class KHTMLSearchConfig : public TDECModule { Q_OBJECT diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index ea6dff669..a02538543 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/khelpcenter/htmlsearchconfig.cpp @@ -117,7 +117,7 @@ void HtmlSearchConfig::makeReadOnly() mDbDir->setEnabled( false ); } -void HtmlSearchConfig::load( KConfig *config ) +void HtmlSearchConfig::load( TDEConfig *config ) { config->setGroup("htdig"); @@ -126,7 +126,7 @@ void HtmlSearchConfig::load( KConfig *config ) mDbDir->lineEdit()->setText(config->readPathEntry("dbdir", "/opt/www/htdig/db/" ) ); } -void HtmlSearchConfig::save( KConfig *config ) +void HtmlSearchConfig::save( TDEConfig *config ) { config->setGroup("htdig"); diff --git a/khelpcenter/htmlsearchconfig.h b/khelpcenter/htmlsearchconfig.h index f1e093f13..7f5742b1e 100644 --- a/khelpcenter/htmlsearchconfig.h +++ b/khelpcenter/htmlsearchconfig.h @@ -24,7 +24,7 @@ #include <tqwidget.h> class KURLRequester; -class KConfig; +class TDEConfig; namespace KHC { @@ -35,8 +35,8 @@ class HtmlSearchConfig : public TQWidget HtmlSearchConfig(TQWidget *parent = 0L, const char *name = 0L); virtual ~HtmlSearchConfig(); - void load( KConfig * ); - void save( KConfig * ); + void load( TDEConfig * ); + void save( TDEConfig * ); void defaults(); void makeReadOnly(); diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp index 8e37e4c94..91dcb535a 100644 --- a/khelpcenter/infotree.cpp +++ b/khelpcenter/infotree.cpp @@ -95,7 +95,7 @@ void InfoTree::build( NavigatorItem *parent ) m_categoryItem = new NavigatorItem( entry, parent ); m_categoryItem->setAutoDeleteDocEntry( true ); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup( "Info pages" ); TQStringList infoDirFiles = cfg->readListEntry( "Search paths" ); // Default paths taken fron tdebase/kioslave/info/kde-info2html.conf diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index 10a3ced0f..c01d8f3c3 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -135,7 +135,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent ) IndexProgressDialog::~IndexProgressDialog() { if ( !mLogView->isHidden() ) { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "indexprogressdialog" ); cfg->writeEntry( "size", size() ); } @@ -196,7 +196,7 @@ void IndexProgressDialog::slotEnd() void IndexProgressDialog::toggleDetails() { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "indexprogressdialog" ); if ( mLogView->isHidden() ) { mLogLabel->show(); diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h index 4e28428fc..10f0c5311 100644 --- a/khelpcenter/kcmhelpcenter.h +++ b/khelpcenter/kcmhelpcenter.h @@ -33,7 +33,7 @@ class TQTextEdit; class TQLabel; class TDEProcess; -class KConfig; +class TDEConfig; class TDEAboutData; class KTempFile; class KURLRequester; @@ -162,7 +162,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface TQValueList<KHC::DocEntry *> mIndexQueue; TQValueList<KHC::DocEntry *>::ConstIterator mCurrentEntry; - KConfig *mConfig; + TDEConfig *mConfig; TDEAboutData *mAboutData; diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index f6e16da15..56aec0179 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -97,8 +97,8 @@ MainWindow::MainWindow() TQT_SLOT( statusBarMessage( const TQString & ) ) ); connect( mDoc, TQT_SIGNAL( onURL( const TQString & ) ), TQT_SLOT( statusBarMessage( const TQString & ) ) ); - connect( mDoc, TQT_SIGNAL( started( KIO::Job * ) ), - TQT_SLOT( slotStarted( KIO::Job * ) ) ); + connect( mDoc, TQT_SIGNAL( started( TDEIO::Job * ) ), + TQT_SLOT( slotStarted( TDEIO::Job * ) ) ); connect( mDoc, TQT_SIGNAL( completed() ), TQT_SLOT( documentCompleted() ) ); connect( mDoc, TQT_SIGNAL( searchResultCacheAvailable() ), @@ -130,11 +130,11 @@ MainWindow::MainWindow() mSplitter->setSizes(sizes); setGeometry(366, 0, 800, 600); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); { - KConfigGroupSaver groupSaver( cfg, "General" ); + TDEConfigGroupSaver groupSaver( cfg, "General" ); if ( cfg->readBoolEntry( "UseKonqSettings", true ) ) { - KConfig konqCfg( "konquerorrc" ); + TDEConfig konqCfg( "konquerorrc" ); const_cast<KHTMLSettings *>( mDoc->settings() )->init( &konqCfg ); } const int zoomFactor = cfg->readNumEntry( "Font zoom factor", 100 ); @@ -171,21 +171,21 @@ void MainWindow::enableCopyTextAction() mCopyText->setEnabled( mDoc->hasSelection() ); } -void MainWindow::saveProperties( KConfig *config ) +void MainWindow::saveProperties( TDEConfig *config ) { - kdDebug()<<"void MainWindow::saveProperties( KConfig *config )" << endl; + kdDebug()<<"void MainWindow::saveProperties( TDEConfig *config )" << endl; config->writePathEntry( "URL" , mDoc->baseURL().url() ); } -void MainWindow::readProperties( KConfig *config ) +void MainWindow::readProperties( TDEConfig *config ) { - kdDebug()<<"void MainWindow::readProperties( KConfig *config )" << endl; + kdDebug()<<"void MainWindow::readProperties( TDEConfig *config )" << endl; mDoc->slotReload( KURL( config->readPathEntry( "URL" ) ) ); } void MainWindow::readConfig() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "MainWindowState" ); TQValueList<int> sizes = config->readIntListEntry( "Splitter" ); if ( sizes.count() == 2 ) { @@ -197,7 +197,7 @@ void MainWindow::readConfig() void MainWindow::writeConfig() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "MainWindowState" ); config->writeEntry( "Splitter", mSplitter->sizes() ); @@ -237,7 +237,7 @@ void MainWindow::setupActions() KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Debug" ); if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) { new KAction( i18n("Show Search Error Log"), 0, TQT_TQOBJECT(this), @@ -262,11 +262,11 @@ void MainWindow::print() mDoc->view()->print(); } -void MainWindow::slotStarted(KIO::Job *job) +void MainWindow::slotStarted(TDEIO::Job *job) { if (job) - connect(job, TQT_SIGNAL(infoMessage( KIO::Job *, const TQString &)), - TQT_SLOT(slotInfoMessage(KIO::Job *, const TQString &))); + connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)), + TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); History::self().updateActions(); } @@ -342,7 +342,7 @@ void MainWindow::documentCompleted() History::self().updateActions(); } -void MainWindow::slotInfoMessage(KIO::Job *, const TQString &m) +void MainWindow::slotInfoMessage(TDEIO::Job *, const TQString &m) { statusBarMessage(m); } @@ -447,9 +447,9 @@ void MainWindow::updateZoomActions() actionCollection()->action( "incFontSizes" )->setEnabled( mDoc->zoomFactor() + mDoc->zoomStepping() <= 300 ); actionCollection()->action( "decFontSizes" )->setEnabled( mDoc->zoomFactor() - mDoc->zoomStepping() >= 20 ); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); { - KConfigGroupSaver groupSaver( cfg, "General" ); + TDEConfigGroupSaver groupSaver( cfg, "General" ); cfg->writeEntry( "Font zoom factor", mDoc->zoomFactor() ); cfg->sync(); } diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h index 8f6b2e727..7e2d8b0b7 100644 --- a/khelpcenter/mainwindow.h +++ b/khelpcenter/mainwindow.h @@ -61,8 +61,8 @@ class MainWindow : public KMainWindow, public DCOPObject protected: void setupActions(); - virtual void saveProperties( KConfig *config ); - virtual void readProperties( KConfig *config ); + virtual void saveProperties( TDEConfig *config ); + virtual void readProperties( TDEConfig *config ); void readConfig(); void writeConfig(); @@ -76,8 +76,8 @@ class MainWindow : public KMainWindow, public DCOPObject private slots: void slotGlossSelected(const GlossaryEntry &entry); - void slotStarted(KIO::Job *job); - void slotInfoMessage(KIO::Job *, const TQString &); + void slotStarted(TDEIO::Job *job); + void slotInfoMessage(TDEIO::Job *, const TQString &); void goInternalUrl( const KURL & ); /** This function is called when the user clicks on a link in the viewer part. diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 1907ac1f8..1c813972f 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -80,7 +80,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mIndexDialog( 0 ), mView( view ), mSelected( false ) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false); @@ -591,7 +591,7 @@ void Navigator::hideSearch() bool Navigator::checkSearchIndex() { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Search" ); if ( cfg->readBoolEntry( "IndexExists", false ) ) return true; @@ -626,7 +626,7 @@ KURL Navigator::homeURL() { if ( !mHomeUrl.isEmpty() ) return mHomeUrl; - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); // We have to reparse the configuration here in order to get a // language-specific StartUrl, e.g. "StartUrl[de]". cfg->reparseConfiguration(); diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp index 0f73369f9..e48ec8359 100644 --- a/khelpcenter/plugintraverser.cpp +++ b/khelpcenter/plugintraverser.cpp @@ -73,7 +73,7 @@ void PluginTraverser::process( DocEntry *entry ) appItem = new NavigatorAppItem( entry, mListView, mCurrentItem ); else appItem = new NavigatorAppItem( entry, mParentItem, mCurrentItem ); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup( "General" ); appItem->setRelpath( cfg->readPathEntry( "AppsRoot" ) ); mCurrentItem = appItem; diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index 0b830725e..b62777272 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/khelpcenter/scrollkeepertreebuilder.cpp @@ -44,9 +44,9 @@ ScrollKeeperTreeBuilder::ScrollKeeperTreeBuilder( TQObject *parent, const char * void ScrollKeeperTreeBuilder::loadConfig() { - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); { - KConfigGroupSaver groupSaver( cfg, "ScrollKeeper" ); + TDEConfigGroupSaver groupSaver( cfg, "ScrollKeeper" ); mShowEmptyDirs = cfg->readBoolEntry( "ShowEmptyDirs", false ); } } diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index bc0a1d167..ca4f56c01 100644 --- a/khelpcenter/searchengine.cpp +++ b/khelpcenter/searchengine.cpp @@ -293,7 +293,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches, if ( method == "or" ) mOperation = Or; else mOperation = And; - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Search" ); TQString commonSearchProgram = cfg->readPathEntry( "CommonProgram" ); bool useCommon = cfg->readBoolEntry( "UseCommonProgram", false ); diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h index 31f4c667f..9821c0da0 100644 --- a/khelpcenter/searchengine.h +++ b/khelpcenter/searchengine.h @@ -12,7 +12,7 @@ class TQWidget; class TDEProcess; -class KConfig; +class TDEConfig; class KHTMLPart; namespace KHC { diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp index 076890428..adf0574a2 100644 --- a/khelpcenter/searchhandler.cpp +++ b/khelpcenter/searchhandler.cpp @@ -138,11 +138,11 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words, kdDebug() << "SearchHandler::search() URL: " << urlString << endl; - KIO::TransferJob *job = KIO::get( KURL( urlString ) ); - 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( urlString ) ); + 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 & ) ) ); SearchJob *searchJob = new SearchJob; searchJob->mEntry = entry; @@ -213,12 +213,12 @@ void SearchHandler::searchExited( TDEProcess *proc ) } } -void SearchHandler::slotJobResult( KIO::Job *job ) +void SearchHandler::slotJobResult( TDEIO::Job *job ) { TQString result; DocEntry *entry = 0; - TQMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job ); + TQMap<TDEIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job ); if ( it != mKioJobs.end() ) { SearchJob *j = *it; @@ -236,11 +236,11 @@ void SearchHandler::slotJobResult( KIO::Job *job ) } } -void SearchHandler::slotJobData( KIO::Job *job, const TQByteArray &data ) +void SearchHandler::slotJobData( TDEIO::Job *job, const TQByteArray &data ) { // kdDebug() << "SearchHandler::slotJobData()" << endl; - TQMap<KIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job ); + TQMap<TDEIO::Job *, SearchJob *>::ConstIterator it = mKioJobs.find( job ); if ( it != mKioJobs.end() ) { (*it)->mResult += data.data(); } diff --git a/khelpcenter/searchhandler.h b/khelpcenter/searchhandler.h index 356446db5..31c3adb1f 100644 --- a/khelpcenter/searchhandler.h +++ b/khelpcenter/searchhandler.h @@ -25,7 +25,7 @@ #include <tqobject.h> #include <tqstringlist.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -39,7 +39,7 @@ class SearchJob DocEntry *mEntry; TDEProcess *mProcess; - KIO::Job *mKioJob; + TDEIO::Job *mKioJob; TQString mCmd; @@ -75,8 +75,8 @@ class SearchHandler : public QObject void searchStderr( TDEProcess *proc, char *buffer, int buflen ); void searchExited( TDEProcess *proc ); - void slotJobResult( KIO::Job *job ); - void slotJobData( KIO::Job *, const TQByteArray &data ); + void slotJobResult( TDEIO::Job *job ); + void slotJobData( TDEIO::Job *, const TQByteArray &data ); private: SearchHandler(); @@ -89,7 +89,7 @@ class SearchHandler : public QObject TQStringList mDocumentTypes; TQMap<TDEProcess *,SearchJob *> mProcessJobs; - TQMap<KIO::Job *,SearchJob *> mKioJobs; + TQMap<TDEIO::Job *,SearchJob *> mKioJobs; }; } diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp index df04f9531..4930197a0 100644 --- a/khelpcenter/searchwidget.cpp +++ b/khelpcenter/searchwidget.cpp @@ -115,7 +115,7 @@ SearchWidget::~SearchWidget() } -void SearchWidget::readConfig( KConfig *cfg ) +void SearchWidget::readConfig( TDEConfig *cfg ) { cfg->setGroup( "Search" ); @@ -142,7 +142,7 @@ void SearchWidget::readConfig( KConfig *cfg ) checkScope(); } -void SearchWidget::writeConfig( KConfig *cfg ) +void SearchWidget::writeConfig( TDEConfig *cfg ) { cfg->setGroup( "Search" ); diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h index 408c64560..14801223b 100644 --- a/khelpcenter/searchwidget.h +++ b/khelpcenter/searchwidget.h @@ -33,7 +33,7 @@ class TQListViewItem; class TQComboBox; class KLanguageCombo; -class KConfig; +class TDEConfig; class KCMHelpCenter; @@ -64,8 +64,8 @@ class SearchWidget : public TQWidget, public DCOPObject TQString scopeSelectionLabel( int ) const; - void readConfig( KConfig * ); - void writeConfig( KConfig * ); + void readConfig( TDEConfig * ); + void writeConfig( TDEConfig * ); int scopeCount() const; diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index 2278fa038..518e45972 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/khotkeys/kcontrol/init.cpp @@ -24,7 +24,7 @@ extern "C" { KDE_EXPORT void init_khotkeys() { - KConfig cfg( "khotkeysrc", true ); + TDEConfig cfg( "khotkeysrc", true ); cfg.setGroup( "Main" ); if( !cfg.readBoolEntry( "Autostart", false )) return; diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 5f1ca3df3..46f96c9fc 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -48,7 +48,7 @@ extern "C" { - KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P ) + KDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P ) { // sleep( 20 ); // CHECKME DEBUG TDEGlobal::locale()->insertCatalogue("khotkeys"); @@ -62,7 +62,7 @@ namespace KHotKeys { Module::Module( TQWidget* parent_P, const char* ) - : KCModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ), + : TDECModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ), listview_is_changed( false ), deleting_action( false ) { setButtons( Help | Cancel | Apply | Ok ); @@ -114,7 +114,7 @@ void Module::load() kdDebug( 1217 ) << "actions_root:" << _actions_root << endl; actions_listview_widget->build_up(); tab_widget->load_current_action(); - emit KCModule::changed( false ); // HACK otherwise the module would be changed from the very beginning + emit TDECModule::changed( false ); // HACK otherwise the module would be changed from the very beginning } void Module::save() @@ -142,7 +142,7 @@ void Module::save() kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl; } } - emit KCModule::changed( false ); + emit TDECModule::changed( false ); } @@ -287,12 +287,12 @@ void Module::import() actions_listview_widget->clear(); actions_listview_widget->build_up(); tab_widget->load_current_action(); - emit KCModule::changed( true ); + emit TDECModule::changed( true ); } void Module::changed() { - emit KCModule::changed( true ); + emit TDECModule::changed( true ); } void Module::init_arts() diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h index b406df8fe..fdc12a8f2 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.h +++ b/khotkeys/kcontrol/kcmkhotkeys.h @@ -28,7 +28,7 @@ class Action_data_base; class Main_buttons_widget; class Module - : public KCModule + : public TDECModule { Q_OBJECT public: diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp index 472259268..ff56eb99d 100644 --- a/khotkeys/shared/action_data.cpp +++ b/khotkeys/shared/action_data.cpp @@ -36,7 +36,7 @@ Action_data_base::Action_data_base( Action_data_group* parent_P, const TQString& _conditions->set_data( this ); } -Action_data_base::Action_data_base( KConfig& cfg_P, Action_data_group* parent_P ) +Action_data_base::Action_data_base( TDEConfig& cfg_P, Action_data_group* parent_P ) : _parent( parent_P ) { TQString save_cfg_group = cfg_P.group(); @@ -58,7 +58,7 @@ Action_data_base::~Action_data_base() delete _conditions; } -void Action_data_base::cfg_write( KConfig& cfg_P ) const +void Action_data_base::cfg_write( TDEConfig& cfg_P ) const { cfg_P.writeEntry( "Type", "ERROR" ); // derived classes should call with their type cfg_P.writeEntry( "Name", name()); @@ -72,7 +72,7 @@ void Action_data_base::cfg_write( KConfig& cfg_P ) const } -Action_data_base* Action_data_base::create_cfg_read( KConfig& cfg_P, Action_data_group* parent_P ) +Action_data_base* Action_data_base::create_cfg_read( TDEConfig& cfg_P, Action_data_group* parent_P ) { TQString type = cfg_P.readEntry( "Type" ); if( type == "ACTION_DATA_GROUP" ) @@ -110,7 +110,7 @@ Action_data_base* Action_data_base::create_cfg_read( KConfig& cfg_P, Action_data return NULL; } -bool Action_data_base::cfg_is_enabled( KConfig& cfg_P ) +bool Action_data_base::cfg_is_enabled( TDEConfig& cfg_P ) { return cfg_P.readBoolEntry( "Enabled", true ); } @@ -140,7 +140,7 @@ bool Action_data_base::conditions_match() const // Action_data_group -Action_data_group::Action_data_group( KConfig& cfg_P, Action_data_group* parent_P ) +Action_data_group::Action_data_group( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data_base( cfg_P, parent_P ) { unsigned int system_group_tmp = cfg_P.readUnsignedNumEntry( "SystemGroup", 0 ); @@ -149,7 +149,7 @@ Action_data_group::Action_data_group( KConfig& cfg_P, Action_data_group* parent_ _system_group = static_cast< system_group_t >( system_group_tmp ); } -void Action_data_group::cfg_write( KConfig& cfg_P ) const +void Action_data_group::cfg_write( TDEConfig& cfg_P ) const { Action_data_base::cfg_write( cfg_P ); cfg_P.writeEntry( "SystemGroup", system_group()); @@ -166,7 +166,7 @@ void Action_data_group::update_triggers() // Action_data -Action_data::Action_data( KConfig& cfg_P, Action_data_group* parent_P ) +Action_data::Action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data_base( cfg_P, parent_P ) { TQString save_cfg_group = cfg_P.group(); @@ -185,7 +185,7 @@ Action_data::~Action_data() // CHECKME jeste remove z parenta ? } -void Action_data::cfg_write( KConfig& cfg_P ) const +void Action_data::cfg_write( TDEConfig& cfg_P ) const { Action_data_base::cfg_write( cfg_P ); TQString save_cfg_group = cfg_P.group(); @@ -277,7 +277,7 @@ void Action_data::update_triggers() // Generic_action_data -void Generic_action_data::cfg_write( KConfig& cfg_P ) const +void Generic_action_data::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "GENERIC_ACTION_DATA" ); @@ -297,7 +297,7 @@ Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_ template<> KDE_EXPORT void Simple_action_data< Shortcut_trigger, Command_url_action > - ::cfg_write( KConfig& cfg_P ) const + ::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "COMMAND_URL_SHORTCUT_ACTION_DATA" ); @@ -317,7 +317,7 @@ Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_grou template<> KDE_EXPORT void Simple_action_data< Shortcut_trigger, Menuentry_action > - ::cfg_write( KConfig& cfg_P ) const + ::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "MENUENTRY_SHORTCUT_ACTION_DATA" ); @@ -327,7 +327,7 @@ void Simple_action_data< Shortcut_trigger, Menuentry_action > template<> KDE_EXPORT void Simple_action_data< Shortcut_trigger, Dcop_action > - ::cfg_write( KConfig& cfg_P ) const + ::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "DCOP_SHORTCUT_ACTION_DATA" ); @@ -337,7 +337,7 @@ void Simple_action_data< Shortcut_trigger, Dcop_action > template<> KDE_EXPORT void Simple_action_data< Shortcut_trigger, Keyboard_input_action > - ::cfg_write( KConfig& cfg_P ) const + ::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "KEYBOARD_INPUT_SHORTCUT_ACTION_DATA" ); @@ -347,7 +347,7 @@ void Simple_action_data< Shortcut_trigger, Keyboard_input_action > template<> KDE_EXPORT void Simple_action_data< Shortcut_trigger, Activate_window_action > - ::cfg_write( KConfig& cfg_P ) const + ::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "ACTIVATE_WINDOW_SHORTCUT_ACTION_DATA" ); @@ -369,7 +369,7 @@ const Keyboard_input_action* Keyboard_input_gesture_action_data::action() const return static_cast< Keyboard_input_action* >( const_cast< Action_list* >( actions())->first()); } -void Keyboard_input_gesture_action_data::cfg_write( KConfig& cfg_P ) const +void Keyboard_input_gesture_action_data::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "KEYBOARD_INPUT_GESTURE_ACTION_DATA" ); diff --git a/khotkeys/shared/action_data.h b/khotkeys/shared/action_data.h index 4de5e715b..cf1186263 100644 --- a/khotkeys/shared/action_data.h +++ b/khotkeys/shared/action_data.h @@ -17,7 +17,7 @@ #include <kdebug.h> -class KConfig; +class TDEConfig; #include "khotkeysglobal.h" @@ -36,9 +36,9 @@ class KDE_EXPORT Action_data_base public: Action_data_base( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Condition_list* condition_P, bool enabled_P ); - Action_data_base( KConfig& cfg_P, Action_data_group* parent_P ); + Action_data_base( TDEConfig& cfg_P, Action_data_group* parent_P ); virtual ~Action_data_base(); - virtual void cfg_write( KConfig& cfg_P ) const = 0; + virtual void cfg_write( TDEConfig& cfg_P ) const = 0; const Condition_list* conditions() const; Action_data_group* parent() const; void reparent( Action_data_group* new_parent_P ); @@ -48,8 +48,8 @@ class KDE_EXPORT Action_data_base void set_name( const TQString& name_P ); const TQString& comment() const; bool enabled( bool ignore_group_P ) const; - static Action_data_base* create_cfg_read( KConfig& cfg_P, Action_data_group* parent_P ); - static bool cfg_is_enabled( KConfig& cfg_P ); + static Action_data_base* create_cfg_read( TDEConfig& cfg_P, Action_data_group* parent_P ); + static bool cfg_is_enabled( TDEConfig& cfg_P ); protected: void set_conditions( Condition_list* conditions_P ); private: @@ -70,10 +70,10 @@ class KDE_EXPORT Action_data_group Action_data_group( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Condition_list* conditions_P, system_group_t system_group_P, bool enabled_P ); - Action_data_group( KConfig& cfg_P, Action_data_group* parent_P ); + Action_data_group( TDEConfig& cfg_P, Action_data_group* parent_P ); virtual ~Action_data_group(); virtual void update_triggers(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; typedef TQPtrListIterator< Action_data_base > Iterator; // CHECKME neni const :( Iterator first_child() const; bool is_system_group() const; @@ -96,10 +96,10 @@ class KDE_EXPORT Action_data Action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P, Action_list* actions_P, bool enabled_P = true ); - Action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); virtual ~Action_data(); virtual void update_triggers(); - virtual void cfg_write( KConfig& cfg_P ) const = 0; + virtual void cfg_write( TDEConfig& cfg_P ) const = 0; virtual void execute(); const Trigger_list* triggers() const; const Action_list* actions() const; @@ -129,8 +129,8 @@ class KDE_EXPORT Generic_action_data Generic_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P, Action_list* actions_P, bool enabled_P = true ); - Generic_action_data( KConfig& cfg_P, Action_data_group* parent_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + Generic_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); + virtual void cfg_write( TDEConfig& cfg_P ) const; using Action_data_base::set_conditions; // make public using Action_data::add_trigger; // make public using Action_data::add_triggers; // make public @@ -148,13 +148,13 @@ class KDE_EXPORT Simple_action_data public: Simple_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, bool enabled_P = true ); - Simple_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Simple_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); const A* action() const; const T* trigger() const; // CHECKME kontrola, ze se dava jen jedna akce ? void set_action( A* action_P ); void set_trigger( T* trigger_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; }; class KDE_EXPORT Command_url_shortcut_action_data @@ -167,7 +167,7 @@ class KDE_EXPORT Command_url_shortcut_action_data Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P = true ); - Command_url_shortcut_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); }; class KDE_EXPORT Menuentry_shortcut_action_data @@ -180,7 +180,7 @@ class KDE_EXPORT Menuentry_shortcut_action_data Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P = true ); - Menuentry_shortcut_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Menuentry_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); }; typedef Simple_action_data< Shortcut_trigger, Dcop_action > Dcop_shortcut_action_data; @@ -196,13 +196,13 @@ class KDE_EXPORT Keyboard_input_gesture_action_data public: Keyboard_input_gesture_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, bool enabled_P = true ); - Keyboard_input_gesture_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Keyboard_input_gesture_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); const Keyboard_input_action* action() const; // CHECKME kontrola, ze se dava jen jedna akce ? void set_action( Keyboard_input_action* action_P ); enum { NUM_TRIGGERS = 3 }; // needs changing code elsewhere using Action_data::set_triggers; // make public // CHECKME kontrola poctu? - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; }; @@ -335,7 +335,7 @@ Generic_action_data::Generic_action_data( Action_data_group* parent_P, const TQS } inline -Generic_action_data::Generic_action_data( KConfig& cfg_P, Action_data_group* parent_P ) +Generic_action_data::Generic_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data( cfg_P, parent_P ) { // CHECKME do nothing ? } @@ -353,7 +353,7 @@ Simple_action_data< T, A >::Simple_action_data( Action_data_group* parent_P, template< typename T, typename A > inline -Simple_action_data< T, A >::Simple_action_data( KConfig& cfg_P, Action_data_group* parent_P ) +Simple_action_data< T, A >::Simple_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data( cfg_P, parent_P ) { // CHECKME nothing ? } @@ -401,7 +401,7 @@ Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_ } inline -Command_url_shortcut_action_data::Command_url_shortcut_action_data( KConfig& cfg_P, +Command_url_shortcut_action_data::Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Simple_action_data< Shortcut_trigger, Command_url_action >( cfg_P, parent_P ) { @@ -418,7 +418,7 @@ Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_grou } inline -Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( KConfig& cfg_P, +Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Simple_action_data< Shortcut_trigger, Menuentry_action >( cfg_P, parent_P ) { @@ -435,7 +435,7 @@ Keyboard_input_gesture_action_data::Keyboard_input_gesture_action_data( } inline -Keyboard_input_gesture_action_data::Keyboard_input_gesture_action_data( KConfig& cfg_P, +Keyboard_input_gesture_action_data::Keyboard_input_gesture_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data( cfg_P, parent_P ) { // CHECKME nothing ? diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index e25b1c359..5ce1e1d5a 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -40,7 +40,7 @@ namespace KHotKeys // Action -Action* Action::create_cfg_read( KConfig& cfg_P, Action_data* data_P ) +Action* Action::create_cfg_read( TDEConfig& cfg_P, Action_data* data_P ) { TQString type = cfg_P.readEntry( "Type" ); if( type == "COMMAND_URL" ) @@ -57,14 +57,14 @@ Action* Action::create_cfg_read( KConfig& cfg_P, Action_data* data_P ) return NULL; } -void Action::cfg_write( KConfig& cfg_P ) const +void Action::cfg_write( TDEConfig& cfg_P ) const { cfg_P.writeEntry( "Type", "ERROR" ); // derived classes should call with their type } // Action_list -Action_list::Action_list( KConfig& cfg_P, Action_data* data_P ) +Action_list::Action_list( TDEConfig& cfg_P, Action_data* data_P ) : TQPtrList< Action >() { setAutoDelete( true ); @@ -82,7 +82,7 @@ Action_list::Action_list( KConfig& cfg_P, Action_data* data_P ) cfg_P.setGroup( save_cfg_group ); } -void Action_list::cfg_write( KConfig& cfg_P ) const +void Action_list::cfg_write( TDEConfig& cfg_P ) const { TQString save_cfg_group = cfg_P.group(); int i = 0; @@ -99,13 +99,13 @@ void Action_list::cfg_write( KConfig& cfg_P ) const // Command_url_action -Command_url_action::Command_url_action( KConfig& cfg_P, Action_data* data_P ) +Command_url_action::Command_url_action( TDEConfig& cfg_P, Action_data* data_P ) : Action( cfg_P, data_P ) { _command_url = cfg_P.readEntry( "CommandURL" ); } -void Command_url_action::cfg_write( KConfig& cfg_P ) const +void Command_url_action::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "CommandURL", command_url()); @@ -188,7 +188,7 @@ Action* Command_url_action::copy( Action_data* data_P ) const // Menuentry_action -void Menuentry_action::cfg_write( KConfig& cfg_P ) const +void Menuentry_action::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "MENUENTRY" ); // overwrites value set in base::cfg_write() @@ -225,7 +225,7 @@ Action* Menuentry_action::copy( Action_data* data_P ) const // Dcop_action -Dcop_action::Dcop_action( KConfig& cfg_P, Action_data* data_P ) +Dcop_action::Dcop_action( TDEConfig& cfg_P, Action_data* data_P ) : Action( cfg_P, data_P ) { app = cfg_P.readEntry( "RemoteApp" ); @@ -234,7 +234,7 @@ Dcop_action::Dcop_action( KConfig& cfg_P, Action_data* data_P ) args = cfg_P.readEntry( "Arguments" ); } -void Dcop_action::cfg_write( KConfig& cfg_P ) const +void Dcop_action::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "DCOP" ); // overwrites value set in base::cfg_write() @@ -311,7 +311,7 @@ Action* Dcop_action::copy( Action_data* data_P ) const // Keyboard_input_action -Keyboard_input_action::Keyboard_input_action( KConfig& cfg_P, Action_data* data_P ) +Keyboard_input_action::Keyboard_input_action( TDEConfig& cfg_P, Action_data* data_P ) : Action( cfg_P, data_P ) { _input = cfg_P.readEntry( "Input" ); @@ -335,7 +335,7 @@ Keyboard_input_action::~Keyboard_input_action() delete _dest_window; } -void Keyboard_input_action::cfg_write( KConfig& cfg_P ) const +void Keyboard_input_action::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "KEYBOARD_INPUT" ); // overwrites value set in base::cfg_write() @@ -404,7 +404,7 @@ Action* Keyboard_input_action::copy( Action_data* data_P ) const // Activate_window_action -Activate_window_action::Activate_window_action( KConfig& cfg_P, Action_data* data_P ) +Activate_window_action::Activate_window_action( TDEConfig& cfg_P, Action_data* data_P ) : Action( cfg_P, data_P ) { TQString save_cfg_group = cfg_P.group(); @@ -418,7 +418,7 @@ Activate_window_action::~Activate_window_action() delete _window; } -void Activate_window_action::cfg_write( KConfig& cfg_P ) const +void Activate_window_action::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "ACTIVATE_WINDOW" ); // overwrites value set in base::cfg_write() diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h index 828bbdb70..f381683e1 100644 --- a/khotkeys/shared/actions.h +++ b/khotkeys/shared/actions.h @@ -18,7 +18,7 @@ #include <kservice.h> -class KConfig; +class TDEConfig; #include "khotkeysglobal.h" @@ -34,13 +34,13 @@ class KDE_EXPORT Action { public: Action( Action_data* data_P ); - Action( KConfig& cfg_P, Action_data* data_P ); + Action( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Action(); virtual void execute() = 0; virtual TQString description() const = 0; - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual Action* copy( Action_data* data_P ) const = 0; - static Action* create_cfg_read( KConfig& cfg_P, Action_data* data_P ); + static Action* create_cfg_read( TDEConfig& cfg_P, Action_data* data_P ); protected: Action_data* const data; KHOTKEYS_DISABLE_COPY( Action ); @@ -51,8 +51,8 @@ class KDE_EXPORT Action_list { public: Action_list( const TQString& comment_P ); // CHECKME nebo i data ? - Action_list( KConfig& cfg_P, Action_data* data_P ); - void cfg_write( KConfig& cfg_P ) const; + Action_list( TDEConfig& cfg_P, Action_data* data_P ); + void cfg_write( TDEConfig& cfg_P ) const; typedef TQPtrListIterator< Action > Iterator; const TQString& comment() const; private: @@ -66,8 +66,8 @@ class KDE_EXPORT Command_url_action typedef Action base; public: Command_url_action( Action_data* data_P, const TQString& command_url_P ); - Command_url_action( KConfig& cfg_P, Action_data* data_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + Command_url_action( TDEConfig& cfg_P, Action_data* data_P ); + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual void execute(); virtual TQString description() const; const TQString& command_url() const; @@ -84,8 +84,8 @@ class KDE_EXPORT Menuentry_action typedef Command_url_action base; public: Menuentry_action( Action_data* data_P, const TQString& menuentry_P ); - Menuentry_action( KConfig& cfg_P, Action_data* data_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + Menuentry_action( TDEConfig& cfg_P, Action_data* data_P ); + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual void execute(); virtual TQString description() const; virtual Action* copy( Action_data* data_P ) const; @@ -101,8 +101,8 @@ class KDE_EXPORT Dcop_action public: Dcop_action( Action_data* data_P, const TQString& app_P, const TQString& obj_P, const TQString& call_P, const TQString& args_P ); - Dcop_action( KConfig& cfg_P, Action_data* data_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + Dcop_action( TDEConfig& cfg_P, Action_data* data_P ); + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual void execute(); const TQString& remote_application() const; const TQString& remote_object() const; @@ -124,9 +124,9 @@ class KDE_EXPORT Keyboard_input_action public: Keyboard_input_action( Action_data* data_P, const TQString& input_P, const Windowdef_list* dest_window_P, bool active_window_P ); - Keyboard_input_action( KConfig& cfg_P, Action_data* data_P ); + Keyboard_input_action( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Keyboard_input_action(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual void execute(); const TQString& input() const; // send to specific window: dest_window != NULL @@ -148,9 +148,9 @@ class KDE_EXPORT Activate_window_action typedef Action base; public: Activate_window_action( Action_data* data_P, const Windowdef_list* window_P ); - Activate_window_action( KConfig& cfg_P, Action_data* data_P ); + Activate_window_action( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Activate_window_action(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual void execute(); const Windowdef_list* window() const; virtual TQString description() const; @@ -172,7 +172,7 @@ Action::Action( Action_data* data_P ) } inline -Action::Action( KConfig&, Action_data* data_P ) +Action::Action( TDEConfig&, Action_data* data_P ) : data( data_P ) { } @@ -220,7 +220,7 @@ Menuentry_action::Menuentry_action( Action_data* data_P, const TQString& menuent } inline -Menuentry_action::Menuentry_action( KConfig& cfg_P, Action_data* data_P ) +Menuentry_action::Menuentry_action( TDEConfig& cfg_P, Action_data* data_P ) : Command_url_action( cfg_P, data_P ) { } diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp index fb819f6c7..3132fa01d 100644 --- a/khotkeys/shared/conditions.cpp +++ b/khotkeys/shared/conditions.cpp @@ -42,14 +42,14 @@ Condition::Condition( Condition_list_base* parent_P ) _parent->append( this ); } -Condition::Condition( KConfig&, Condition_list_base* parent_P ) +Condition::Condition( TDEConfig&, Condition_list_base* parent_P ) : _parent( parent_P ) { if( _parent ) _parent->append( this ); } -Condition* Condition::create_cfg_read( KConfig& cfg_P, Condition_list_base* parent_P ) +Condition* Condition::create_cfg_read( TDEConfig& cfg_P, Condition_list_base* parent_P ) { TQString type = cfg_P.readEntry( "Type" ); if( type == "ACTIVE_WINDOW" ) @@ -73,7 +73,7 @@ Condition::~Condition() } -void Condition::cfg_write( KConfig& cfg_P ) const +void Condition::cfg_write( TDEConfig& cfg_P ) const { cfg_P.writeEntry( "Type", "ERROR" ); } @@ -118,7 +118,7 @@ void Condition::debug_list( const TQPtrList< Condition >& list_P, int depth_P ) // Condition_list_base -Condition_list_base::Condition_list_base( KConfig& cfg_P, Condition_list_base* parent_P ) +Condition_list_base::Condition_list_base( TDEConfig& cfg_P, Condition_list_base* parent_P ) : Condition( parent_P ) { TQString save_cfg_group = cfg_P.group(); @@ -143,7 +143,7 @@ Condition_list_base::~Condition_list_base() } } -void Condition_list_base::cfg_write( KConfig& cfg_P ) const +void Condition_list_base::cfg_write( TDEConfig& cfg_P ) const { TQString save_cfg_group = cfg_P.group(); int i = 0; @@ -180,13 +180,13 @@ void Condition_list_base::debug( int depth_P ) // Condition_list -Condition_list::Condition_list( KConfig& cfg_P, Action_data_base* data_P ) +Condition_list::Condition_list( TDEConfig& cfg_P, Action_data_base* data_P ) : Condition_list_base( cfg_P, NULL ), data( data_P ) { _comment = cfg_P.readEntry( "Comment" ); } -void Condition_list::cfg_write( KConfig& cfg_P ) const +void Condition_list::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Comment", comment()); @@ -244,7 +244,7 @@ Condition_list* Condition_list::copy( Condition_list_base* ) const // Active_window_condition -Active_window_condition::Active_window_condition( KConfig& cfg_P, Condition_list_base* parent_P ) +Active_window_condition::Active_window_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ) : Condition( cfg_P, parent_P ) { TQString save_cfg_group = cfg_P.group(); @@ -273,7 +273,7 @@ void Active_window_condition::set_match() updated(); } -void Active_window_condition::cfg_write( KConfig& cfg_P ) const +void Active_window_condition::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); TQString save_cfg_group = cfg_P.group(); @@ -310,7 +310,7 @@ Active_window_condition::~Active_window_condition() // Existing_window_condition -Existing_window_condition::Existing_window_condition( KConfig& cfg_P, Condition_list_base* parent_P ) +Existing_window_condition::Existing_window_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ) : Condition( cfg_P, parent_P ) { TQString save_cfg_group = cfg_P.group(); @@ -342,7 +342,7 @@ void Existing_window_condition::set_match( WId w_P ) updated(); } -void Existing_window_condition::cfg_write( KConfig& cfg_P ) const +void Existing_window_condition::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); TQString save_cfg_group = cfg_P.group(); @@ -384,7 +384,7 @@ Existing_window_condition::~Existing_window_condition() // Not_condition -Not_condition::Not_condition( KConfig& cfg_P, Condition_list_base* parent_P ) +Not_condition::Not_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ) : Condition_list_base( cfg_P, parent_P ) { // CHECKME kontrola poctu ? @@ -395,7 +395,7 @@ bool Not_condition::match() const return condition() ? !condition()->match() : false; } -void Not_condition::cfg_write( KConfig& cfg_P ) const +void Not_condition::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "NOT" ); // overwrites value set in base::cfg_write() @@ -421,7 +421,7 @@ bool Not_condition::accepts_children() const // And_condition -And_condition::And_condition( KConfig& cfg_P, Condition_list_base* parent_P ) +And_condition::And_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ) : Condition_list_base( cfg_P, parent_P ) { // CHECKME kontrola poctu ? @@ -437,7 +437,7 @@ bool And_condition::match() const return true; // all true (or empty) } -void And_condition::cfg_write( KConfig& cfg_P ) const +void And_condition::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "AND" ); // overwrites value set in base::cfg_write() @@ -460,7 +460,7 @@ const TQString And_condition::description() const // Or_condition -Or_condition::Or_condition( KConfig& cfg_P, Condition_list_base* parent_P ) +Or_condition::Or_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ) : Condition_list_base( cfg_P, parent_P ) { // CHECKME kontrola poctu ? @@ -478,7 +478,7 @@ bool Or_condition::match() const return false; } -void Or_condition::cfg_write( KConfig& cfg_P ) const +void Or_condition::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Type", "OR" ); // overwrites value set in base::cfg_write() diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h index bc0ca5d6e..ff1af7d07 100644 --- a/khotkeys/shared/conditions.h +++ b/khotkeys/shared/conditions.h @@ -21,7 +21,7 @@ #include <X11/Xlib.h> #include <fixx11h.h> -class KConfig; +class TDEConfig; namespace KHotKeys { @@ -34,16 +34,16 @@ class KDE_EXPORT Condition { public: Condition( Condition_list_base* parent_P ); - Condition( KConfig& cfg_P, Condition_list_base* parent_P ); + Condition( TDEConfig& cfg_P, Condition_list_base* parent_P ); virtual ~Condition(); virtual bool match() const = 0; virtual void updated() const; // called when the condition changes - virtual void cfg_write( KConfig& cfg_P ) const = 0; + virtual void cfg_write( TDEConfig& cfg_P ) const = 0; virtual const TQString description() const = 0; virtual Condition* copy( Condition_list_base* parent_P ) const = 0; const Condition_list_base* parent() const; Condition_list_base* parent(); - static Condition* create_cfg_read( KConfig& cfg_P, Condition_list_base* parent_P ); + static Condition* create_cfg_read( TDEConfig& cfg_P, Condition_list_base* parent_P ); protected: Condition_list_base* const _parent; KHOTKEYS_DISABLE_COPY( Condition ); @@ -57,9 +57,9 @@ class KDE_EXPORT Condition_list_base Condition_list_base( Condition_list_base* parent_P ); Condition_list_base( const TQPtrList< Condition >& children_P, Condition_list_base* parent_P ); - Condition_list_base( KConfig& cfg_P, Condition_list_base* parent_P ); + Condition_list_base( TDEConfig& cfg_P, Condition_list_base* parent_P ); virtual ~Condition_list_base(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual bool accepts_children() const; typedef TQPtrListIterator< Condition > Iterator; }; @@ -70,8 +70,8 @@ class KDE_EXPORT Condition_list typedef Condition_list_base base; public: Condition_list( const TQString& comment_P, Action_data_base* data_P ); - Condition_list( KConfig& cfg_P, Action_data_base* data_P ); - void cfg_write( KConfig& cfg_P ) const; + Condition_list( TDEConfig& cfg_P, Action_data_base* data_P ); + void cfg_write( TDEConfig& cfg_P ) const; Condition_list* copy( Action_data_base* data_P ) const; virtual bool match() const; const TQString& comment() const; @@ -91,10 +91,10 @@ class KDE_EXPORT Active_window_condition typedef Condition base; public: Active_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P ); - Active_window_condition( KConfig& cfg_P, Condition_list_base* parent_P ); + Active_window_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ); virtual ~Active_window_condition(); virtual bool match() const; - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; const Windowdef_list* window() const; #ifndef COVARIANT_RETURN_BROKEN virtual Active_window_condition* copy( Condition_list_base* parent_P ) const; @@ -118,10 +118,10 @@ class KDE_EXPORT Existing_window_condition typedef Condition base; public: Existing_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P ); - Existing_window_condition( KConfig& cfg_P, Condition_list_base* parent_P ); + Existing_window_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ); virtual ~Existing_window_condition(); virtual bool match() const; - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; const Windowdef_list* window() const; #ifndef COVARIANT_RETURN_BROKEN virtual Existing_window_condition* copy( Condition_list_base* parent_P ) const; @@ -145,9 +145,9 @@ class KDE_EXPORT Not_condition typedef Condition_list_base base; public: Not_condition( Condition_list_base* parent_P ); - Not_condition( KConfig& cfg_P, Condition_list_base* parent_P ); + Not_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ); virtual bool match() const; - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual Not_condition* copy( Condition_list_base* parent_P ) const; virtual const TQString description() const; const Condition* condition() const; @@ -160,9 +160,9 @@ class KDE_EXPORT And_condition typedef Condition_list_base base; public: And_condition( Condition_list_base* parent_P ); - And_condition( KConfig& cfg_P, Condition_list_base* parent_P ); + And_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ); virtual bool match() const; - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual And_condition* copy( Condition_list_base* parent_P ) const; virtual const TQString description() const; }; @@ -173,9 +173,9 @@ class KDE_EXPORT Or_condition typedef Condition_list_base base; public: Or_condition( Condition_list_base* parent_P ); - Or_condition( KConfig& cfg_P, Condition_list_base* parent_P ); + Or_condition( TDEConfig& cfg_P, Condition_list_base* parent_P ); virtual bool match() const; - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual Or_condition* copy( Condition_list_base* parent_P ) const; virtual const TQString description() const; }; diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h index 53be7c039..92dba09b6 100644 --- a/khotkeys/shared/khotkeysglobal.h +++ b/khotkeys/shared/khotkeysglobal.h @@ -22,7 +22,7 @@ #include <klocale.h> -class KConfig; +class TDEConfig; class TQObject; namespace KHotKeys diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index fdab2be56..9481ff762 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -39,16 +39,16 @@ Settings::Settings() bool Settings::read_settings( bool include_disabled_P ) { - KConfig cfg( KHOTKEYS_CONFIG_FILE, true ); + TDEConfig cfg( KHOTKEYS_CONFIG_FILE, true ); return read_settings( cfg, include_disabled_P, ImportNone ); } -bool Settings::import( KConfig& cfg_P, bool ask_P ) +bool Settings::import( TDEConfig& cfg_P, bool ask_P ) { return read_settings( cfg_P, true, ask_P ? ImportAsk : ImportSilent ); } -bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportType import_P ) +bool Settings::read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportType import_P ) { if( actions == NULL ) actions = new Action_data_group( NULL, "should never see", "should never see", @@ -120,7 +120,7 @@ bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportTyp void Settings::write_settings() { - KConfig cfg( KHOTKEYS_CONFIG_FILE, false ); + TDEConfig cfg( KHOTKEYS_CONFIG_FILE, false ); // CHECKME smazat stare sekce ? TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); @@ -154,7 +154,7 @@ void Settings::write_settings() // return value means the number of enabled actions written in the cfg file // i.e. 'Autostart' for value > 0 should be on -int Settings::write_actions_recursively_v2( KConfig& cfg_P, Action_data_group* parent_P, bool enabled_P ) +int Settings::write_actions_recursively_v2( TDEConfig& cfg_P, Action_data_group* parent_P, bool enabled_P ) { int enabled_cnt = 0; TQString save_cfg_group = cfg_P.group(); @@ -177,13 +177,13 @@ int Settings::write_actions_recursively_v2( KConfig& cfg_P, Action_data_group* p return enabled_cnt; } -void Settings::read_settings_v2( KConfig& cfg_P, bool include_disabled_P ) +void Settings::read_settings_v2( TDEConfig& cfg_P, bool include_disabled_P ) { cfg_P.setGroup( "Data" ); read_actions_recursively_v2( cfg_P, actions, include_disabled_P ); } -void Settings::read_actions_recursively_v2( KConfig& cfg_P, Action_data_group* parent_P, +void Settings::read_actions_recursively_v2( TDEConfig& cfg_P, Action_data_group* parent_P, bool include_disabled_P ) { TQString save_cfg_group = cfg_P.group(); @@ -205,7 +205,7 @@ void Settings::read_actions_recursively_v2( KConfig& cfg_P, Action_data_group* p } // backward compatibility -void Settings::read_settings_v1( KConfig& cfg_P ) +void Settings::read_settings_v1( TDEConfig& cfg_P ) { int sections = cfg_P.readNumEntry( "Num_Sections", 0 ); Action_data_group* menuentries = NULL; diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h index fa6754160..c758764b4 100644 --- a/khotkeys/shared/settings.h +++ b/khotkeys/shared/settings.h @@ -14,7 +14,7 @@ #include "actions.h" #include <kshortcut.h> -class KConfig; +class TDEConfig; namespace KHotKeys { @@ -32,7 +32,7 @@ class KDE_EXPORT Settings Settings(); bool read_settings( bool include_disabled_P ); void write_settings(); - bool import( KConfig& cfg_P, bool ask_P ); + bool import( TDEConfig& cfg_P, bool ask_P ); Action_data_group* actions; bool gestures_disabled_globally; int gesture_mouse_button; @@ -41,11 +41,11 @@ class KDE_EXPORT Settings Windowdef_list* gestures_exclude; KShortcut voice_shortcut; protected: - bool read_settings( KConfig& cfg_P, bool include_disabled_P, ImportType import_P ); - void read_settings_v1( KConfig& cfg_P ); - void read_settings_v2( KConfig& cfg_P, bool include_disabled_P ); - int write_actions_recursively_v2( KConfig& cfg_P, Action_data_group* parent_P, bool enabled_P ); - void read_actions_recursively_v2( KConfig& cfg_P, Action_data_group* parent_P, + bool read_settings( TDEConfig& cfg_P, bool include_disabled_P, ImportType import_P ); + void read_settings_v1( TDEConfig& cfg_P ); + void read_settings_v2( TDEConfig& cfg_P, bool include_disabled_P ); + int write_actions_recursively_v2( TDEConfig& cfg_P, Action_data_group* parent_P, bool enabled_P ); + void read_actions_recursively_v2( TDEConfig& cfg_P, Action_data_group* parent_P, bool include_disabled_P ); private: TQStringList already_imported; diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index cf9b99c6c..27736ed0b 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -39,12 +39,12 @@ namespace KHotKeys // Trigger -void Trigger::cfg_write( KConfig& cfg_P ) const +void Trigger::cfg_write( TDEConfig& cfg_P ) const { cfg_P.writeEntry( "Type", "ERROR" ); } -Trigger* Trigger::create_cfg_read( KConfig& cfg_P, Action_data* data_P ) +Trigger* Trigger::create_cfg_read( TDEConfig& cfg_P, Action_data* data_P ) { TQString type = cfg_P.readEntry( "Type" ); if( type == "SHORTCUT" || type == "SINGLE_SHORTCUT" ) @@ -62,7 +62,7 @@ Trigger* Trigger::create_cfg_read( KConfig& cfg_P, Action_data* data_P ) // Trigger_list -Trigger_list::Trigger_list( KConfig& cfg_P, Action_data* data_P ) +Trigger_list::Trigger_list( TDEConfig& cfg_P, Action_data* data_P ) : TQPtrList< Trigger >() { setAutoDelete( true ); @@ -81,7 +81,7 @@ Trigger_list::Trigger_list( KConfig& cfg_P, Action_data* data_P ) cfg_P.setGroup( save_cfg_group ); } -void Trigger_list::cfg_write( KConfig& cfg_P ) const +void Trigger_list::cfg_write( TDEConfig& cfg_P ) const { cfg_P.writeEntry( "Comment", comment()); TQString save_cfg_group = cfg_P.group(); @@ -123,7 +123,7 @@ Shortcut_trigger::Shortcut_trigger( Action_data* data_P, const KShortcut& shortc keyboard_handler->insert_item( shortcut(), this ); } -Shortcut_trigger::Shortcut_trigger( KConfig& cfg_P, Action_data* data_P ) +Shortcut_trigger::Shortcut_trigger( TDEConfig& cfg_P, Action_data* data_P ) : Trigger( cfg_P, data_P ), _shortcut( cfg_P.readEntry( "Key", 0 )) { keyboard_handler->insert_item( shortcut(), this ); @@ -134,7 +134,7 @@ Shortcut_trigger::~Shortcut_trigger() keyboard_handler->remove_item( shortcut(), this ); } -void Shortcut_trigger::cfg_write( KConfig& cfg_P ) const +void Shortcut_trigger::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Key", _shortcut.toStringInternal()); @@ -175,7 +175,7 @@ void Shortcut_trigger::activate( bool activate_P ) // Window_trigger -Window_trigger::Window_trigger( KConfig& cfg_P, Action_data* data_P ) +Window_trigger::Window_trigger( TDEConfig& cfg_P, Action_data* data_P ) : Trigger( cfg_P, data_P ), active( false ) { // kdDebug( 1217 ) << "Window_trigger" << endl; @@ -290,7 +290,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P ) kdDebug( 1217 ) << "Window_trigger::w_changed() : " << was_match << "|" << matches << endl; } -void Window_trigger::cfg_write( KConfig& cfg_P ) const +void Window_trigger::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); TQString save_cfg_group = cfg_P.group(); @@ -325,7 +325,7 @@ Gesture_trigger::Gesture_trigger( Action_data* data_P, const TQString &gestureco { } -Gesture_trigger::Gesture_trigger( KConfig& cfg_P, Action_data* data_P ) +Gesture_trigger::Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P ) : Trigger( cfg_P, data_P ) { _gesturecode = cfg_P.readEntry( "Gesture" ); @@ -336,7 +336,7 @@ Gesture_trigger::~Gesture_trigger() gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId ))); } -void Gesture_trigger::cfg_write( KConfig& cfg_P ) const +void Gesture_trigger::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Gesture", gesturecode()); @@ -381,7 +381,7 @@ void Gesture_trigger::activate( bool activate_P ) _voicesignature[1]=signature2_P; } -Voice_trigger::Voice_trigger( KConfig& cfg_P, Action_data* data_P ) +Voice_trigger::Voice_trigger( TDEConfig& cfg_P, Action_data* data_P ) : Trigger( cfg_P, data_P ) { _voicecode = cfg_P.readEntry( "Name" ); @@ -394,7 +394,7 @@ Voice_trigger::~Voice_trigger() voice_handler->unregister_handler( this ); } -void Voice_trigger::cfg_write( KConfig& cfg_P ) const +void Voice_trigger::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Name", voicecode()); diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h index 9a8fe6bee..cf511f975 100644 --- a/khotkeys/shared/triggers.h +++ b/khotkeys/shared/triggers.h @@ -21,7 +21,7 @@ #include "input.h" -class KConfig; +class TDEConfig; namespace KHotKeys { @@ -33,12 +33,12 @@ class KDE_EXPORT Trigger { public: Trigger( Action_data* data_P ); - Trigger( KConfig& cfg_P, Action_data* data_P ); + Trigger( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Trigger(); - virtual void cfg_write( KConfig& cfg_P ) const = 0; + virtual void cfg_write( TDEConfig& cfg_P ) const = 0; virtual Trigger* copy( Action_data* data_P ) const = 0; virtual const TQString description() const = 0; - static Trigger* create_cfg_read( KConfig& cfg_P, Action_data* data_P ); + static Trigger* create_cfg_read( TDEConfig& cfg_P, Action_data* data_P ); virtual void activate( bool activate_P ) = 0; protected: Action_data* const data; @@ -50,9 +50,9 @@ class KDE_EXPORT Trigger_list { public: Trigger_list( const TQString& comment_P ); // CHECKME nebo i data ? - Trigger_list( KConfig& cfg_P, Action_data* data_P ); + Trigger_list( TDEConfig& cfg_P, Action_data* data_P ); void activate( bool activate_P ); - void cfg_write( KConfig& cfg_P ) const; + void cfg_write( TDEConfig& cfg_P ) const; typedef TQPtrListIterator< Trigger > Iterator; const TQString& comment() const; Trigger_list* copy( Action_data* data_P ) const; @@ -67,9 +67,9 @@ class KDE_EXPORT Shortcut_trigger typedef Trigger base; public: Shortcut_trigger( Action_data* data_P, const KShortcut& shortcut_P ); - Shortcut_trigger( KConfig& cfg_P, Action_data* data_P ); + Shortcut_trigger( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Shortcut_trigger(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual Shortcut_trigger* copy( Action_data* data_P ) const; virtual const TQString description() const; const KShortcut& shortcut() const; @@ -93,9 +93,9 @@ class KDE_EXPORT Window_trigger WINDOW_DEACTIVATES = ( 1 << 3 ) }; Window_trigger( Action_data* data_P, Windowdef_list* windows_P, int window_actions_P ); - Window_trigger( KConfig& cfg_P, Action_data* data_P ); + Window_trigger( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Window_trigger(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; #ifndef COVARIANT_RETURN_BROKEN // stupid gcc, it doesn't even warn it can't do this virtual Window_trigger* copy( Action_data* data_P ) const; #else @@ -128,9 +128,9 @@ class KDE_EXPORT Gesture_trigger typedef Trigger base; public: Gesture_trigger( Action_data* data_P, const TQString& gesture_P ); - Gesture_trigger( KConfig& cfg_P, Action_data* data_P ); + Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Gesture_trigger(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual Trigger* copy( Action_data* data_P ) const; virtual const TQString description() const; const TQString& gesturecode() const; @@ -149,9 +149,9 @@ class KDE_EXPORT Voice_trigger typedef Trigger base; public: Voice_trigger( Action_data* data_P, const TQString& Voice_P, const VoiceSignature & signature1_P, const VoiceSignature & signature2_P ); - Voice_trigger( KConfig& cfg_P, Action_data* data_P ); + Voice_trigger( TDEConfig& cfg_P, Action_data* data_P ); virtual ~Voice_trigger(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; virtual Trigger* copy( Action_data* data_P ) const; virtual const TQString description() const; const TQString& voicecode() const; @@ -178,7 +178,7 @@ Trigger::Trigger( Action_data* data_P ) } inline -Trigger::Trigger( KConfig&, Action_data* data_P ) +Trigger::Trigger( TDEConfig&, Action_data* data_P ) : data( data_P ) { } diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp index 8ef817933..054f66827 100644 --- a/khotkeys/shared/voicesignature.cpp +++ b/khotkeys/shared/voicesignature.cpp @@ -398,7 +398,7 @@ TQMap<int, TQMap<int, double> > VoiceSignature::pond; -void VoiceSignature::write(KConfigBase *cfg, const TQString &key) const +void VoiceSignature::write(TDEConfigBase *cfg, const TQString &key) const { TQStringList sl; for(int x=0;x<WINDOW_NUMBER;x++) @@ -409,7 +409,7 @@ void VoiceSignature::write(KConfigBase *cfg, const TQString &key) const cfg->writeEntry(key,sl); } -void VoiceSignature::read(KConfigBase *cfg, const TQString &key) +void VoiceSignature::read(TDEConfigBase *cfg, const TQString &key) { TQStringList sl=cfg->readListEntry(key); for(int x=0;x<WINDOW_NUMBER;x++) diff --git a/khotkeys/shared/voicesignature.h b/khotkeys/shared/voicesignature.h index 82556864f..af987cce1 100644 --- a/khotkeys/shared/voicesignature.h +++ b/khotkeys/shared/voicesignature.h @@ -26,7 +26,7 @@ #include <kdemacros.h> class Sound; -class KConfigBase; +class TDEConfigBase; #define WINDOW_MINIMUM 0.10 @@ -87,8 +87,8 @@ public: static TQMemArray<double> fft(const Sound& sound, unsigned int start, unsigned int stop); static bool window(const Sound& sound, unsigned int *start, unsigned int *stop); - void write(KConfigBase *cfg, const TQString &key) const; - void read(KConfigBase *cfg, const TQString &key); + void write(TDEConfigBase *cfg, const TQString &key) const; + void read(TDEConfigBase *cfg, const TQString &key); inline bool isNull() const { diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index 4b009ace3..ddfc612e2 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -201,18 +201,18 @@ Window_data::Window_data( WId id_P ) // Windowdef -void Windowdef::cfg_write( KConfig& cfg_P ) const +void Windowdef::cfg_write( TDEConfig& cfg_P ) const { cfg_P.writeEntry( "Type", "ERROR" ); cfg_P.writeEntry( "Comment", comment()); } -Windowdef::Windowdef( KConfig& cfg_P ) +Windowdef::Windowdef( TDEConfig& cfg_P ) { _comment = cfg_P.readEntry( "Comment" ); } -Windowdef* Windowdef::create_cfg_read( KConfig& cfg_P ) +Windowdef* Windowdef::create_cfg_read( TDEConfig& cfg_P ) { TQString type = cfg_P.readEntry( "Type" ); if( type == "SIMPLE" ) @@ -223,7 +223,7 @@ Windowdef* Windowdef::create_cfg_read( KConfig& cfg_P ) // Windowdef_list -Windowdef_list::Windowdef_list( KConfig& cfg_P ) +Windowdef_list::Windowdef_list( TDEConfig& cfg_P ) : TQPtrList< Windowdef >() { setAutoDelete( true ); @@ -242,7 +242,7 @@ Windowdef_list::Windowdef_list( KConfig& cfg_P ) cfg_P.setGroup( save_cfg_group ); } -void Windowdef_list::cfg_write( KConfig& cfg_P ) const +void Windowdef_list::cfg_write( TDEConfig& cfg_P ) const { TQString save_cfg_group = cfg_P.group(); int i = 0; @@ -292,7 +292,7 @@ Windowdef_simple::Windowdef_simple( const TQString& comment_P, const TQString& t { } -Windowdef_simple::Windowdef_simple( KConfig& cfg_P ) +Windowdef_simple::Windowdef_simple( TDEConfig& cfg_P ) : Windowdef( cfg_P ) { _title = cfg_P.readEntry( "Title" ); @@ -304,7 +304,7 @@ Windowdef_simple::Windowdef_simple( KConfig& cfg_P ) _window_types = cfg_P.readNumEntry( "WindowTypes" ); } -void Windowdef_simple::cfg_write( KConfig& cfg_P ) const +void Windowdef_simple::cfg_write( TDEConfig& cfg_P ) const { base::cfg_write( cfg_P ); cfg_P.writeEntry( "Title", title()); diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index 5c491acbf..4fa403436 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -21,7 +21,7 @@ #include "khotkeysglobal.h" -class KConfig; +class TDEConfig; class KWinModule; namespace KHotKeys @@ -80,12 +80,12 @@ class KDE_EXPORT Windowdef { public: Windowdef( const TQString& comment_P ); - Windowdef( KConfig& cfg_P ); + Windowdef( TDEConfig& cfg_P ); virtual ~Windowdef(); const TQString& comment() const; virtual bool match( const Window_data& window_P ) = 0; - static Windowdef* create_cfg_read( KConfig& cfg_P/*, Action_data_base* data_P*/ ); - virtual void cfg_write( KConfig& cfg_P ) const = 0; + static Windowdef* create_cfg_read( TDEConfig& cfg_P/*, Action_data_base* data_P*/ ); + virtual void cfg_write( TDEConfig& cfg_P ) const = 0; virtual Windowdef* copy( /*Action_data_base* data_P*/ ) const = 0; virtual const TQString description() const = 0; private: @@ -98,8 +98,8 @@ class KDE_EXPORT Windowdef_list { public: Windowdef_list( const TQString& comment_P ); - Windowdef_list( KConfig& cfg_P/*, Action_data_base* data_P*/ ); - void cfg_write( KConfig& cfg_P ) const; + Windowdef_list( TDEConfig& cfg_P/*, Action_data_base* data_P*/ ); + void cfg_write( TDEConfig& cfg_P ) const; bool match( const Window_data& window_P ) const; Windowdef_list* copy( /*Action_data_base* data_P*/ ) const; typedef TQPtrListIterator< Windowdef > Iterator; @@ -136,9 +136,9 @@ class KDE_EXPORT Windowdef_simple Windowdef_simple( const TQString& comment_P, const TQString& title_P, substr_type_t title_type_P, const TQString& wclass_P, substr_type_t wclass_type_P, const TQString& role_P, substr_type_t role_type_P, int window_types_P ); - Windowdef_simple( KConfig& cfg_P ); + Windowdef_simple( TDEConfig& cfg_P ); virtual bool match( const Window_data& window_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; const TQString& title() const; substr_type_t title_match_type() const; const TQString& wclass() const; diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index 00649d854..1d4f26b45 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -49,7 +49,7 @@ int main( int argc, char* argv[] ) init_global_data( false, TQT_TQOBJECT(&app) ); Settings settings; settings.read_settings( true ); - KConfig cfg( file, true ); + TDEConfig cfg( file, true ); if( !settings.import( cfg, false )) { kdWarning() << "Import of " << id << " failed!" << endl; diff --git a/kicker/TODO b/kicker/TODO index cf43fa146..00cd6d42e 100644 --- a/kicker/TODO +++ b/kicker/TODO @@ -82,7 +82,7 @@ Unnasigned - Space activates focused control (on panel or within an applet) +++++ Settings dialog fix up -*** Now that we have KConfigXT, use it in the settings dialogs +*** Now that we have TDEConfigXT, use it in the settings dialogs Convert the "Arrangement" and "Hiding" modules. "Menus" and "Appearance" are done as far as possible. diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index b29d52f19..35dccf148 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -68,11 +68,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // Settings -KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, +TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, const char *name, Prefs * prefs, KDialogBase::DialogType dialogType, bool modal) : - KConfigDialog(parent, name, prefs, dialogType, + TDEConfigDialog(parent, name, prefs, dialogType, KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, @@ -126,19 +126,19 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } -void KConfigDialogSingle::updateSettings() +void TDEConfigDialogSingle::updateSettings() { settings->OkApply(); } -void KConfigDialogSingle::updateWidgets() +void TDEConfigDialogSingle::updateWidgets() { selectPage( _prefs->type() ); } -void KConfigDialogSingle::updateWidgetsDefault() +void TDEConfigDialogSingle::updateWidgetsDefault() { - KConfigSkeletonItem *item = _prefs->findItem("Type"); + TDEConfigSkeletonItem *item = _prefs->findItem("Type"); item->swapDefault(); selectPage( _prefs->type() ); item->swapDefault(); @@ -147,13 +147,13 @@ void KConfigDialogSingle::updateWidgetsDefault() TQTimer::singleShot(0, this, TQT_SLOT(dateToggled())); } -void KConfigDialogSingle::selectPage(int p) +void TDEConfigDialogSingle::selectPage(int p) { settings->widgetStack->raiseWidget( p ); dateToggled(); } -void KConfigDialogSingle::dateToggled() +void TDEConfigDialogSingle::dateToggled() { bool showDate; switch( settings->kcfg_Type->currentItem() ) @@ -1151,11 +1151,11 @@ void ClockApplet::preferences() void ClockApplet::preferences(bool timezone) { - KConfigDialogSingle *dialog = dynamic_cast<KConfigDialogSingle*>(KConfigDialog::exists(configFileName)); + TDEConfigDialogSingle *dialog = dynamic_cast<TDEConfigDialogSingle*>(TDEConfigDialog::exists(configFileName)); if (!dialog) { - dialog = new KConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow); + dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure())); } diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index c5295d87b..9a80c24b6 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -52,7 +52,7 @@ class KPopupMenu; class Prefs; class ClockApplet; -namespace KIO +namespace TDEIO { class Job; } @@ -61,7 +61,7 @@ class DigitalWidget; class AnalogWidget; class FuzzyWidget; class ClockApplet; -class KConfigDialogManager; +class TDEConfigDialogManager; class SettingsWidgetImp; class SettingsWidgetImp : public SettingsWidget @@ -82,12 +82,12 @@ class SettingsWidgetImp : public SettingsWidget Zone *zone; }; -class KConfigDialogSingle : public KConfigDialog +class TDEConfigDialogSingle : public TDEConfigDialog { Q_OBJECT public: - KConfigDialogSingle(Zone *zone, + TDEConfigDialogSingle(Zone *zone, TQWidget *parent=0, const char *name=0, Prefs *prefs=0, diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index 320d84b4c..bf007c933 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <time.h> #include <stdlib.h> // for getenv() -Zone::Zone(KConfig* conf): +Zone::Zone(TDEConfig* conf): config(conf), _zoneIndex(0) { diff --git a/kicker/applets/clock/zone.h b/kicker/applets/clock/zone.h index db34188bd..caaa112f9 100644 --- a/kicker/applets/clock/zone.h +++ b/kicker/applets/clock/zone.h @@ -27,13 +27,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <ktimezones.h> #include <tqstringlist.h> -class KConfig; +class TDEConfig; class KListView; class Zone { public: - Zone(KConfig* conf); + Zone(TDEConfig* conf); ~Zone(); void writeSettings(); @@ -54,7 +54,7 @@ public: protected: KTimezones m_zoneDb; TQStringList _remotezonelist; - KConfig *config; + TDEConfig *config; TQString _defaultTZ; unsigned int _zoneIndex; }; diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index c35f0970c..94bb9c899 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "configdlgbase.h" ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, - int autoSize, KConfigDialog::DialogType dialogType, + int autoSize, TDEConfigDialog::DialogType dialogType, int dialogButtons) : - KConfigDialog(parent, name, config, dialogType, dialogButtons), + TDEConfigDialog(parent, name, config, dialogType, dialogButtons), m_settings(config), m_autoSize(autoSize) { @@ -57,7 +57,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, void ConfigDlg::updateSettings() { kdDebug() << "updateSettings" << endl; - KConfigDialog::updateSettings(); + TDEConfigDialog::updateSettings(); if (!hasChanged()) { return; @@ -76,7 +76,7 @@ void ConfigDlg::updateSettings() void ConfigDlg::updateWidgets() { - KConfigDialog::updateWidgets(); + TDEConfigDialog::updateWidgets(); if (m_settings->iconDim() == m_autoSize) { m_ui->iconDim->setEditText(i18n("Automatic")); @@ -89,13 +89,13 @@ void ConfigDlg::updateWidgets() void ConfigDlg::updateWidgetsDefault() { - KConfigDialog::updateWidgetsDefault(); + TDEConfigDialog::updateWidgetsDefault(); } bool ConfigDlg::hasChanged() { return m_oldIconDimText != m_ui->iconDim->currentText() || - KConfigDialog::hasChanged(); + TDEConfigDialog::hasChanged(); } #include "configdlg.moc" diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h index ff35098d3..e5fdbe34b 100644 --- a/kicker/applets/launcher/configdlg.h +++ b/kicker/applets/launcher/configdlg.h @@ -29,13 +29,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class ConfigDlgBase; class Prefs; -class ConfigDlg : public KConfigDialog +class ConfigDlg : public TDEConfigDialog { Q_OBJECT public: ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize, - KConfigDialog::DialogType dialogType, int dialogButtons); + TDEConfigDialog::DialogType dialogType, int dialogButtons); protected: virtual bool hasChanged(); diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index ee72d58bb..e5658f1cb 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -833,7 +833,7 @@ public: void QuickLauncher::loadConfig() { DEBUGSTR << "QuickLauncher::loadConfig()" << endl << flush; - //KConfig *c = config(); + //TDEConfig *c = config(); //c->setGroup("General"); setConserveSpace(m_settings->conserveSpace()); setDragEnabled(m_settings->dragEnabled()); diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index 00187fb3f..72652d74b 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -56,7 +56,7 @@ extern "C" Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name) : KPanelApplet( configFile, KPanelApplet::Normal, 0, parent, name ), bTransparent( false ) { - KConfig *conf = config(); + TDEConfig *conf = config(); conf->setGroup("lockout"); //setFrameStyle(Panel | Sunken); @@ -190,7 +190,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) if( e->type() == TQEvent::MouseButtonPress ) { - KConfig *conf = config(); + TDEConfig *conf = config(); conf->setGroup("lockout"); TQMouseEvent *me = TQT_TQMOUSEEVENT( e ); @@ -257,7 +257,7 @@ void Lockout::slotTransparent() { bTransparent = !bTransparent; - KConfig* conf = config(); + TDEConfig* conf = config(); conf->setGroup("lockout"); conf->writeEntry( "Transparent", bTransparent ); conf->sync(); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 28d982e4f..527c92b62 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -368,7 +368,7 @@ void MediaApplet::positionChange(Position) void MediaApplet::loadConfig() { - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); if(c->hasKey("ExcludedTypes")) @@ -398,7 +398,7 @@ void MediaApplet::loadConfig() void MediaApplet::saveConfig() { - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); c->writeEntry("ExcludedTypes", mExcludedTypesList, ';'); diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 1a0ab5ebe..732f5acdb 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -339,7 +339,7 @@ void Applet::lostSelection() void Applet::readSettings() { - KConfig cfg( "kdesktoprc", true ); + TDEConfig cfg( "kdesktoprc", true ); cfg.setGroup( "Menubar" ); desktop_menu = cfg.readBoolEntry( "ShowMenubar", false ); cfg.setGroup( "KDE" ); diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index c6a2fdc93..9d12279c2 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -94,7 +94,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, TQRect desk = TQApplication::desktop()->screenGeometry(scnum); if (desk.width() <= 800) { - KConfigSkeleton::ItemBool* item = dynamic_cast<KConfigSkeleton::ItemBool*>(m_settings->findItem("Preview")); + TDEConfigSkeleton::ItemBool* item = dynamic_cast<TDEConfigSkeleton::ItemBool*>(m_settings->findItem("Preview")); if (item) { item->setDefaultValue(false); diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 0f33f74d1..f0069cae6 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -79,7 +79,7 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions, connect(_input, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(run_command(const TQString&))); - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); // restore history and completion list @@ -98,7 +98,7 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions, RunApplet::~RunApplet() { - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); // save history and completion list diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index b5910e3b0..428d0bb7e 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -111,7 +111,7 @@ SwallowApplet::~SwallowApplet() SwallowCommandList* SwallowApplet::readConfig() { m_swcList->clear(); - KConfig *kc = config(); + TDEConfig *kc = config(); kc->setGroup("General"); int count = kc->readNumEntry("Number of apps"); diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index 72795cc79..b4be4f624 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -27,7 +27,7 @@ #include <kpanelapplet.h> class TQBoxLayout; -class KConfig; +class TDEConfig; class TDEProcess; class KWinModule; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index d10fd107e..02f13df2b 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -296,7 +296,7 @@ void SystemTrayApplet::applySettings() m_showClockInTray = m_showClockSettingCB->isChecked(); - KConfig *conf = config(); + TDEConfig *conf = config(); // Save the sort order and hidden status using the window class (WM_CLASS) rather // than window name (caption) - window name is i18n-ed, so it's for example @@ -485,7 +485,7 @@ void SystemTrayApplet::loadSettings() setFrameStyle(NoFrame); m_showFrame = KickerSettings::showDeepButtons()?true:false; - KConfig *conf = config(); + TDEConfig *conf = config(); conf->reparseConfiguration(); conf->setGroup("General"); diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 166e9164f..57904db43 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -35,8 +35,8 @@ TrashButton::TrashButton(TQWidget *parent) : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/") { - KIO::UDSEntry entry; - KIO::NetAccess::stat("trash:/", entry, 0L); + TDEIO::UDSEntry entry; + TDEIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 71160cbe6..393e9a2d6 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -273,7 +273,7 @@ void DockBarExtension::settingsChanged(DockContainer *) void DockBarExtension::saveContainerConfig() { TQStringList applet_list; - KConfig *conf = config(); + TDEConfig *conf = config(); unsigned count = 0; for (DockContainer::Vector::const_iterator it = containers.constBegin(); @@ -300,7 +300,7 @@ void DockBarExtension::saveContainerConfig() void DockBarExtension::loadContainerConfig() { - KConfig *conf = config(); + TDEConfig *conf = config(); conf->setGroup("General"); TQStringList applets = conf->readListEntry("Applets"); diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index c8ee55166..cdc356180 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -587,8 +587,8 @@ * This took me 2 hours to find... - - KConfigGroupSaver( conf, "Appearance" ); + - KConfigGroupSaver saver( conf, "Appearance" ); + - TDEConfigGroupSaver( conf, "Appearance" ); + + TDEConfigGroupSaver saver( conf, "Appearance" ); Finally the size is restored correctly. diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 708aeb1e6..abd6337df 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -85,7 +85,7 @@ int main( int argc, char **argv ) int wflags = TQt::WStyle_Customize | TQt::WX11BypassWM | TQt::WStyle_DialogBorder | TQt::WStyle_StaysOnTop; KasBar *kasbar; - KConfig conf( "kasbarrc" ); + TDEConfig conf( "kasbarrc" ); if ( args->isSet("test") ) { kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 42199272a..31f5c5a33 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -164,7 +164,7 @@ void KasPrefsDialog::addLookPage() "available space will be used." ) ); TQLabel *maxBoxesLabel = new TQLabel( i18n("Bo&xes per line: "), maxBoxesBox ); - KConfig *conf = kasbar->config(); + TDEConfig *conf = kasbar->config(); if ( conf ) conf->setGroup( "Layout" ); maxBoxesSpin = new KIntSpinBox( 0, 50, 1, @@ -447,7 +447,7 @@ void KasPrefsDialog::customSizeChanged ( int value ) void KasPrefsDialog::accept() { - KConfig *conf = kasbar->config(); + TDEConfig *conf = kasbar->config(); if ( conf ) { kasbar->writeConfig( conf ); diff --git a/kicker/extensions/kasbar/kasprefsdlg.h b/kicker/extensions/kasbar/kasprefsdlg.h index cc56f2c7f..c3e8be131 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.h +++ b/kicker/extensions/kasbar/kasprefsdlg.h @@ -65,7 +65,7 @@ class TQCheckBox; class TQSlider; class TQSpinBox; class KColorButton; -class KConfig; +class TDEConfig; class KIntSpinBox; class KasTasker; diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 851b7d915..a11c18547 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -539,7 +539,7 @@ void KasTasker::setStandAlone( bool enable ) // Configuration Loader // -void KasTasker::setConfig( KConfig *conf ) +void KasTasker::setConfig( TDEConfig *conf ) { this->conf = conf; } @@ -559,10 +559,10 @@ void KasTasker::writeConfig() writeConfig(conf); } -void KasTasker::readConfig( KConfig *conf ) +void KasTasker::readConfig( TDEConfig *conf ) { if ( !conf ) { - kdWarning() << "KasTasker::readConfig() got a null KConfig" << endl; + kdWarning() << "KasTasker::readConfig() got a null TDEConfig" << endl; return; } @@ -578,7 +578,7 @@ void KasTasker::readConfig( KConfig *conf ) // // Appearance Settings. // - KConfigGroupSaver saver( conf, "Appearance" ); + TDEConfigGroupSaver saver( conf, "Appearance" ); int ext = conf->readNumEntry( "ItemExtent", -1 ); if ( ext > 0 ) @@ -657,10 +657,10 @@ void KasTasker::readConfig( KConfig *conf ) emit configChanged(); } -void KasTasker::writeConfig( KConfig *conf ) +void KasTasker::writeConfig( TDEConfig *conf ) { if ( !conf ) { - kdWarning() << "KasTasker::writeConfig() got a null KConfig" << endl; + kdWarning() << "KasTasker::writeConfig() got a null TDEConfig" << endl; return; } diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index 015d9fb37..27dc2ff44 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -62,7 +62,7 @@ #include <kdemacros.h> #include <taskmanager.h> -class KConfig; +class TDEConfig; class KPixmap; class KPopupMenu; class KAction; @@ -220,18 +220,18 @@ public slots: void showPreferences(); void showAbout(); - /** Sets the current KConfig object. */ - void setConfig( KConfig *config ); - KConfig *config() const { return conf; } + /** Sets the current TDEConfig object. */ + void setConfig( TDEConfig *config ); + TDEConfig *config() const { return conf; } - /** Reads the settings from the current KConfig. */ + /** Reads the settings from the current TDEConfig. */ void readConfig(); void writeConfig(); void writeConfigLater(); void writeLayout(); - /** Writes the settings of this bar to the specified KConfig. */ - void writeConfig( KConfig *conf ); + /** Writes the settings of this bar to the specified TDEConfig. */ + void writeConfig( TDEConfig *conf ); void setStandAlone( bool enable ); @@ -243,11 +243,11 @@ signals: protected slots: /** Load settings from the specified configuration. */ - void readConfig( KConfig *conf ); + void readConfig( TDEConfig *conf ); private: KPopupMenu *menu; - KConfig *conf; + TDEConfig *conf; KasGrouper *grouper; KToggleAction *toggleDetachedAction; KToggleAction *showAllWindowsAction; diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index 3d8518519..82c0df75d 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -42,7 +42,7 @@ public: BookmarksButton(TQWidget* parent); ~BookmarksButton(); - void loadConfig(const KConfigGroup& config); + void loadConfig(const TDEConfigGroup& config); virtual void properties(); protected: diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 2e2cb5a2d..e470fb93a 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -45,7 +45,7 @@ BrowserButton::BrowserButton( const TQString& icon, const TQString& startDir, TQ initialize( icon, startDir ); } -BrowserButton::BrowserButton( const KConfigGroup& config, TQWidget* parent ) +BrowserButton::BrowserButton( const TDEConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "BrowserButton" ) , topMenu( 0 ) { @@ -73,7 +73,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path ) setIcon ( _icon ); } -void BrowserButton::saveConfig( KConfigGroup& config ) const +void BrowserButton::saveConfig( TDEConfigGroup& config ) const { config.writeEntry("Icon", _icon); config.writePathEntry("Path", topMenu->path()); diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index bb08801d9..507a764ed 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -37,10 +37,10 @@ class BrowserButton : public PanelPopupButton public: BrowserButton( const TQString& icon, const TQString& startDir, TQWidget* parent ); - BrowserButton( const KConfigGroup& config, TQWidget* parent ); + BrowserButton( const TDEConfigGroup& config, TQWidget* parent ); virtual ~BrowserButton(); - void saveConfig( KConfigGroup& config ) const; + void saveConfig( TDEConfigGroup& config ) const; virtual void properties(); diff --git a/kicker/kicker/buttons/extensionbutton.cpp b/kicker/kicker/buttons/extensionbutton.cpp index d4590a024..8ab9fd0bd 100644 --- a/kicker/kicker/buttons/extensionbutton.cpp +++ b/kicker/kicker/buttons/extensionbutton.cpp @@ -39,7 +39,7 @@ ExtensionButton::ExtensionButton( const TQString& desktopFile, TQWidget* parent initialize( desktopFile ); } -ExtensionButton::ExtensionButton( const KConfigGroup& config, TQWidget* parent ) +ExtensionButton::ExtensionButton( const TDEConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "extensionbuttton" ) { initialize( config.readPathEntry("DesktopFile") ); @@ -66,7 +66,7 @@ ExtensionButton::~ExtensionButton() delete info; } -void ExtensionButton::saveConfig( KConfigGroup& config ) const +void ExtensionButton::saveConfig( TDEConfigGroup& config ) const { config.writePathEntry("DesktopFile", info->desktopFile()); } diff --git a/kicker/kicker/buttons/extensionbutton.h b/kicker/kicker/buttons/extensionbutton.h index 48854323e..2d2d2d1f2 100644 --- a/kicker/kicker/buttons/extensionbutton.h +++ b/kicker/kicker/buttons/extensionbutton.h @@ -35,10 +35,10 @@ class ExtensionButton : public PanelPopupButton public: ExtensionButton( const TQString& desktopFile, TQWidget* parent ); - ExtensionButton( const KConfigGroup& config, TQWidget* parent ); + ExtensionButton( const TDEConfigGroup& config, TQWidget* parent ); ~ExtensionButton(); - void saveConfig( KConfigGroup& config ) const; + void saveConfig( TDEConfigGroup& config ) const; protected: void initialize( const TQString& desktopFile ); diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index 523d9ed49..a051e9d57 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -37,7 +37,7 @@ public: KButton( TQWidget *parent ); ~KButton(); - void loadConfig( const KConfigGroup& config ); + void loadConfig( const TDEConfigGroup& config ); virtual void properties(); diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h index bc926cf0d..1bdbbafbd 100644 --- a/kicker/kicker/buttons/knewbutton.h +++ b/kicker/kicker/buttons/knewbutton.h @@ -42,7 +42,7 @@ public: ~KNewButton(); static KNewButton *self() { return m_self; } - void loadConfig( const KConfigGroup& config ); + void loadConfig( const TDEConfigGroup& config ); TQColor borderColor() const; //virtual void setPopupDirection(KPanelApplet::Direction d); diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index 808d02633..e48386008 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -65,7 +65,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name, } // this constructor is used when restoring a button, usually at startup -NonKDEAppButton::NonKDEAppButton( const KConfigGroup& config, TQWidget* parent ) +NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent ) : PanelButton(parent, "NonKDEAppButton") // call our superclass's constructor { // call the initialization method, this time with values from a config file @@ -129,7 +129,7 @@ void NonKDEAppButton::initialize(const TQString& name, setIcon(iconStr); } -void NonKDEAppButton::saveConfig( KConfigGroup& config ) const +void NonKDEAppButton::saveConfig( TDEConfigGroup& config ) const { // this is called whenever we change something // the config object sent in will already be set to the @@ -223,7 +223,7 @@ void NonKDEAppButton::runCommand(const TQString& execStr) // run in a terminal? ok! we find this in the config file in the // [misc] group (this will usually be in kdeglobal, actually, which // get merged into the application config automagically for us - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("misc"); TQString termStr = config->readPathEntry("Terminal", "konsole"); diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h index 2676a667c..0407e85a4 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.h +++ b/kicker/kicker/buttons/nonkdeappbutton.h @@ -47,10 +47,10 @@ public: const TQString& cmdLine, bool inTerm, TQWidget* parent); // ... and once for restoring them at start up - NonKDEAppButton(const KConfigGroup& config, TQWidget* parent); + NonKDEAppButton(const TDEConfigGroup& config, TQWidget* parent); // reimplemented from PanelButton - virtual void saveConfig(KConfigGroup& config) const; + virtual void saveConfig(TDEConfigGroup& config) const; virtual void properties(); protected slots: diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index 57a619954..99f8368cf 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -61,7 +61,7 @@ ServiceButton::ServiceButton(const KService::Ptr &service, TQWidget* parent) initialize(); } -ServiceButton::ServiceButton( const KConfigGroup& config, TQWidget* parent ) +ServiceButton::ServiceButton( const TDEConfigGroup& config, TQWidget* parent ) : PanelButton(parent, "ServiceButton"), _service(0) { @@ -149,7 +149,7 @@ void ServiceButton::readDesktopFile() setIcon( _service->icon() ); } -void ServiceButton::saveConfig( KConfigGroup& config ) const +void ServiceButton::saveConfig( TDEConfigGroup& config ) const { config.writePathEntry("StorageId", _id ); if (!config.hasKey("DesktopFile") && _service) diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h index 2d881d72c..9d17d1fe5 100644 --- a/kicker/kicker/buttons/servicebutton.h +++ b/kicker/kicker/buttons/servicebutton.h @@ -35,11 +35,11 @@ class ServiceButton : public PanelButton public: ServiceButton( const TQString& desktopFile, TQWidget* parent ); ServiceButton( const KService::Ptr& service, TQWidget* parent ); - ServiceButton( const KConfigGroup& config, TQWidget* parent ); + ServiceButton( const TDEConfigGroup& config, TQWidget* parent ); ~ServiceButton(); - virtual void saveConfig(KConfigGroup& config) const; + virtual void saveConfig(TDEConfigGroup& config) const; virtual void properties(); protected slots: diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp index 7a036e796..0ebc931f4 100644 --- a/kicker/kicker/buttons/servicemenubutton.cpp +++ b/kicker/kicker/buttons/servicemenubutton.cpp @@ -39,7 +39,7 @@ ServiceMenuButton::ServiceMenuButton( const TQString& relPath, TQWidget* parent initialize( relPath ); } -ServiceMenuButton::ServiceMenuButton( const KConfigGroup& config, TQWidget* parent ) +ServiceMenuButton::ServiceMenuButton( const TDEConfigGroup& config, TQWidget* parent ) : PanelPopupButton( parent, "ServiceMenuButton" ) , topMenu( 0 ) { @@ -75,7 +75,7 @@ void ServiceMenuButton::initialize( const TQString& relPath ) setIcon(group->icon()); } -void ServiceMenuButton::saveConfig( KConfigGroup& config ) const +void ServiceMenuButton::saveConfig( TDEConfigGroup& config ) const { if (topMenu) config.writePathEntry("RelPath", topMenu->relPath()); diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index 0bd05b8ee..da512105d 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -37,9 +37,9 @@ class ServiceMenuButton : public PanelPopupButton public: ServiceMenuButton( const TQString& relPath, TQWidget* parent ); - ServiceMenuButton( const KConfigGroup& config, TQWidget* parent ); + ServiceMenuButton( const TDEConfigGroup& config, TQWidget* parent ); - void saveConfig( KConfigGroup& config ) const; + void saveConfig( TDEConfigGroup& config ) const; protected: void initialize( const TQString& relPath ); diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index 3b70fe9c2..132aa8193 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -52,7 +52,7 @@ URLButton::URLButton( const TQString& url, TQWidget* parent ) initialize( url ); } -URLButton::URLButton( const KConfigGroup& config, TQWidget* parent ) +URLButton::URLButton( const TDEConfigGroup& config, TQWidget* parent ) : PanelButton( parent, "URLButton" ) , fileItem( 0 ) , pDlg( 0 ) @@ -99,7 +99,7 @@ void URLButton::initialize( const TQString& _url ) } } -void URLButton::saveConfig( KConfigGroup& config ) const +void URLButton::saveConfig( TDEConfigGroup& config ) const { config.writePathEntry("URL", fileItem->url().prettyURL()); } diff --git a/kicker/kicker/buttons/urlbutton.h b/kicker/kicker/buttons/urlbutton.h index c2cbd2a19..ba4a1b43d 100644 --- a/kicker/kicker/buttons/urlbutton.h +++ b/kicker/kicker/buttons/urlbutton.h @@ -38,11 +38,11 @@ class URLButton : public PanelButton public: URLButton( const TQString& url, TQWidget* parent ); - URLButton( const KConfigGroup& config, TQWidget* parent ); + URLButton( const TDEConfigGroup& config, TQWidget* parent ); virtual ~URLButton(); - void saveConfig( KConfigGroup& config ) const; + void saveConfig( TDEConfigGroup& config ) const; virtual void properties(); diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 5fc276d44..a35b34fd0 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -255,7 +255,7 @@ void AppletContainer::showAppletMenu() clearOpMenu(); } -void AppletContainer::slotRemoved(KConfig* config) +void AppletContainer::slotRemoved(TDEConfig* config) { BaseContainer::slotRemoved(config); @@ -288,13 +288,13 @@ void AppletContainer::focusRequested(bool focus) emit maintainFocus(focus); } -void AppletContainer::doLoadConfiguration( KConfigGroup& config ) +void AppletContainer::doLoadConfiguration( TDEConfigGroup& config ) { setWidthForHeightHint(config.readNumEntry("WidthForHeightHint", 0)); setHeightForWidthHint(config.readNumEntry("HeightForWidthHint", 0)); } -void AppletContainer::doSaveConfiguration( KConfigGroup& config, +void AppletContainer::doSaveConfiguration( TDEConfigGroup& config, bool layoutOnly ) const { // immutability is checked by ContainerBase diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 18ce050d5..458f18fe0 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQHBox; class QXEmbed; class TQBoxLayout; -class KConfig; +class TDEConfig; class AppletHandle; @@ -72,7 +72,7 @@ signals: void updateLayout(); public slots: - virtual void slotRemoved(KConfig* config); + virtual void slotRemoved(TDEConfig* config); virtual void setPopupDirection(KPanelApplet::Direction d); virtual void setOrientation(KPanelExtension::Orientation o); virtual void setImmutable(bool immutable); @@ -82,8 +82,8 @@ public slots: void activateWindow(); protected: - virtual void doLoadConfiguration( KConfigGroup& ); - virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; + virtual void doLoadConfiguration( TDEConfigGroup& ); + virtual void doSaveConfiguration( TDEConfigGroup&, bool layoutOnly ) const; virtual void alignmentChange(KPanelExtension::Alignment a); virtual TQPopupMenu* createOpMenu(); diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index e224efe7a..56c09f285 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -72,13 +72,13 @@ void BaseContainer::setImmutable(bool immutable) clearOpMenu(); } -void BaseContainer::loadConfiguration( KConfigGroup& group ) +void BaseContainer::loadConfiguration( TDEConfigGroup& group ) { setFreeSpace( TQMIN( group.readDoubleNumEntry( "FreeSpace2", 0 ), 1 ) ); doLoadConfiguration( group ); } -void BaseContainer::saveConfiguration(KConfigGroup& group, +void BaseContainer::saveConfiguration(TDEConfigGroup& group, bool layoutOnly) const { if (isImmutable()) @@ -101,7 +101,7 @@ void BaseContainer::configure(KPanelExtension::Orientation o, configure(); } -void BaseContainer::slotRemoved(KConfig* config) +void BaseContainer::slotRemoved(TDEConfig* config) { if (!config) { diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index f1eaddee1..88e06e715 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpanelextension.h> #include <kpanelapplet.h> -class KConfigGroup; +class TDEConfigGroup; class TQPopupMenu; class BaseContainer : public TQWidget @@ -80,8 +80,8 @@ public: TQPopupMenu* opMenu(); void clearOpMenu(); - void loadConfiguration( KConfigGroup& ); - void saveConfiguration( KConfigGroup&, bool layoutOnly = false ) const; + void loadConfiguration( TDEConfigGroup& ); + void saveConfiguration( TDEConfigGroup&, bool layoutOnly = false ) const; void configure(KPanelExtension::Orientation, KPanelApplet::Direction); virtual void configure() {} @@ -93,7 +93,7 @@ public: virtual TQString visibleName() const = 0; public slots: - virtual void slotRemoved(KConfig* config); + virtual void slotRemoved(TDEConfig* config); virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; } virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; } @@ -108,8 +108,8 @@ signals: void focusReqested(bool); protected: - virtual void doLoadConfiguration( KConfigGroup& ) {} - virtual void doSaveConfiguration( KConfigGroup&, + virtual void doLoadConfiguration( TDEConfigGroup& ) {} + virtual void doSaveConfiguration( TDEConfigGroup&, bool /* layoutOnly */ ) const {} virtual void alignmentChange(KPanelExtension::Alignment) {} diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 0cd7d6f19..0ec70bc93 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -114,7 +114,7 @@ void ButtonContainer::configure() } } -void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool layoutOnly) const +void ButtonContainer::doSaveConfiguration(TDEConfigGroup& config, bool layoutOnly) const { // immutability is checked by ContainerBase if (_button && !layoutOnly) @@ -315,7 +315,7 @@ void ButtonContainer::slotMenuClosed() _button->setDown(false); } -void ButtonContainer::checkImmutability(const KConfigGroup& config) +void ButtonContainer::checkImmutability(const TDEConfigGroup& config) { m_immutable = config.groupIsImmutable() || config.entryIsImmutable("ConfigFile") || @@ -323,7 +323,7 @@ void ButtonContainer::checkImmutability(const KConfigGroup& config) } // KMenuButton containerpan -KMenuButtonContainer::KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) +KMenuButtonContainer::KMenuButtonContainer(const TDEConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -359,7 +359,7 @@ DesktopButtonContainer::DesktopButtonContainer(TQPopupMenu *opMenu, TQWidget* pa embedButton( new DesktopButton(this) ); } -DesktopButtonContainer::DesktopButtonContainer(const KConfigGroup& config, +DesktopButtonContainer::DesktopButtonContainer(const TDEConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { @@ -384,7 +384,7 @@ ServiceButtonContainer::ServiceButtonContainer( const KService::Ptr &service, _actions = KPanelApplet::Preferences; } -ServiceButtonContainer::ServiceButtonContainer( const KConfigGroup& config, +ServiceButtonContainer::ServiceButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { @@ -411,7 +411,7 @@ URLButtonContainer::URLButtonContainer( const TQString& url, TQPopupMenu* opMenu _actions = KPanelApplet::Preferences; } -URLButtonContainer::URLButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) +URLButtonContainer::URLButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -437,7 +437,7 @@ BrowserButtonContainer::BrowserButtonContainer(const TQString &startDir, TQPopup _actions = KPanelApplet::Preferences; } -BrowserButtonContainer::BrowserButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) +BrowserButtonContainer::BrowserButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -452,7 +452,7 @@ ServiceMenuButtonContainer::ServiceMenuButtonContainer(const TQString& relPath, embedButton( new ServiceMenuButton(relPath, this) ); } -ServiceMenuButtonContainer::ServiceMenuButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) +ServiceMenuButtonContainer::ServiceMenuButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -470,7 +470,7 @@ TQString ServiceMenuButtonContainer::visibleName() const } // WindowListButton container -WindowListButtonContainer::WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) +WindowListButtonContainer::WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -484,7 +484,7 @@ WindowListButtonContainer::WindowListButtonContainer(TQPopupMenu *opMenu, TQWidg } // BookmarkButton container -BookmarksButtonContainer::BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) +BookmarksButtonContainer::BookmarksButtonContainer(const TDEConfigGroup& config, TQPopupMenu *opMenu, TQWidget* parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -515,7 +515,7 @@ NonKDEAppButtonContainer::NonKDEAppButtonContainer(const TQString &name, _actions = KPanelApplet::Preferences; } -NonKDEAppButtonContainer::NonKDEAppButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) +NonKDEAppButtonContainer::NonKDEAppButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); @@ -530,7 +530,7 @@ ExtensionButtonContainer::ExtensionButtonContainer(const TQString& df, TQPopupMe embedButton( new ExtensionButton(df, this) ); } -ExtensionButtonContainer::ExtensionButtonContainer( const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) +ExtensionButtonContainer::ExtensionButtonContainer( const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent) : ButtonContainer(opMenu, parent) { checkImmutability(config); diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index f67ac5ec2..79d75e594 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQLayout; class PanelButton; -class KConfigGroup; +class TDEConfigGroup; class ButtonContainer : public BaseContainer { @@ -68,10 +68,10 @@ protected slots: void dragButton(const TQPixmap icon); protected: - virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; + virtual void doSaveConfiguration( TDEConfigGroup&, bool layoutOnly ) const; void embedButton(PanelButton* p); TQPopupMenu* createOpMenu(); - void checkImmutability(const KConfigGroup&); + void checkImmutability(const TDEConfigGroup&); protected: PanelButton *_button; @@ -82,7 +82,7 @@ protected: class KMenuButtonContainer : public ButtonContainer { public: - KMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + KMenuButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); KMenuButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); virtual TQString appletType() const { return "KMenuButton"; } virtual TQString icon() const { return "kmenu"; } @@ -95,7 +95,7 @@ public: class DesktopButtonContainer : public ButtonContainer { public: - DesktopButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + DesktopButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); DesktopButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "DesktopButton"; } virtual TQString icon() const { return "desktop"; } @@ -105,7 +105,7 @@ public: class ServiceButtonContainer : public ButtonContainer { public: - ServiceButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + ServiceButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); ServiceButtonContainer(const KService::Ptr & service, TQPopupMenu* opMenu,TQWidget* parent = 0); ServiceButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu,TQWidget* parent = 0); TQString appletType() const { return "ServiceButton"; } @@ -116,7 +116,7 @@ public: class URLButtonContainer : public ButtonContainer { public: - URLButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + URLButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); URLButtonContainer(const TQString& url, TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "URLButton"; } virtual TQString icon() const; @@ -126,7 +126,7 @@ public: class BrowserButtonContainer : public ButtonContainer { public: - BrowserButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + BrowserButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); BrowserButtonContainer(const TQString& startDir, TQPopupMenu* opMenu, const TQString& icon = "kdisknav", TQWidget* parent = 0); TQString appletType() const { return "BrowserButton"; } virtual TQString icon() const { return "kdisknav"; } @@ -137,7 +137,7 @@ public: class ServiceMenuButtonContainer : public ButtonContainer { public: - ServiceMenuButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + ServiceMenuButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); ServiceMenuButtonContainer(const TQString& relPath, TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "ServiceMenuButton"; } virtual TQString icon() const; @@ -148,7 +148,7 @@ public: class WindowListButtonContainer : public ButtonContainer { public: - WindowListButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "WindowListButton"; } virtual TQString icon() const { return "window_list"; } @@ -159,7 +159,7 @@ public: class BookmarksButtonContainer : public ButtonContainer { public: - BookmarksButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); + BookmarksButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); BookmarksButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "BookmarksButton"; } virtual TQString icon() const { return "bookmark"; } @@ -170,7 +170,7 @@ public: class NonKDEAppButtonContainer : public ButtonContainer { public: - NonKDEAppButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); + NonKDEAppButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); NonKDEAppButtonContainer(const TQString &name, const TQString &description, const TQString &filePath, const TQString &icon, const TQString &cmdLine, bool inTerm, @@ -183,7 +183,7 @@ public: class ExtensionButtonContainer : public ButtonContainer { public: - ExtensionButtonContainer(const KConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); + ExtensionButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget *parent=0); ExtensionButtonContainer(const TQString& desktopFile, TQPopupMenu* opMenu, TQWidget *parent= 0); TQString appletType() const { return "ExtensionButton"; } virtual TQString icon() const; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 37cd1516a..7639fe146 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -172,7 +172,7 @@ void ExtensionContainer::init() updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup(extensionId()); int tmp = config->readNumEntry("UserHidden", Unhidden); if (tmp > Unhidden && tmp <= RightBottom) @@ -187,7 +187,7 @@ void ExtensionContainer::init() // defaults in the settings object since the extension may differ // from the "normal" panels. for example, the universal sidebar's // preferred position is the left, not the bottom/top - KConfigSkeleton::ItemInt* item = dynamic_cast<KConfigSkeleton::ItemInt*>(m_settings.findItem("Position")); + TDEConfigSkeleton::ItemInt* item = dynamic_cast<TDEConfigSkeleton::ItemInt*>(m_settings.findItem("Position")); if (item) { KPanelExtension::Position p = m_extension->preferedPosition(); @@ -195,13 +195,13 @@ void ExtensionContainer::init() item->readConfig(m_settings.config()); } - item = dynamic_cast<KConfigSkeleton::ItemInt*>(m_settings.findItem("Size")); + item = dynamic_cast<TDEConfigSkeleton::ItemInt*>(m_settings.findItem("Size")); if (item) { item->setDefaultValue(m_extension->sizeSetting()); } - item = dynamic_cast<KConfigSkeleton::ItemInt*>(m_settings.findItem("CustomSize")); + item = dynamic_cast<TDEConfigSkeleton::ItemInt*>(m_settings.findItem("CustomSize")); if (item) { item->setDefaultValue(m_extension->customSize()); @@ -359,7 +359,7 @@ void ExtensionContainer::readConfig() void ExtensionContainer::writeConfig() { // kdDebug(1210) << "ExtensionContainer::writeConfig()" << endl; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup(extensionId()); config->writePathEntry("ConfigFile", _info.configFile()); @@ -984,7 +984,7 @@ void ExtensionContainer::animatedHide(bool left) // save our hidden status so that when kicker starts up again // we'll come back in the same state - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); @@ -998,7 +998,7 @@ bool ExtensionContainer::reserveStrut() const KPanelExtension::Alignment ExtensionContainer::alignment() const { - // KConfigXT really needs to get support for vars that are enums that + // TDEConfigXT really needs to get support for vars that are enums that // are defined in other classes return static_cast<KPanelExtension::Alignment>(m_settings.alignment()); } @@ -1385,7 +1385,7 @@ void ExtensionContainer::positionChange(KPanelExtension::Position p) void ExtensionContainer::updateHighlightColor() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("WM"); TQColor color = TQApplication::palette().active().highlight(); m_highlightColor = config->readColorEntry("activeBackground", &color); @@ -1470,7 +1470,7 @@ void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) KPanelExtension::Size ExtensionContainer::size() const { - // KConfigXT really needs to get support for vars that are enums that + // TDEConfigXT really needs to get support for vars that are enums that // are defined in other classes return static_cast<KPanelExtension::Size>(m_settings.size()); } @@ -1592,7 +1592,7 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const KPanelExtension::Position ExtensionContainer::position() const { - // KConfigXT really needs to get support for vars that are enums that + // TDEConfigXT really needs to get support for vars that are enums that // are defined in other classes return static_cast<KPanelExtension::Position>(m_settings.position()); } diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 81752bffa..8948341d1 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -43,7 +43,7 @@ class TQTimer; class TQVBox; class QXEmbed; class HideButton; -class KConfig; +class TDEConfig; class KWinModule; class PopupWidgetFilter; class PanelExtensionOpMenu; diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index d2407182e..12949f95b 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -70,7 +70,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // for multihead extern int kicker_screen_number; -ContainerArea::ContainerArea(KConfig* _c, +ContainerArea::ContainerArea(TDEConfig* _c, TQWidget* parent, TQPopupMenu* opMenu, const char* name) @@ -310,7 +310,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) continue; } - KConfigGroup group(_config, appletId.latin1()); + TDEConfigGroup group(_config, appletId.latin1()); BaseContainer* a = 0; @@ -395,13 +395,13 @@ void ContainerArea::saveContainerConfig(bool layoutOnly) BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget()); if (a) { - KConfigGroup group(_config, a->appletId().latin1()); + TDEConfigGroup group(_config, a->appletId().latin1()); a->saveConfiguration(group, layoutOnly); alist.append(a->appletId()); } } - KConfigGroup group( _config, "General" ); + TDEConfigGroup group( _config, "General" ); group.writeEntry("Applets2", alist); _config->sync(); diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index 54bbf6f48..f52003982 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "panner.h" #include "container_base.h" -class KConfig; +class TDEConfig; class DragIndicator; class PanelContainer; class KRootPixmap; @@ -48,7 +48,7 @@ class ContainerArea : public Panner Q_OBJECT public: - ContainerArea( KConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 ); + ContainerArea( TDEConfig* config, TQWidget* parent, TQPopupMenu* opMenu, const char* name = 0 ); ~ContainerArea(); void initialize(bool useDefaultConfig); @@ -150,7 +150,7 @@ private: BaseContainer::List m_containers; BaseContainer* _moveAC; KPanelExtension::Position _pos; - KConfig* _config; + TDEConfig* _config; DragIndicator* _dragIndicator; BaseContainer* _dragMoveAC; TQPoint _dragMoveOffset; diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg index 12bf9e37c..b8fd66100 100644 --- a/kicker/kicker/core/extensionSettings.kcfg +++ b/kicker/kicker/core/extensionSettings.kcfg @@ -11,7 +11,7 @@ <group name="General"> <entry name="IExist" type="Bool"> - <label>Whether this panel actually exists or not. Primarily to work around the fact that KConfigXT won't write a config file unless there is at least one non-default entry.</label> + <label>Whether this panel actually exists or not. Primarily to work around the fact that TDEConfigXT won't write a config file unless there is at least one non-default entry.</label> <default>false</default> </entry> <entry name="Position" type="Int" > diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index fce133a0f..62594443f 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -87,7 +87,7 @@ ExtensionManager::~ExtensionManager() void ExtensionManager::initialize() { // kdDebug(1210) << "ExtensionManager::loadContainerConfig()" << endl; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); PluginManager* pm = PluginManager::the(); // set up the "main" panel @@ -175,9 +175,9 @@ void ExtensionManager::initialize() void ExtensionManager::configureMenubar(bool duringInit) { - KConfig menuConfig( "kdesktoprc", true ); - if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false) - || KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false )) + TDEConfig menuConfig( "kdesktoprc", true ); + if( TDEConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false) + || TDEConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false )) { if (TDEGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() || m_menubarPanel) @@ -239,7 +239,7 @@ void ExtensionManager::migrateMenubar() // panel, meaning kickerrc itself would have to be vastly modified // with lots of complications. not work it IMHO. - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General"); if (config->readBoolEntry("CheckedForMenubar", false)) @@ -272,7 +272,7 @@ void ExtensionManager::migrateMenubar() config->setGroup(extensionId); TQString extension = config->readPathEntry("ConfigFile"); - KConfig extensionConfig(locate("config", extension)); + TDEConfig extensionConfig(locate("config", extension)); extensionConfig.setGroup("General"); if (extensionConfig.hasKey("Applets2")) @@ -290,7 +290,7 @@ void ExtensionManager::migrateMenubar() continue; } - KConfigGroup group(&extensionConfig, appletId.latin1()); + TDEConfigGroup group(&extensionConfig, appletId.latin1()); TQString appletType = appletId.left(appletId.findRev('_')); if (appletType == "Applet") @@ -299,7 +299,7 @@ void ExtensionManager::migrateMenubar() if (appletFile.find("menuapplet.desktop") != -1) { TQString menubarConfig = locate("config", extension); - KIO::NetAccess::copy(menubarConfig, + TDEIO::NetAccess::copy(menubarConfig, locateLocal("config", "kicker_menubarpanelrc"), 0); elist.remove(it); @@ -322,7 +322,7 @@ void ExtensionManager::saveContainerConfig() { // kdDebug(1210) << "ExtensionManager::saveContainerConfig()" << endl; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); // build the extension list TQStringList elist; diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 864bcec6f..3fa04e374 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -197,7 +197,7 @@ void Kicker::slotSettingsChanged(int category) void Kicker::paletteChanged() { - KConfigGroup c(TDEGlobal::config(), "General"); + TDEConfigGroup c(TDEGlobal::config(), "General"); KickerSettings::setTintColor(c.readColorEntry("TintColor", &palette().active().mid())); KickerSettings::self()->writeConfig(); @@ -227,7 +227,7 @@ void Kicker::configure() { static bool notFirstConfig = false; - KConfig* c = TDEGlobal::config(); + TDEConfig* c = TDEGlobal::config(); c->reparseConfiguration(); c->setGroup("General"); m_canAddContainers = !c->entryIsImmutable("Applets2"); diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 893efdd41..17a148474 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -122,7 +122,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) aboutData.addAuthor("John Firebaugh",0, "[email protected]"); aboutData.addAuthor("Waldo Bastian", I18N_NOOP("Kiosk mode"), "[email protected]"); - aboutData.addCredit("Jessica Hall", /* I18N_NOOP("KConfigXT") */ 0, "[email protected]"); + aboutData.addCredit("Jessica Hall", /* I18N_NOOP("TDEConfigXT") */ 0, "[email protected]"); aboutData.addCredit("Stefan Nikolaus", /* I18N_NOOP("Bug fixes") */ 0, "[email protected]"); aboutData.addCredit("Benoît Minisini", /* I18N_NOOP("Bug fixes") */ 0, "[email protected]"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index 0ac38610f..32eeba076 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -113,7 +113,7 @@ AppletInfo::List PluginManager::plugins(const TQStringList& desktopFiles, PluginManager::PluginManager() { - KConfigGroup generalGroup(TDEGlobal::config(), "General"); + TDEConfigGroup generalGroup(TDEGlobal::config(), "General"); m_untrustedApplets = generalGroup.readListEntry("UntrustedApplets"); m_untrustedExtensions = generalGroup.readListEntry("UntrustedExtensions"); } @@ -282,7 +282,7 @@ AppletContainer* PluginManager::createAppletContainer( { // we haven't loaded this puppy before and we're not in the untrusted list m_untrustedApplets.append(desktopFile); - KConfigGroup generalGroup(TDEGlobal::config(), "General"); + TDEConfigGroup generalGroup(TDEGlobal::config(), "General"); generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets); generalGroup.sync(); } @@ -335,7 +335,7 @@ ExtensionContainer* PluginManager::createExtensionContainer(const TQString& desk { // we don't have an instance around and we're not in the untrusted list! m_untrustedExtensions.append(desktopFile); - KConfigGroup generalGroup(TDEGlobal::config(), "General"); + TDEConfigGroup generalGroup(TDEGlobal::config(), "General"); generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions); generalGroup.sync(); } @@ -349,7 +349,7 @@ void PluginManager::clearUntrustedLists() m_untrustedExtensions.clear(); m_untrustedApplets.clear(); - KConfigGroup generalGroup(TDEGlobal::config(), "General"); + TDEConfigGroup generalGroup(TDEGlobal::config(), "General"); generalGroup.writeEntry("UntrustedApplets", m_untrustedApplets); generalGroup.writeEntry("UntrustedExtensions", m_untrustedExtensions); generalGroup.sync(); diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 748850eee..4a6639574 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -74,7 +74,7 @@ void ShowDesktop::slotWindowAdded(WId w) if ((windowType == NET::Normal || windowType == NET::Unknown) && inf.mappingState() == NET::Visible) { - KConfig twincfg( "twinrc", true ); // see in twin + TDEConfig twincfg( "twinrc", true ); // see in twin twincfg.setGroup( "Windows" ); if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) { diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 696065266..c6ca4ab32 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -149,7 +149,7 @@ void PanelBrowserMenu::initialize() // only the first part menu got them if(_startid == 0 && !_filesOnly) { insertTitle(path()); - KConfig *c = TDEGlobal::config(); + TDEConfig *c = TDEGlobal::config(); c->setGroup("menus"); insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); if (kapp->authorize("shell_access") && c->readBoolEntry("kickerOpenInTerminalIsVisible",false)) @@ -229,7 +229,7 @@ void PanelBrowserMenu::initialize() else if(fi->isFile()) { TQString name = fi->fileName(); - TQString title = KIO::decodeFileName(name); + TQString title = TDEIO::decodeFileName(name); TQPixmap icon; TQString path = fi->absFilePath(); @@ -449,7 +449,7 @@ void PanelBrowserMenu::slotExec(int id) void PanelBrowserMenu::slotOpenTerminal() { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); config->setGroup("General"); TQString term = config->readPathEntry("TerminalApplication", "konsole"); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 8dca46038..84c977331 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -383,7 +383,7 @@ void PanelKMenu::initialize() /* If the user configured ksmserver to */ - KConfig ksmserver("ksmserverrc", false, false); + TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 7dc8424d1..eba68ed1c 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -1206,7 +1206,7 @@ void KMenu::initialize() /* If the user configured ksmserver to */ - KConfig ksmserver("ksmserverrc", false, false); + TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage())); m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout")); @@ -1289,7 +1289,7 @@ void KMenu::insertStaticExitItems() m_exitView->leftView()->insertItem( "lock", i18n( "Lock" ), i18n( "Lock screen" ), "kicker:/lock", nId++, index++ ); - KConfig ksmserver("ksmserverrc", false, false); + TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { @@ -2890,7 +2890,7 @@ void KMenu::slotContextMenu(int selected) TQDataStream ds(ba, IO_WriteOnly); KURL src,dest; - KIO::CopyJob *job; + TDEIO::CopyJob *job; TDEProcess *proc; @@ -2904,7 +2904,7 @@ void KMenu::slotContextMenu(int selected) dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( src.fileName() ); - job = KIO::copyAs( src, dest ); + job = TDEIO::copyAs( src, dest ); job->setDefaultPermissions( true ); } else { @@ -3492,7 +3492,7 @@ void KMenu::updateMedia() uint64_t total = ( uint64_t )sfs.f_blocks * sfs.f_bsize; uint64_t avail = ( uint64_t )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize; if ( avail < total && avail > 1024 ) { - label += " " + i18n( "(%1 available)" ).arg( KIO::convertSize(avail) ); + label += " " + i18n( "(%1 available)" ).arg( TDEIO::convertSize(avail) ); } } } diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 64f779807..6432cf032 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -669,7 +669,7 @@ void PanelServiceMenu::slotContextMenu(int selected) TQDataStream ds(ba, IO_WriteOnly); KURL src,dest; - KIO::CopyJob *job; + TDEIO::CopyJob *job; KDesktopFile *df; switch (selected) { @@ -680,7 +680,7 @@ void PanelServiceMenu::slotContextMenu(int selected) dest.setPath( TDEGlobalSettings::desktopPath() ); dest.setFileName( src.fileName() ); - job = KIO::copyAs( src, dest ); + job = TDEIO::copyAs( src, dest ); job->setDefaultPermissions( true ); break; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 0527f8224..f300df3a2 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -196,7 +196,7 @@ TQString copyDesktopFile(const KURL& url) TQString file = newDesktopFile(url); KURL dest; dest.setPath(file); - KIO::NetAccess::upload(url.path(), dest, 0); + TDEIO::NetAccess::upload(url.path(), dest, 0); return file; } @@ -326,7 +326,7 @@ TQPoint popupPosition(KPanelApplet::Direction d, void colorize(TQImage& image) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("WM"); TQColor color = TQApplication::palette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 3ecc19dfd..e9481ea85 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -108,7 +108,7 @@ void PanelButton::configure() return; } - KConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" ); + TDEConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" ); if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) { setTile( TQString::null ); return; diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 3a455a58f..b67bc2b9a 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kickertip.h" class TQPopupMenu; -class KConfigGroup; +class TDEConfigGroup; class KShadowEngine; /** @@ -66,9 +66,9 @@ public: /** * Prompts the button to save it's configuration. Subclass specific - * settings should be saved in this method to the KConfigGroup passed in. + * settings should be saved in this method to the TDEConfigGroup passed in. */ - virtual void saveConfig(KConfigGroup&) const {} + virtual void saveConfig(TDEConfigGroup&) const {} /** * Reimplement this to display a properties dialog for your button. diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index ea7668c8a..a3c076741 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/kicker/menuext/konq-profiles/konqy_menu.cpp @@ -63,7 +63,7 @@ void KonquerorProfilesMenu::initialize() for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt ) { TQFileInfo info( *pIt ); - TQString profileName = KIO::decodeFileName( info.baseName() ); + TQString profileName = TDEIO::decodeFileName( info.baseName() ); TQString niceName=profileName; KSimpleConfig cfg( *pIt, true ); if ( cfg.hasGroup( "Profile" ) ) diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index 16e11a039..dbaa1e434 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -205,7 +205,7 @@ void KonsoleMenu::initialize() for (TQStringList::ConstIterator pIt = profiles.begin(); pIt != pEnd; ++pIt) { TQFileInfo info(*pIt); - TQString profileName = KIO::decodeFileName(info.baseName()); + TQString profileName = TDEIO::decodeFileName(info.baseName()); TQString niceName = profileName; KSimpleConfig cfg(*pIt, true); if (cfg.hasGroup("Profile")) diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 5ab089f0d..19ff376f4 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -180,7 +180,7 @@ TOM::TOM(TQWidget *parent, const char *name) setCaption(i18n("Task-Oriented Menu")); // KMenu legacy: support some menu config options - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("menus"); m_detailedTaskEntries = config->readBoolEntry("DetailedMenuEntries", false); if (m_detailedTaskEntries) @@ -244,7 +244,7 @@ void TOM::initializeRecentDocs() } } -int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) +int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) { if (!config.hasGroup("General")) { @@ -452,7 +452,7 @@ void TOM::initialize() for (; eIt != eEnd; ++eIt ) { - KConfig config(*dIt + *eIt); + TDEConfig config(*dIt + *eIt); appendTaskGroup(config); } } @@ -476,7 +476,7 @@ void TOM::initialize() if (!destinationsConfig.isEmpty() && TQFile::exists(destinationsConfig)) { - KConfig config(destinationsConfig); + TDEConfig config(destinationsConfig); numDests = appendTaskGroup(config, false); } @@ -516,7 +516,7 @@ void TOM::initialize() } - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); TQStringList menu_ext = config->readListEntry("Extensions"); if (!menu_ext.isEmpty()) { @@ -628,7 +628,7 @@ void TOM::removeTask() * bool TOM::loadSidePixmap() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQColor color = palette().active().highlight(); TQImage image; diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h index b42feb536..e4b8cc884 100644 --- a/kicker/menuext/tom/tom.h +++ b/kicker/menuext/tom/tom.h @@ -66,7 +66,7 @@ class TOM : public KPanelMenu protected: void reload(); - int appendTaskGroup(KConfig& config, bool inSubMenu = true ); + int appendTaskGroup(TDEConfig& config, bool inSubMenu = true ); void initializeRecentApps(TQPopupMenu* menu); //int insertTOMTitle(TQPopupMenu* menu, const TQString &text, int id = -1, int index = -1); diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 581719660..db7fd8729 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -62,8 +62,8 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid TQFile configFileObject(locateLocal("config", configFile)); if (!configFileObject.exists()) { - KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); - KConfig localConfig(configFile); + TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE); + TDEConfig localConfig(configFile); globalConfig.copyTo(configFile, &localConfig); localConfig.sync(); } diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index b5bcf40e1..6215f9ba6 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -93,7 +93,7 @@ TaskManager::~TaskManager() void TaskManager::configure_startup() { - KConfig c("klaunchrc", true); + TDEConfig c("klaunchrc", true); c.setGroup("FeedbackStyle"); if (!c.readBoolEntry("TaskbarButton", false)) return; diff --git a/kioslave/DESIGN b/kioslave/DESIGN index 92a03b212..d1b21fd3a 100644 --- a/kioslave/DESIGN +++ b/kioslave/DESIGN @@ -23,7 +23,7 @@ Any time you'd like to use non blocking IO over a high level protocol That's nice, but how do I use it? -Basically, you create "jobs" by calling a public KIO::blah method +Basically, you create "jobs" by calling a public TDEIO::blah method (the correct prototypes, etc, are in kio/job.h). Once this is done, you connect to the result() signal, and wait for the result. There are other signals emitted by jobs, see kio/jobclasses.h. Once again, diff --git a/kioslave/about/kio_about.cpp b/kioslave/about/kio_about.cpp index 5ef52196d..29fba8e4a 100644 --- a/kioslave/about/kio_about.cpp +++ b/kioslave/about/kio_about.cpp @@ -25,7 +25,7 @@ #include <kinstance.h> #include <kurl.h> -using namespace KIO; +using namespace TDEIO; AboutProtocol::AboutProtocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("about", pool_socket, app_socket) diff --git a/kioslave/about/kio_about.h b/kioslave/about/kio_about.h index a5bff2a8f..db1302f04 100644 --- a/kioslave/about/kio_about.h +++ b/kioslave/about/kio_about.h @@ -26,7 +26,7 @@ #include <kio/slavebase.h> -class AboutProtocol : public KIO::SlaveBase +class AboutProtocol : public TDEIO::SlaveBase { public: AboutProtocol(const TQCString &pool_socket, const TQCString &app_socket); diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index e527c2db4..9f8906f17 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -31,14 +31,14 @@ #include "cgi.h" -using namespace KIO; +using namespace TDEIO; CgiProtocol::CgiProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "cgi", pool, app ) { kdDebug(7124) << "CgiProtocol::CgiProtocol" << endl; - KConfig cfg( "kcmcgirc" ); + TDEConfig cfg( "kcmcgirc" ); cfg.setGroup( "General" ); mCgiPaths = cfg.readListEntry( "Paths" ); } @@ -150,7 +150,7 @@ void CgiProtocol::get( const KURL& url ) if ( !fd ) { kdDebug(7124) << "Error opening '" << filepath << "'" << endl; - error( KIO::ERR_CANNOT_OPEN_FOR_READING, filepath ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, filepath ); return; } } else { @@ -160,7 +160,7 @@ void CgiProtocol::get( const KURL& url ) if ( !fd ) { kdDebug(7124) << "Error running '" << cmd << "'" << endl; - error( KIO::ERR_CANNOT_OPEN_FOR_READING, cmd ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, cmd ); return; } } diff --git a/kioslave/cgi/cgi.h b/kioslave/cgi/cgi.h index 908b6bc99..8f9dc88c8 100644 --- a/kioslave/cgi/cgi.h +++ b/kioslave/cgi/cgi.h @@ -28,7 +28,7 @@ class TDEProcess; This class implements an ioslave for viewing CGI script output without the need to run a web server. */ -class CgiProtocol : public KIO::SlaveBase +class CgiProtocol : public TDEIO::SlaveBase { public: CgiProtocol( const TQCString &pool, const TQCString &app ); diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp index a5c0181c5..828f50f69 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT KCModule *create_cgi( TQWidget *parent, const char * ) + KDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * ) { TDEGlobal::locale()->insertCatalogue("kcmcgi"); return new KCMCgi( parent, "kcmcgi" ); @@ -42,7 +42,7 @@ extern "C" KCMCgi::KCMCgi(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { setButtons(Default|Apply); @@ -63,7 +63,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name) connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removePath() ) ); connect( mListBox, TQT_SIGNAL( clicked ( TQListBoxItem * )),this, TQT_SLOT( slotItemSelected( TQListBoxItem *))); - mConfig = new KConfig("kcmcgirc"); + mConfig = new TDEConfig("kcmcgirc"); load(); updateButton(); diff --git a/kioslave/cgi/kcmcgi/kcmcgi.h b/kioslave/cgi/kcmcgi/kcmcgi.h index d68d3fe23..f6ad715b3 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.h +++ b/kioslave/cgi/kcmcgi/kcmcgi.h @@ -23,9 +23,9 @@ class TQListBox; class TQPushButton; -class KConfig; +class TDEConfig; -class KCMCgi : public KCModule +class KCMCgi : public TDECModule { Q_OBJECT public: @@ -49,7 +49,7 @@ class KCMCgi : public KCModule TQPushButton *mAddButton; TQPushButton *mRemoveButton; - KConfig *mConfig; + TDEConfig *mConfig; }; #endif diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc index 7db846d17..793921c6c 100644 --- a/kioslave/filter/filter.cc +++ b/kioslave/filter/filter.cc @@ -54,7 +54,7 @@ int kdemain( int argc, char ** argv) } FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app ) - : KIO::SlaveBase( protocol, pool, app ) + : TDEIO::SlaveBase( protocol, pool, app ) { TQString mimetype = TQString::fromLatin1("application/x-") + TQString::fromLatin1(protocol); filter = KFilterBase::findFilterByMimeType( mimetype ); @@ -65,12 +65,12 @@ void FilterProtocol::get( const KURL & ) { if (subURL.isEmpty()) { - error( KIO::ERR_NO_SOURCE_PROTOCOL, mProtocol ); + error( TDEIO::ERR_NO_SOURCE_PROTOCOL, mProtocol ); return; } if (!filter) { - error( KIO::ERR_INTERNAL, mProtocol ); + error( TDEIO::ERR_INTERNAL, mProtocol ); return; } needSubURLData(); @@ -146,7 +146,7 @@ void FilterProtocol::get( const KURL & ) if (bError) { - error(KIO::ERR_COULD_NOT_READ, subURL.url()); + error(TDEIO::ERR_COULD_NOT_READ, subURL.url()); subURL = KURL(); // Clear subURL return; } @@ -157,7 +157,7 @@ void FilterProtocol::get( const KURL & ) void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ ) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put")); + error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put")); } void FilterProtocol::setSubURL(const KURL &url) diff --git a/kioslave/filter/filter.h b/kioslave/filter/filter.h index 4f81af3c7..54a91322a 100644 --- a/kioslave/filter/filter.h +++ b/kioslave/filter/filter.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kio/global.h> #include <kio/slavebase.h> -class FilterProtocol : public TQObject, public KIO::SlaveBase +class FilterProtocol : public TQObject, public TDEIO::SlaveBase { public: FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app ); diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp index efa4d7cb8..8f330b95e 100644 --- a/kioslave/finger/kio_finger.cpp +++ b/kioslave/finger/kio_finger.cpp @@ -37,7 +37,7 @@ #include "kio_finger.h" -using namespace KIO; +using namespace TDEIO; static const TQString defaultRefreshRate = "60"; diff --git a/kioslave/finger/kio_finger.h b/kioslave/finger/kio_finger.h index 97c68f8c3..e9044f26d 100644 --- a/kioslave/finger/kio_finger.h +++ b/kioslave/finger/kio_finger.h @@ -28,7 +28,7 @@ #include <kio/global.h> #include <kio/slavebase.h> -class FingerProtocol : public TQObject, public KIO::SlaveBase +class FingerProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index ac8556291..3a527e39e 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -114,7 +114,7 @@ static int isNXFish = 0; #define E(x) ((const char*)remoteEncoding()->encode(x).data()) -using namespace KIO; +using namespace TDEIO; extern "C" { static void ripper(int) @@ -310,7 +310,7 @@ void fishProtocol::openConnection() { if (connectionHost.isEmpty() && !isNXFish) { - error( KIO::ERR_UNKNOWN_HOST, TQString::null ); + error( TDEIO::ERR_UNKNOWN_HOST, TQString::null ); return; } @@ -532,7 +532,7 @@ bool fishProtocol::connectionStart() { /** writes one chunk of data to stdin of child process */ -void fishProtocol::writeChild(const char *buf, KIO::fileoffset_t len) { +void fishProtocol::writeChild(const char *buf, TDEIO::fileoffset_t len) { if (outBufPos >= 0 && outBuf) { #if 0 TQString debug; @@ -549,7 +549,7 @@ void fishProtocol::writeChild(const char *buf, KIO::fileoffset_t len) { /** manages initial communication setup including password queries */ -int fishProtocol::establishConnection(char *buffer, KIO::fileoffset_t len) { +int fishProtocol::establishConnection(char *buffer, TDEIO::fileoffset_t len) { TQString buf; buf.setLatin1(buffer,len); int pos; @@ -812,7 +812,7 @@ void fishProtocol::manageConnection(const TQString &l) { int rc = handleResponse(line); UDSAtom atom; TQDateTime dt; - KIO::filesize_t fsize; + TDEIO::filesize_t fsize; int pos, pos2, pos3; bool isOk = false; if (!rc) { @@ -1158,7 +1158,7 @@ void fishProtocol::manageConnection(const TQString &l) { } else if (fishCommand == FISH_STAT) { UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = url.fileName(); udsStatEntry.append( atom ); statEntry(udsStatEntry); @@ -1225,7 +1225,7 @@ void fishProtocol::sent() } } -int fishProtocol::received(const char *buffer, KIO::fileoffset_t buflen) +int fishProtocol::received(const char *buffer, TDEIO::fileoffset_t buflen) { int pos = 0; do { diff --git a/kioslave/fish/fish.h b/kioslave/fish/fish.h index 6508d39ba..8a85a9bd2 100644 --- a/kioslave/fish/fish.h +++ b/kioslave/fish/fish.h @@ -29,7 +29,7 @@ #define FISH_EXEC_CMD 'X' -class fishProtocol : public KIO::SlaveBase +class fishProtocol : public TDEIO::SlaveBase { public: fishProtocol(const TQCString &pool_socket, const TQCString &app_socket); @@ -90,9 +90,9 @@ private: // Private attributes /** buffer for data to be written */ const char *outBuf; /** current write position in buffer */ - KIO::fileoffset_t outBufPos; + TDEIO::fileoffset_t outBufPos; /** length of buffer */ - KIO::fileoffset_t outBufLen; + TDEIO::fileoffset_t outBufLen; /** use su if true else use ssh */ bool local; /** // FIXME: just a workaround for konq deficiencies */ @@ -102,13 +102,13 @@ private: // Private attributes protected: // Protected attributes /** for LIST/STAT */ - KIO::UDSEntry udsEntry; + TDEIO::UDSEntry udsEntry; /** for LIST/STAT */ - KIO::UDSEntry udsStatEntry; + TDEIO::UDSEntry udsStatEntry; /** for LIST/STAT */ - KIO::UDSAtom typeAtom; + TDEIO::UDSAtom typeAtom; /** for LIST/STAT */ - KIO::UDSAtom mimeAtom; + TDEIO::UDSAtom mimeAtom; /** for LIST/STAT */ TQString thisFn; /** for STAT */ @@ -127,7 +127,7 @@ protected: // Protected attributes /** password of current connection */ TQString connectionPassword; /** AuthInfo object used for logging in */ - KIO::AuthInfo connectionAuth; + TDEIO::AuthInfo connectionAuth; /** number of lines received, == 0 -> everything went ok */ int errorCount; /** queue for lines to be sent */ @@ -137,13 +137,13 @@ protected: // Protected attributes /** queue for commands to be sent */ TQValueList<int> commandCodes; /** bytes still to be read in raw mode */ - KIO::fileoffset_t rawRead; + TDEIO::fileoffset_t rawRead; /** bytes still to be written in raw mode */ - KIO::fileoffset_t rawWrite; + TDEIO::fileoffset_t rawWrite; /** data bytes to read in next read command */ - KIO::fileoffset_t recvLen; + TDEIO::fileoffset_t recvLen; /** data bytes to write in next write command */ - KIO::fileoffset_t sendLen; + TDEIO::fileoffset_t sendLen; /** true if the last write operation was finished */ bool writeReady; /** true if a command stack is currently executing */ @@ -157,7 +157,7 @@ protected: // Protected attributes /** true if file may be overwritten */ bool checkOverwrite; /** current position of write */ - KIO::fileoffset_t putPos; + TDEIO::fileoffset_t putPos; /** true if file already existed */ bool checkExist; /** true if this is the first login attempt (== use cached password) */ @@ -169,7 +169,7 @@ protected: // Protected attributes /** whther the mimetype has been sent already */ bool mimeTypeSent; /** number of bytes read so far */ - KIO::fileoffset_t dataRead; + TDEIO::fileoffset_t dataRead; /** details about each fishCommand */ static const struct fish_info { const char *command; @@ -186,8 +186,8 @@ protected: // Protected attributes int fishCodeLen; protected: // Protected methods /** manages initial communication setup including password queries */ - int establishConnection(char *buffer, KIO::fileoffset_t buflen); - int received(const char *buffer, KIO::fileoffset_t buflen); + int establishConnection(char *buffer, TDEIO::fileoffset_t buflen); + int received(const char *buffer, TDEIO::fileoffset_t buflen); void sent(); /** builds each FISH request and sets the error counter */ bool sendCommand(fish_command_type cmd, ...); @@ -200,7 +200,7 @@ protected: // Protected methods /** creates the subprocess */ bool connectionStart(); /** writes one chunk of data to stdin of child process */ - void writeChild(const char *buf, KIO::fileoffset_t len); + void writeChild(const char *buf, TDEIO::fileoffset_t len); /** parses response from server and acts accordingly */ void manageConnection(const TQString &line); /** writes to process */ diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp index c9f8daa80..8b80e8d54 100644 --- a/kioslave/floppy/kio_floppy.cpp +++ b/kioslave/floppy/kio_floppy.cpp @@ -47,7 +47,7 @@ #include <kio/global.h> #include <klocale.h> -using namespace KIO; +using namespace TDEIO; extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } @@ -197,56 +197,56 @@ bool FloppyProtocol::stopAfterError(const KURL& url, const TQString& drive) kdDebug(7101)<<"line: -"<<line<<"-"<<endl; if (line.find("resource busy") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access drive %1.\nThe drive is still busy.\nWait until it is inactive and then try again.").arg(drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access drive %1.\nThe drive is still busy.\nWait until it is inactive and then try again.").arg(drive)); } else if ((line.find("Disk full") > -1) || (line.find("No free cluster") > -1)) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not write to file %1.\nThe disk in drive %2 is probably full.").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not write to file %1.\nThe disk in drive %2 is probably full.").arg(url.prettyURL(),drive)); } //file not found else if (line.find("not found") > -1) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } //no disk else if (line.find("not configured") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2").arg(url.prettyURL(),drive)); } else if (line.find("No such device") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2 or you do not have enough permissions to access the drive.").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2 or you do not have enough permissions to access the drive.").arg(url.prettyURL(),drive)); } else if (line.find("not supported") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe drive %2 is not supported.").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe drive %2 is not supported.").arg(url.prettyURL(),drive)); } //not supported or no such drive else if (line.find("Permission denied") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nMake sure the floppy in drive %2 is a DOS-formatted floppy disk \nand that the permissions of the device file (e.g. /dev/fd0) are set correctly (e.g. rwxrwxrwx).").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nMake sure the floppy in drive %2 is a DOS-formatted floppy disk \nand that the permissions of the device file (e.g. /dev/fd0) are set correctly (e.g. rwxrwxrwx).").arg(url.prettyURL(),drive)); } else if (line.find("non DOS media") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe disk in drive %2 is probably not a DOS-formatted floppy disk.").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe disk in drive %2 is probably not a DOS-formatted floppy disk.").arg(url.prettyURL(),drive)); } else if (line.find("Read-only") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Access denied.\nCould not write to %1.\nThe disk in drive %2 is probably write-protected.").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Access denied.\nCould not write to %1.\nThe disk in drive %2 is probably write-protected.").arg(url.prettyURL(),drive)); } else if ((outputString.find("already exists") > -1) || (outputString.find("Skipping ") > -1)) { - error( KIO::ERR_FILE_ALREADY_EXIST,url.prettyURL()); + error( TDEIO::ERR_FILE_ALREADY_EXIST,url.prettyURL()); //return false; } else if (outputString.find("could not read boot sector") > -1) { - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not read boot sector for %1.\nThere is probably not any disk in drive %2.").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not read boot sector for %1.\nThere is probably not any disk in drive %2.").arg(url.prettyURL(),drive)); //return false; } else { - error( KIO::ERR_UNKNOWN, outputString); + error( TDEIO::ERR_UNKNOWN, outputString); } return true; } @@ -365,29 +365,29 @@ void FloppyProtocol::listDir( const KURL& _url) void FloppyProtocol::errorMissingMToolsProgram(const TQString& name) { - error(KIO::ERR_SLAVE_DEFINED,i18n("Could not start program \"%1\".\nEnsure that the mtools package is installed correctly on your system.").arg(name)); + error(TDEIO::ERR_SLAVE_DEFINED,i18n("Could not start program \"%1\".\nEnsure that the mtools package is installed correctly on your system.").arg(name)); } void FloppyProtocol::createUDSEntry(const StatInfo& info, UDSEntry& entry) { UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = info.name; entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = info.size; entry.append(atom); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = info.time; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long=info.mode; entry.append( atom ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long =(info.isDir?S_IFDIR:S_IFREG); entry.append( atom ); } @@ -568,7 +568,7 @@ StatInfo FloppyProtocol::_stat(const KURL& url) if (m_stdoutSize==0) { info.isValid=false; - error( KIO::ERR_COULD_NOT_STAT, url.prettyURL()); + error( TDEIO::ERR_COULD_NOT_STAT, url.prettyURL()); return info; } @@ -583,11 +583,11 @@ StatInfo FloppyProtocol::_stat(const KURL& url) continue; StatInfo info=createStatInfo(line,true,url.fileName()); if (info.isValid==false) - error( KIO::ERR_COULD_NOT_STAT, url.prettyURL()); + error( TDEIO::ERR_COULD_NOT_STAT, url.prettyURL()); return info; } if (info.isValid==false) - error( KIO::ERR_COULD_NOT_STAT, url.prettyURL()); + error( TDEIO::ERR_COULD_NOT_STAT, url.prettyURL()); return info; } @@ -657,7 +657,7 @@ int FloppyProtocol::freeSpace(const KURL& url) if (m_stdoutSize==0) { - error( KIO::ERR_COULD_NOT_STAT, url.prettyURL()); + error( TDEIO::ERR_COULD_NOT_STAT, url.prettyURL()); return -1; } @@ -1141,7 +1141,7 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool ) if (bytesRead>freeSpaceLeft) { result=0; - error( KIO::ERR_SLAVE_DEFINED, i18n("Could not write to file %1.\nThe disk in drive %2 is probably full.").arg(url.prettyURL(),drive)); + error( TDEIO::ERR_SLAVE_DEFINED, i18n("Could not write to file %1.\nThe disk in drive %2 is probably full.").arg(url.prettyURL(),drive)); } else { @@ -1157,7 +1157,7 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool ) if (result<0) { perror("writing to stdin"); - error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, url.prettyURL()); + error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, url.prettyURL()); return; } diff --git a/kioslave/floppy/kio_floppy.h b/kioslave/floppy/kio_floppy.h index 3cc58488f..783e496ae 100644 --- a/kioslave/floppy/kio_floppy.h +++ b/kioslave/floppy/kio_floppy.h @@ -40,7 +40,7 @@ struct StatInfo }; -class FloppyProtocol : public KIO::SlaveBase +class FloppyProtocol : public TDEIO::SlaveBase { public: FloppyProtocol (const TQCString &pool, const TQCString &app ); @@ -60,7 +60,7 @@ class FloppyProtocol : public KIO::SlaveBase int readStderr(); StatInfo createStatInfo(const TQString line, bool makeStat=false, const TQString& dirName=""); - void createUDSEntry(const StatInfo& info, KIO::UDSEntry& entry); + void createUDSEntry(const StatInfo& info, TDEIO::UDSEntry& entry); StatInfo _stat(const KURL& _url); int freeSpace(const KURL& url); diff --git a/kioslave/home/homeimpl.cpp b/kioslave/home/homeimpl.cpp index 9d6d0d5bd..ea3dad520 100644 --- a/kioslave/home/homeimpl.cpp +++ b/kioslave/home/homeimpl.cpp @@ -69,7 +69,7 @@ bool HomeImpl::realURL(const TQString &name, const TQString &path, KURL &url) } -bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list) +bool HomeImpl::listHomes(TQValueList<TDEIO::UDSEntry> &list) { kdDebug() << "HomeImpl::listHomes" << endl; @@ -93,7 +93,7 @@ bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list) && !uid_list.contains( (*it).uid() ) ) { uid_list.append( (*it).uid() ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; createHomeEntry(entry, *it); list.append(entry); } @@ -103,10 +103,10 @@ bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list) return true; } -static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, +static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s = TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; @@ -114,19 +114,19 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, } -void HomeImpl::createTopLevelEntry(KIO::UDSEntry &entry) const +void HomeImpl::createTopLevelEntry(TDEIO::UDSEntry &entry) const { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, "."); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0555); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); - addAtom(entry, KIO::UDS_ICON_NAME, 0, "kfm_home"); - addAtom(entry, KIO::UDS_USER, 0, "root"); - addAtom(entry, KIO::UDS_GROUP, 0, "root"); + addAtom(entry, TDEIO::UDS_NAME, 0, "."); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0555); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "kfm_home"); + addAtom(entry, TDEIO::UDS_USER, 0, "root"); + addAtom(entry, TDEIO::UDS_GROUP, 0, "root"); } -void HomeImpl::createHomeEntry(KIO::UDSEntry &entry, +void HomeImpl::createHomeEntry(TDEIO::UDSEntry &entry, const KUser &user) { kdDebug() << "HomeImpl::createHomeEntry" << endl; @@ -140,13 +140,13 @@ void HomeImpl::createHomeEntry(KIO::UDSEntry &entry, full_name = user.fullName()+" ("+user.loginName()+")"; } - full_name = KIO::encodeFileName( full_name ); + full_name = TDEIO::encodeFileName( full_name ); - addAtom(entry, KIO::UDS_NAME, 0, full_name); - addAtom(entry, KIO::UDS_URL, 0, "home:/"+user.loginName()); + addAtom(entry, TDEIO::UDS_NAME, 0, full_name); + addAtom(entry, TDEIO::UDS_URL, 0, "home:/"+user.loginName()); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); TQString icon_name = "folder_home2"; @@ -155,14 +155,14 @@ void HomeImpl::createHomeEntry(KIO::UDSEntry &entry, icon_name = "folder_home"; } - addAtom(entry, KIO::UDS_ICON_NAME, 0, icon_name); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon_name); KURL url; url.setPath(user.homeDir()); entry += extractUrlInfos(url); } -bool HomeImpl::statHome(const TQString &name, KIO::UDSEntry &entry) +bool HomeImpl::statHome(const TQString &name, TDEIO::UDSEntry &entry) { kdDebug() << "HomeImpl::statHome: " << name << endl; @@ -177,41 +177,41 @@ bool HomeImpl::statHome(const TQString &name, KIO::UDSEntry &entry) return false; } -void HomeImpl::slotStatResult(KIO::Job *job) +void HomeImpl::slotStatResult(TDEIO::Job *job) { if ( job->error() == 0) { - KIO::StatJob *stat_job = static_cast<KIO::StatJob *>(job); + TDEIO::StatJob *stat_job = static_cast<TDEIO::StatJob *>(job); m_entryBuffer = stat_job->statResult(); } tqApp->eventLoop()->exitLoop(); } -KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) +TDEIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) { m_entryBuffer.clear(); - KIO::StatJob *job = KIO::stat(url, false); - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( slotStatResult(KIO::Job *) ) ); + TDEIO::StatJob *job = TDEIO::stat(url, false); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); - KIO::UDSEntry::iterator it = m_entryBuffer.begin(); - KIO::UDSEntry::iterator end = m_entryBuffer.end(); + TDEIO::UDSEntry::iterator it = m_entryBuffer.begin(); + TDEIO::UDSEntry::iterator end = m_entryBuffer.end(); - KIO::UDSEntry infos; + TDEIO::UDSEntry infos; for(; it!=end; ++it) { switch( (*it).m_uds ) { - case KIO::UDS_ACCESS: - case KIO::UDS_USER: - case KIO::UDS_GROUP: - case KIO::UDS_CREATION_TIME: - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: + case TDEIO::UDS_ACCESS: + case TDEIO::UDS_USER: + case TDEIO::UDS_GROUP: + case TDEIO::UDS_CREATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: infos.append(*it); break; default: @@ -219,7 +219,7 @@ KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) } } - addAtom(infos, KIO::UDS_LOCAL_PATH, 0, url.path()); + addAtom(infos, TDEIO::UDS_LOCAL_PATH, 0, url.path()); return infos; } diff --git a/kioslave/home/homeimpl.h b/kioslave/home/homeimpl.h index 62c7b3868..786fa598a 100644 --- a/kioslave/home/homeimpl.h +++ b/kioslave/home/homeimpl.h @@ -36,19 +36,19 @@ public: bool parseURL(const KURL &url, TQString &name, TQString &path) const; bool realURL(const TQString &name, const TQString &path, KURL &url); - bool statHome(const TQString &name, KIO::UDSEntry &entry); - bool listHomes(TQValueList<KIO::UDSEntry> &list); + bool statHome(const TQString &name, TDEIO::UDSEntry &entry); + bool listHomes(TQValueList<TDEIO::UDSEntry> &list); - void createTopLevelEntry(KIO::UDSEntry &entry) const; + void createTopLevelEntry(TDEIO::UDSEntry &entry) const; private slots: - void slotStatResult(KIO::Job *job); + void slotStatResult(TDEIO::Job *job); private: - void createHomeEntry(KIO::UDSEntry& entry, const KUser &user); + void createHomeEntry(TDEIO::UDSEntry& entry, const KUser &user); - KIO::UDSEntry extractUrlInfos(const KURL &url); - KIO::UDSEntry m_entryBuffer; + TDEIO::UDSEntry extractUrlInfos(const KURL &url); + TDEIO::UDSEntry m_entryBuffer; long m_effectiveUid; diff --git a/kioslave/home/kio_home.cpp b/kioslave/home/kio_home.cpp index 3f307f6fd..bd55aee0a 100644 --- a/kioslave/home/kio_home.cpp +++ b/kioslave/home/kio_home.cpp @@ -72,14 +72,14 @@ bool HomeProtocol::rewriteURL(const KURL &url, KURL &newUrl) if ( !m_impl.parseURL(url, name, path) ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return false; } if ( !m_impl.realURL(name, path, newUrl) ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return false; } @@ -102,7 +102,7 @@ void HomeProtocol::listDir(const KURL &url) if ( !ok ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return; } @@ -111,14 +111,14 @@ void HomeProtocol::listDir(const KURL &url) void HomeProtocol::listRoot() { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::UDSEntryList home_entries; + TDEIO::UDSEntryList home_entries; bool ok = m_impl.listHomes(home_entries); if (!ok) // can't happen { - error(KIO::ERR_UNKNOWN, ""); + error(TDEIO::ERR_UNKNOWN, ""); return; } @@ -127,8 +127,8 @@ void HomeProtocol::listRoot() m_impl.createTopLevelEntry(entry); listEntry(entry, false); - KIO::UDSEntryListIterator it = home_entries.begin(); - KIO::UDSEntryListIterator end = home_entries.end(); + TDEIO::UDSEntryListIterator it = home_entries.begin(); + TDEIO::UDSEntryListIterator end = home_entries.end(); for(; it!=end; ++it) { @@ -149,7 +149,7 @@ void HomeProtocol::stat(const KURL &url) if ( path.isEmpty() || path == "/" ) { // The root is "virtual" - it's not a single physical directory - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; m_impl.createTopLevelEntry( entry ); statEntry( entry ); finished(); @@ -161,13 +161,13 @@ void HomeProtocol::stat(const KURL &url) if ( !ok ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return; } if( path.isEmpty() ) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if ( m_impl.statHome(name, entry) ) { @@ -176,7 +176,7 @@ void HomeProtocol::stat(const KURL &url) } else { - error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } } else diff --git a/kioslave/home/kio_home.h b/kioslave/home/kio_home.h index cf5f3a3cd..25607a5d4 100644 --- a/kioslave/home/kio_home.h +++ b/kioslave/home/kio_home.h @@ -23,7 +23,7 @@ #include <kio/forwardingslavebase.h> #include "homeimpl.h" -class HomeProtocol : public KIO::ForwardingSlaveBase +class HomeProtocol : public TDEIO::ForwardingSlaveBase { public: HomeProtocol(const TQCString &protocol, const TQCString &pool, diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc index 4af1f4c63..71d2dc863 100644 --- a/kioslave/info/info.cc +++ b/kioslave/info/info.cc @@ -16,7 +16,7 @@ #include "info.h" -using namespace KIO; +using namespace TDEIO; InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "info", pool, app ) @@ -39,7 +39,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app ) errorStr = "kde-info2html" + i18n( "\nUnable to locate file %1 which is necessary to run this service. " "Please check your software installation" ).arg( missing ); } - error( KIO::ERR_CANNOT_LAUNCH_PROCESS, errorStr ); + error( TDEIO::ERR_CANNOT_LAUNCH_PROCESS, errorStr ); exit(); } @@ -230,7 +230,7 @@ void InfoProtocol::stat( const KURL & ) UDSAtom uds_atom; // Regular file with rwx permission for all - uds_atom.m_uds = KIO::UDS_FILE_TYPE; + uds_atom.m_uds = TDEIO::UDS_FILE_TYPE; uds_atom.m_long = S_IFREG | S_IRWXU | S_IRWXG | S_IRWXO; uds_entry.append( uds_atom ); diff --git a/kioslave/info/info.h b/kioslave/info/info.h index 068546803..639348513 100644 --- a/kioslave/info/info.h +++ b/kioslave/info/info.h @@ -7,7 +7,7 @@ class TDEProcess; -class InfoProtocol : public KIO::SlaveBase +class InfoProtocol : public TDEIO::SlaveBase { public: diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index fe958c35c..d4a29f1d4 100644 --- a/kioslave/ldap/kio_ldap.cpp +++ b/kioslave/ldap/kio_ldap.cpp @@ -24,7 +24,7 @@ #include "kio_ldap.h" -using namespace KIO; +using namespace TDEIO; using namespace KABC; extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } diff --git a/kioslave/ldap/kio_ldap.h b/kioslave/ldap/kio_ldap.h index d262b61ea..4ee15ad2b 100644 --- a/kioslave/ldap/kio_ldap.h +++ b/kioslave/ldap/kio_ldap.h @@ -12,7 +12,7 @@ #include <ldap.h> #include <kabc/ldapurl.h> -class LDAPProtocol : public KIO::SlaveBase +class LDAPProtocol : public TDEIO::SlaveBase { public: LDAPProtocol( const TQCString &protocol, const TQCString &pool, const TQCString &app ); @@ -51,7 +51,7 @@ class LDAPProtocol : public KIO::SlaveBase const TQByteArray &value, bool critical ); void addModOp( LDAPMod ***pmods, int mod_type, const TQString &attr, const TQByteArray &value ); - void LDAPEntry2UDSEntry( const TQString &dn, KIO::UDSEntry &entry, + void LDAPEntry2UDSEntry( const TQString &dn, TDEIO::UDSEntry &entry, const KABC::LDAPUrl &usrc, bool dir=false ); int asyncSearch( KABC::LDAPUrl &usrc ); @@ -59,7 +59,7 @@ class LDAPProtocol : public KIO::SlaveBase void LDAPErr( const KURL &url, int err = LDAP_SUCCESS ); void changeCheck( KABC::LDAPUrl &url ); - void fillAuthInfo( KIO::AuthInfo &info ); + void fillAuthInfo( TDEIO::AuthInfo &info ); }; #endif diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp index 47b56119c..a7fc4da0f 100644 --- a/kioslave/mac/kio_mac.cpp +++ b/kioslave/mac/kio_mac.cpp @@ -32,7 +32,7 @@ #include "kio_mac.moc" -using namespace KIO; +using namespace TDEIO; extern "C" { int KDE_EXPORT kdemain(int, char **argv) { @@ -76,10 +76,10 @@ void MacProtocol::get(const KURL& url) { UDSEntry entry = doStat(url); UDSEntry::Iterator it; for(it = entry.begin(); it != entry.end(); ++it) { - if ((*it).m_uds == KIO::UDS_MIME_TYPE) { + if ((*it).m_uds == TDEIO::UDS_MIME_TYPE) { mime = (*it).m_str; } - if ((*it).m_uds == KIO::UDS_SIZE) { + if ((*it).m_uds == TDEIO::UDS_SIZE) { totalSize((*it).m_long); } } @@ -180,7 +180,7 @@ void MacProtocol::stat(const KURL& url) { //doStat(), does all the work that stat() needs //it's been separated out so it can be called from get() which //also need information -TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) { +TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) { TQString filename = prepareHP(url); if (filename.isNull()) { @@ -225,7 +225,7 @@ TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) { return entry; }//if filename == null - return TQValueList<KIO::UDSAtom>(); + return TQValueList<TDEIO::UDSAtom>(); } //prepareHP() called from get() listDir() and stat() @@ -239,7 +239,7 @@ TQString MacProtocol::prepareHP(const KURL& url) { //find out if a device has been specified in the query e.g. ?dev=/dev/fd0 //or in the config file (query device entries are saved to config file) TQString device; - KConfig* config = new KConfig("macrc"); + TDEConfig* config = new TDEConfig("macrc"); TQString query = url.query(); int modepos = query.find("dev="); @@ -333,7 +333,7 @@ TQString MacProtocol::prepareHP(const KURL& url) { //makeUDS() takes a line of output from hpls -l and converts it into // one of these UDSEntrys to return //called from listDir() and stat() -TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) { +TQValueList<TDEIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) { TQString line(_line); UDSEntry entry; @@ -342,38 +342,38 @@ TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) { TQRegExp fileRE("^([f|F]). +(....)/(....) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +(.*)"); if (dirRE.exactMatch(line)) { UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = dirRE.cap(6); entry.append(atom); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = makeTime(dirRE.cap(4), dirRE.cap(3), dirRE.cap(5)); entry.append(atom); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; entry.append(atom); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = 0755; entry.append(atom); } else if (fileRE.exactMatch(line)) { UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = fileRE.cap(9); entry.append(atom); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; TQString theSize(fileRE.cap(4)); //TODO: this is data size, what about resource size? atom.m_long = theSize.toLong(); entry.append(atom); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = makeTime(fileRE.cap(7), fileRE.cap(6), fileRE.cap(8)); entry.append(atom); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; if (TQString(fileRE.cap(1)) == TQString("F")) { //if locked then read only atom.m_long = 0444; } else { @@ -381,7 +381,7 @@ TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) { } entry.append(atom); - atom.m_uds = KIO::UDS_MIME_TYPE; + atom.m_uds = TDEIO::UDS_MIME_TYPE; TQString mimetype = getMimetype(fileRE.cap(2),fileRE.cap(3)); atom.m_str = mimetype.local8Bit(); entry.append(atom); @@ -389,17 +389,17 @@ TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) { // Is it a file or a link/alias, just make aliases link to themselves if (TQString(fileRE.cap(2)) == TQString("adrp") || TQString(fileRE.cap(2)) == TQString("fdrp")) { - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFREG; entry.append(atom); - atom.m_uds = KIO::UDS_LINK_DEST; + atom.m_uds = TDEIO::UDS_LINK_DEST; atom.m_str = fileRE.cap(9); //I have a file called "Mozilla alias" the name // of which displays funny because of this. // No idea why. Same for other kioslaves. A font thing? entry.append(atom); } else { - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFREG; entry.append(atom); } diff --git a/kioslave/mac/kio_mac.h b/kioslave/mac/kio_mac.h index 1376efe7a..2501791b2 100644 --- a/kioslave/mac/kio_mac.h +++ b/kioslave/mac/kio_mac.h @@ -26,7 +26,7 @@ #include <tqfile.h> #include <tqtextstream.h> -class MacProtocol : public TQObject, public KIO::SlaveBase +class MacProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT public: @@ -40,12 +40,12 @@ protected slots: void slotSetDataStdOutput(TDEProcess*, char *s, int len); protected: TQString prepareHP(const KURL& _url); - TQValueList<KIO::UDSAtom> makeUDS(const TQString& _line); + TQValueList<TDEIO::UDSAtom> makeUDS(const TQString& _line); int makeTime(TQString mday, TQString mon, TQString third); TQString getMimetype(TQString type, TQString app); - TQValueList<KIO::UDSAtom> doStat(const KURL& url); + TQValueList<TDEIO::UDSAtom> doStat(const KURL& url); - KIO::filesize_t processedBytes; + TDEIO::filesize_t processedBytes; TQString standardOutputStream; TDEProcess* myTDEProcess; diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index cc7ac770b..1fd81de8d 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -46,7 +46,7 @@ #include <kfilterbase.h> #include <kfilterdev.h> -using namespace KIO; +using namespace TDEIO; MANProtocol *MANProtocol::_self = 0; @@ -649,7 +649,7 @@ void MANProtocol::stat( const KURL& url) if (!parseUrl(url.path(), title, section)) { - error(KIO::ERR_MALFORMED_URL, url.url()); + error(TDEIO::ERR_MALFORMED_URL, url.url()); return; } @@ -1485,7 +1485,7 @@ void MANProtocol::listDir(const KURL &url) TQString section; if ( !parseUrl(url.path(), title, section) ) { - error( KIO::ERR_MALFORMED_URL, url.url() ); + error( TDEIO::ERR_MALFORMED_URL, url.url() ); return; } @@ -1495,7 +1495,7 @@ void MANProtocol::listDir(const KURL &url) UDSEntry uds_entry; UDSAtom uds_atom; - uds_atom.m_uds = KIO::UDS_NAME; // we only do names... + uds_atom.m_uds = TDEIO::UDS_NAME; // we only do names... uds_entry.append( uds_atom ); TQStringList::Iterator it = list.begin(); diff --git a/kioslave/man/kio_man.h b/kioslave/man/kio_man.h index ee987ddd9..caa59ff3b 100644 --- a/kioslave/man/kio_man.h +++ b/kioslave/man/kio_man.h @@ -32,7 +32,7 @@ #include <kio/slavebase.h> -class MANProtocol : public TQObject, public KIO::SlaveBase +class MANProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp index 06ced93ec..01768e33d 100644 --- a/kioslave/man/kmanpart.cpp +++ b/kioslave/man/kmanpart.cpp @@ -94,18 +94,18 @@ bool KManPart::openFile() url.setProtocol( "man" ); url.setPath( m_file ); - m_job = KIO::get( url, true, false ); - connect( m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( KIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( jobDone( KIO::Job * ) ) ); + m_job = TDEIO::get( url, true, false ); + connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } -void KManPart::readData(KIO::Job * , const TQByteArray & data) +void KManPart::readData(TDEIO::Job * , const TQByteArray & data) { write(data,data.size()); } -void KManPart::jobDone( KIO::Job *) +void KManPart::jobDone( TDEIO::Job *) { m_job=0; end(); diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h index 2f39af11f..dd290cf75 100644 --- a/kioslave/man/kmanpart.h +++ b/kioslave/man/kmanpart.h @@ -66,13 +66,13 @@ class KManPart : public KHTMLPart public slots: virtual bool openURL( const KURL &url ); protected slots: - void readData(KIO::Job * , const TQByteArray & data); - void jobDone( KIO::Job *); + void readData(TDEIO::Job * , const TQByteArray & data); + void jobDone( TDEIO::Job *); protected: virtual bool openFile(); TDEInstance *m_instance; KParts::BrowserExtension * m_extension; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; }; #endif diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp index 29c48d990..9036583df 100644 --- a/kioslave/media/kcmodule/main.cpp +++ b/kioslave/media/kcmodule/main.cpp @@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) ) MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& ) - : KCModule(MediaFactory::instance(), parent, name ) + : TDECModule(MediaFactory::instance(), parent, name ) { TDEGlobal::locale()->insertCatalogue("kio_media"); TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/kioslave/media/kcmodule/main.h b/kioslave/media/kcmodule/main.h index 14e747bd9..b5297aed5 100644 --- a/kioslave/media/kcmodule/main.h +++ b/kioslave/media/kcmodule/main.h @@ -22,7 +22,7 @@ #include <kcmodule.h> -class MediaModule : public KCModule +class MediaModule : public TDECModule { Q_OBJECT @@ -38,8 +38,8 @@ protected slots: void moduleChanged( bool state ); private: - KCModule *m_notifierModule; - KCModule *m_managerModule; + TDECModule *m_notifierModule; + TDECModule *m_managerModule; }; #endif diff --git a/kioslave/media/kcmodule/managermodule.cpp b/kioslave/media/kcmodule/managermodule.cpp index 712b026f4..4c9859889 100644 --- a/kioslave/media/kcmodule/managermodule.cpp +++ b/kioslave/media/kcmodule/managermodule.cpp @@ -34,7 +34,7 @@ #include "mediamanagersettings.h" ManagerModule::ManagerModule( TQWidget* parent, const char* name ) - : KCModule( parent, name ) + : TDECModule( parent, name ) { view = new ManagerModuleView( this ); @@ -71,9 +71,9 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name ) void ManagerModule::load() { - KCModule::load(); + TDECModule::load(); - KConfig config("mediamanagerrc"); + TDEConfig config("mediamanagerrc"); config.setGroup("DefaultOptions"); view->option_automount->setChecked( config.readBoolEntry("automount", false) ); @@ -109,9 +109,9 @@ void ManagerModule::load() void ManagerModule::save() { - KCModule::save(); + TDECModule::save(); - KConfig config("mediamanagerrc"); + TDEConfig config("mediamanagerrc"); config.setGroup("DefaultOptions"); config.writeEntry("automount", view->option_automount->isChecked()); @@ -152,7 +152,7 @@ void ManagerModule::save() void ManagerModule::defaults() { - KCModule::defaults(); + TDECModule::defaults(); view->option_automount->setChecked(false); view->option_ro->setChecked(false); diff --git a/kioslave/media/kcmodule/managermodule.h b/kioslave/media/kcmodule/managermodule.h index e34610c7e..a26c7a24a 100644 --- a/kioslave/media/kcmodule/managermodule.h +++ b/kioslave/media/kcmodule/managermodule.h @@ -25,7 +25,7 @@ class ManagerModuleView; -class ManagerModule : public KCModule +class ManagerModule : public TDECModule { Q_OBJECT diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp index c7871c953..4146c514f 100644 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ b/kioslave/media/kcmodule/notifiermodule.cpp @@ -32,7 +32,7 @@ #include "mimetypelistboxitem.h" NotifierModule::NotifierModule(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); diff --git a/kioslave/media/kcmodule/notifiermodule.h b/kioslave/media/kcmodule/notifiermodule.h index 88f06c97b..391feb47f 100644 --- a/kioslave/media/kcmodule/notifiermodule.h +++ b/kioslave/media/kcmodule/notifiermodule.h @@ -26,7 +26,7 @@ #include "notifiersettings.h" #include "notifiermoduleview.h" -class NotifierModule : public KCModule +class NotifierModule : public TDECModule { Q_OBJECT diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp index eff311b0d..c6174da81 100644 --- a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp +++ b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp @@ -121,8 +121,8 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) if ( ::statvfs(TQFile::encodeName(mount_point), &vfs) != -1 ) { - m_total = static_cast<KIO::filesize_t>(vfs.f_blocks) * static_cast<KIO::filesize_t>(vfs.f_frsize); - m_free = static_cast<KIO::filesize_t>(vfs.f_bavail) * static_cast<KIO::filesize_t>(vfs.f_frsize); + m_total = static_cast<TDEIO::filesize_t>(vfs.f_blocks) * static_cast<TDEIO::filesize_t>(vfs.f_frsize); + m_free = static_cast<TDEIO::filesize_t>(vfs.f_bavail) * static_cast<TDEIO::filesize_t>(vfs.f_frsize); m_used = m_total - m_free; int percent = 0; diff --git a/kioslave/media/kfile-plugin/kfilemediaplugin.h b/kioslave/media/kfile-plugin/kfilemediaplugin.h index 7799ffc3d..df99c46c1 100644 --- a/kioslave/media/kfile-plugin/kfilemediaplugin.h +++ b/kioslave/media/kfile-plugin/kfilemediaplugin.h @@ -39,9 +39,9 @@ private: void addMimeType(const char *mimeType); const Medium askMedium(KFileMetaInfo &info); - KIO::filesize_t m_total; - KIO::filesize_t m_used; - KIO::filesize_t m_free; + TDEIO::filesize_t m_total; + TDEIO::filesize_t m_used; + TDEIO::filesize_t m_free; }; #endif diff --git a/kioslave/media/kio_media.cpp b/kioslave/media/kio_media.cpp index 113d1b311..d1647c6fc 100644 --- a/kioslave/media/kio_media.cpp +++ b/kioslave/media/kio_media.cpp @@ -76,7 +76,7 @@ bool MediaProtocol::rewriteURL(const KURL &url, KURL &newUrl) if ( !m_impl.parseURL(url, name, path) ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return false; } @@ -100,7 +100,7 @@ void MediaProtocol::put(const KURL &url, int permissions, if ( ok && path.isEmpty() ) { - error(KIO::ERR_CANNOT_OPEN_FOR_WRITING, url.prettyURL()); + error(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, url.prettyURL()); } else { @@ -145,7 +145,7 @@ void MediaProtocol::mkdir(const KURL &url, int permissions) if ( ok && path.isEmpty() ) { - error(KIO::ERR_COULD_NOT_MKDIR, url.prettyURL()); + error(TDEIO::ERR_COULD_NOT_MKDIR, url.prettyURL()); } else { @@ -162,7 +162,7 @@ void MediaProtocol::del(const KURL &url, bool isFile) if ( ok && path.isEmpty() ) { - error(KIO::ERR_CANNOT_DELETE, url.prettyURL()); + error(TDEIO::ERR_CANNOT_DELETE, url.prettyURL()); } else { @@ -177,7 +177,7 @@ void MediaProtocol::stat(const KURL &url) if( path.isEmpty() || path == "/" ) { // The root is "virtual" - it's not a single physical directory - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; m_impl.createTopLevelEntry( entry ); statEntry( entry ); finished(); @@ -189,13 +189,13 @@ void MediaProtocol::stat(const KURL &url) if ( !ok ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return; } if( path.isEmpty() ) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if ( m_impl.statMedium(name, entry) || m_impl.statMediumByLabel(name, entry) ) @@ -205,7 +205,7 @@ void MediaProtocol::stat(const KURL &url) } else { - error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } } else @@ -229,7 +229,7 @@ void MediaProtocol::listDir(const KURL &url) if ( !ok ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return; } @@ -238,9 +238,9 @@ void MediaProtocol::listDir(const KURL &url) void MediaProtocol::listRoot() { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::UDSEntryList media_entries; + TDEIO::UDSEntryList media_entries; bool ok = m_impl.listMedia(media_entries); if (!ok) @@ -254,8 +254,8 @@ void MediaProtocol::listRoot() m_impl.createTopLevelEntry(entry); listEntry(entry, false); - KIO::UDSEntryListIterator it = media_entries.begin(); - KIO::UDSEntryListIterator end = media_entries.end(); + TDEIO::UDSEntryListIterator it = media_entries.begin(); + TDEIO::UDSEntryListIterator end = media_entries.end(); for(; it!=end; ++it) { diff --git a/kioslave/media/kio_media.h b/kioslave/media/kio_media.h index 80da4a6cc..8a4cd86fb 100644 --- a/kioslave/media/kio_media.h +++ b/kioslave/media/kio_media.h @@ -24,7 +24,7 @@ #include "mediaimpl.h" -class MediaProtocol : public KIO::ForwardingSlaveBase +class MediaProtocol : public TDEIO::ForwardingSlaveBase { Q_OBJECT public: diff --git a/kioslave/media/libmediacommon/medium.cpp b/kioslave/media/libmediacommon/medium.cpp index 031e56788..38d68725b 100644 --- a/kioslave/media/libmediacommon/medium.cpp +++ b/kioslave/media/libmediacommon/medium.cpp @@ -147,7 +147,7 @@ void Medium::setHidden(bool state) void Medium::setUserLabel(const TQString &label) { - KConfig cfg("mediamanagerrc"); + TDEConfig cfg("mediamanagerrc"); cfg.setGroup("UserLabels"); TQString entry_name = m_properties[UUID]; @@ -166,7 +166,7 @@ void Medium::setUserLabel(const TQString &label) void Medium::loadUserLabel() { - KConfig cfg("mediamanagerrc"); + TDEConfig cfg("mediamanagerrc"); cfg.setGroup("UserLabels"); TQString entry_name = m_properties[UUID]; diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp index cc90e5ef7..254e591cb 100644 --- a/kioslave/media/libmediacommon/notifiersettings.cpp +++ b/kioslave/media/libmediacommon/notifiersettings.cpp @@ -227,7 +227,7 @@ void NotifierSettings::reload() m_actions.append( nothing ); m_idMap[ nothing->id() ] = nothing; - KConfig config( "medianotifierrc", true ); + TDEConfig config( "medianotifierrc", true ); TQMap<TQString,TQString> auto_actions_map = config.entryMap( "Auto Actions" ); TQMap<TQString,TQString>::iterator auto_it = auto_actions_map.begin(); diff --git a/kioslave/media/mediaimpl.cpp b/kioslave/media/mediaimpl.cpp index 8729c832d..8f132776b 100644 --- a/kioslave/media/mediaimpl.cpp +++ b/kioslave/media/mediaimpl.cpp @@ -75,7 +75,7 @@ bool MediaImpl::realURL(const TQString &name, const TQString &path, KURL &url) } -bool MediaImpl::statMedium(const TQString &name, KIO::UDSEntry &entry) +bool MediaImpl::statMedium(const TQString &name, TDEIO::UDSEntry &entry) { kdDebug(1219) << "MediaImpl::statMedium: " << name << endl; @@ -84,7 +84,7 @@ bool MediaImpl::statMedium(const TQString &name, KIO::UDSEntry &entry) if ( !reply.isValid() ) { - m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; + m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; m_lastErrorMessage = i18n("The TDE mediamanager is not running."); return false; } @@ -102,7 +102,7 @@ bool MediaImpl::statMedium(const TQString &name, KIO::UDSEntry &entry) return true; } -bool MediaImpl::statMediumByLabel(const TQString &label, KIO::UDSEntry &entry) +bool MediaImpl::statMediumByLabel(const TQString &label, TDEIO::UDSEntry &entry) { kdDebug(1219) << "MediaImpl::statMediumByLabel: " << label << endl; @@ -111,7 +111,7 @@ bool MediaImpl::statMediumByLabel(const TQString &label, KIO::UDSEntry &entry) if ( !reply.isValid() ) { - m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; + m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; m_lastErrorMessage = i18n("The TDE mediamanager is not running."); return false; } @@ -128,7 +128,7 @@ bool MediaImpl::statMediumByLabel(const TQString &label, KIO::UDSEntry &entry) } -bool MediaImpl::listMedia(TQValueList<KIO::UDSEntry> &list) +bool MediaImpl::listMedia(TQValueList<TDEIO::UDSEntry> &list) { kdDebug(1219) << "MediaImpl::listMedia" << endl; @@ -137,14 +137,14 @@ bool MediaImpl::listMedia(TQValueList<KIO::UDSEntry> &list) if ( !reply.isValid() ) { - m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; + m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; m_lastErrorMessage = i18n("The TDE mediamanager is not running."); return false; } const Medium::MList media = Medium::createList(reply); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; Medium::MList::const_iterator it = media.begin(); Medium::MList::const_iterator end = media.end(); @@ -173,7 +173,7 @@ bool MediaImpl::setUserLabel(const TQString &name, const TQString &label) if ( !reply.isValid() ) { - m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; + m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; m_lastErrorMessage = i18n("The TDE mediamanager is not running."); return false; } @@ -183,7 +183,7 @@ bool MediaImpl::setUserLabel(const TQString &name, const TQString &label) if (!returned_name.isEmpty() && returned_name!=name) { - m_lastErrorCode = KIO::ERR_DIR_ALREADY_EXIST; + m_lastErrorCode = TDEIO::ERR_DIR_ALREADY_EXIST; m_lastErrorMessage = i18n("This media name already exists."); return false; } @@ -193,7 +193,7 @@ bool MediaImpl::setUserLabel(const TQString &name, const TQString &label) if ( !reply.isValid() ) { - m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; + m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; m_lastErrorMessage = i18n("The TDE mediamanager is not running."); return false; } @@ -214,7 +214,7 @@ const Medium MediaImpl::findMediumByName(const TQString &name, bool &ok) } else { - m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; + m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; m_lastErrorMessage = i18n("The TDE mediamanager is not running."); ok = false; } @@ -226,7 +226,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) { if (medium.id().isEmpty()) { - m_lastErrorCode = KIO::ERR_COULD_NOT_MOUNT; + m_lastErrorCode = TDEIO::ERR_COULD_NOT_MOUNT; m_lastErrorMessage = i18n("No such medium."); return false; } @@ -234,7 +234,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) #ifdef COMPILE_HALBACKEND if ( medium.isEncrypted() && medium.clearDeviceUdi().isEmpty() ) { - m_lastErrorCode = KIO::ERR_COULD_NOT_MOUNT; + m_lastErrorCode = TDEIO::ERR_COULD_NOT_MOUNT; m_lastErrorMessage = i18n("The drive is encrypted."); return false; } @@ -248,14 +248,14 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) /* - KIO::Job* job = KIO::mount(false, 0, + TDEIO::Job* job = TDEIO::mount(false, 0, medium.deviceNode(), medium.mountPoint()); job->setAutoWarningHandlingEnabled(false); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( warning( KIO::Job *, const TQString & ) ), - this, TQT_SLOT( slotWarning( KIO::Job *, const TQString & ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotMountResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ), + this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) ); */ kapp->dcopClient() ->connectDCOPSignal("kded", "mediamanager", @@ -271,7 +271,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) else m_lastErrorMessage = i18n("Internal Error"); if (!m_lastErrorMessage.isEmpty()) - m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; + m_lastErrorCode = TDEIO::ERR_SLAVE_DEFINED; else { tqApp->eventLoop()->enterLoop(); } @@ -289,7 +289,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) if (medium.id().isEmpty()) { - m_lastErrorCode = KIO::ERR_COULD_NOT_MOUNT; + m_lastErrorCode = TDEIO::ERR_COULD_NOT_MOUNT; m_lastErrorMessage = i18n("No such medium."); return false; } @@ -297,12 +297,12 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) return true; } -void MediaImpl::slotWarning( KIO::Job * /*job*/, const TQString &msg ) +void MediaImpl::slotWarning( TDEIO::Job * /*job*/, const TQString &msg ) { emit warning( msg ); } -void MediaImpl::slotMountResult(KIO::Job *job) +void MediaImpl::slotMountResult(TDEIO::Job *job) { kdDebug(1219) << "MediaImpl::slotMountResult" << endl; @@ -327,10 +327,10 @@ void MediaImpl::slotMediumChanged(const TQString &name) } } -static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, +static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s = TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; @@ -338,55 +338,55 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, } -void MediaImpl::createTopLevelEntry(KIO::UDSEntry& entry) const +void MediaImpl::createTopLevelEntry(TDEIO::UDSEntry& entry) const { entry.clear(); - addAtom(entry, KIO::UDS_URL, 0, "media:/"); - addAtom(entry, KIO::UDS_NAME, 0, "."); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0555); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); - addAtom(entry, KIO::UDS_ICON_NAME, 0, "blockdevice"); + addAtom(entry, TDEIO::UDS_URL, 0, "media:/"); + addAtom(entry, TDEIO::UDS_NAME, 0, "."); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0555); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "blockdevice"); } -void MediaImpl::slotStatResult(KIO::Job *job) +void MediaImpl::slotStatResult(TDEIO::Job *job) { if ( job->error() == 0) { - KIO::StatJob *stat_job = static_cast<KIO::StatJob *>(job); + TDEIO::StatJob *stat_job = static_cast<TDEIO::StatJob *>(job); m_entryBuffer = stat_job->statResult(); } tqApp->eventLoop()->exitLoop(); } -KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) +TDEIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) { m_entryBuffer.clear(); - KIO::StatJob *job = KIO::stat(url, false); + TDEIO::StatJob *job = TDEIO::stat(url, false); job->setAutoWarningHandlingEnabled( false ); - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( slotStatResult(KIO::Job *) ) ); - connect( job, TQT_SIGNAL( warning( KIO::Job *, const TQString & ) ), - this, TQT_SLOT( slotWarning( KIO::Job *, const TQString & ) ) ); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) ); + connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ), + this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) ); tqApp->eventLoop()->enterLoop(); - KIO::UDSEntry::iterator it = m_entryBuffer.begin(); - KIO::UDSEntry::iterator end = m_entryBuffer.end(); + TDEIO::UDSEntry::iterator it = m_entryBuffer.begin(); + TDEIO::UDSEntry::iterator end = m_entryBuffer.end(); - KIO::UDSEntry infos; + TDEIO::UDSEntry infos; for(; it!=end; ++it) { switch( (*it).m_uds ) { - case KIO::UDS_ACCESS: - case KIO::UDS_USER: - case KIO::UDS_GROUP: - case KIO::UDS_CREATION_TIME: - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: + case TDEIO::UDS_ACCESS: + case TDEIO::UDS_USER: + case TDEIO::UDS_GROUP: + case TDEIO::UDS_CREATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: infos.append(*it); break; default: @@ -396,14 +396,14 @@ KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) if (url.isLocalFile()) { - addAtom(infos, KIO::UDS_LOCAL_PATH, 0, url.path()); + addAtom(infos, TDEIO::UDS_LOCAL_PATH, 0, url.path()); } return infos; } -void MediaImpl::createMediumEntry(KIO::UDSEntry& entry, +void MediaImpl::createMediumEntry(TDEIO::UDSEntry& entry, const Medium &medium) { kdDebug(1219) << "MediaProtocol::createMedium" << endl; @@ -414,30 +414,30 @@ void MediaImpl::createMediumEntry(KIO::UDSEntry& entry, entry.clear(); - addAtom(entry, KIO::UDS_URL, 0, url); + addAtom(entry, TDEIO::UDS_URL, 0, url); - TQString label = KIO::encodeFileName( medium.prettyLabel() ); - addAtom(entry, KIO::UDS_NAME, 0, label); + TQString label = TDEIO::encodeFileName( medium.prettyLabel() ); + addAtom(entry, TDEIO::UDS_NAME, 0, label); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, medium.mimeType()); - addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, medium.mimeType()); + addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "inode/directory"); if (!medium.iconName().isEmpty()) { - addAtom(entry, KIO::UDS_ICON_NAME, 0, medium.iconName()); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, medium.iconName()); } else { TQString mime = medium.mimeType(); TQString icon = KMimeType::mimeType(mime)->icon(mime, false); - addAtom(entry, KIO::UDS_ICON_NAME, 0, icon); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon); } if (medium.needMounting()) { - addAtom(entry, KIO::UDS_ACCESS, 0400); + addAtom(entry, TDEIO::UDS_ACCESS, 0400); } else { diff --git a/kioslave/media/mediaimpl.h b/kioslave/media/mediaimpl.h index 92b1d0202..4675ee2f9 100644 --- a/kioslave/media/mediaimpl.h +++ b/kioslave/media/mediaimpl.h @@ -39,12 +39,12 @@ public: bool parseURL(const KURL &url, TQString &name, TQString &path) const; bool realURL(const TQString &name, const TQString &path, KURL &url); - bool statMedium(const TQString &name, KIO::UDSEntry &entry); - bool statMediumByLabel(const TQString &label, KIO::UDSEntry &entry); - bool listMedia(TQValueList<KIO::UDSEntry> &list); + bool statMedium(const TQString &name, TDEIO::UDSEntry &entry); + bool statMediumByLabel(const TQString &label, TDEIO::UDSEntry &entry); + bool listMedia(TQValueList<TDEIO::UDSEntry> &list); bool setUserLabel(const TQString &name, const TQString &label); - void createTopLevelEntry(KIO::UDSEntry& entry) const; + void createTopLevelEntry(TDEIO::UDSEntry& entry) const; int lastErrorCode() const { return m_lastErrorCode; } TQString lastErrorMessage() const { return m_lastErrorMessage; } @@ -56,18 +56,18 @@ signals: void warning(const TQString &msg); private slots: - void slotWarning(KIO::Job *job, const TQString &msg); - void slotMountResult(KIO::Job *job); - void slotStatResult(KIO::Job *job); + void slotWarning(TDEIO::Job *job, const TQString &msg); + void slotMountResult(TDEIO::Job *job); + void slotStatResult(TDEIO::Job *job); private: const Medium findMediumByName(const TQString &name, bool &ok); bool ensureMediumMounted(Medium &medium); - KIO::UDSEntry extractUrlInfos(const KURL &url); - KIO::UDSEntry m_entryBuffer; + TDEIO::UDSEntry extractUrlInfos(const KURL &url); + TDEIO::UDSEntry m_entryBuffer; - void createMediumEntry(KIO::UDSEntry& entry, + void createMediumEntry(TDEIO::UDSEntry& entry, const Medium &medium); Medium *mp_mounting; diff --git a/kioslave/media/mediamanager/fstabbackend.cpp b/kioslave/media/mediamanager/fstabbackend.cpp index 0ae99228e..b15e26683 100644 --- a/kioslave/media/mediamanager/fstabbackend.cpp +++ b/kioslave/media/mediamanager/fstabbackend.cpp @@ -102,8 +102,8 @@ TQString FstabBackend::mount( const TQString &_udi ) const Medium* medium = m_mediaList.findById(_udi); if (!medium) return i18n("No such medium: %1").arg(_udi); - KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); - KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); + TDEIO::NetAccess::synchronousRun( job, 0 ); return TQString::null; } @@ -112,8 +112,8 @@ TQString FstabBackend::unmount( const TQString &_udi ) const Medium* medium = m_mediaList.findById(_udi); if (!medium) return i18n("No such medium: %1").arg(_udi); - KIO::Job* job = KIO::unmount( medium->mountPoint(), false); - KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::unmount( medium->mountPoint(), false); + TDEIO::NetAccess::synchronousRun( job, 0 ); return TQString::null; } diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index 9ebf0ade7..072c6cc3a 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -927,7 +927,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) } } - KConfig config("mediamanagerrc"); + TDEConfig config("mediamanagerrc"); bool use_defaults = true; if (config.hasGroup(name)) @@ -1097,7 +1097,7 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio { kdDebug() << "setMountoptions " << name << " " << options << endl; - KConfig config("mediamanagerrc"); + TDEConfig config("mediamanagerrc"); config.setGroup(name); TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options); @@ -1368,7 +1368,7 @@ TQString HALBackend::killUsingProcesses(const Medium* medium) } } -void HALBackend::slotResult(KIO::Job *job) +void HALBackend::slotResult(TDEIO::Job *job) { kdDebug() << "slotResult " << mount_jobs[job] << endl; @@ -1376,7 +1376,7 @@ void HALBackend::slotResult(KIO::Job *job) TQString& qerror = data->errorMessage; const Medium* medium = data->medium; - if (job->error() == KIO::ERR_COULD_NOT_UNMOUNT) { + if (job->error() == TDEIO::ERR_COULD_NOT_UNMOUNT) { TQString proclist(listUsingProcesses(medium)); qerror = "<qt>"; @@ -1443,9 +1443,9 @@ TQString HALBackend::mount(const Medium *medium) data.medium = medium; kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; - KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); - connect(job, TQT_SIGNAL( result (KIO::Job *)), - TQT_SLOT( slotResult( KIO::Job *))); + TDEIO::Job *job = TDEIO::mount( false, 0, medium->deviceNode(), mountPoint ); + connect(job, TQT_SIGNAL( result (TDEIO::Job *)), + TQT_SLOT( slotResult( TDEIO::Job *))); mount_jobs[job] = &data; // The caller expects the device to be mounted when the function // completes. Thus block until the job completes. @@ -1608,9 +1608,9 @@ TQString HALBackend::unmount(const TQString &_udi) data.medium = medium; kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, TQT_SIGNAL( result (KIO::Job *)), - TQT_SLOT( slotResult( KIO::Job *))); + TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false ); + connect(job, TQT_SIGNAL( result (TDEIO::Job *)), + TQT_SLOT( slotResult( TDEIO::Job *))); mount_jobs[job] = &data; // The caller expects the device to be unmounted when the function // completes. Thus block until the job completes. diff --git a/kioslave/media/mediamanager/halbackend.h b/kioslave/media/mediamanager/halbackend.h index 18de7ea3c..8c8bbfce6 100644 --- a/kioslave/media/mediamanager/halbackend.h +++ b/kioslave/media/mediamanager/halbackend.h @@ -45,7 +45,7 @@ #include <libhal.h> #include <libhal-storage.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -148,7 +148,7 @@ private: static TQString killUsingProcesses(const Medium *medium); private slots: - void slotResult(KIO::Job *job); + void slotResult(TDEIO::Job *job); /* Hal call-backs -- from gvm*/ public: @@ -220,13 +220,13 @@ private: const Medium* medium; // [in,out] Should be set to true when the job completes bool completed; - // [out] KIO::Error if an error occured during operation. Otherwise, 0 + // [out] TDEIO::Error if an error occured during operation. Otherwise, 0 int error; // [out] Error message to be displayed to the user TQString errorMessage; }; - TQMap<KIO::Job *, struct mount_job_data*> mount_jobs; + TQMap<TDEIO::Job *, struct mount_job_data*> mount_jobs; }; #endif /* _HALBACKEND_H_ */ diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/kioslave/media/mediamanager/tdehardwarebackend.cpp index 1086a3e77..65c6431cf 100644 --- a/kioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/kioslave/media/mediamanager/tdehardwarebackend.cpp @@ -728,7 +728,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name) TQString drive_udi = driveUDIFromDeviceUID(medium->id()); - KConfig config("mediamanagerrc"); + TDEConfig config("mediamanagerrc"); bool use_defaults = true; if (config.hasGroup(drive_udi)) { @@ -893,7 +893,7 @@ bool TDEBackend::setMountoptions(const TQString &name, const TQStringList &optio kdDebug(1219) << "setMountoptions " << name << " " << options << endl; - KConfig config("mediamanagerrc"); + TDEConfig config("mediamanagerrc"); config.setGroup(drive_udi); TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options); @@ -948,8 +948,8 @@ TQString TDEBackend::mount(const Medium *medium) data.completed = false; data.medium = medium; - KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); - connect(job, TQT_SIGNAL( result (KIO::Job *)), TQT_SLOT( slotResult( KIO::Job *))); + TDEIO::Job *job = TDEIO::mount( false, 0, medium->deviceNode(), mountPoint ); + connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_SLOT( slotResult( TDEIO::Job *))); mount_jobs[job] = &data; // The caller expects the device to be mounted when the function // completes. Thus block until the job completes. @@ -1148,8 +1148,8 @@ TQString TDEBackend::unmount(const TQString &_udi) data.completed = false; data.medium = medium; - KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); - connect(job, TQT_SIGNAL( result (KIO::Job *)), TQT_SLOT( slotResult( KIO::Job *))); + TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false ); + connect(job, TQT_SIGNAL( result (TDEIO::Job *)), TQT_SLOT( slotResult( TDEIO::Job *))); mount_jobs[job] = &data; // The caller expects the device to be unmounted when the function // completes. Thus block until the job completes. diff --git a/kioslave/media/mediamanager/tdehardwarebackend.h b/kioslave/media/mediamanager/tdehardwarebackend.h index 190d06e41..9b5407d8f 100644 --- a/kioslave/media/mediamanager/tdehardwarebackend.h +++ b/kioslave/media/mediamanager/tdehardwarebackend.h @@ -36,7 +36,7 @@ #include <tdehardwaredevices.h> -namespace KIO { +namespace TDEIO { class Job; } @@ -157,13 +157,13 @@ private: const Medium* medium; // [in,out] Should be set to true when the job completes bool completed; - // [out] KIO::Error if an error occured during operation. Otherwise, 0 + // [out] TDEIO::Error if an error occured during operation. Otherwise, 0 int error; // [out] Error message to be displayed to the user TQString errorMessage; }; - TQMap<KIO::Job *, struct mount_job_data*> mount_jobs; + TQMap<TDEIO::Job *, struct mount_job_data*> mount_jobs; TQStringList m_ignoreDeviceChangeEvents; }; diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp index 94ee0e8c2..de6a56645 100644 --- a/kioslave/media/medianotifier/medianotifier.cpp +++ b/kioslave/media/medianotifier/medianotifier.cpp @@ -80,25 +80,25 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification KURL url( "system:/media/"+name ); - KIO::SimpleJob *job = KIO::stat( url, false ); + TDEIO::SimpleJob *job = TDEIO::stat( url, false ); job->setInteractive( false ); m_allowNotificationMap[job] = allowNotification; - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotStatResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); } -void MediaNotifier::slotStatResult( KIO::Job *job ) +void MediaNotifier::slotStatResult( TDEIO::Job *job ) { bool allowNotification = m_allowNotificationMap[job]; m_allowNotificationMap.remove( job ); if ( job->error() != 0 ) return; - KIO::StatJob *stat_job = static_cast<KIO::StatJob *>( job ); + TDEIO::StatJob *stat_job = static_cast<TDEIO::StatJob *>( job ); - KIO::UDSEntry entry = stat_job->statResult(); + TDEIO::UDSEntry entry = stat_job->statResult(); KURL url = stat_job->url(); KFileItem medium( entry, url ); diff --git a/kioslave/media/medianotifier/medianotifier.h b/kioslave/media/medianotifier/medianotifier.h index 23f203f97..acbb23505 100644 --- a/kioslave/media/medianotifier/medianotifier.h +++ b/kioslave/media/medianotifier/medianotifier.h @@ -43,7 +43,7 @@ k_dcop: void onMediumChange( const TQString &name, bool allowNotification ); private slots: - void slotStatResult( KIO::Job *job ); + void slotStatResult( TDEIO::Job *job ); void checkFreeDiskSpace(); void slotFreeFinished( KMessageBox::ButtonCode ); void slotFreeContinue(); @@ -58,7 +58,7 @@ private: bool execAutoopen( const KFileItem &medium, const TQString &path, const TQString &autoopenFile ); - TQMap<KIO::Job*,bool> m_allowNotificationMap; + TQMap<TDEIO::Job*,bool> m_allowNotificationMap; TQTimer * m_freeTimer; KDialogBase * m_freeDialog; }; diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp index 7ba172601..29cf6b4f2 100644 --- a/kioslave/media/medianotifier/notificationdialog.cpp +++ b/kioslave/media/medianotifier/notificationdialog.cpp @@ -37,7 +37,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett : KDialogBase( parent, name, false, i18n( "Medium Detected" ), Ok|Cancel|User1, Ok, true), m_medium(medium), m_settings( settings ) { - setCaption( KIO::decodeFileName(m_medium.name()) ); + setCaption( TDEIO::decodeFileName(m_medium.name()) ); clearWState( WState_Polished ); TQWidget *page = new TQWidget( this ); diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp index b8ae1aa76..b28f3d61e 100644 --- a/kioslave/nfs/kio_nfs.cpp +++ b/kioslave/nfs/kio_nfs.cpp @@ -68,7 +68,7 @@ #define NFSPROG ((u_long)100003) #define NFSVERS ((u_long)2) -using namespace KIO; +using namespace TDEIO; using namespace std; //this is taken from tdelibs/tdecore/fakes.cpp @@ -144,23 +144,23 @@ static void createVirtualDirEntry(UDSEntry & entry) { UDSAtom atom; - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; entry.append( atom ); - atom.m_uds = KIO::UDS_USER; + atom.m_uds = TDEIO::UDS_USER; atom.m_str = "root"; entry.append( atom ); - atom.m_uds = KIO::UDS_GROUP; + atom.m_uds = TDEIO::UDS_GROUP; atom.m_str = "root"; entry.append( atom ); //a dummy size - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = 1024; entry.append( atom ); } @@ -468,9 +468,9 @@ void NFSProtocol::openConnection() fh=fhStatus.fhstatus_u.fhs_fhandle; TQString fname; if ( exportlist->ex_dir[0] == '/' ) - fname = KIO::encodeFileName(exportlist->ex_dir + 1); + fname = TDEIO::encodeFileName(exportlist->ex_dir + 1); else - fname = KIO::encodeFileName(exportlist->ex_dir); + fname = TDEIO::encodeFileName(exportlist->ex_dir); m_handleCache.insert(TQString("/")+fname,fh); m_exportedDirs.append(fname); // kdDebug() <<"appending file -"<<fname<<"- with FH: -"<<fhStatus.fhstatus_u.fhs_fhandle<<"-"<<endl; @@ -534,7 +534,7 @@ void NFSProtocol::listDir( const KURL& _url) { UDSAtom atom; entry.clear(); - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = (*it); kdDebug(7121)<<"listing "<<(*it)<<endl; entry.append( atom ); @@ -599,7 +599,7 @@ void NFSProtocol::listDir( const KURL& _url) entry.clear(); - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = (*it); entry.append( atom ); @@ -620,7 +620,7 @@ void NFSProtocol::listDir( const KURL& _url) if (!checkForError(clnt_stat,readLinkRes.status,(*it))) return; kdDebug(7121)<<"link dest is -"<<readLinkRes.readlinkres_u.data<<"-"<<endl; TQCString linkDest(readLinkRes.readlinkres_u.data); - atom.m_uds = KIO::UDS_LINK_DEST; + atom.m_uds = TDEIO::UDS_LINK_DEST; atom.m_str = linkDest; entry.append( atom ); @@ -675,7 +675,7 @@ void NFSProtocol::stat( const KURL & url) UDSEntry entry; UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = path; entry.append( atom ); createVirtualDirEntry(entry); @@ -714,7 +714,7 @@ void NFSProtocol::stat( const KURL & url) getLastPart(path, fileName, parentDir); stripTrailingSlash(parentDir); - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = fileName; entry.append( atom ); @@ -735,7 +735,7 @@ void NFSProtocol::stat( const KURL & url) if (!checkForError(clnt_stat,readLinkRes.status,path)) return; kdDebug(7121)<<"link dest is -"<<readLinkRes.readlinkres_u.data<<"-"<<endl; TQCString linkDest(readLinkRes.readlinkres_u.data); - atom.m_uds = KIO::UDS_LINK_DEST; + atom.m_uds = TDEIO::UDS_LINK_DEST; atom.m_str = linkDest; entry.append( atom ); @@ -782,23 +782,23 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& if ( ::stat( path.data(), &buff ) == -1 ) return; UDSAtom atom; - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = buff.st_mode & S_IFMT; // extract file type entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = buff.st_mode & 07777; // extract permissions entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = buff.st_size; entry.append( atom ); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = buff.st_mtime; entry.append( atom ); - atom.m_uds = KIO::UDS_USER; + atom.m_uds = TDEIO::UDS_USER; uid_t uid = buff.st_uid; TQString *temp = m_usercache.find( uid ); @@ -817,7 +817,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& atom.m_str = *temp; entry.append( atom ); - atom.m_uds = KIO::UDS_GROUP; + atom.m_uds = TDEIO::UDS_GROUP; gid_t gid = buff.st_gid; temp = m_groupcache.find( gid ); if ( !temp ) @@ -835,11 +835,11 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& atom.m_str = *temp; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS_TIME; + atom.m_uds = TDEIO::UDS_ACCESS_TIME; atom.m_long = buff.st_atime; entry.append( atom ); - atom.m_uds = KIO::UDS_CREATION_TIME; + atom.m_uds = TDEIO::UDS_CREATION_TIME; atom.m_long = buff.st_ctime; entry.append( atom ); } @@ -850,15 +850,15 @@ void NFSProtocol::completeBadLinkUDSEntry(UDSEntry& entry, fattr& attributes) completeUDSEntry(entry,attributes); UDSAtom atom; - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFMT - 1; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRWXU | S_IRWXG | S_IRWXO; entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = 0L; entry.append( atom ); } @@ -867,31 +867,31 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes) { UDSAtom atom; - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = attributes.size; entry.append(atom); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = attributes.mtime.seconds; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS_TIME; + atom.m_uds = TDEIO::UDS_ACCESS_TIME; atom.m_long = attributes.atime.seconds; entry.append( atom ); - atom.m_uds = KIO::UDS_CREATION_TIME; + atom.m_uds = TDEIO::UDS_CREATION_TIME; atom.m_long = attributes.ctime.seconds; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = (attributes.mode & 07777); entry.append( atom ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long =attributes.mode & S_IFMT; // extract file type entry.append( atom ); - atom.m_uds = KIO::UDS_USER; + atom.m_uds = TDEIO::UDS_USER; uid_t uid = attributes.uid; TQString *temp = m_usercache.find( uid ); if ( !temp ) @@ -909,7 +909,7 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes) atom.m_str = *temp; entry.append( atom ); - atom.m_uds = KIO::UDS_GROUP; + atom.m_uds = TDEIO::UDS_GROUP; gid_t gid = attributes.gid; temp = m_groupcache.find( gid ); if ( !temp ) @@ -927,32 +927,32 @@ void NFSProtocol::completeUDSEntry(UDSEntry& entry, fattr& attributes) atom.m_str = *temp; entry.append( atom ); -/* KIO::UDSEntry::ConstIterator it = entry.begin(); +/* TDEIO::UDSEntry::ConstIterator it = entry.begin(); for( ; it != entry.end(); it++ ) { switch ((*it).m_uds) { - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: kdDebug(7121) << "File Type : " << (mode_t)((*it).m_long) << endl; break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: kdDebug(7121) << "Access permissions : " << (mode_t)((*it).m_long) << endl; break; - case KIO::UDS_USER: + case TDEIO::UDS_USER: kdDebug(7121) << "User : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: kdDebug(7121) << "Group : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: kdDebug(7121) << "Name : " << ((*it).m_str.ascii() ) << endl; //m_strText = decodeFileName( (*it).m_str ); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: kdDebug(7121) << "URL : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: kdDebug(7121) << "MimeType : " << ((*it).m_str.ascii() ) << endl; break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: kdDebug(7121) << "LinkDest : " << ((*it).m_str.ascii() ) << endl; break; } diff --git a/kioslave/nfs/kio_nfs.h b/kioslave/nfs/kio_nfs.h index 9f6d38103..73b36e64d 100644 --- a/kioslave/nfs/kio_nfs.h +++ b/kioslave/nfs/kio_nfs.h @@ -58,7 +58,7 @@ class NFSFileHandle typedef TQMap<TQString,NFSFileHandle> NFSFileHandleMap; -class NFSProtocol : public KIO::SlaveBase +class NFSProtocol : public TDEIO::SlaveBase { public: NFSProtocol (const TQCString &pool, const TQCString &app ); @@ -80,12 +80,12 @@ class NFSProtocol : public KIO::SlaveBase virtual void rename(const KURL &src, const KURL &dest, bool overwrite); virtual void copy( const KURL& src, const KURL &dest, int mode, bool overwrite ); protected: -// void createVirtualDirEntry(KIO::UDSEntry & entry); +// void createVirtualDirEntry(TDEIO::UDSEntry & entry); bool checkForError(int clientStat, int nfsStat, const TQString& text); bool isExportedDir(const TQString& path); - void completeUDSEntry(KIO::UDSEntry& entry, fattr& attributes); - void completeBadLinkUDSEntry(KIO::UDSEntry& entry, fattr& attributes); - void completeAbsoluteLinkUDSEntry(KIO::UDSEntry& entry, const TQCString& path); + void completeUDSEntry(TDEIO::UDSEntry& entry, fattr& attributes); + void completeBadLinkUDSEntry(TDEIO::UDSEntry& entry, fattr& attributes); + void completeAbsoluteLinkUDSEntry(TDEIO::UDSEntry& entry, const TQCString& path); bool isValidLink(const TQString& parentDir, const TQString& linkDest); // bool isAbsoluteLink(const TQString& path); diff --git a/kioslave/nntp/nntp.cpp b/kioslave/nntp/nntp.cpp index 1169415b8..b92ff6a30 100644 --- a/kioslave/nntp/nntp.cpp +++ b/kioslave/nntp/nntp.cpp @@ -33,7 +33,7 @@ #define WRN kdWarning(DBG_AREA) #define FAT kdFatal(DBG_AREA) -using namespace KIO; +using namespace TDEIO; extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } @@ -768,7 +768,7 @@ int NNTPProtocol::sendCommand( const TQString &cmd ) DBG << "auth needed, sending user info" << endl; if ( mUser.isEmpty() || mPass.isEmpty() ) { - KIO::AuthInfo authInfo; + TDEIO::AuthInfo authInfo; authInfo.username = mUser; authInfo.password = mPass; if ( openPassDlg( authInfo ) ) { @@ -842,7 +842,7 @@ int NNTPProtocol::evalResponse ( char *data, ssize_t &len ) } /* not really necessary, because the slave has to - use the KIO::Error's instead, but let this here for + use the TDEIO::Error's instead, but let this here for documentation of the NNTP response codes and may by later use. TQString& NNTPProtocol::errorStr(int resp_code) { diff --git a/kioslave/nntp/nntp.h b/kioslave/nntp/nntp.h index 30368eee1..1d369b775 100644 --- a/kioslave/nntp/nntp.h +++ b/kioslave/nntp/nntp.h @@ -23,7 +23,7 @@ - remove unnecessary debug stuff */ -class NNTPProtocol:public KIO::TCPSlaveBase +class NNTPProtocol:public TDEIO::TCPSlaveBase { public: @@ -115,7 +115,7 @@ class NNTPProtocol:public KIO::TCPSlaveBase */ bool fetchGroupXOVER( unsigned long first, bool ¬Supported ); /// creates an UDSEntry with file information used in stat and listDir - void fillUDSEntry ( KIO::UDSEntry & entry, const TQString & name, long size, + void fillUDSEntry ( TDEIO::UDSEntry & entry, const TQString & name, long size, bool postingAllowed, bool is_article ); /// error handling for unexpected responses void unexpected_response ( int res_code, const TQString & command ); diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index f4a061521..e950f79c1 100644 --- a/kioslave/pop3/pop3.cc +++ b/kioslave/pop3/pop3.cc @@ -73,7 +73,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } -using namespace KIO; +using namespace TDEIO; #ifdef HAVE_LIBSASL2 static sasl_callback_t callbacks[] = { @@ -349,7 +349,7 @@ void POP3Protocol::closeConnection() opened = false; } -int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai ) +int POP3Protocol::loginAPOP( char *challenge, TDEIO::AuthInfo &ai ) { char buf[512]; @@ -457,7 +457,7 @@ bool POP3Protocol::saslInteract( void *in, AuthInfo &ai ) error(ERR_COULD_NOT_AUTHENTICATE, i18n("An error occured during authentication: %1").arg \ ( TQString::fromUtf8( sasl_errdetail( conn ) ))); \ -int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) +int POP3Protocol::loginSASL( TDEIO::AuthInfo &ai ) { #ifdef HAVE_LIBSASL2 char buf[512]; @@ -606,7 +606,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) #endif } -bool POP3Protocol::loginPASS( KIO::AuthInfo &ai ) +bool POP3Protocol::loginPASS( TDEIO::AuthInfo &ai ) { char buf[512]; @@ -749,7 +749,7 @@ bool POP3Protocol::pop3_open() return false; } - KIO::AuthInfo authInfo; + TDEIO::AuthInfo authInfo; authInfo.username = m_sUser; authInfo.password = m_sPass; authInfo.prompt = i18n("Username and password for your POP3 account:"); @@ -1191,7 +1191,7 @@ void POP3Protocol::listDir(const KURL &) atom.m_long = realGetSize(i + 1); entry.append(atom); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRUSR | S_IXUSR | S_IWUSR; entry.append (atom); diff --git a/kioslave/pop3/pop3.h b/kioslave/pop3/pop3.h index 9c6ca9185..60b23c3e8 100644 --- a/kioslave/pop3/pop3.h +++ b/kioslave/pop3/pop3.h @@ -39,7 +39,7 @@ #define MAX_PACKET_LEN 4096 -class POP3Protocol:public KIO::TCPSlaveBase { +class POP3Protocol:public TDEIO::TCPSlaveBase { public: POP3Protocol(const TQCString & pool, const TQCString & app, bool SSL); virtual ~ POP3Protocol(); @@ -107,17 +107,17 @@ protected: /** * Authenticate via APOP */ - int loginAPOP( char *challenge, KIO::AuthInfo &ai ); + int loginAPOP( char *challenge, TDEIO::AuthInfo &ai ); - bool saslInteract( void *in, KIO::AuthInfo &ai ); + bool saslInteract( void *in, TDEIO::AuthInfo &ai ); /** * Authenticate via SASL */ - int loginSASL( KIO::AuthInfo &ai ); + int loginSASL( TDEIO::AuthInfo &ai ); /** * Authenticate via traditional USER/PASS */ - bool loginPASS( KIO::AuthInfo &ai ); + bool loginPASS( TDEIO::AuthInfo &ai ); int m_cmd; unsigned short int m_iOldPort; diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp index f4b71086d..87437700f 100644 --- a/kioslave/remote/kio_remote.cpp +++ b/kioslave/remote/kio_remote.cpp @@ -89,14 +89,14 @@ void RemoteProtocol::listDir(const KURL &url) return; } - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); } void RemoteProtocol::listRoot() { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::UDSEntryList remote_entries; + TDEIO::UDSEntryList remote_entries; m_impl.listRoot(remote_entries); totalSize(remote_entries.count()+2); @@ -107,8 +107,8 @@ void RemoteProtocol::listRoot() m_impl.createWizardEntry(entry); listEntry(entry, false); - KIO::UDSEntryListIterator it = remote_entries.begin(); - KIO::UDSEntryListIterator end = remote_entries.end(); + TDEIO::UDSEntryListIterator it = remote_entries.begin(); + TDEIO::UDSEntryListIterator end = remote_entries.end(); for(; it!=end; ++it) { @@ -129,7 +129,7 @@ void RemoteProtocol::stat(const KURL &url) if ( path.isEmpty() || path == "/" ) { // The root is "virtual" - it's not a single physical directory - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; m_impl.createTopLevelEntry( entry ); statEntry( entry ); finished(); @@ -138,7 +138,7 @@ void RemoteProtocol::stat(const KURL &url) if (m_impl.isWizardURL(url)) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (m_impl.createWizardEntry(entry)) { statEntry(entry); @@ -146,7 +146,7 @@ void RemoteProtocol::stat(const KURL &url) } else { - error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } return; } @@ -156,7 +156,7 @@ void RemoteProtocol::stat(const KURL &url) if ( second_slash_idx==-1 || ( (int)url.path().length() )==second_slash_idx+1 ) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (m_impl.statNetworkFolder(entry, root_dirname)) { statEntry(entry); @@ -177,7 +177,7 @@ void RemoteProtocol::stat(const KURL &url) } } - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); } void RemoteProtocol::del(const KURL &url, bool /*isFile*/) @@ -191,7 +191,7 @@ void RemoteProtocol::del(const KURL &url, bool /*isFile*/) return; } - error(KIO::ERR_CANNOT_DELETE, url.prettyURL()); + error(TDEIO::ERR_CANNOT_DELETE, url.prettyURL()); } void RemoteProtocol::get(const KURL &url) @@ -211,7 +211,7 @@ void RemoteProtocol::get(const KURL &url) return; } - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); } void RemoteProtocol::rename(const KURL &src, const KURL &dest, @@ -220,7 +220,7 @@ void RemoteProtocol::rename(const KURL &src, const KURL &dest, if (src.protocol()!="remote" || dest.protocol()!="remote" || m_impl.isWizardURL(src) || m_impl.isWizardURL(dest)) { - error(KIO::ERR_UNSUPPORTED_ACTION, src.prettyURL()); + error(TDEIO::ERR_UNSUPPORTED_ACTION, src.prettyURL()); return; } @@ -230,5 +230,5 @@ void RemoteProtocol::rename(const KURL &src, const KURL &dest, return; } - error(KIO::ERR_CANNOT_RENAME, src.prettyURL()); + error(TDEIO::ERR_CANNOT_RENAME, src.prettyURL()); } diff --git a/kioslave/remote/kio_remote.h b/kioslave/remote/kio_remote.h index f2c06296a..77ac1d7cb 100644 --- a/kioslave/remote/kio_remote.h +++ b/kioslave/remote/kio_remote.h @@ -23,7 +23,7 @@ #include <kio/slavebase.h> #include "remoteimpl.h" -class RemoteProtocol : public KIO::SlaveBase +class RemoteProtocol : public TDEIO::SlaveBase { public: RemoteProtocol(const TQCString &protocol, const TQCString &pool, diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp index fbc21bfec..2ca263768 100644 --- a/kioslave/remote/remoteimpl.cpp +++ b/kioslave/remote/remoteimpl.cpp @@ -49,7 +49,7 @@ RemoteImpl::RemoteImpl() } } -void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const +void RemoteImpl::listRoot(TQValueList<TDEIO::UDSEntry> &list) const { kdDebug(1220) << "RemoteImpl::listRoot" << endl; @@ -67,7 +67,7 @@ void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const = dir.entryList( TQDir::Files | TQDir::Readable ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList::ConstIterator name = filenames.begin(); TQStringList::ConstIterator endf = filenames.end(); @@ -102,7 +102,7 @@ bool RemoteImpl::findDirectory(const TQString &filename, TQString &directory) co = dir.entryList( TQDir::Files | TQDir::Readable ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList::ConstIterator name = filenames.begin(); TQStringList::ConstIterator endf = filenames.end(); @@ -148,10 +148,10 @@ KURL RemoteImpl::findBaseURL(const TQString &filename) const } -static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, +static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s = TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; @@ -159,14 +159,14 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, } -void RemoteImpl::createTopLevelEntry(KIO::UDSEntry &entry) const +void RemoteImpl::createTopLevelEntry(TDEIO::UDSEntry &entry) const { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, "."); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0555); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); - addAtom(entry, KIO::UDS_ICON_NAME, 0, "network"); + addAtom(entry, TDEIO::UDS_NAME, 0, "."); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0555); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "network"); } static KURL findWizardRealURL() @@ -184,7 +184,7 @@ static KURL findWizardRealURL() return url; } -bool RemoteImpl::createWizardEntry(KIO::UDSEntry &entry) const +bool RemoteImpl::createWizardEntry(TDEIO::UDSEntry &entry) const { entry.clear(); @@ -195,13 +195,13 @@ bool RemoteImpl::createWizardEntry(KIO::UDSEntry &entry) const return false; } - addAtom(entry, KIO::UDS_NAME, 0, i18n("Add a Network Folder")); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFREG); - addAtom(entry, KIO::UDS_URL, 0, WIZARD_URL); - addAtom(entry, KIO::UDS_LOCAL_PATH, 0, url.path()); - addAtom(entry, KIO::UDS_ACCESS, 0500); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "application/x-desktop"); - addAtom(entry, KIO::UDS_ICON_NAME, 0, "wizard"); + addAtom(entry, TDEIO::UDS_NAME, 0, i18n("Add a Network Folder")); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG); + addAtom(entry, TDEIO::UDS_URL, 0, WIZARD_URL); + addAtom(entry, TDEIO::UDS_LOCAL_PATH, 0, url.path()); + addAtom(entry, TDEIO::UDS_ACCESS, 0500); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "application/x-desktop"); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "wizard"); return true; } @@ -212,7 +212,7 @@ bool RemoteImpl::isWizardURL(const KURL &url) const } -void RemoteImpl::createEntry(KIO::UDSEntry &entry, +void RemoteImpl::createEntry(TDEIO::UDSEntry &entry, const TQString &directory, const TQString &file) const { @@ -227,19 +227,19 @@ void RemoteImpl::createEntry(KIO::UDSEntry &entry, TQString new_filename = file; new_filename.truncate( file.length()-8); - addAtom(entry, KIO::UDS_NAME, 0, desktop.readName()); - addAtom(entry, KIO::UDS_URL, 0, "remote:/"+new_filename); + addAtom(entry, TDEIO::UDS_NAME, 0, desktop.readName()); + addAtom(entry, TDEIO::UDS_URL, 0, "remote:/"+new_filename); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); TQString icon = desktop.readIcon(); - addAtom(entry, KIO::UDS_ICON_NAME, 0, icon); - addAtom(entry, KIO::UDS_LINK_DEST, 0, desktop.readURL()); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon); + addAtom(entry, TDEIO::UDS_LINK_DEST, 0, desktop.readURL()); } -bool RemoteImpl::statNetworkFolder(KIO::UDSEntry &entry, const TQString &filename) const +bool RemoteImpl::statNetworkFolder(TDEIO::UDSEntry &entry, const TQString &filename) const { kdDebug(1220) << "RemoteImpl::statNetworkFolder: " << filename << endl; diff --git a/kioslave/remote/remoteimpl.h b/kioslave/remote/remoteimpl.h index b9bb6ac2d..ff16099dc 100644 --- a/kioslave/remote/remoteimpl.h +++ b/kioslave/remote/remoteimpl.h @@ -31,12 +31,12 @@ class RemoteImpl public: RemoteImpl(); - void createTopLevelEntry(KIO::UDSEntry &entry) const; - bool createWizardEntry(KIO::UDSEntry &entry) const; + void createTopLevelEntry(TDEIO::UDSEntry &entry) const; + bool createWizardEntry(TDEIO::UDSEntry &entry) const; bool isWizardURL(const KURL &url) const; - bool statNetworkFolder(KIO::UDSEntry &entry, const TQString &filename) const; + bool statNetworkFolder(TDEIO::UDSEntry &entry, const TQString &filename) const; - void listRoot(TQValueList<KIO::UDSEntry> &list) const; + void listRoot(TQValueList<TDEIO::UDSEntry> &list) const; KURL findBaseURL(const TQString &filename) const; TQString findDesktopFile(const TQString &filename) const; @@ -47,7 +47,7 @@ public: private: bool findDirectory(const TQString &filename, TQString &directory) const; - void createEntry(KIO::UDSEntry& entry, const TQString &directory, + void createEntry(TDEIO::UDSEntry& entry, const TQString &directory, const TQString &file) const; }; diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc index 26e04d9e5..5622cb8aa 100644 --- a/kioslave/settings/kio_settings.cc +++ b/kioslave/settings/kio_settings.cc @@ -31,7 +31,7 @@ #include <kservicegroup.h> #include <kstandarddirs.h> -class SettingsProtocol : public KIO::SlaveBase +class SettingsProtocol : public TDEIO::SlaveBase { public: enum RunMode { SettingsMode, ProgramsMode, ApplicationsMode }; @@ -60,40 +60,40 @@ extern "C" { } -static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null) +static void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; entry.append(atom); } -static void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime, const TQString& iconName, const TQString& localPath) +static void createFileEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime, const TQString& iconName, const TQString& localPath) { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, KIO::encodeFileName(name)); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFREG); - addAtom(entry, KIO::UDS_URL, 0, url); - addAtom(entry, KIO::UDS_ACCESS, 0500); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); - addAtom(entry, KIO::UDS_SIZE, 0); - addAtom(entry, KIO::UDS_LOCAL_PATH, 0, localPath); - addAtom(entry, KIO::UDS_CREATION_TIME, 1); - addAtom(entry, KIO::UDS_MODIFICATION_TIME, time(0)); - addAtom(entry, KIO::UDS_ICON_NAME, 0, iconName); + addAtom(entry, TDEIO::UDS_NAME, 0, TDEIO::encodeFileName(name)); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG); + addAtom(entry, TDEIO::UDS_URL, 0, url); + addAtom(entry, TDEIO::UDS_ACCESS, 0500); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime); + addAtom(entry, TDEIO::UDS_SIZE, 0); + addAtom(entry, TDEIO::UDS_LOCAL_PATH, 0, localPath); + addAtom(entry, TDEIO::UDS_CREATION_TIME, 1); + addAtom(entry, TDEIO::UDS_MODIFICATION_TIME, time(0)); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, iconName); } -static void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime,const TQString& iconName) +static void createDirEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime,const TQString& iconName) { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, name); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0500); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); - addAtom(entry, KIO::UDS_URL, 0, url); - addAtom(entry, KIO::UDS_SIZE, 0); - addAtom(entry, KIO::UDS_ICON_NAME, 0, iconName); + addAtom(entry, TDEIO::UDS_NAME, 0, name); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0500); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime); + addAtom(entry, TDEIO::UDS_URL, 0, url); + addAtom(entry, TDEIO::UDS_SIZE, 0); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, iconName); } SettingsProtocol::SettingsProtocol( const TQCString &protocol, const TQCString &pool, const TQCString &app): SlaveBase( protocol, pool, app ) @@ -173,14 +173,14 @@ void SettingsProtocol::get( const KURL & url ) redirection(redirUrl); finished(); } else { - error( KIO::ERR_IS_DIRECTORY, url.prettyURL() ); + error( TDEIO::ERR_IS_DIRECTORY, url.prettyURL() ); } } void SettingsProtocol::stat(const KURL& url) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQString servicePath( url.path(1) ); servicePath.remove(0, 1); // remove starting '/' @@ -203,7 +203,7 @@ void SettingsProtocol::stat(const KURL& url) createFileEntry(entry, service->name(), url.url(1)+service->desktopEntryName(), "application/x-desktop", service->icon(), locate("apps", service->desktopEntryPath()) ); } else { - error(KIO::ERR_SLAVE_DEFINED,i18n("Unknown settings folder")); + error(TDEIO::ERR_SLAVE_DEFINED,i18n("Unknown settings folder")); return; } } @@ -227,13 +227,13 @@ void SettingsProtocol::listDir(const KURL& url) if (!grp || !grp->isValid()) { grp = findGroup(groupPath); if (!grp || !grp->isValid()) { - error(KIO::ERR_SLAVE_DEFINED,i18n("Unknown settings folder")); + error(TDEIO::ERR_SLAVE_DEFINED,i18n("Unknown settings folder")); return; } } unsigned int count = 0; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; KServiceGroup::List list = grp->entries(true, true); KServiceGroup::List::ConstIterator it; diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp index ac747fa02..73f5bfc6d 100644 --- a/kioslave/sftp/kio_sftp.cpp +++ b/kioslave/sftp/kio_sftp.cpp @@ -74,7 +74,7 @@ So we can't connect. #include "ksshprocess.h" -using namespace KIO; +using namespace TDEIO; extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) @@ -234,7 +234,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool } } - KIO::filesize_t offset = 0; + TDEIO::filesize_t offset = 0; TQCString dest_part ( dest_orig + ".part" ); int fd = -1; @@ -295,7 +295,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool if ( info.code != 0 ) { // Should we keep the partially downloaded file ?? - KIO::filesize_t size = config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE); + TDEIO::filesize_t size = config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE); if (info.size < size) ::remove(dest_part.data()); @@ -324,7 +324,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool finished(); } -sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t offset, int fd ) +sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t offset, int fd ) { int code; sftpFileAttr attr(remoteEncoding()); @@ -347,7 +347,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t off return res; } - KIO::filesize_t fileSize = attr.fileSize(); + TDEIO::filesize_t fileSize = attr.fileSize(); TQ_UINT32 pflags = SSH2_FXF_READ; attr.clear(); @@ -1103,22 +1103,22 @@ void sftpProtocol::stat ( const KURL& url ){ UDSEntry entry; UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = TQString::null; entry.append( atom ); - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; entry.append( atom ); - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; entry.append( atom ); - atom.m_uds = KIO::UDS_USER; + atom.m_uds = TDEIO::UDS_USER; atom.m_str = mUsername; entry.append( atom ); - atom.m_uds = KIO::UDS_GROUP; + atom.m_uds = TDEIO::UDS_GROUP; entry.append( atom ); // no size @@ -1331,9 +1331,9 @@ void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){ if (!overwrite) { if ( S_ISDIR(attr.permissions()) ) - error( KIO::ERR_DIR_ALREADY_EXIST, dest.url() ); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dest.url() ); else - error( KIO::ERR_FILE_ALREADY_EXIST, dest.url() ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dest.url() ); return; } @@ -2184,7 +2184,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, } -int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data) +int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data) { // kdDebug(KIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl; TQByteArray p; @@ -2231,7 +2231,7 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ } -int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, const TQByteArray& data){ +int sftpProtocol::sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data){ // kdDebug(KIO_SFTP_DB) << "sftpWrite( offset = " << offset << // ", data sz = " << data.size() << ")" << endl; TQByteArray p; diff --git a/kioslave/sftp/kio_sftp.h b/kioslave/sftp/kio_sftp.h index 951d3e46e..e9120452b 100644 --- a/kioslave/sftp/kio_sftp.h +++ b/kioslave/sftp/kio_sftp.h @@ -33,7 +33,7 @@ #define KIO_SFTP_DB 7120 -class sftpProtocol : public KIO::SlaveBase +class sftpProtocol : public TDEIO::SlaveBase { public: @@ -86,7 +86,7 @@ private: // Private variables struct Status { int code; - KIO::filesize_t size; + TDEIO::filesize_t size; TQString text; }; @@ -133,9 +133,9 @@ private: // private methods /** No descriptions */ int sftpOpen(const KURL& url, const TQ_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle); /** No descriptions */ - int sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data); + int sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data); /** No descriptions */ - int sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, const TQByteArray& data); + int sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data); /** Performs faster upload when the source is a local file... */ void sftpCopyPut(const KURL& src, const KURL& dest, int mode, bool overwrite); @@ -143,7 +143,7 @@ private: // private methods void sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite); /** */ - Status sftpGet( const KURL& src, KIO::filesize_t offset = 0, int fd = -1); + Status sftpGet( const KURL& src, TDEIO::filesize_t offset = 0, int fd = -1); void sftpPut( const KURL& dest, int permissions, bool resume, bool overwrite, int fd = -1); }; #endif diff --git a/kioslave/sftp/sftpfileattr.cpp b/kioslave/sftp/sftpfileattr.cpp index 1ebb43f5f..95a82677f 100644 --- a/kioslave/sftp/sftpfileattr.cpp +++ b/kioslave/sftp/sftpfileattr.cpp @@ -27,7 +27,7 @@ #include <kio/global.h> #include <kremoteencoding.h> -using namespace KIO; +using namespace TDEIO; sftpFileAttr::sftpFileAttr(){ clear(); diff --git a/kioslave/sftp/sftpfileattr.h b/kioslave/sftp/sftpfileattr.h index f0bca2527..543153b5e 100644 --- a/kioslave/sftp/sftpfileattr.h +++ b/kioslave/sftp/sftpfileattr.h @@ -222,7 +222,7 @@ public: /** Returns a UDSEntry describing the file. The UDSEntry is generated from the sftp file attributes. */ - KIO::UDSEntry entry(); + TDEIO::UDSEntry entry(); /** Use to output the file attributes to a sftp packet This will only write the sftp ATTR structure to the stream. diff --git a/kioslave/smb/kio_smb.h b/kioslave/smb/kio_smb.h index c7c316478..d111c7646 100644 --- a/kioslave/smb/kio_smb.h +++ b/kioslave/smb/kio_smb.h @@ -86,13 +86,13 @@ extern "C" #define MAX_XFER_BUF_SIZE 16348 #define KIO_SMB 7106 -using namespace KIO; +using namespace TDEIO; class TDEProcess; //=========================================================================== -class SMBSlave : public TQObject, public KIO::SlaveBase +class SMBSlave : public TQObject, public TDEIO::SlaveBase { Q_OBJECT diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp index d4a48239f..b03e77420 100644 --- a/kioslave/smb/kio_smb_auth.cpp +++ b/kioslave/smb/kio_smb_auth.cpp @@ -76,7 +76,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share, password[pwmaxlen - 1] = 0; TQString s_password = TQString::fromUtf8(password); - KIO::AuthInfo info; + TDEIO::AuthInfo info; info.url = KURL("smb:///"); info.url.setHost(s_server); info.url.setPath("/" + s_share); @@ -113,7 +113,7 @@ bool SMBSlave::checkPassword(SMBUrl &url) { kdDebug(KIO_SMB) << "checkPassword for " << url << endl; - KIO::AuthInfo info; + TDEIO::AuthInfo info; info.url = KURL("smb:///"); info.url.setHost(url.host()); diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp index e9a216fd3..b8f237653 100644 --- a/kioslave/smb/kio_smb_browse.cpp +++ b/kioslave/smb/kio_smb_browse.cpp @@ -41,13 +41,13 @@ #include "kio_smb.h" #include "kio_smb_internal.h" -using namespace KIO; +using namespace TDEIO; int SMBSlave::cache_stat(const SMBUrl &url, struct stat* st ) { int result = smbc_stat( url.toSmbcUrl(), st); kdDebug(KIO_SMB) << "smbc_stat " << url << " " << errno << " " << result << endl; - kdDebug(KIO_SMB) << "size " << (KIO::filesize_t)st->st_size << endl; + kdDebug(KIO_SMB) << "size " << (TDEIO::filesize_t)st->st_size << endl; return result; } @@ -69,15 +69,15 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign return false; } - udsatom.m_uds = KIO::UDS_FILE_TYPE; + udsatom.m_uds = TDEIO::UDS_FILE_TYPE; udsatom.m_long = st.st_mode & S_IFMT; udsentry.append(udsatom); - udsatom.m_uds = KIO::UDS_SIZE; + udsatom.m_uds = TDEIO::UDS_SIZE; udsatom.m_long = st.st_size; udsentry.append(udsatom); - udsatom.m_uds = KIO::UDS_USER; + udsatom.m_uds = TDEIO::UDS_USER; uid_t uid = st.st_uid; struct passwd *user = getpwuid( uid ); if ( user ) @@ -86,7 +86,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign udsatom.m_str = TQString::number( uid ); udsentry.append(udsatom); - udsatom.m_uds = KIO::UDS_GROUP; + udsatom.m_uds = TDEIO::UDS_GROUP; gid_t gid = st.st_gid; struct group *grp = getgrgid( gid ); if ( grp ) @@ -95,7 +95,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign udsatom.m_str = TQString::number( gid ); udsentry.append(udsatom); - udsatom.m_uds = KIO::UDS_ACCESS; + udsatom.m_uds = TDEIO::UDS_ACCESS; udsatom.m_long = st.st_mode & 07777; udsentry.append(udsatom); @@ -153,7 +153,7 @@ void SMBSlave::stat( const KURL& kurl ) UDSAtom udsatom; UDSEntry udsentry; // Set name - udsatom.m_uds = KIO::UDS_NAME; + udsatom.m_uds = TDEIO::UDS_NAME; udsatom.m_str = kurl.fileName(); udsentry.append( udsatom ); @@ -166,7 +166,7 @@ void SMBSlave::stat( const KURL& kurl ) case SMBURLTYPE_ENTIRE_NETWORK: case SMBURLTYPE_WORKGROUP_OR_SERVER: - udsatom.m_uds = KIO::UDS_FILE_TYPE; + udsatom.m_uds = TDEIO::UDS_FILE_TYPE; udsatom.m_long = S_IFDIR; udsentry.append(udsatom); break; @@ -342,7 +342,7 @@ void SMBSlave::listDir( const KURL& kurl ) break; // Set name - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; TQString dirpName = TQString::fromUtf8( dirp->name ); // We cannot trust dirp->commentlen has it might be with or without the NUL character // See KDE bug #111430 and Samba bug #3030 @@ -387,17 +387,17 @@ void SMBSlave::listDir( const KURL& kurl ) dirp->smbc_type == SMBC_FILE_SHARE) { // Set type - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; udsentry.append( atom ); // Set permissions - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = (S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH); udsentry.append(atom); if (dirp->smbc_type == SMBC_SERVER) { - atom.m_uds = KIO::UDS_URL; + atom.m_uds = TDEIO::UDS_URL; // TQString workgroup = m_current_url.host().upper(); KURL u("smb:/"); u.setHost(dirpName); @@ -408,7 +408,7 @@ void SMBSlave::listDir( const KURL& kurl ) kdDebug(KIO_SMB) << "list item " << atom.m_str << endl; udsentry.append(atom); - atom.m_uds = KIO::UDS_MIME_TYPE; + atom.m_uds = TDEIO::UDS_MIME_TYPE; atom.m_str = TQString::fromLatin1("application/x-smb-server"); udsentry.append(atom); } @@ -419,20 +419,20 @@ void SMBSlave::listDir( const KURL& kurl ) else if(dirp->smbc_type == SMBC_WORKGROUP) { // Set type - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = S_IFDIR; udsentry.append( atom ); // Set permissions - atom.m_uds = KIO::UDS_ACCESS; + atom.m_uds = TDEIO::UDS_ACCESS; atom.m_long = (S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH); udsentry.append(atom); - atom.m_uds = KIO::UDS_MIME_TYPE; + atom.m_uds = TDEIO::UDS_MIME_TYPE; atom.m_str = TQString::fromLatin1("application/x-smb-workgroup"); udsentry.append(atom); - atom.m_uds = KIO::UDS_URL; + atom.m_uds = TDEIO::UDS_URL; // TQString workgroup = m_current_url.host().upper(); KURL u("smb:/"); u.setHost(dirpName); diff --git a/kioslave/smb/kio_smb_config.cpp b/kioslave/smb/kio_smb_config.cpp index 101ba160d..123462772 100644 --- a/kioslave/smb/kio_smb_config.cpp +++ b/kioslave/smb/kio_smb_config.cpp @@ -37,7 +37,7 @@ //=========================================================================== void SMBSlave::reparseConfiguration() { - KConfig *cfg = new KConfig("kioslaverc", true); + TDEConfig *cfg = new TDEConfig("kioslaverc", true); cfg->setGroup("Browser Settings/SMBro"); m_default_user=cfg->readEntry("User"); // m_default_workgroup=cfg->readEntry("Workgroup"); diff --git a/kioslave/smb/kio_smb_dir.cpp b/kioslave/smb/kio_smb_dir.cpp index 936ec15af..54c3b6cfb 100644 --- a/kioslave/smb/kio_smb_dir.cpp +++ b/kioslave/smb/kio_smb_dir.cpp @@ -48,7 +48,7 @@ void SMBSlave::copy( const KURL& ksrc, int dstflags; int srcfd = -1; int dstfd = -1; - KIO::filesize_t processed_size = 0; + TDEIO::filesize_t processed_size = 0; unsigned char buf[MAX_XFER_BUF_SIZE]; kdDebug(KIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst << endl; @@ -62,17 +62,17 @@ void SMBSlave::copy( const KURL& ksrc, { if ( errno == EACCES ) { - error( KIO::ERR_ACCESS_DENIED, src.prettyURL()); + error( TDEIO::ERR_ACCESS_DENIED, src.prettyURL()); } else { - error( KIO::ERR_DOES_NOT_EXIST, src.prettyURL()); + error( TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL()); } return; } if ( S_ISDIR( st.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, src.prettyURL() ); + error( TDEIO::ERR_IS_DIRECTORY, src.prettyURL() ); return; } totalSize(st.st_size); @@ -82,12 +82,12 @@ void SMBSlave::copy( const KURL& ksrc, { if(S_ISDIR(st.st_mode)) { - error( KIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL()); + error( TDEIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL()); return; } if(!overwrite) { - error( KIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL()); + error( TDEIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL()); return; } } @@ -98,11 +98,11 @@ void SMBSlave::copy( const KURL& ksrc, { if(errno == EACCES) { - error( KIO::ERR_ACCESS_DENIED, src.prettyURL() ); + error( TDEIO::ERR_ACCESS_DENIED, src.prettyURL() ); } else { - error( KIO::ERR_DOES_NOT_EXIST, src.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL() ); } return; } @@ -129,11 +129,11 @@ void SMBSlave::copy( const KURL& ksrc, { if(errno == EACCES) { - error(KIO::ERR_WRITE_ACCESS_DENIED, dst.prettyURL()); + error(TDEIO::ERR_WRITE_ACCESS_DENIED, dst.prettyURL()); } else { - error(KIO::ERR_CANNOT_OPEN_FOR_READING, dst.prettyURL()); + error(TDEIO::ERR_CANNOT_OPEN_FOR_READING, dst.prettyURL()); } if(srcfd >= 0 ) { @@ -152,8 +152,8 @@ void SMBSlave::copy( const KURL& ksrc, n = smbc_write(dstfd, buf, n); if(n == -1) { - kdDebug(KIO_SMB) << "SMBSlave::copy copy now KIO::ERR_COULD_NOT_WRITE" << endl; - error( KIO::ERR_COULD_NOT_WRITE, dst.prettyURL()); + kdDebug(KIO_SMB) << "SMBSlave::copy copy now TDEIO::ERR_COULD_NOT_WRITE" << endl; + error( TDEIO::ERR_COULD_NOT_WRITE, dst.prettyURL()); break; } @@ -166,7 +166,7 @@ void SMBSlave::copy( const KURL& ksrc, } else { - error( KIO::ERR_COULD_NOT_READ, src.prettyURL()); + error( TDEIO::ERR_COULD_NOT_READ, src.prettyURL()); break; } } @@ -188,7 +188,7 @@ void SMBSlave::copy( const KURL& ksrc, } else { - error( KIO::ERR_COULD_NOT_WRITE, dst.prettyURL()); + error( TDEIO::ERR_COULD_NOT_WRITE, dst.prettyURL()); return; } } @@ -211,7 +211,7 @@ void SMBSlave::del( const KURL &kurl, bool isfile) switch(errno) { case EISDIR: - error( KIO::ERR_IS_DIRECTORY, m_current_url.prettyURL()); + error( TDEIO::ERR_IS_DIRECTORY, m_current_url.prettyURL()); break; default: reportError(kurl); @@ -244,12 +244,12 @@ void SMBSlave::mkdir( const KURL &kurl, int permissions ) { if(S_ISDIR(st.st_mode )) { - error( KIO::ERR_DIR_ALREADY_EXIST, m_current_url.prettyURL()); + error( TDEIO::ERR_DIR_ALREADY_EXIST, m_current_url.prettyURL()); } } else { - error( KIO::ERR_FILE_ALREADY_EXIST, m_current_url.prettyURL()); + error( TDEIO::ERR_FILE_ALREADY_EXIST, m_current_url.prettyURL()); } } else reportError(kurl); @@ -287,15 +287,15 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite ) { if(S_ISDIR(st.st_mode)) { - kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_DIR_ALREADY_EXIST" << endl; - error( KIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL()); + kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DIR_ALREADY_EXIST" << endl; + error( TDEIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL()); finished(); return; } if(!overwrite) { - kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_FILE_ALREADY_EXIST" << endl; - error( KIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL()); + kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_FILE_ALREADY_EXIST" << endl; + error( TDEIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL()); finished(); return; } @@ -311,26 +311,26 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite ) { if(errno == EACCES) { - kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_ACCESS_DENIED" << endl; - error(KIO::ERR_ACCESS_DENIED, src.prettyURL()); + kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl; + error(TDEIO::ERR_ACCESS_DENIED, src.prettyURL()); } else { - kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_DOES_NOT_EXIST" << endl; - error(KIO::ERR_DOES_NOT_EXIST, src.prettyURL()); + kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DOES_NOT_EXIST" << endl; + error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL()); } } break; case EACCES: case EPERM: - kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_ACCESS_DENIED" << endl; - error( KIO::ERR_ACCESS_DENIED, dst.prettyURL() ); + kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl; + error( TDEIO::ERR_ACCESS_DENIED, dst.prettyURL() ); break; default: - kdDebug(KIO_SMB) << "SMBSlave::rename KIO::ERR_CANNOT_RENAME" << endl; - error( KIO::ERR_CANNOT_RENAME, src.prettyURL() ); + kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_CANNOT_RENAME" << endl; + error( TDEIO::ERR_CANNOT_RENAME, src.prettyURL() ); } diff --git a/kioslave/smb/kio_smb_file.cpp b/kioslave/smb/kio_smb_file.cpp index 8c7867722..25137c8ce 100644 --- a/kioslave/smb/kio_smb_file.cpp +++ b/kioslave/smb/kio_smb_file.cpp @@ -44,7 +44,7 @@ void SMBSlave::get( const KURL& kurl ) // time_t curtime = 0; time_t lasttime = 0; time_t starttime = 0; - KIO::filesize_t totalbytesread = 0; + TDEIO::filesize_t totalbytesread = 0; TQByteArray filedata; SMBUrl url; @@ -68,13 +68,13 @@ void SMBSlave::get( const KURL& kurl ) if(cache_stat(url,&st) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, url.prettyURL()); + error( TDEIO::ERR_ACCESS_DENIED, url.prettyURL()); else - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); return; } if ( S_ISDIR( st.st_mode ) ) { - error( KIO::ERR_IS_DIRECTORY, url.prettyURL()); + error( TDEIO::ERR_IS_DIRECTORY, url.prettyURL()); return; } @@ -99,7 +99,7 @@ void SMBSlave::get( const KURL& kurl ) } else if(bytesread < 0) { - error( KIO::ERR_COULD_NOT_READ, url.prettyURL()); + error( TDEIO::ERR_COULD_NOT_READ, url.prettyURL()); return; } @@ -133,12 +133,12 @@ void SMBSlave::get( const KURL& kurl ) smbc_close(filefd); data( TQByteArray() ); - processedSize(static_cast<KIO::filesize_t>(st.st_size)); + processedSize(static_cast<TDEIO::filesize_t>(st.st_size)); } else { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL()); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL()); return; } @@ -172,12 +172,12 @@ void SMBSlave::put( const KURL& kurl, if (S_ISDIR(st.st_mode)) { kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already isdir !!"<< endl; - error( KIO::ERR_DIR_ALREADY_EXIST, m_current_url.prettyURL()); + error( TDEIO::ERR_DIR_ALREADY_EXIST, m_current_url.prettyURL()); } else { kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already exist !!"<< endl; - error( KIO::ERR_FILE_ALREADY_EXIST, m_current_url.prettyURL()); + error( TDEIO::ERR_FILE_ALREADY_EXIST, m_current_url.prettyURL()); } return; } @@ -216,12 +216,12 @@ void SMBSlave::put( const KURL& kurl, if ( errno == EACCES ) { kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" access denied !!"<< endl; - error( KIO::ERR_WRITE_ACCESS_DENIED, m_current_url.prettyURL()); + error( TDEIO::ERR_WRITE_ACCESS_DENIED, m_current_url.prettyURL()); } else { kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" can not open for writing !!"<< endl; - error( KIO::ERR_CANNOT_OPEN_FOR_WRITING, m_current_url.prettyURL()); + error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, m_current_url.prettyURL()); } finished(); return; @@ -246,7 +246,7 @@ void SMBSlave::put( const KURL& kurl, if ( size < 0) { kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" could not write !!"<< endl; - error( KIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL()); + error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL()); finished(); return; } @@ -257,7 +257,7 @@ void SMBSlave::put( const KURL& kurl, if(smbc_close(filefd)) { kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" could not write !!"<< endl; - error( KIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL()); + error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL()); finished(); return; } diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp index 5466ee06a..ad421f631 100644 --- a/kioslave/smb/kio_smb_mount.cpp +++ b/kioslave/smb/kio_smb_mount.cpp @@ -65,7 +65,7 @@ void SMBSlave::special( const TQByteArray & data) if (tmp==3) { if (!KStandardDirs::makeDir(mountPoint)) { - error(KIO::ERR_COULD_NOT_MKDIR, mountPoint); + error(TDEIO::ERR_COULD_NOT_MKDIR, mountPoint); return; } } @@ -121,7 +121,7 @@ void SMBSlave::special( const TQByteArray & data) if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput )) { - error(KIO::ERR_CANNOT_LAUNCH_PROCESS, + error(TDEIO::ERR_CANNOT_LAUNCH_PROCESS, "smbmount"+i18n("\nMake sure that the samba package is installed properly on your system.")); return; } @@ -131,7 +131,7 @@ void SMBSlave::special( const TQByteArray & data) if (proc.exitStatus() != 0) { - error( KIO::ERR_COULD_NOT_MOUNT, + error( TDEIO::ERR_COULD_NOT_MOUNT, i18n("Mounting of share \"%1\" from host \"%2\" by user \"%3\" failed.\n%4") .arg(share).arg(host).arg(user).arg(mybuf + "\n" + mystderr)); return; @@ -162,7 +162,7 @@ void SMBSlave::special( const TQByteArray & data) if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { - error(KIO::ERR_CANNOT_LAUNCH_PROCESS, + error(TDEIO::ERR_CANNOT_LAUNCH_PROCESS, "smbumount"+i18n("\nMake sure that the samba package is installed properly on your system.")); return; } @@ -172,7 +172,7 @@ void SMBSlave::special( const TQByteArray & data) if (proc.exitStatus() != 0) { - error(KIO::ERR_COULD_NOT_UNMOUNT, + error(TDEIO::ERR_COULD_NOT_UNMOUNT, i18n("Unmounting of mountpoint \"%1\" failed.\n%2") .arg(mountPoint).arg(mybuf + "\n" + mystderr)); return; @@ -194,7 +194,7 @@ void SMBSlave::special( const TQByteArray & data) if ( !ok ) { - error(KIO::ERR_COULD_NOT_RMDIR, mountPoint); + error(TDEIO::ERR_COULD_NOT_RMDIR, mountPoint); return; } } diff --git a/kioslave/smtp/command.cc b/kioslave/smtp/command.cc index 2771baf82..2971c291a 100644 --- a/kioslave/smtp/command.cc +++ b/kioslave/smtp/command.cc @@ -134,7 +134,7 @@ static sasl_callback_t callbacks[] = { // "command not {recognized,implemented}" response: if ( r.code() == 500 || r.code() == 502 ) { if ( mEHLONotSupported ) { // HELO failed... - mSMTP->error( KIO::ERR_INTERNAL_SERVER, + mSMTP->error( TDEIO::ERR_INTERNAL_SERVER, i18n("The server rejected both EHLO and HELO commands " "as unknown or unimplemented.\n" "Please contact the server's system administrator.") ); @@ -148,7 +148,7 @@ static sasl_callback_t callbacks[] = { parseFeatures( r ); return true; } - mSMTP->error( KIO::ERR_UNKNOWN, + mSMTP->error( TDEIO::ERR_UNKNOWN, i18n("Unexpected server response to %1 command.\n%2") .arg( mEHLONotSupported ? "HELO" : "EHLO" ) .arg( r.errorMessage() ) ); @@ -182,7 +182,7 @@ static sasl_callback_t callbacks[] = { if ( tlsrc != -3 ) //kdDebug(7112) << "TLS negotiation failed!" << endl; - mSMTP->messageBox(KIO::SlaveBase::Information, + mSMTP->messageBox(TDEIO::SlaveBase::Information, i18n("Your SMTP server claims to " "support TLS, but negotiation " "was unsuccessful.\nYou can " @@ -193,7 +193,7 @@ static sasl_callback_t callbacks[] = { } -#define SASLERROR mSMTP->error(KIO::ERR_COULD_NOT_AUTHENTICATE, \ +#define SASLERROR mSMTP->error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, \ i18n("An error occured during authentication: %1").arg \ ( TQString::fromUtf8( sasl_errdetail( conn ) ))); @@ -203,7 +203,7 @@ static sasl_callback_t callbacks[] = { AuthCommand::AuthCommand( SMTPProtocol * smtp, const char *mechanisms, const TQString &aFQDN, - KIO::AuthInfo &ai ) + TDEIO::AuthInfo &ai ) : Command( smtp, CloseConnectionOnError|OnlyLastInPipeline ), mAi( &ai ), mFirstTime( true ) @@ -238,7 +238,7 @@ static sasl_callback_t callbacks[] = { if ( result == SASL_OK ) mOneStep = true; kdDebug(7112) << "Mechanism: " << mMechusing << " one step: " << mOneStep << endl; #else - mSMTP->error(KIO::ERR_COULD_NOT_AUTHENTICATE, + mSMTP->error(TDEIO::ERR_COULD_NOT_AUTHENTICATE, i18n("Authentication support is not compiled into kio_smtp.")); #endif } @@ -268,7 +268,7 @@ static sasl_callback_t callbacks[] = { if ( mAi->username.isEmpty() || mAi->password.isEmpty()) { if (!mSMTP->openPassDlg(*mAi)) { - mSMTP->error(KIO::ERR_ABORTED, i18n("No authentication details supplied.")); + mSMTP->error(TDEIO::ERR_ABORTED, i18n("No authentication details supplied.")); return false; } } @@ -370,15 +370,15 @@ static sasl_callback_t callbacks[] = { if ( !r.isOk() ) { if ( mFirstTime ) if ( haveCapability( "AUTH" ) ) - mSMTP->error( KIO::ERR_COULD_NOT_LOGIN, + mSMTP->error( TDEIO::ERR_COULD_NOT_LOGIN, i18n("Your SMTP server does not support %1.\nChoose a different authentication method.\n%2") .arg( mMechusing ).arg( r.errorMessage() ) ); else - mSMTP->error( KIO::ERR_COULD_NOT_LOGIN, + mSMTP->error( TDEIO::ERR_COULD_NOT_LOGIN, i18n("Your SMTP server does not support authentication.\n" " %2").arg( r.errorMessage() ) ); else - mSMTP->error( KIO::ERR_COULD_NOT_LOGIN, + mSMTP->error( TDEIO::ERR_COULD_NOT_LOGIN, i18n("Authentication failed.\n" "Most likely the password is wrong.\n" "%1").arg( r.errorMessage() ) ); @@ -516,7 +516,7 @@ static sasl_callback_t callbacks[] = { if ( result > 0 ) return prepare( ba ); else if ( result < 0 ) { - ts->setFailedFatally( KIO::ERR_INTERNAL, + ts->setFailedFatally( TDEIO::ERR_INTERNAL, i18n("Could not read data from application.") ); mComplete = true; mNeedResponse = true; diff --git a/kioslave/smtp/command.h b/kioslave/smtp/command.h index 53e8d00f3..ed3e1fb66 100644 --- a/kioslave/smtp/command.h +++ b/kioslave/smtp/command.h @@ -176,7 +176,7 @@ namespace KioSMTP { class AuthCommand : public Command { public: AuthCommand( SMTPProtocol * smtp, const char *mechanisms, - const TQString &aFQDN, KIO::AuthInfo &ai ); + const TQString &aFQDN, TDEIO::AuthInfo &ai ); ~AuthCommand(); bool doNotExecute( const TransactionState * ts ) const; TQCString nextCommandLine( TransactionState * ); @@ -193,7 +193,7 @@ namespace KioSMTP { uint mOutlen; bool mOneStep; - KIO::AuthInfo *mAi; + TDEIO::AuthInfo *mAi; TQCString mLastChallenge; TQCString mUngetSASLResponse; bool mFirstTime; diff --git a/kioslave/smtp/response.cc b/kioslave/smtp/response.cc index 8ae8cdceb..0ddce0e5a 100644 --- a/kioslave/smtp/response.cc +++ b/kioslave/smtp/response.cc @@ -119,41 +119,41 @@ namespace KioSMTP { case 454: // TLS not available due to temporary reason // Temporary authentication failure case 554: // Transaction failed / No SMTP service here / No valid recipients - return KIO::ERR_SERVICE_NOT_AVAILABLE; + return TDEIO::ERR_SERVICE_NOT_AVAILABLE; case 451: // Requested action aborted: local error in processing - return KIO::ERR_INTERNAL_SERVER; + return TDEIO::ERR_INTERNAL_SERVER; case 452: // Requested action not taken: insufficient system storage case 552: // Requested mail action aborted: exceeded storage allocation - return KIO::ERR_DISK_FULL; + return TDEIO::ERR_DISK_FULL; case 500: // Syntax error, command unrecognized case 501: // Syntax error in parameters or arguments case 502: // Command not implemented case 503: // Bad sequence of commands case 504: // Command parameter not implemented - return KIO::ERR_INTERNAL; + return TDEIO::ERR_INTERNAL; case 450: // Requested mail action not taken: mailbox unavailable case 550: // Requested action not taken: mailbox unavailable case 551: // User not local; please try <forward-path> case 553: // Requested action not taken: mailbox name not allowed - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; case 530: // {STARTTLS,Authentication} required case 538: // Encryption required for requested authentication mechanism case 534: // Authentication mechanism is too weak - return KIO::ERR_UPGRADE_REQUIRED; + return TDEIO::ERR_UPGRADE_REQUIRED; case 432: // A password transition is needed - return KIO::ERR_COULD_NOT_AUTHENTICATE; + return TDEIO::ERR_COULD_NOT_AUTHENTICATE; default: if ( isPositive() ) return 0; else - return KIO::ERR_UNKNOWN; + return TDEIO::ERR_UNKNOWN; } } diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc index 55352aed6..b1effa415 100644 --- a/kioslave/smtp/smtp.cc +++ b/kioslave/smtp/smtp.cc @@ -170,7 +170,7 @@ void SMTPProtocol::special( const TQByteArray & aData ) { if ( !execute( Command::NOOP ) ) return; } else { - error( KIO::ERR_INTERNAL, + error( TDEIO::ERR_INTERNAL, i18n("The application sent an invalid request.") ); return; } @@ -233,14 +233,14 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ , if ( !from.isNull() ) request.setFromAddress( from ); else if ( request.emitHeaders() ) { - error(KIO::ERR_NO_CONTENT, i18n("The sender address is missing.")); + error(TDEIO::ERR_NO_CONTENT, i18n("The sender address is missing.")); return; } } if ( !smtp_open( request.heloHostname() ) ) { - error(KIO::ERR_SERVICE_NOT_AVAILABLE, + error(TDEIO::ERR_SERVICE_NOT_AVAILABLE, i18n("SMTPProtocol::smtp_open failed (%1)") // ### better error message? .arg(open_url.path())); return; @@ -248,7 +248,7 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ , if ( request.is8BitBody() && !haveCapability("8BITMIME") && metaData("8bitmime") != "on" ) { - error( KIO::ERR_SERVICE_NOT_AVAILABLE, + error( TDEIO::ERR_SERVICE_NOT_AVAILABLE, i18n("Your server does not support sending of 8-bit messages.\n" "Please use base64 or quoted-printable encoding.") ); return; @@ -290,7 +290,7 @@ bool SMTPProtocol::sendCommandLine( const TQCString & cmdline ) { kdDebug( 7112) << "C: <" << cmdline.length() << " bytes>" << endl; ssize_t cmdline_len = cmdline.length(); if ( write( cmdline.data(), cmdline_len ) != cmdline_len ) { - error( KIO::ERR_COULD_NOT_WRITE, m_sServer ); + error( TDEIO::ERR_COULD_NOT_WRITE, m_sServer ); return false; } return true; @@ -308,14 +308,14 @@ Response SMTPProtocol::getResponse( bool * ok ) { do { // wait for data... if ( !waitForResponse( 600 ) ) { - error( KIO::ERR_SERVER_TIMEOUT, m_sServer ); + error( TDEIO::ERR_SERVER_TIMEOUT, m_sServer ); return response; } // ...read data... recv_len = readLine( buf, sizeof(buf) - 1 ); if ( recv_len < 1 && !isConnectionValid() ) { - error( KIO::ERR_CONNECTION_BROKEN, m_sServer ); + error( TDEIO::ERR_CONNECTION_BROKEN, m_sServer ); return response; } @@ -328,7 +328,7 @@ Response SMTPProtocol::getResponse( bool * ok ) { } while ( !response.isComplete() && response.isWellFormed() ); if ( !response.isValid() ) { - error( KIO::ERR_NO_CONTENT, i18n("Invalid SMTP response (%1) received.").arg(response.code()) ); + error( TDEIO::ERR_NO_CONTENT, i18n("Invalid SMTP response (%1) received.").arg(response.code()) ); return response; } @@ -514,7 +514,7 @@ bool SMTPProtocol::smtp_open(const TQString& fakeHostname) if ( !ok || !greeting.isOk() ) { if ( ok ) - error( KIO::ERR_COULD_NOT_LOGIN, + error( TDEIO::ERR_COULD_NOT_LOGIN, i18n("The server did not accept the connection.\n" "%1").arg( greeting.errorMessage() ) ); smtp_close(); @@ -528,7 +528,7 @@ bool SMTPProtocol::smtp_open(const TQString& fakeHostname) else { TQString tmpPort; - KSocketAddress* addr = KExtendedSocket::localAddress(m_iSock); + TDESocketAddress* addr = KExtendedSocket::localAddress(m_iSock); // perform name lookup. NI_NAMEREQD means: don't return a numeric // value (we need to know when we get have the IP address, so we // can enclose it in sqaure brackets (domain-literal). Failure to @@ -587,7 +587,7 @@ bool SMTPProtocol::authenticate() if ( (m_sUser.isEmpty() || !haveCapability( "AUTH" )) && metaData( "sasl" ).isEmpty() ) return true; - KIO::AuthInfo authInfo; + TDEIO::AuthInfo authInfo; authInfo.username = m_sUser; authInfo.password = m_sPass; authInfo.prompt = i18n("Username and password for your SMTP account:"); @@ -642,6 +642,6 @@ void SMTPProtocol::smtp_close( bool nice ) { void SMTPProtocol::stat(const KURL & url) { TQString path = url.path(); - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); } diff --git a/kioslave/smtp/smtp.h b/kioslave/smtp/smtp.h index bcdcaaae3..eef1aab42 100644 --- a/kioslave/smtp/smtp.h +++ b/kioslave/smtp/smtp.h @@ -49,7 +49,7 @@ namespace KioSMTP { class Command; } -class SMTPProtocol : public KIO::TCPSlaveBase { +class SMTPProtocol : public TDEIO::TCPSlaveBase { friend class KioSMTP::Command; public: SMTPProtocol(const TQCString & pool, const TQCString & app, bool useSSL); diff --git a/kioslave/smtp/test_commands.cc b/kioslave/smtp/test_commands.cc index 23d7723ee..458b386b8 100644 --- a/kioslave/smtp/test_commands.cc +++ b/kioslave/smtp/test_commands.cc @@ -31,7 +31,7 @@ public: TQByteArray nextData; int nextDataReturnCode; TQStringList caps; - KIO::MetaData metadata; + TDEIO::MetaData metadata; void clear() { startTLSReturnCode = 1; @@ -161,7 +161,7 @@ int main( int, char** ) { assert( ehlo3.processResponse( r, 0 ) == false ); assert( ehlo3.isComplete() ); assert( !ehlo3.needsResponse() ); - assert( smtp.lastErrorCode == KIO::ERR_UNKNOWN ); + assert( smtp.lastErrorCode == TDEIO::ERR_UNKNOWN ); // dynamics 4: EHLO _and_ HELO fail with "command unknown" smtp.clear(); @@ -176,7 +176,7 @@ int main( int, char** ) { assert( ehlo4.processResponse( r, 0 ) == false ); assert( ehlo4.isComplete() ); assert( !ehlo4.needsResponse() ); - assert( smtp.lastErrorCode == KIO::ERR_INTERNAL_SERVER ); + assert( smtp.lastErrorCode == TDEIO::ERR_INTERNAL_SERVER ); // // STARTTLS @@ -218,7 +218,7 @@ int main( int, char** ) { smtp.startTLSReturnCode = 1; assert( tls2.processResponse( r, &ts ) == false ); assert( !tls2.needsResponse() ); - assert( smtp.lastErrorCode == KIO::ERR_SERVICE_NOT_AVAILABLE ); + assert( smtp.lastErrorCode == TDEIO::ERR_SERVICE_NOT_AVAILABLE ); // dynamics 3: ok from server, TLS negotiation unsuccessful smtp.clear(); @@ -710,7 +710,7 @@ void checkSuccessfulTransferCommand( bool error, bool preload, bool ungetLast, assert( !xfer.needsResponse() ); assert( ts.complete() ); assert( ts.failed() ); - assert( smtp.lastErrorCode == KIO::ERR_DISK_FULL ); + assert( smtp.lastErrorCode == TDEIO::ERR_DISK_FULL ); } else { r.parseLine( "250 Message accepted" ); assert( xfer.processResponse( r, &ts ) == true ); diff --git a/kioslave/smtp/transactionstate.cc b/kioslave/smtp/transactionstate.cc index 67d61486a..b34b45227 100644 --- a/kioslave/smtp/transactionstate.cc +++ b/kioslave/smtp/transactionstate.cc @@ -48,7 +48,7 @@ namespace KioSMTP { void TransactionState::setMailFromFailed( const TQString & addr, const Response & r ) { setFailed(); - mErrorCode = KIO::ERR_NO_CONTENT; + mErrorCode = TDEIO::ERR_NO_CONTENT; if ( addr.isEmpty() ) mErrorMessage = i18n("The server did not accept a blank sender address.\n" "%1").arg( r.errorMessage() ); @@ -81,9 +81,9 @@ namespace KioSMTP { if ( mErrorCode ) return mErrorCode; if ( haveRejectedRecipients() || !dataCommandSucceeded() ) - return KIO::ERR_NO_CONTENT; + return TDEIO::ERR_NO_CONTENT; // ### what else? - return KIO::ERR_INTERNAL; + return TDEIO::ERR_INTERNAL; } TQString TransactionState::errorMessage() const { diff --git a/kioslave/system/kio_system.cpp b/kioslave/system/kio_system.cpp index c64706d8d..61f724093 100644 --- a/kioslave/system/kio_system.cpp +++ b/kioslave/system/kio_system.cpp @@ -73,7 +73,7 @@ bool SystemProtocol::rewriteURL(const KURL &url, KURL &newUrl) if ( !m_impl.parseURL(url, name, path) ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return false; } @@ -95,7 +95,7 @@ void SystemProtocol::stat(const KURL &url) if ( path.isEmpty() || path == "/" ) { // The root is "virtual" - it's not a single physical directory - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; m_impl.createTopLevelEntry( entry ); statEntry( entry ); finished(); @@ -107,13 +107,13 @@ void SystemProtocol::stat(const KURL &url) if ( !ok ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return; } if( path.isEmpty() ) { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if ( m_impl.statByName(name, entry) ) { @@ -122,7 +122,7 @@ void SystemProtocol::stat(const KURL &url) } else { - error(KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } } else @@ -146,7 +146,7 @@ void SystemProtocol::listDir(const KURL &url) if ( !ok ) { - error(KIO::ERR_MALFORMED_URL, url.prettyURL()); + error(TDEIO::ERR_MALFORMED_URL, url.prettyURL()); return; } @@ -155,9 +155,9 @@ void SystemProtocol::listDir(const KURL &url) void SystemProtocol::listRoot() { - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; - KIO::UDSEntryList system_entries; + TDEIO::UDSEntryList system_entries; bool ok = m_impl.listRoot(system_entries); if (!ok) @@ -171,8 +171,8 @@ void SystemProtocol::listRoot() m_impl.createTopLevelEntry(entry); listEntry(entry, false); - KIO::UDSEntryListIterator it = system_entries.begin(); - KIO::UDSEntryListIterator end = system_entries.end(); + TDEIO::UDSEntryListIterator it = system_entries.begin(); + TDEIO::UDSEntryListIterator end = system_entries.end(); for(; it!=end; ++it) { diff --git a/kioslave/system/kio_system.h b/kioslave/system/kio_system.h index 916c495e5..7958e124d 100644 --- a/kioslave/system/kio_system.h +++ b/kioslave/system/kio_system.h @@ -24,7 +24,7 @@ #include "systemimpl.h" -class SystemProtocol : public KIO::ForwardingSlaveBase +class SystemProtocol : public TDEIO::ForwardingSlaveBase { public: SystemProtocol(const TQCString &protocol, const TQCString &pool, diff --git a/kioslave/system/systemimpl.cpp b/kioslave/system/systemimpl.cpp index 24d7776bf..12732767c 100644 --- a/kioslave/system/systemimpl.cpp +++ b/kioslave/system/systemimpl.cpp @@ -37,7 +37,7 @@ SystemImpl::SystemImpl() : TQObject() KStandardDirs::kde_default("data") + "systemview"); } -bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list) +bool SystemImpl::listRoot(TQValueList<TDEIO::UDSEntry> &list) { kdDebug() << "SystemImpl::listRoot" << endl; @@ -55,7 +55,7 @@ bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list) = dir.entryList( TQDir::Files | TQDir::Readable ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList::ConstIterator filename = filenames.begin(); TQStringList::ConstIterator endf = filenames.end(); @@ -110,7 +110,7 @@ bool SystemImpl::realURL(const TQString &name, const TQString &path, return true; } -bool SystemImpl::statByName(const TQString &filename, KIO::UDSEntry& entry) +bool SystemImpl::statByName(const TQString &filename, TDEIO::UDSEntry& entry) { kdDebug() << "SystemImpl::statByName" << endl; @@ -160,7 +160,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const = dir.entryList( TQDir::Files | TQDir::Readable ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList::ConstIterator name = filenames.begin(); TQStringList::ConstIterator endf = filenames.end(); @@ -186,10 +186,10 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const } -static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, +static void addAtom(TDEIO::UDSEntry &entry, unsigned int ID, long l, const TQString &s = TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; @@ -197,14 +197,14 @@ static void addAtom(KIO::UDSEntry &entry, unsigned int ID, long l, } -void SystemImpl::createTopLevelEntry(KIO::UDSEntry &entry) const +void SystemImpl::createTopLevelEntry(TDEIO::UDSEntry &entry) const { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, "."); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0555); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/system_directory"); - addAtom(entry, KIO::UDS_ICON_NAME, 0, "system"); + addAtom(entry, TDEIO::UDS_NAME, 0, "."); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0555); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/system_directory"); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "system"); } TQString SystemImpl::readPathINL(TQString filename) @@ -234,7 +234,7 @@ TQString SystemImpl::readPathINL(TQString filename) } } -void SystemImpl::createEntry(KIO::UDSEntry &entry, +void SystemImpl::createEntry(TDEIO::UDSEntry &entry, const TQString &directory, const TQString &file) { @@ -252,22 +252,22 @@ void SystemImpl::createEntry(KIO::UDSEntry &entry, return; } - addAtom(entry, KIO::UDS_NAME, 0, desktop.readName()); + addAtom(entry, TDEIO::UDS_NAME, 0, desktop.readName()); TQString new_filename = file; new_filename.truncate(file.length()-8); if ( desktop.readURL().isEmpty() ) { - addAtom(entry, KIO::UDS_URL, 0, readPathINL(directory+file)); + addAtom(entry, TDEIO::UDS_URL, 0, readPathINL(directory+file)); } else { - addAtom(entry, KIO::UDS_URL, 0, "system:/"+new_filename); + addAtom(entry, TDEIO::UDS_URL, 0, "system:/"+new_filename); } - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); TQString icon = desktop.readIcon(); TQString empty_icon = desktop.readEntry("EmptyIcon"); @@ -278,22 +278,22 @@ void SystemImpl::createEntry(KIO::UDSEntry &entry, m_lastListingEmpty = true; - KIO::ListJob *job = KIO::listDir(url, false, false); - connect( job, TQT_SIGNAL( entries(KIO::Job *, - const KIO::UDSEntryList &) ), - this, TQT_SLOT( slotEntries(KIO::Job *, - const KIO::UDSEntryList &) ) ); - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( slotResult(KIO::Job *) ) ); + TDEIO::ListJob *job = TDEIO::listDir(url, false, false); + connect( job, TQT_SIGNAL( entries(TDEIO::Job *, + const TDEIO::UDSEntryList &) ), + this, TQT_SLOT( slotEntries(TDEIO::Job *, + const TDEIO::UDSEntryList &) ) ); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( slotResult(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); if (m_lastListingEmpty) icon = empty_icon; } - addAtom(entry, KIO::UDS_ICON_NAME, 0, icon); + addAtom(entry, TDEIO::UDS_ICON_NAME, 0, icon); } -void SystemImpl::slotEntries(KIO::Job *job, const KIO::UDSEntryList &list) +void SystemImpl::slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list) { if (list.size()>0) { @@ -303,7 +303,7 @@ void SystemImpl::slotEntries(KIO::Job *job, const KIO::UDSEntryList &list) } } -void SystemImpl::slotResult(KIO::Job *) +void SystemImpl::slotResult(TDEIO::Job *) { tqApp->eventLoop()->exitLoop(); } diff --git a/kioslave/system/systemimpl.h b/kioslave/system/systemimpl.h index 31dc2daad..fcc4cda48 100644 --- a/kioslave/system/systemimpl.h +++ b/kioslave/system/systemimpl.h @@ -35,10 +35,10 @@ Q_OBJECT public: SystemImpl(); - void createTopLevelEntry(KIO::UDSEntry& entry) const; - bool statByName(const TQString &filename, KIO::UDSEntry& entry); + void createTopLevelEntry(TDEIO::UDSEntry& entry) const; + bool statByName(const TQString &filename, TDEIO::UDSEntry& entry); - bool listRoot(TQValueList<KIO::UDSEntry> &list); + bool listRoot(TQValueList<TDEIO::UDSEntry> &list); bool parseURL(const KURL &url, TQString &name, TQString &path) const; bool realURL(const TQString &name, const TQString &path, KURL &url) const; @@ -48,11 +48,11 @@ public: private slots: KURL findBaseURL(const TQString &filename) const; - void slotEntries(KIO::Job *job, const KIO::UDSEntryList &list); - void slotResult(KIO::Job *job); + void slotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list); + void slotResult(TDEIO::Job *job); private: - void createEntry(KIO::UDSEntry& entry, const TQString &directory, + void createEntry(TDEIO::UDSEntry& entry, const TQString &directory, const TQString &file); bool m_lastListingEmpty; diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc index 9af5062ab..e56b9941c 100644 --- a/kioslave/tar/tar.cc +++ b/kioslave/tar/tar.cc @@ -26,7 +26,7 @@ #include "tar.h" -using namespace KIO; +using namespace TDEIO; extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } @@ -60,7 +60,7 @@ ArchiveProtocol::~ArchiveProtocol() delete m_archiveFile; } -bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Error& errorNum ) +bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, TDEIO::Error& errorNum ) { TQString fullPath = url.path(); kdDebug(7109) << "ArchiveProtocol::checkNewFile " << fullPath << endl; @@ -137,10 +137,10 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro { // Too bad, it is a directory, not an archive. kdDebug(7109) << "Path is a directory, not an archive." << endl; - errorNum = KIO::ERR_IS_DIRECTORY; + errorNum = TDEIO::ERR_IS_DIRECTORY; } else - errorNum = KIO::ERR_DOES_NOT_EXIST; + errorNum = TDEIO::ERR_DOES_NOT_EXIST; return false; } @@ -156,7 +156,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro m_archiveFile = new KZip( archiveFile ); } else { kdWarning(7109) << "Protocol " << url.protocol() << " not supported by this IOSlave" << endl; - errorNum = KIO::ERR_UNSUPPORTED_PROTOCOL; + errorNum = TDEIO::ERR_UNSUPPORTED_PROTOCOL; return false; } @@ -165,7 +165,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro kdDebug(7109) << "Opening " << archiveFile << "failed." << endl; delete m_archiveFile; m_archiveFile = 0L; - errorNum = KIO::ERR_CANNOT_OPEN_FOR_READING; + errorNum = TDEIO::ERR_CANNOT_OPEN_FOR_READING; return false; } @@ -216,14 +216,14 @@ void ArchiveProtocol::listDir( const KURL & url ) kdDebug( 7109 ) << "ArchiveProtocol::listDir " << url << endl; TQString path; - KIO::Error errorNum; + TDEIO::Error errorNum; if ( !checkNewFile( url, path, errorNum ) ) { - if ( errorNum == KIO::ERR_CANNOT_OPEN_FOR_READING ) + if ( errorNum == TDEIO::ERR_CANNOT_OPEN_FOR_READING ) { // If we cannot open, it might be a problem with the archive header (e.g. unsupported format) // Therefore give a more specific error message - error( KIO::ERR_SLAVE_DEFINED, + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Could not open the file, probably due to an unsupported file format.\n%1") .arg( url.prettyURL() ) ); return; @@ -268,12 +268,12 @@ void ArchiveProtocol::listDir( const KURL & url ) const KArchiveEntry* e = root->entry( path ); if ( !e ) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } if ( ! e->isDirectory() ) { - error( KIO::ERR_IS_FILE, url.prettyURL() ); + error( TDEIO::ERR_IS_FILE, url.prettyURL() ); return; } dir = (KArchiveDirectory*)e; @@ -307,16 +307,16 @@ void ArchiveProtocol::stat( const KURL & url ) { TQString path; UDSEntry entry; - KIO::Error errorNum; + TDEIO::Error errorNum; if ( !checkNewFile( url, path, errorNum ) ) { // We may be looking at a real directory - this happens // when pressing up after being in the root of an archive - if ( errorNum == KIO::ERR_CANNOT_OPEN_FOR_READING ) + if ( errorNum == TDEIO::ERR_CANNOT_OPEN_FOR_READING ) { // If we cannot open, it might be a problem with the archive header (e.g. unsupported format) // Therefore give a more specific error message - error( KIO::ERR_SLAVE_DEFINED, + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Could not open the file, probably due to an unsupported file format.\n%1") .arg( url.prettyURL() ) ); return; @@ -329,7 +329,7 @@ void ArchiveProtocol::stat( const KURL & url ) } // Real directory. Return just enough information for KRun to work UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = url.fileName(); entry.append( atom ); kdDebug( 7109 ) << "ArchiveProtocol::stat returning name=" << url.fileName() << endl; @@ -338,11 +338,11 @@ void ArchiveProtocol::stat( const KURL & url ) if ( KDE_stat( TQFile::encodeName( url.path() ), &buff ) == -1 ) { // Should not happen, as the file was already stated by checkNewFile - error( KIO::ERR_COULD_NOT_STAT, url.prettyURL() ); + error( TDEIO::ERR_COULD_NOT_STAT, url.prettyURL() ); return; } - atom.m_uds = KIO::UDS_FILE_TYPE; + atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = buff.st_mode & S_IFMT; entry.append( atom ); @@ -368,7 +368,7 @@ void ArchiveProtocol::stat( const KURL & url ) } if ( !archiveEntry ) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } @@ -383,14 +383,14 @@ void ArchiveProtocol::get( const KURL & url ) kdDebug( 7109 ) << "ArchiveProtocol::get " << url << endl; TQString path; - KIO::Error errorNum; + TDEIO::Error errorNum; if ( !checkNewFile( url, path, errorNum ) ) { - if ( errorNum == KIO::ERR_CANNOT_OPEN_FOR_READING ) + if ( errorNum == TDEIO::ERR_CANNOT_OPEN_FOR_READING ) { // If we cannot open, it might be a problem with the archive header (e.g. unsupported format) // Therefore give a more specific error message - error( KIO::ERR_SLAVE_DEFINED, + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Could not open the file, probably due to an unsupported file format.\n%1") .arg( url.prettyURL() ) ); return; @@ -410,12 +410,12 @@ void ArchiveProtocol::get( const KURL & url ) if ( !archiveEntry ) { - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); return; } if ( archiveEntry->isDirectory() ) { - error( KIO::ERR_IS_DIRECTORY, url.prettyURL() ); + error( TDEIO::ERR_IS_DIRECTORY, url.prettyURL() ); return; } const KArchiveFile* archiveFileEntry = static_cast<const KArchiveFile *>(archiveEntry); @@ -461,13 +461,13 @@ void ArchiveProtocol::get( const KURL & url ) { // Wrong protocol? Why was this not catched by checkNewFile? kdWarning(7109) << "Protocol " << url.protocol() << " not supported by this IOSlave; " << k_funcinfo << endl; - error( KIO::ERR_UNSUPPORTED_PROTOCOL, url.protocol() ); + error( TDEIO::ERR_UNSUPPORTED_PROTOCOL, url.protocol() ); return; } if (!io) { - error( KIO::ERR_SLAVE_DEFINED, + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "The archive file could not be opened, perhaps because the format is unsupported.\n%1" ) .arg( url.prettyURL() ) ); return; @@ -475,7 +475,7 @@ void ArchiveProtocol::get( const KURL & url ) if ( !io->open( IO_ReadOnly ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL() ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, url.prettyURL() ); return; } @@ -489,7 +489,7 @@ void ArchiveProtocol::get( const KURL & url ) if ( buffer.isEmpty() && bufferSize > 0 ) { // Something went wrong - error( KIO::ERR_OUT_OF_MEMORY, url.prettyURL() ); + error( TDEIO::ERR_OUT_OF_MEMORY, url.prettyURL() ); return; } @@ -497,7 +497,7 @@ void ArchiveProtocol::get( const KURL & url ) // How much file do we still have to process? int fileSize = archiveFileEntry->size(); - KIO::filesize_t processed = 0; + TDEIO::filesize_t processed = 0; while ( !io->atEnd() && fileSize > 0 ) { @@ -510,7 +510,7 @@ void ArchiveProtocol::get( const KURL & url ) if ( read != bufferSize ) { kdWarning(7109) << "Read " << read << " bytes but expected " << bufferSize << endl; - error( KIO::ERR_COULD_NOT_READ, url.prettyURL() ); + error( TDEIO::ERR_COULD_NOT_READ, url.prettyURL() ); return; } if ( firstRead ) diff --git a/kioslave/tar/tar.h b/kioslave/tar/tar.h index 1cde2deae..95887e559 100644 --- a/kioslave/tar/tar.h +++ b/kioslave/tar/tar.h @@ -25,7 +25,7 @@ #include <kio/global.h> #include <kio/slavebase.h> -class ArchiveProtocol : public KIO::SlaveBase +class ArchiveProtocol : public TDEIO::SlaveBase { public: ArchiveProtocol( const TQCString &pool, const TQCString &app ); @@ -36,7 +36,7 @@ public: virtual void get( const KURL & url ); protected: - void createUDSEntry( const KArchiveEntry * tarEntry, KIO::UDSEntry & entry ); + void createUDSEntry( const KArchiveEntry * tarEntry, TDEIO::UDSEntry & entry ); /** * \brief find, check and open the archive file @@ -45,7 +45,7 @@ protected: * \param errNum KIO error number (undefined if the function returns true) * \return true if file was found, false if there was an error */ - bool checkNewFile( const KURL & url, TQString & path, KIO::Error& errorNum ); + bool checkNewFile( const KURL & url, TQString & path, TDEIO::Error& errorNum ); KArchive * m_archiveFile; TQString m_archiveName; diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp index 0cc8d54d3..39e8f1fe2 100644 --- a/kioslave/thumbnail/exrcreator.cpp +++ b/kioslave/thumbnail/exrcreator.cpp @@ -62,8 +62,8 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img) // EXR images just to turn it into an icon, so we go back // to honouring it in here. kdDebug() << "EXRcreator - using original image" << endl; - KConfig * config = TDEGlobal::config(); - KConfigGroupSaver cgs( config, "PreviewSettings" ); + TDEConfig * config = TDEGlobal::config(); + TDEConfigGroupSaver cgs( config, "PreviewSettings" ); unsigned long long maxSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); unsigned long long fileSize = TQFile( path ).size(); if ( (fileSize > 0) && (fileSize < maxSize) ) { diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index ac7525c60..3dbd5b4a3 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -81,7 +81,7 @@ // int depth // Otherwise, the data returned is the image in PNG format. -using namespace KIO; +using namespace TDEIO; extern "C" { @@ -148,19 +148,19 @@ void ThumbnailProtocol::get(const KURL &url) if (info.isDir()) { // We cannot process a directory - error(KIO::ERR_IS_DIRECTORY,url.path()); + error(TDEIO::ERR_IS_DIRECTORY,url.path()); return; } else if (!info.exists()) { // The file does not exist - error(KIO::ERR_DOES_NOT_EXIST,url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST,url.path()); return; } else if (!info.isReadable()) { // The file is not readable! - error(KIO::ERR_COULD_NOT_READ,url.path()); + error(TDEIO::ERR_COULD_NOT_READ,url.path()); return; } m_mimeType = KMimeType::findByURL(url)->name(); @@ -171,7 +171,7 @@ void ThumbnailProtocol::get(const KURL &url) if (m_mimeType.isEmpty()) { - error(KIO::ERR_INTERNAL, i18n("No MIME Type specified.")); + error(TDEIO::ERR_INTERNAL, i18n("No MIME Type specified.")); return; } @@ -181,7 +181,7 @@ void ThumbnailProtocol::get(const KURL &url) if (m_width < 0 || m_height < 0) { - error(KIO::ERR_INTERNAL, i18n("No or invalid size specified.")); + error(TDEIO::ERR_INTERNAL, i18n("No or invalid size specified.")); return; } #ifdef THUMBNAIL_HACK @@ -206,7 +206,7 @@ void ThumbnailProtocol::get(const KURL &url) TQImage img; - KConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); + TDEConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); // ### KFMI @@ -262,7 +262,7 @@ void ThumbnailProtocol::get(const KURL &url) #endif if (plugin.isEmpty()) { - error(KIO::ERR_INTERNAL, i18n("No plugin specified.")); + error(TDEIO::ERR_INTERNAL, i18n("No plugin specified.")); return; } @@ -280,7 +280,7 @@ void ThumbnailProtocol::get(const KURL &url) } if (!creator) { - error(KIO::ERR_INTERNAL, i18n("Cannot load ThumbCreator %1").arg(plugin)); + error(TDEIO::ERR_INTERNAL, i18n("Cannot load ThumbCreator %1").arg(plugin)); return; } m_creators.insert(plugin, creator); @@ -288,7 +288,7 @@ void ThumbnailProtocol::get(const KURL &url) if (!creator->create(url.path(), m_width, m_height, img)) { - error(KIO::ERR_INTERNAL, i18n("Cannot create thumbnail for %1").arg(url.path())); + error(TDEIO::ERR_INTERNAL, i18n("Cannot create thumbnail for %1").arg(url.path())); return; } flags = creator->flags(); @@ -355,7 +355,7 @@ void ThumbnailProtocol::get(const KURL &url) if (img.isNull()) { - error(KIO::ERR_INTERNAL, i18n("Failed to create a thumbnail.")); + error(TDEIO::ERR_INTERNAL, i18n("Failed to create a thumbnail.")); return; } @@ -370,7 +370,7 @@ void ThumbnailProtocol::get(const KURL &url) TQBuffer buf; if (!buf.open(IO_WriteOnly)) { - error(KIO::ERR_INTERNAL, i18n("Could not write image.")); + error(TDEIO::ERR_INTERNAL, i18n("Could not write image.")); return; } img.save(&buf,"PNG"); @@ -395,16 +395,16 @@ void ThumbnailProtocol::get(const KURL &url) void *shmaddr = shmat(shmid.toInt(), 0, 0); if (shmaddr == (void *)-1) { - error(KIO::ERR_INTERNAL, i18n("Failed to attach to shared memory segment %1").arg(shmid)); + error(TDEIO::ERR_INTERNAL, i18n("Failed to attach to shared memory segment %1").arg(shmid)); return; } if (img.width() * img.height() > m_width * m_height) { - error(KIO::ERR_INTERNAL, i18n("Image is too big for the shared memory segment")); + error(TDEIO::ERR_INTERNAL, i18n("Image is too big for the shared memory segment")); shmdt((char*)shmaddr); return; } - if( img.depth() != 32 ) // KIO::PreviewJob and this code below completely + if( img.depth() != 32 ) // TDEIO::PreviewJob and this code below completely img = img.convertDepth( 32 ); // ignores colortable :-/, so make sure there is none stream << img.width() << img.height() << img.depth() << img.hasAlphaBuffer(); diff --git a/kioslave/thumbnail/thumbnail.h b/kioslave/thumbnail/thumbnail.h index a2eb53841..091ad02c2 100644 --- a/kioslave/thumbnail/thumbnail.h +++ b/kioslave/thumbnail/thumbnail.h @@ -27,7 +27,7 @@ class ThumbCreator; class TQImage; -class ThumbnailProtocol : public KIO::SlaveBase +class ThumbnailProtocol : public TDEIO::SlaveBase { public: ThumbnailProtocol(const TQCString &pool, const TQCString &app); diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index 8b033abd4..f77cbf9ab 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -94,7 +94,7 @@ void TrashProtocol::restore( const KURL& trashURL ) TQString fileId, relativePath; bool ok = TrashImpl::parseURL( trashURL, trashId, fileId, relativePath ); if ( !ok ) { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( trashURL.prettyURL() ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( trashURL.prettyURL() ) ); return; } TrashedFileInfo info; @@ -112,7 +112,7 @@ void TrashProtocol::restore( const KURL& trashURL ) const TQString destDir = dest.directory(); KDE_struct_stat buff; if ( KDE_lstat( TQFile::encodeName( destDir ), &buff ) == -1 ) { - error( KIO::ERR_SLAVE_DEFINED, + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "The directory %1 does not exist anymore, so it is not possible to restore this item to its original location. " "You can either recreate that directory and use the restore operation again, or drag the item anywhere else to restore it." ).arg( destDir ) ); return; @@ -128,7 +128,7 @@ void TrashProtocol::rename( const KURL &oldURL, const KURL &newURL, bool overwri kdDebug()<<"TrashProtocol::rename(): old="<<oldURL<<" new="<<newURL<<" overwrite=" << overwrite<<endl; if ( oldURL.protocol() == "trash" && newURL.protocol() == "trash" ) { - error( KIO::ERR_CANNOT_RENAME, oldURL.prettyURL() ); + error( TDEIO::ERR_CANNOT_RENAME, oldURL.prettyURL() ); return; } @@ -142,7 +142,7 @@ void TrashProtocol::copy( const KURL &src, const KURL &dest, int /*permissions*/ kdDebug()<<"TrashProtocol::copy(): " << src << " " << dest << endl; if ( src.protocol() == "trash" && dest.protocol() == "trash" ) { - error( KIO::ERR_UNSUPPORTED_ACTION, i18n( "This file is already in the trash bin." ) ); + error( TDEIO::ERR_UNSUPPORTED_ACTION, i18n( "This file is already in the trash bin." ) ); return; } @@ -157,7 +157,7 @@ void TrashProtocol::copyOrMove( const KURL &src, const KURL &dest, bool overwrit TQString fileId, relativePath; bool ok = TrashImpl::parseURL( src, trashId, fileId, relativePath ); if ( !ok ) { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( src.prettyURL() ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( src.prettyURL() ) ); return; } const TQString destPath = dest.path(); @@ -166,7 +166,7 @@ void TrashProtocol::copyOrMove( const KURL &src, const KURL &dest, bool overwrit ok = TQFile::remove( destPath ); Q_ASSERT( ok ); // ### TODO } else { - error( KIO::ERR_FILE_ALREADY_EXIST, destPath ); + error( TDEIO::ERR_FILE_ALREADY_EXIST, destPath ); return; } } @@ -224,33 +224,33 @@ void TrashProtocol::copyOrMove( const KURL &src, const KURL &dest, bool overwrit } return; } else { - kdDebug() << "returning KIO::ERR_ACCESS_DENIED, it's not allowed to add a file to an existing trash directory" << endl; + kdDebug() << "returning TDEIO::ERR_ACCESS_DENIED, it's not allowed to add a file to an existing trash directory" << endl; // It's not allowed to add a file to an existing trash directory. - error( KIO::ERR_ACCESS_DENIED, dest.prettyURL() ); + error( TDEIO::ERR_ACCESS_DENIED, dest.prettyURL() ); return; } } else - error( KIO::ERR_UNSUPPORTED_ACTION, "should never happen" ); + error( TDEIO::ERR_UNSUPPORTED_ACTION, "should never happen" ); } -static void addAtom(KIO::UDSEntry& entry, unsigned int ID, long long l, const TQString& s = TQString::null) +static void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long long l, const TQString& s = TQString::null) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; entry.append(atom); } -void TrashProtocol::createTopLevelDirEntry(KIO::UDSEntry& entry) +void TrashProtocol::createTopLevelDirEntry(TDEIO::UDSEntry& entry) { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, "."); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0700); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, "inode/directory"); - addAtom(entry, KIO::UDS_USER, 0, m_userName); - addAtom(entry, KIO::UDS_GROUP, 0, m_groupName); + addAtom(entry, TDEIO::UDS_NAME, 0, "."); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0700); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/directory"); + addAtom(entry, TDEIO::UDS_USER, 0, m_userName); + addAtom(entry, TDEIO::UDS_GROUP, 0, m_groupName); } void TrashProtocol::stat(const KURL& url) @@ -259,7 +259,7 @@ void TrashProtocol::stat(const KURL& url) const TQString path = url.path(); if( path.isEmpty() || path == "/" ) { // The root is "virtual" - it's not a single physical directory - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; createTopLevelDirEntry( entry ); statEntry( entry ); finished(); @@ -274,8 +274,8 @@ void TrashProtocol::stat(const KURL& url) kdDebug() << k_funcinfo << url << " looks fishy, returning does-not-exist" << endl; // A URL like trash:/file simply means that CopyJob is trying to see if // the destination exists already (it made up the URL by itself). - error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); - //error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); + error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() ); + //error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); return; } @@ -292,14 +292,14 @@ void TrashProtocol::stat(const KURL& url) fileURL = url.url(); } - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TrashedFileInfo info; ok = impl.infoForFile( trashId, fileId, info ); if ( ok ) ok = createUDSEntry( filePath, fileName, fileURL, entry, info ); if ( !ok ) { - error( KIO::ERR_COULD_NOT_STAT, url.prettyURL() ); + error( TDEIO::ERR_COULD_NOT_STAT, url.prettyURL() ); } statEntry( entry ); @@ -314,13 +314,13 @@ void TrashProtocol::del( const KURL &url, bool /*isfile*/ ) bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath ); if ( !ok ) { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); return; } ok = relativePath.isEmpty(); if ( !ok ) { - error( KIO::ERR_ACCESS_DENIED, url.prettyURL() ); + error( TDEIO::ERR_ACCESS_DENIED, url.prettyURL() ); return; } @@ -346,7 +346,7 @@ void TrashProtocol::listDir(const KURL& url) TQString relativePath; bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath ); if ( !ok ) { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); return; } //was: const TQString physicalPath = impl.physicalPath( trashId, fileId, relativePath ); @@ -368,7 +368,7 @@ void TrashProtocol::listDir(const KURL& url) kdDebug() << k_funcinfo << "listing " << info.physicalPath << endl; TQStrList entryNames = impl.listDir( info.physicalPath ); totalSize( entryNames.count() ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStrListIterator entryIt( entryNames ); for (; entryIt.current(); ++entryIt) { TQString fileName = TQFile::decodeName( entryIt.current() ); @@ -390,7 +390,7 @@ void TrashProtocol::listDir(const KURL& url) finished(); } -bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString& fileName, const TQString& url, KIO::UDSEntry& entry, const TrashedFileInfo& info ) +bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString& fileName, const TQString& url, TDEIO::UDSEntry& entry, const TrashedFileInfo& info ) { TQCString physicalPath_c = TQFile::encodeName( physicalPath ); KDE_struct_stat buff; @@ -405,7 +405,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString buffer2[ n ] = 0; } - addAtom( entry, KIO::UDS_LINK_DEST, 0, TQFile::decodeName( buffer2 ) ); + addAtom( entry, TDEIO::UDS_LINK_DEST, 0, TQFile::decodeName( buffer2 ) ); // Follow symlink // That makes sense in kio_file, but not in the trash, especially for the size // #136876 @@ -422,21 +422,21 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString mode_t type = buff.st_mode & S_IFMT; // extract file type mode_t access = buff.st_mode & 07777; // extract permissions access &= 07555; // make it readonly, since it's in the trashcan - addAtom( entry, KIO::UDS_NAME, 0, fileName ); - addAtom( entry, KIO::UDS_FILE_TYPE, type ); + addAtom( entry, TDEIO::UDS_NAME, 0, fileName ); + addAtom( entry, TDEIO::UDS_FILE_TYPE, type ); if ( !url.isEmpty() ) - addAtom( entry, KIO::UDS_URL, 0, url ); + addAtom( entry, TDEIO::UDS_URL, 0, url ); KMimeType::Ptr mt = KMimeType::findByPath( physicalPath, buff.st_mode ); - addAtom( entry, KIO::UDS_MIME_TYPE, 0, mt->name() ); - addAtom( entry, KIO::UDS_ACCESS, access ); - addAtom( entry, KIO::UDS_SIZE, buff.st_size ); - addAtom( entry, KIO::UDS_USER, 0, m_userName ); // assumption - addAtom( entry, KIO::UDS_GROUP, 0, m_groupName ); // assumption - addAtom( entry, KIO::UDS_MODIFICATION_TIME, buff.st_mtime ); - addAtom( entry, KIO::UDS_ACCESS_TIME, buff.st_atime ); // ## or use it for deletion time? - addAtom( entry, KIO::UDS_EXTRA, 0, info.origPath ); - addAtom( entry, KIO::UDS_EXTRA, 0, info.deletionDate.toString( Qt::ISODate ) ); + addAtom( entry, TDEIO::UDS_MIME_TYPE, 0, mt->name() ); + addAtom( entry, TDEIO::UDS_ACCESS, access ); + addAtom( entry, TDEIO::UDS_SIZE, buff.st_size ); + addAtom( entry, TDEIO::UDS_USER, 0, m_userName ); // assumption + addAtom( entry, TDEIO::UDS_GROUP, 0, m_groupName ); // assumption + addAtom( entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime ); + addAtom( entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime ); // ## or use it for deletion time? + addAtom( entry, TDEIO::UDS_EXTRA, 0, info.origPath ); + addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( Qt::ISODate ) ); return true; } @@ -445,7 +445,7 @@ void TrashProtocol::listRoot() INIT_IMPL; const TrashedFileInfoList lst = impl.list(); totalSize( lst.count() ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; createTopLevelDirEntry( entry ); listEntry( entry, false ); for ( TrashedFileInfoList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { @@ -488,7 +488,7 @@ void TrashProtocol::special( const TQByteArray & data ) } default: kdWarning(7116) << "Unknown command in special(): " << cmd << endl; - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd) ); + error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::number(cmd) ); break; } } @@ -499,7 +499,7 @@ void TrashProtocol::put( const KURL& url, int /*permissions*/, bool /*overwrite* kdDebug() << "put: " << url << endl; // create deleted file. We need to get the mtime and original location from metadata... // Maybe we can find the info file for url.fileName(), in case ::rename() was called first, and failed... - error( KIO::ERR_ACCESS_DENIED, url.prettyURL() ); + error( TDEIO::ERR_ACCESS_DENIED, url.prettyURL() ); } void TrashProtocol::get( const KURL& url ) @@ -508,11 +508,11 @@ void TrashProtocol::get( const KURL& url ) kdDebug() << "get() : " << url << endl; if ( !url.isValid() ) { kdDebug() << kdBacktrace() << endl; - error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.url() ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.url() ) ); return; } if ( url.path().length() <= 1 ) { - error( KIO::ERR_IS_DIRECTORY, url.prettyURL() ); + error( TDEIO::ERR_IS_DIRECTORY, url.prettyURL() ); return; } int trashId; @@ -520,7 +520,7 @@ void TrashProtocol::get( const KURL& url ) TQString relativePath; bool ok = TrashImpl::parseURL( url, trashId, fileId, relativePath ); if ( !ok ) { - error( KIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); + error( TDEIO::ERR_SLAVE_DEFINED, i18n( "Malformed URL %1" ).arg( url.prettyURL() ) ); return; } const TQString physicalPath = impl.physicalPath( trashId, fileId, relativePath ); @@ -533,27 +533,27 @@ void TrashProtocol::get( const KURL& url ) // But for this one we wouldn't use DCOP for every bit of data... KURL fileURL; fileURL.setPath( physicalPath ); - KIO::Job* job = KIO::get( fileURL ); - connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( mimetype( KIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotMimetype( KIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( jobFinished(KIO::Job *) ) ); + TDEIO::Job* job = TDEIO::get( fileURL ); + connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ), + this, TQT_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); } -void TrashProtocol::slotData( KIO::Job*, const TQByteArray&arr ) +void TrashProtocol::slotData( TDEIO::Job*, const TQByteArray&arr ) { data( arr ); } -void TrashProtocol::slotMimetype( KIO::Job*, const TQString& mt ) +void TrashProtocol::slotMimetype( TDEIO::Job*, const TQString& mt ) { mimeType( mt ); } -void TrashProtocol::jobFinished( KIO::Job* job ) +void TrashProtocol::jobFinished( TDEIO::Job* job ) { if ( job->error() ) error( job->error(), job->errorText() ); @@ -588,7 +588,7 @@ void TrashProtocol::mkdir( const KURL& url, int /*permissions*/ ) } } else { // Well it's not allowed to add a directory to an existing deleted directory. - error( KIO::ERR_ACCESS_DENIED, url.prettyURL() ); + error( TDEIO::ERR_ACCESS_DENIED, url.prettyURL() ); } } #endif diff --git a/kioslave/trash/kio_trash.h b/kioslave/trash/kio_trash.h index 37ea1944f..6f94512d7 100644 --- a/kioslave/trash/kio_trash.h +++ b/kioslave/trash/kio_trash.h @@ -22,12 +22,12 @@ #include <kio/slavebase.h> #include "trashimpl.h" -namespace KIO { class Job; } +namespace TDEIO { class Job; } typedef TrashImpl::TrashedFileInfo TrashedFileInfo; typedef TrashImpl::TrashedFileInfoList TrashedFileInfoList; -class TrashProtocol : public TQObject, public KIO::SlaveBase +class TrashProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT public: @@ -50,16 +50,16 @@ public: virtual void special( const TQByteArray & data ); private slots: - void slotData( KIO::Job*, const TQByteArray& ); - void slotMimetype( KIO::Job*, const TQString& ); - void jobFinished( KIO::Job* job ); + void slotData( TDEIO::Job*, const TQByteArray& ); + void slotMimetype( TDEIO::Job*, const TQString& ); + void jobFinished( TDEIO::Job* job ); private: typedef enum CopyOrMove { Copy, Move }; void copyOrMove( const KURL& src, const KURL& dest, bool overwrite, CopyOrMove action ); - void createTopLevelDirEntry(KIO::UDSEntry& entry); + void createTopLevelDirEntry(TDEIO::UDSEntry& entry); bool createUDSEntry( const TQString& physicalPath, const TQString& fileName, const TQString& url, - KIO::UDSEntry& entry, const TrashedFileInfo& info ); + TDEIO::UDSEntry& entry, const TrashedFileInfo& info ); void listRoot(); void restore( const KURL& trashURL ); diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp index 630b8e314..b05cac249 100644 --- a/kioslave/trash/ktrash.cpp +++ b/kioslave/trash/ktrash.cpp @@ -53,8 +53,8 @@ int main(int argc, char *argv[]) TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)1; - KIO::Job* job = KIO::special( "trash:/", packedArgs ); - (void)KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( "trash:/", packedArgs ); + (void)TDEIO::NetAccess::synchronousRun( job, 0 ); // Update konq windows opened on trash:/ KDirNotify_stub allDirNotify("*", "KDirNotify*"); @@ -68,8 +68,8 @@ int main(int argc, char *argv[]) TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)2; - KIO::Job* job = KIO::special( "trash:/", packedArgs ); - (void)KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( "trash:/", packedArgs ); + (void)TDEIO::NetAccess::synchronousRun( job, 0 ); return 0; } #endif @@ -91,10 +91,10 @@ int main(int argc, char *argv[]) TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)3 << trashURL; - KIO::Job* job = KIO::special( trashURL, packedArgs ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( trashURL, packedArgs ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); if ( !ok ) - kdError() << KIO::NetAccess::lastErrorString() << endl; + kdError() << TDEIO::NetAccess::lastErrorString() << endl; return 0; } diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp index ef255e91d..e3d06a6d2 100644 --- a/kioslave/trash/testtrash.cpp +++ b/kioslave/trash/testtrash.cpp @@ -197,12 +197,12 @@ void TestTrash::setup() // Start with a clean base dir if ( TQFileInfo( homeTmpDir() ).exists() ) { - bool ok = KIO::NetAccess::del( homeTmpDir(), 0 ); + bool ok = TDEIO::NetAccess::del( homeTmpDir(), 0 ); if ( !ok ) kdFatal() << "Couldn't delete " << homeTmpDir() << endl; } if ( TQFileInfo( otherTmpDir() ).exists() ) { - bool ok = KIO::NetAccess::del( otherTmpDir(), 0 ); + bool ok = TDEIO::NetAccess::del( otherTmpDir(), 0 ); if ( !ok ) kdFatal() << "Couldn't delete " << otherTmpDir() << endl; } @@ -249,11 +249,11 @@ void TestTrash::cleanTrash() removeFile( m_trashDir, "/info/trashDirFromOther.trashinfo" ); removeFile( m_trashDir, "/files/trashDirFromOther/testfile" ); removeDir( m_trashDir, "/files/trashDirFromOther" ); - KIO::NetAccess::del( m_trashDir + "/files/readonly", 0 ); + TDEIO::NetAccess::del( m_trashDir + "/files/readonly", 0 ); // for trashDirectoryOwnedByRoot - KIO::NetAccess::del( m_trashDir + "/files/cups", 0 ); - KIO::NetAccess::del( m_trashDir + "/files/boot", 0 ); - KIO::NetAccess::del( m_trashDir + "/files/etc", 0 ); + TDEIO::NetAccess::del( m_trashDir + "/files/cups", 0 ); + TDEIO::NetAccess::del( m_trashDir + "/files/boot", 0 ); + TDEIO::NetAccess::del( m_trashDir + "/files/etc", 0 ); //system( "find ~/.local-testtrash/share/Trash" ); } @@ -405,12 +405,12 @@ void TestTrash::trashFile( const TQString& origFilePath, const TQString& fileId u.setPath( origFilePath ); // test - KIO::Job* job = KIO::move( u, "trash:/" ); + TDEIO::Job* job = TDEIO::move( u, "trash:/" ); TQMap<TQString, TQString> metaData; - //bool ok = KIO::NetAccess::move( u, "trash:/" ); - bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); + //bool ok = TDEIO::NetAccess::move( u, "trash:/" ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); if ( !ok ) - kdError() << "moving " << u << " to trash failed with error " << KIO::NetAccess::lastError() << " " << KIO::NetAccess::lastErrorString() << endl; + kdError() << "moving " << u << " to trash failed with error " << TDEIO::NetAccess::lastError() << " " << TDEIO::NetAccess::lastErrorString() << endl; assert( ok ); if ( origFilePath.startsWith( "/tmp" ) && m_tmpIsWritablePartition ) { kdDebug() << " TESTS SKIPPED" << endl; @@ -512,9 +512,9 @@ void TestTrash::trashFileIntoOtherPartition() u.setPath( origFilePath ); // test - KIO::Job* job = KIO::move( u, "trash:/" ); + TDEIO::Job* job = TDEIO::move( u, "trash:/" ); TQMap<TQString, TQString> metaData; - bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); assert( ok ); // Note that the Path stored in the info file is relative, on other partitions (#95652) checkInfoFile( m_otherPartitionTrashDir + "/info/" + fileId + ".trashinfo", fileName ); @@ -550,13 +550,13 @@ void TestTrash::trashFileOwnedByRoot() u.setPath( "/etc/passwd" ); const TQString fileId = "passwd"; - KIO::CopyJob* job = KIO::move( u, "trash:/" ); + TDEIO::CopyJob* job = TDEIO::move( u, "trash:/" ); job->setInteractive( false ); // no skip dialog, thanks TQMap<TQString, TQString> metaData; - //bool ok = KIO::NetAccess::move( u, "trash:/" ); - bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); + //bool ok = TDEIO::NetAccess::move( u, "trash:/" ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); assert( !ok ); - assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED ); const TQString infoPath( m_trashDir + "/info/" + fileId + ".trashinfo" ); assert( !TQFile::exists( infoPath ) ); @@ -577,7 +577,7 @@ void TestTrash::trashSymlink( const TQString& origFilePath, const TQString& file u.setPath( origFilePath ); // test - ok = KIO::NetAccess::move( u, "trash:/" ); + ok = TDEIO::NetAccess::move( u, "trash:/" ); assert( ok ); if ( origFilePath.startsWith( "/tmp" ) && m_tmpIsWritablePartition ) { kdDebug() << " TESTS SKIPPED" << endl; @@ -625,7 +625,7 @@ void TestTrash::trashDirectory( const TQString& origPath, const TQString& fileId KURL u; u.setPath( origPath ); // test - bool ok = KIO::NetAccess::move( u, "trash:/" ); + bool ok = TDEIO::NetAccess::move( u, "trash:/" ); assert( ok ); if ( origPath.startsWith( "/tmp" ) && m_tmpIsWritablePartition ) { kdDebug() << " TESTS SKIPPED" << endl; @@ -678,14 +678,14 @@ void TestTrash::trashDirectoryFromOther() void TestTrash::tryRenameInsideTrash() { kdDebug() << k_funcinfo << " with file_move" << endl; - bool worked = KIO::NetAccess::file_move( "trash:/0-tryRenameInsideTrash", "trash:/foobar" ); + bool worked = TDEIO::NetAccess::file_move( "trash:/0-tryRenameInsideTrash", "trash:/foobar" ); assert( !worked ); - assert( KIO::NetAccess::lastError() == KIO::ERR_CANNOT_RENAME ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_CANNOT_RENAME ); kdDebug() << k_funcinfo << " with move" << endl; - worked = KIO::NetAccess::move( "trash:/0-tryRenameInsideTrash", "trash:/foobar" ); + worked = TDEIO::NetAccess::move( "trash:/0-tryRenameInsideTrash", "trash:/foobar" ); assert( !worked ); - assert( KIO::NetAccess::lastError() == KIO::ERR_CANNOT_RENAME ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_CANNOT_RENAME ); } void TestTrash::delRootFile() @@ -693,7 +693,7 @@ void TestTrash::delRootFile() kdDebug() << k_funcinfo << endl; // test deleting a trashed file - bool ok = KIO::NetAccess::del( "trash:/0-fileFromHome", 0L ); + bool ok = TDEIO::NetAccess::del( "trash:/0-fileFromHome", 0L ); assert( ok ); TQFileInfo file( m_trashDir + "/files/fileFromHome" ); @@ -711,9 +711,9 @@ void TestTrash::delFileInDirectory() kdDebug() << k_funcinfo << endl; // test deleting a file inside a trashed directory -> not allowed - bool ok = KIO::NetAccess::del( "trash:/0-trashDirFromHome/testfile", 0L ); + bool ok = TDEIO::NetAccess::del( "trash:/0-trashDirFromHome/testfile", 0L ); assert( !ok ); - assert( KIO::NetAccess::lastError() == KIO::ERR_ACCESS_DENIED ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_ACCESS_DENIED ); TQFileInfo dir( m_trashDir + "/files/trashDirFromHome" ); assert( dir.exists() ); @@ -728,7 +728,7 @@ void TestTrash::delDirectory() kdDebug() << k_funcinfo << endl; // test deleting a trashed directory - bool ok = KIO::NetAccess::del( "trash:/0-trashDirFromHome", 0L ); + bool ok = TDEIO::NetAccess::del( "trash:/0-trashDirFromHome", 0L ); assert( ok ); TQFileInfo dir( m_trashDir + "/files/trashDirFromHome" ); @@ -747,8 +747,8 @@ void TestTrash::statRoot() { kdDebug() << k_funcinfo << endl; KURL url( "trash:/" ); - KIO::UDSEntry entry; - bool ok = KIO::NetAccess::stat( url, entry, 0 ); + TDEIO::UDSEntry entry; + bool ok = TDEIO::NetAccess::stat( url, entry, 0 ); assert( ok ); KFileItem item( entry, url ); assert( item.isDir() ); @@ -764,8 +764,8 @@ void TestTrash::statFileInRoot() { kdDebug() << k_funcinfo << endl; KURL url( "trash:/0-fileFromHome" ); - KIO::UDSEntry entry; - bool ok = KIO::NetAccess::stat( url, entry, 0 ); + TDEIO::UDSEntry entry; + bool ok = TDEIO::NetAccess::stat( url, entry, 0 ); assert( ok ); KFileItem item( entry, url ); assert( item.isFile() ); @@ -782,8 +782,8 @@ void TestTrash::statDirectoryInRoot() { kdDebug() << k_funcinfo << endl; KURL url( "trash:/0-trashDirFromHome" ); - KIO::UDSEntry entry; - bool ok = KIO::NetAccess::stat( url, entry, 0 ); + TDEIO::UDSEntry entry; + bool ok = TDEIO::NetAccess::stat( url, entry, 0 ); assert( ok ); KFileItem item( entry, url ); assert( item.isDir() ); @@ -799,8 +799,8 @@ void TestTrash::statSymlinkInRoot() { kdDebug() << k_funcinfo << endl; KURL url( "trash:/0-symlinkFromHome" ); - KIO::UDSEntry entry; - bool ok = KIO::NetAccess::stat( url, entry, 0 ); + TDEIO::UDSEntry entry; + bool ok = TDEIO::NetAccess::stat( url, entry, 0 ); assert( ok ); KFileItem item( entry, url ); assert( item.isLink() ); @@ -816,8 +816,8 @@ void TestTrash::statFileInDirectory() { kdDebug() << k_funcinfo << endl; KURL url( "trash:/0-trashDirFromHome/testfile" ); - KIO::UDSEntry entry; - bool ok = KIO::NetAccess::stat( url, entry, 0 ); + TDEIO::UDSEntry entry; + bool ok = TDEIO::NetAccess::stat( url, entry, 0 ); assert( ok ); KFileItem item( entry, url ); assert( item.isFile() ); @@ -837,12 +837,12 @@ void TestTrash::copyFromTrash( const TQString& fileId, const TQString& destPath, KURL dest; dest.setPath( destPath ); - assert( KIO::NetAccess::exists( src, true, (TQWidget*)0 ) ); + assert( TDEIO::NetAccess::exists( src, true, (TQWidget*)0 ) ); // A dnd would use copy(), but we use copyAs to ensure the final filename //kdDebug() << k_funcinfo << "copyAs:" << src << " -> " << dest << endl; - KIO::Job* job = KIO::copyAs( src, dest ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::copyAs( src, dest ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); TQString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" ); assert( TQFile::exists( infoFile ) ); @@ -895,11 +895,11 @@ void TestTrash::moveFromTrash( const TQString& fileId, const TQString& destPath, KURL dest; dest.setPath( destPath ); - assert( KIO::NetAccess::exists( src, true, (TQWidget*)0 ) ); + assert( TDEIO::NetAccess::exists( src, true, (TQWidget*)0 ) ); // A dnd would use move(), but we use moveAs to ensure the final filename - KIO::Job* job = KIO::moveAs( src, dest ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::moveAs( src, dest ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); TQString infoFile( m_trashDir + "/info/" + fileId + ".trashinfo" ); assert( !TQFile::exists( infoFile ) ); @@ -956,14 +956,14 @@ void TestTrash::trashDirectoryOwnedByRoot() const TQString fileId = u.path(); kdDebug() << k_funcinfo << "fileId=" << fileId << endl; - KIO::CopyJob* job = KIO::move( u, "trash:/" ); + TDEIO::CopyJob* job = TDEIO::move( u, "trash:/" ); job->setInteractive( false ); // no skip dialog, thanks TQMap<TQString, TQString> metaData; - bool ok = KIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0, 0, 0, &metaData ); assert( !ok ); - const int err = KIO::NetAccess::lastError(); - assert( err == KIO::ERR_ACCESS_DENIED - || err == KIO::ERR_CANNOT_OPEN_FOR_READING ); + const int err = TDEIO::NetAccess::lastError(); + assert( err == TDEIO::ERR_ACCESS_DENIED + || err == TDEIO::ERR_CANNOT_OPEN_FOR_READING ); const TQString infoPath( m_trashDir + "/info/" + fileId + ".trashinfo" ); assert( !TQFile::exists( infoPath ) ); @@ -988,7 +988,7 @@ void TestTrash::getFile() const TQString fileId = "fileFromHome_1"; const KURL url = TrashImpl::makeURL( 0, fileId, TQString::null ); TQString tmpFile; - bool ok = KIO::NetAccess::download( url, tmpFile, 0 ); + bool ok = TDEIO::NetAccess::download( url, tmpFile, 0 ); assert( ok ); TQFile file( tmpFile ); ok = file.open( IO_ReadOnly ); @@ -998,7 +998,7 @@ void TestTrash::getFile() if ( cstr != "Hello world\n" ) kdFatal() << "get() returned the following data:" << cstr << endl; file.close(); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } void TestTrash::restoreFile() @@ -1015,8 +1015,8 @@ void TestTrash::restoreFile() TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)3 << url; - KIO::Job* job = KIO::special( url, packedArgs ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( url, packedArgs ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); assert( !TQFile::exists( infoFile ) ); @@ -1042,11 +1042,11 @@ void TestTrash::restoreFileFromSubDir() TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)3 << url; - KIO::Job* job = KIO::special( url, packedArgs ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( url, packedArgs ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( !ok ); // dest dir doesn't exist -> error message - assert( KIO::NetAccess::lastError() == KIO::ERR_SLAVE_DEFINED ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_SLAVE_DEFINED ); // check that nothing happened assert( TQFile::exists( infoFile ) ); @@ -1062,7 +1062,7 @@ void TestTrash::restoreFileToDeletedDirectory() removeFile( m_trashDir, "/files/fileFromHome" ); trashFileFromHome(); // Delete orig dir - bool delOK = KIO::NetAccess::del( homeTmpDir(), 0 ); + bool delOK = TDEIO::NetAccess::del( homeTmpDir(), 0 ); assert( delOK ); const TQString fileId = "fileFromHome"; @@ -1076,11 +1076,11 @@ void TestTrash::restoreFileToDeletedDirectory() TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)3 << url; - KIO::Job* job = KIO::special( url, packedArgs ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( url, packedArgs ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( !ok ); // dest dir doesn't exist -> error message - assert( KIO::NetAccess::lastError() == KIO::ERR_SLAVE_DEFINED ); + assert( TDEIO::NetAccess::lastError() == TDEIO::ERR_SLAVE_DEFINED ); // check that nothing happened assert( TQFile::exists( infoFile ) ); @@ -1095,10 +1095,10 @@ void TestTrash::listRootDir() kdDebug() << k_funcinfo << endl; m_entryCount = 0; m_listResult.clear(); - KIO::ListJob* job = KIO::listDir( "trash:/" ); - connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::ListJob* job = TDEIO::listDir( "trash:/" ); + connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; assert( m_entryCount > 1 ); @@ -1112,10 +1112,10 @@ void TestTrash::listRecursiveRootDir() kdDebug() << k_funcinfo << endl; m_entryCount = 0; m_listResult.clear(); - KIO::ListJob* job = KIO::listRecursive( "trash:/" ); - connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::ListJob* job = TDEIO::listRecursive( "trash:/" ); + connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; assert( m_entryCount > 1 ); @@ -1129,10 +1129,10 @@ void TestTrash::listSubDir() kdDebug() << k_funcinfo << endl; m_entryCount = 0; m_listResult.clear(); - KIO::ListJob* job = KIO::listDir( "trash:/0-trashDirFromHome" ); - connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( KIO::Job*, const KIO::UDSEntryList& ) ) ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::ListJob* job = TDEIO::listDir( "trash:/0-trashDirFromHome" ); + connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; assert( m_entryCount == 2 ); @@ -1142,18 +1142,18 @@ void TestTrash::listSubDir() assert( m_listResult.contains( "testfile" ) == 1 ); // found it, and only once } -void TestTrash::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst ) +void TestTrash::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& lst ) { - for( KIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { - KIO::UDSEntry::ConstIterator it2 = (*it).begin(); + for( TDEIO::UDSEntryList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + TDEIO::UDSEntry::ConstIterator it2 = (*it).begin(); TQString displayName; KURL url; for( ; it2 != (*it).end(); it2++ ) { switch ((*it2).m_uds) { - case KIO::UDS_NAME: + case TDEIO::UDS_NAME: displayName = (*it2).m_str; break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: url = (*it2).m_str; break; } @@ -1177,8 +1177,8 @@ void TestTrash::emptyTrash() TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)1; - KIO::Job* job = KIO::special( "trash:/", packedArgs ); - bool ok = KIO::NetAccess::synchronousRun( job, 0 ); + TDEIO::Job* job = TDEIO::special( "trash:/", packedArgs ); + bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); KSimpleConfig cfg( "trashrc", true ); diff --git a/kioslave/trash/testtrash.h b/kioslave/trash/testtrash.h index fd286c945..ebc217aac 100644 --- a/kioslave/trash/testtrash.h +++ b/kioslave/trash/testtrash.h @@ -88,7 +88,7 @@ public: void emptyTrash(); private slots: - void slotEntries( KIO::Job*, const KIO::UDSEntryList& ); + void slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ); private: void trashFile( const TQString& origFilePath, const TQString& fileId ); diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp index 96888f9d5..3e109c119 100644 --- a/kioslave/trash/trashimpl.cpp +++ b/kioslave/trash/trashimpl.cpp @@ -97,7 +97,7 @@ int TrashImpl::testDir( const TQString &_name ) const ok = false; } if ( !ok ) { - return KIO::ERR_DIR_ALREADY_EXIST; + return TDEIO::ERR_DIR_ALREADY_EXIST; } #if 0 //} else { @@ -109,7 +109,7 @@ int TrashImpl::testDir( const TQString &_name ) const { //KMessageBox::sorry( 0, i18n( "Couldn't create directory %1. Check for permissions." ).arg( name ) ); kdWarning() << "could not create " << name << endl; - return KIO::ERR_COULD_NOT_MKDIR; + return TDEIO::ERR_COULD_NOT_MKDIR; } else { kdDebug() << name << " created." << endl; } @@ -201,9 +201,9 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi KDE_struct_stat buff_src; if ( KDE_lstat( origPath_c.data(), &buff_src ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, origPath ); + error( TDEIO::ERR_ACCESS_DENIED, origPath ); else - error( KIO::ERR_DOES_NOT_EXIST, origPath ); + error( TDEIO::ERR_DOES_NOT_EXIST, origPath ); return false; } @@ -231,10 +231,10 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi fd = ::open( TQFile::encodeName( url.path() ), O_WRONLY | O_CREAT | O_EXCL, 0600 ); if ( fd < 0 ) { if ( errno == EEXIST ) { - url.setFileName( KIO::RenameDlg::suggestName( baseDirectory, url.fileName() ) ); + url.setFileName( TDEIO::RenameDlg::suggestName( baseDirectory, url.fileName() ) ); // and try again on the next iteration } else { - error( KIO::ERR_COULD_NOT_WRITE, url.path() ); + error( TDEIO::ERR_COULD_NOT_WRITE, url.path() ); return false; } } @@ -246,7 +246,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi FILE* file = ::fdopen( fd, "w" ); if ( !file ) { // can't see how this would happen - error( KIO::ERR_COULD_NOT_WRITE, infoPath ); + error( TDEIO::ERR_COULD_NOT_WRITE, infoPath ); return false; } @@ -270,7 +270,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi if ( written != sz ) { ::fclose( file ); TQFile::remove( infoPath ); - error( KIO::ERR_DISK_FULL, infoPath ); + error( TDEIO::ERR_DISK_FULL, infoPath ); return false; } @@ -351,7 +351,7 @@ bool TrashImpl::moveFromTrash( const TQString& dest, int trashId, const TQString bool TrashImpl::move( const TQString& src, const TQString& dest ) { if ( directRename( src, dest ) ) { - // This notification is done by KIO::moveAs when using the code below + // This notification is done by TDEIO::moveAs when using the code below // But if we do a direct rename we need to do the notification ourselves KDirNotify_stub allDirNotify( "*", "KDirNotify*" ); KURL urlDest; urlDest.setPath( dest ); @@ -359,25 +359,25 @@ bool TrashImpl::move( const TQString& src, const TQString& dest ) allDirNotify.FilesAdded( urlDest ); return true; } - if ( m_lastErrorCode != KIO::ERR_UNSUPPORTED_ACTION ) + if ( m_lastErrorCode != TDEIO::ERR_UNSUPPORTED_ACTION ) return false; KURL urlSrc, urlDest; urlSrc.setPath( src ); urlDest.setPath( dest ); kdDebug() << k_funcinfo << urlSrc << " -> " << urlDest << endl; - KIO::CopyJob* job = KIO::moveAs( urlSrc, urlDest, false ); + TDEIO::CopyJob* job = TDEIO::moveAs( urlSrc, urlDest, false ); #ifdef KIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( jobFinished(KIO::Job *) ) ); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; } -void TrashImpl::jobFinished(KIO::Job* job) +void TrashImpl::jobFinished(TDEIO::Job* job) { kdDebug() << k_funcinfo << " error=" << job->error() << endl; error( job->error(), job->errorText() ); @@ -413,12 +413,12 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest ) KURL urlDest; urlDest.setPath( dest ); kdDebug() << k_funcinfo << "copying " << src << " to " << dest << endl; - KIO::CopyJob* job = KIO::copyAs( urlSrc, urlDest, false ); + TDEIO::CopyJob* job = TDEIO::copyAs( urlSrc, urlDest, false ); #ifdef KIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif - connect( job, TQT_SIGNAL( result( KIO::Job* ) ), - this, TQT_SLOT( jobFinished( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), + this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; @@ -429,14 +429,14 @@ bool TrashImpl::directRename( const TQString& src, const TQString& dest ) kdDebug() << k_funcinfo << src << " -> " << dest << endl; if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) { if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") ); + error( TDEIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") ); } else { if (( errno == EACCES ) || (errno == EPERM)) { - error( KIO::ERR_ACCESS_DENIED, dest ); + error( TDEIO::ERR_ACCESS_DENIED, dest ); } else if (errno == EROFS) { // The file is on a read-only filesystem - error( KIO::ERR_CANNOT_DELETE, src ); + error( TDEIO::ERR_CANNOT_DELETE, src ); } else { - error( KIO::ERR_CANNOT_RENAME, src ); + error( TDEIO::ERR_CANNOT_RENAME, src ); } } return false; @@ -450,13 +450,13 @@ bool TrashImpl::mkdir( int trashId, const TQString& fileId, int permissions ) const TQString path = filesPath( trashId, fileId ); if ( ::mkdir( TQFile::encodeName( path ), permissions ) != 0 ) { if ( errno == EACCES ) { - error( KIO::ERR_ACCESS_DENIED, path ); + error( TDEIO::ERR_ACCESS_DENIED, path ); return false; } else if ( errno == ENOSPC ) { - error( KIO::ERR_DISK_FULL, path ); + error( TDEIO::ERR_DISK_FULL, path ); return false; } else { - error( KIO::ERR_COULD_NOT_MKDIR, path ); + error( TDEIO::ERR_COULD_NOT_MKDIR, path ); return false; } } else { @@ -477,9 +477,9 @@ bool TrashImpl::del( int trashId, const TQString& fileId ) KDE_struct_stat buff; if ( KDE_lstat( info_c.data(), &buff ) == -1 ) { if ( errno == EACCES ) - error( KIO::ERR_ACCESS_DENIED, file ); + error( TDEIO::ERR_ACCESS_DENIED, file ); else - error( KIO::ERR_DOES_NOT_EXIST, file ); + error( TDEIO::ERR_DOES_NOT_EXIST, file ); return false; } @@ -505,16 +505,16 @@ bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, boo KFileItem fileItem( url, "inode/directory", KFileItem::Unknown ); KFileItemList fileItemList; fileItemList.append( &fileItem ); - KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ ); - connect( chmodJob, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( jobFinished(KIO::Job *) ) ); + TDEIO::ChmodJob* chmodJob = TDEIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ ); + connect( chmodJob, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); } kdDebug() << k_funcinfo << "deleting " << url << endl; - KIO::DeleteJob *job = KIO::del( url, false, false ); - connect( job, TQT_SIGNAL( result(KIO::Job *) ), - this, TQT_SLOT( jobFinished(KIO::Job *) ) ); + TDEIO::DeleteJob *job = TDEIO::del( url, false, false ); + connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), + this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); bool ok = m_lastErrorCode == 0; if ( !setLastErrorCode ) { @@ -615,7 +615,7 @@ bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, i { KSimpleConfig cfg( infoPath, true ); if ( !cfg.hasGroup( "Trash Info" ) ) { - error( KIO::ERR_CANNOT_OPEN_FOR_READING, infoPath ); + error( TDEIO::ERR_CANNOT_OPEN_FOR_READING, infoPath ); return false; } cfg.setGroup( "Trash Info" ); @@ -713,7 +713,7 @@ int TrashImpl::findTrashDirectory( const TQString& origPath ) && buff.st_dev == m_homeDevice ) return 0; - TQString mountPoint = KIO::findPathMountPoint( origPath ); + TQString mountPoint = TDEIO::findPathMountPoint( origPath ); const TQString trashDir = trashForMountPoint( mountPoint, true ); kdDebug() << "mountPoint=" << mountPoint << " trashDir=" << trashDir << endl; if ( trashDir.isEmpty() ) diff --git a/kioslave/trash/trashimpl.h b/kioslave/trash/trashimpl.h index fb34e5be0..366f8a869 100644 --- a/kioslave/trash/trashimpl.h +++ b/kioslave/trash/trashimpl.h @@ -149,7 +149,7 @@ private: static TQString makeRelativePath( const TQString& topdir, const TQString& path ); private slots: - void jobFinished(KIO::Job *job); + void jobFinished(TDEIO::Job *job); private: /// Last error code stored in class to simplify API. diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 358209876..2ec01c2a9 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -102,7 +102,7 @@ void KlipperApplet::about() KlipperAppletWidget::KlipperAppletWidget( TQWidget* parent ) // init() is called first, before KlipperWidget is called with ( parent, kconfig ) - : KlipperWidget( ( init(), parent ), new KConfig( "klipperrc" )) + : KlipperWidget( ( init(), parent ), new TDEConfig( "klipperrc" )) { } diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 1a8010cc2..163c8eb5f 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -123,10 +123,10 @@ extern bool tqt_qclipboard_bailout_hack; #error Check status of #80072 with Qt4. #endif -static void ensureGlobalSyncOff(KConfig* config); +static void ensureGlobalSyncOff(TDEConfig* config); // config == kapp->config for process, otherwise applet -KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) +KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) : TQWidget( parent ) , DCOPObject( "klipper" ) , m_overflowCounter( 0 ) @@ -182,7 +182,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config ) "quitAction" ); quitAction->setGroup( "exit" ); myURLGrabber = 0L; - KConfig *kc = m_config; + TDEConfig *kc = m_config; readConfiguration( kc ); setURLGrabberEnabled( bURLGrabber ); @@ -448,7 +448,7 @@ void KlipperWidget::saveHistory() { *history_file.dataStream() << crc << data; } -void KlipperWidget::readProperties(KConfig *kc) +void KlipperWidget::readProperties(TDEConfig *kc) { TQStringList dataList; @@ -458,7 +458,7 @@ void KlipperWidget::readProperties(KConfig *kc) if ( !loadHistory() ) { // Try to load from the old config file. // Remove this at some point. - KConfigGroupSaver groupSaver(kc, "General"); + TDEConfigGroupSaver groupSaver(kc, "General"); dataList = kc->readListEntry("ClipboardData"); for (TQStringList::ConstIterator it = dataList.end(); @@ -480,7 +480,7 @@ void KlipperWidget::readProperties(KConfig *kc) } -void KlipperWidget::readConfiguration( KConfig *kc ) +void KlipperWidget::readConfiguration( TDEConfig *kc ) { kc->setGroup("General"); bPopupAtMouse = kc->readBoolEntry("PopupAtMousePosition", false); @@ -496,7 +496,7 @@ void KlipperWidget::readConfiguration( KConfig *kc ) bIgnoreImages = kc->readBoolEntry("IgnoreImages",true); } -void KlipperWidget::writeConfiguration( KConfig *kc ) +void KlipperWidget::writeConfiguration( TDEConfig *kc ) { kc->setGroup("General"); kc->writeEntry("PopupAtMousePosition", bPopupAtMouse); @@ -606,7 +606,7 @@ void KlipperWidget::slotQuit() saveSession(); int autoStart = KMessageBox::questionYesNoCancel( 0L, i18n("Should Klipper start automatically\nwhen you login?"), i18n("Automatically Start Klipper?"), i18n("Start"), i18n("Do Not Start") ); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); if ( autoStart == KMessageBox::Yes ) { config->writeEntry("AutoStart", true); @@ -647,7 +647,7 @@ void KlipperWidget::setURLGrabberEnabled( bool enable ) { if (enable != bURLGrabber) { bURLGrabber = enable; - KConfig *kc = m_config; + TDEConfig *kc = m_config; kc->setGroup("General"); kc->writeEntry("URLGrabberEnabled", bURLGrabber); m_lastURLGrabberTextSelection = TQString(); @@ -1167,7 +1167,7 @@ void Klipper::quitProcess() kapp->quit(); } -static void ensureGlobalSyncOff(KConfig* config) { +static void ensureGlobalSyncOff(TDEConfig* config) { config->setGroup("General"); if ( config->readBoolEntry( "SynchronizeClipboardAndSelection" ) ) { kdDebug() << "Shutting off global synchronization" << endl; diff --git a/klipper/toplevel.h b/klipper/toplevel.h index b072bd187..1d967a213 100644 --- a/klipper/toplevel.h +++ b/klipper/toplevel.h @@ -55,7 +55,7 @@ k_dcop: TQString getClipboardHistoryItem(int i); public: - KlipperWidget( TQWidget *parent, KConfig* config ); + KlipperWidget( TQWidget *parent, TDEConfig* config ); ~KlipperWidget(); virtual void adjustSize(); @@ -88,8 +88,8 @@ protected: void paintEvent(TQPaintEvent *); void mousePressEvent(TQMouseEvent *); - void readProperties(KConfig *); - void readConfiguration(KConfig *); + void readProperties(TDEConfig *); + void readConfiguration(TDEConfig *); /** * Loads history from disk. @@ -101,7 +101,7 @@ protected: */ void saveHistory(); - void writeConfiguration(KConfig *); + void writeConfiguration(TDEConfig *); /** * @returns the contents of the selection or, if empty, the contents of * the clipboard. @@ -127,7 +127,7 @@ protected: void setClipboard( const HistoryItem& item, int mode ); bool ignoreClipboardChanges() const; - KConfig* config() const { return m_config; } + TDEConfig* config() const { return m_config; } bool isApplet() const { return m_config != kapp->config(); } protected slots: @@ -199,7 +199,7 @@ private: URLGrabber *myURLGrabber; TQString m_lastURLGrabberTextSelection; TQString m_lastURLGrabberTextClipboard; - KConfig* m_config; + TDEConfig* m_config; TQTimer m_overflowClearTimer; TQTimer m_pendingCheckTimer; bool m_pendingContentsCheck; diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index f04bdf22f..cb891a33d 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -46,7 +46,7 @@ #define DO_NOTHING_ITEM 11 #define DISABLE_POPUP 12 -URLGrabber::URLGrabber( KConfig* config ) +URLGrabber::URLGrabber( TDEConfig* config ) : m_config( config ) { if( m_config == NULL ) @@ -291,7 +291,7 @@ void URLGrabber::editData() } -void URLGrabber::readConfiguration( KConfig *kc ) +void URLGrabber::readConfiguration( TDEConfig *kc ) { myActions->clear(); kc->setGroup( "General" ); @@ -308,7 +308,7 @@ void URLGrabber::readConfiguration( KConfig *kc ) } -void URLGrabber::writeConfiguration( KConfig *kc ) +void URLGrabber::writeConfiguration( TDEConfig *kc ) { kc->setGroup( "General" ); kc->writeEntry( "Number of Actions", myActions->count() ); @@ -439,7 +439,7 @@ ClipAction::ClipAction( const ClipAction& action ) } -ClipAction::ClipAction( KConfig *kc ) +ClipAction::ClipAction( TDEConfig *kc ) : myRegExp( kc->readEntry( "Regexp" ) ), myDescription( kc->readEntry( "Description" ) ) { @@ -477,8 +477,8 @@ void ClipAction::addCommand( const TQString& command, } -// precondition: we're in the correct action's group of the KConfig object -void ClipAction::save( KConfig *kc ) const +// precondition: we're in the correct action's group of the TDEConfig object +void ClipAction::save( TDEConfig *kc ) const { kc->writeEntry( "Description", description() ); kc->writeEntry( "Regexp", regExp() ); diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h index b5212890b..a40e48bf6 100644 --- a/klipper/urlgrabber.h +++ b/klipper/urlgrabber.h @@ -31,7 +31,7 @@ class TQTimer; -class KConfig; +class TDEConfig; class KPopupMenu; class ClipAction; @@ -44,7 +44,7 @@ class URLGrabber : public TQObject Q_OBJECT public: - URLGrabber( KConfig* config ); + URLGrabber( TDEConfig* config ); ~URLGrabber(); /** @@ -58,8 +58,8 @@ public: const ActionList * actionList() const { return myActions; } void setActionList( ActionList * ); - void readConfiguration( KConfig * ); - void writeConfiguration( KConfig * ); + void readConfiguration( TDEConfig * ); + void writeConfiguration( TDEConfig * ); int popupTimeout() const { return myPopupKillTimeout; } void setPopupTimeout( int timeout ) { myPopupKillTimeout = timeout; } @@ -89,7 +89,7 @@ private: TQTimer *myPopupKillTimer; int myPopupKillTimeout; bool m_stripWhiteSpace; - KConfig* m_config; + TDEConfig* m_config; private slots: void slotActionMenu() { actionMenu( true ); } @@ -124,7 +124,7 @@ class ClipAction public: ClipAction( const TQString& regExp, const TQString& description ); ClipAction( const ClipAction& ); - ClipAction( KConfig *kc ); + ClipAction( TDEConfig *kc ); ~ClipAction(); void setRegExp( const TQString& r) { myRegExp = TQRegExp( r ); } @@ -150,9 +150,9 @@ public: const TQPtrList<ClipCommand>& commands() const { return myCommands; } /** - * Saves this action to a a given KConfig object + * Saves this action to a a given TDEConfig object */ - void save( KConfig * ) const; + void save( TDEConfig * ) const; /** * Returns the most recent list of matched group backreferences. diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index f0903d70b..018b69f0e 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -53,7 +53,7 @@ KMenuEdit::KMenuEdit (bool controlCenter, TQWidget *, const char *name) KMenuEdit::~KMenuEdit() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); config->writeEntry("SplitterSizes", m_splitter->sizes()); @@ -101,7 +101,7 @@ void KMenuEdit::setupView() m_tree, TQT_SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &))); // restore splitter sizes - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); TQValueList<int> sizes = config->readIntListEntry("SplitterSizes"); if (sizes.isEmpty()) diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp index 68aae34ba..e04f92c18 100644 --- a/kmenuedit/menuinfo.cpp +++ b/kmenuedit/menuinfo.cpp @@ -193,15 +193,15 @@ void MenuFolderInfo::save(MenuFile *menuFile) { TQString local = KDesktopFile::locateLocal(directoryFile); - KConfig *df = 0; + TDEConfig *df = 0; if (directoryFile != local) { - KConfig orig(directoryFile, true, false, "apps"); + TDEConfig orig(directoryFile, true, false, "apps"); df = orig.copyTo(local); } else { - df = new KConfig(directoryFile, false, false, "apps"); + df = new TDEConfig(directoryFile, false, false, "apps"); } df->setDesktopGroup(); diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h index d4c3baf84..b690f953b 100644 --- a/knetattach/knetattach.ui.h +++ b/knetattach/knetattach.ui.h @@ -18,7 +18,7 @@ void KNetAttach::init() finishButton()->setText(i18n("Save && C&onnect")); //setResizeMode(Fixed); FIXME: make the wizard fixed-geometry setFinishEnabled(_folderParameters, false); - KConfig recent("krecentconnections", true, false); + TDEConfig recent("krecentconnections", true, false); recent.setGroup("General"); TQStringList idx = recent.readListEntry("Index"); if (idx.isEmpty()) { @@ -75,7 +75,7 @@ void KNetAttach::showPage( TQWidget *page ) setInformationText("SMB"); updateForProtocol("SMB"); } else { //if (_recent->isChecked()) { - KConfig recent("krecentconnections", true, false); + TDEConfig recent("krecentconnections", true, false); if (!recent.hasGroup(_recentConnectionName->currentText())) { recent.setGroup("General"); TQStringList idx = recent.readListEntry("Index"); @@ -186,7 +186,7 @@ void KNetAttach::finished() } if (!name.isEmpty()) { - KConfig recent("krecentconnections", false, false); + TDEConfig recent("krecentconnections", false, false); recent.setGroup("General"); TQStringList idx = recent.readListEntry("Index"); recent.deleteGroup(name); // erase anything stale @@ -232,8 +232,8 @@ void KNetAttach::updatePort(bool encryption) bool KNetAttach::doConnectionTest(const KURL& url) { - KIO::UDSEntry entry; - if (KIO::NetAccess::stat(url, entry, this)) { + TDEIO::UDSEntry entry; + if (TDEIO::NetAccess::stat(url, entry, this)) { // Anything to test here? return true; } diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 0f026a1ed..c87b5dbfd 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -119,7 +119,7 @@ TQString KonqAboutPageFactory::launch() // Try to split page in three. If it succeeds, insert the default search into the middle part. TQStringList parts = TQStringList::split( "<!--search bar splitter-->", res ); if ( parts.count() == 3 ) { - KConfig config( "kuriikwsfilterrc", true /*read-only*/, false /*no KDE globals*/ ); + TDEConfig config( "kuriikwsfilterrc", true /*read-only*/, false /*no KDE globals*/ ); config.setGroup( "General" ); TQString name = config.readEntry("DefaultSearchEngine"); KService::Ptr service = diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 2fc8b336a..649115d5c 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -178,7 +178,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) */ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile ) { - KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); + TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); TQStringList allowed_parts; // is duplicated in ../KonquerorIface.cc @@ -200,7 +200,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile ); if( profilepath.isEmpty()) return true; - KConfig cfg( profilepath, true ); + TDEConfig cfg( profilepath, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" )); @@ -248,7 +248,7 @@ static int currentScreen() // when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile ! static TQCString getPreloadedKonqy() { - KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); + TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 ) return ""; @@ -301,7 +301,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co // check if user wants to use external browser // ###### this option seems to have no GUI and to be redundant with BrowserApplication now. // ###### KDE4: remove - KConfig config( TQString::fromLatin1("kfmclientrc")); + TDEConfig config( TQString::fromLatin1("kfmclientrc")); config.setGroup( TQString::fromLatin1("Settings")); TQString strBrowser = config.readPathEntry("ExternalBrowser"); if (!strBrowser.isEmpty()) @@ -330,7 +330,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co } } - KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); + TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "FMSettings" ); if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) ) { @@ -550,10 +550,10 @@ bool clientApp::doIt() for ( int i = 1; i <= argc - 2; i++ ) srcLst.append( args->url(i) ); - KIO::Job * job = KIO::move( srcLst, args->url(argc - 1) ); + TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -585,10 +585,10 @@ bool clientApp::doIt() return m_ok; // AK - really okay? KURL dsturl; dsturl.setPath( dst ); - KIO::Job * job = KIO::copy( srcLst, dsturl ); + TDEIO::Job * job = TDEIO::copy( srcLst, dsturl ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -599,10 +599,10 @@ bool clientApp::doIt() for ( int i = 1; i <= argc - 2; i++ ) srcLst.append( args->url(i) ); - KIO::Job * job = KIO::copy( srcLst, args->url(argc - 1) ); + TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), &app, TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -636,7 +636,7 @@ bool clientApp::doIt() return true; } -void clientApp::slotResult( KIO::Job * job ) +void clientApp::slotResult( TDEIO::Job * job ) { if (job->error() && s_interactive) job->showErrorDialog(); diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h index 01f5f16b4..54ffcfb53 100644 --- a/konqueror/client/kfmclient.h +++ b/konqueror/client/kfmclient.h @@ -37,7 +37,7 @@ public: static bool openProfile(const TQString & profile, const TQString & url, const TQString & mimetype = TQString::null); protected slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); void delayedQuit(); void slotDialogCanceled(); diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 5157ed360..78f6472c6 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -990,7 +990,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) case Date: { TQDateTime dayt; - dayt.setTime_t(item->item()->time(KIO::UDS_MODIFICATION_TIME )); + dayt.setTime_t(item->item()->time(TDEIO::UDS_MODIFICATION_TIME )); key = dayt.toString("yyyyMMddhhmmss"); break; } @@ -1403,7 +1403,7 @@ void KonqKfmIconView::setupSortKeys() TQDateTime dayt; for ( TQIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() ) { - dayt.setTime_t(static_cast<KFileIVI *>( it )->item()->time(KIO::UDS_MODIFICATION_TIME)); + dayt.setTime_t(static_cast<KFileIVI *>( it )->item()->time(TDEIO::UDS_MODIFICATION_TIME)); it->setKey(dayt.toString("yyyyMMddhhmmss")); } break; @@ -1413,7 +1413,7 @@ void KonqKfmIconView::setupSortKeys() TQString KonqKfmIconView::makeSizeKey( KFileIVI *item ) { - return KIO::number( item->item()->size() ).rightJustify( 20, '0' ); + return TDEIO::number( item->item()->size() ).rightJustify( 20, '0' ); } void KonqKfmIconView::disableIcons( const KURL::List & lst ) diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 0d7d0ddf8..97386a3e7 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -86,14 +86,14 @@ bool TestLinkItr::isApplicable(const KBookmark &bk) const { void TestLinkItr::doAction() { m_errSet = false; - m_job = KIO::get(curBk().url(), true, false); + m_job = TDEIO::get(curBk().url(), true, false); m_job->addMetaData("errorPage", "true"); m_job->addMetaData( TQString("cookies"), TQString("none") ); - connect(m_job, TQT_SIGNAL( result( KIO::Job *)), - this, TQT_SLOT( slotJobResult(KIO::Job *))); - connect(m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &)), - this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &))); + connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)), + this, TQT_SLOT( slotJobResult(TDEIO::Job *))); + connect(m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), + this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); curItem()->setTmpStatus(i18n("Checking...")); TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); @@ -101,8 +101,8 @@ void TestLinkItr::doAction() { TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking...")); } -void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) { - KIO::TransferJob *transfer = (KIO::TransferJob *)job; +void TestLinkItr::slotJobData(TDEIO::Job *job, const TQByteArray &data) { + TDEIO::TransferJob *transfer = (TDEIO::TransferJob *)job; if (transfer->isErrorPage()) { TQStringList lines = TQStringList::split('\n', data); @@ -132,11 +132,11 @@ void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) { transfer->kill(false); } -void TestLinkItr::slotJobResult(KIO::Job *job) { +void TestLinkItr::slotJobResult(TDEIO::Job *job) { m_job = 0; if ( !curItem() ) return; - KIO::TransferJob *transfer = (KIO::TransferJob *)job; + TDEIO::TransferJob *transfer = (TDEIO::TransferJob *)job; TQString modDate = transfer->queryMetaData("modified"); bool chkErr = true; diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h index 7ee84f90b..a808202e1 100644 --- a/konqueror/keditbookmarks/testlink.h +++ b/konqueror/keditbookmarks/testlink.h @@ -61,14 +61,14 @@ public: virtual TestLinkItrHolder* holder() const { return TestLinkItrHolder::self(); } public slots: - void slotJobResult(KIO::Job *job); - void slotJobData(KIO::Job *job, const TQByteArray &data); + void slotJobResult(TDEIO::Job *job); + void slotJobData(TDEIO::Job *job, const TQByteArray &data); private: virtual void doAction(); virtual bool isApplicable(const KBookmark &bk) const; - KIO::TransferJob *m_job; + TDEIO::TransferJob *m_job; bool m_errSet; }; diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 0d9a4cd11..ee2b6d3b6 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -145,20 +145,20 @@ void FavIconUpdater::notifyChange(bool isHost, TQString hostOrURL, TQString icon FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url) : m_part(part), m_url(url) { - // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting KIO::get() " << url << endl; + // kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting TDEIO::get() " << url << endl; // the use of KIO rather than directly using KHTML is to allow silently abort on error - KIO::Job *job = KIO::get(m_url, false, false); + TDEIO::Job *job = TDEIO::get(m_url, false, false); job->addMetaData( TQString("cookies"), TQString("none") ); - connect(job, TQT_SIGNAL( result( KIO::Job *)), - this, TQT_SLOT( slotFinished(KIO::Job *) )); - connect(job, TQT_SIGNAL( mimetype( KIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(KIO::Job *, const TQString &) )); + connect(job, TQT_SIGNAL( result( TDEIO::Job *)), + this, TQT_SLOT( slotFinished(TDEIO::Job *) )); + connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), + this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); } -void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) { - KIO::SimpleJob *sjob = static_cast<KIO::SimpleJob *>(job); +void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) { + TDEIO::SimpleJob *sjob = static_cast<TDEIO::SimpleJob *>(job); m_url = sjob->url(); // allow for redirection sjob->putOnHold(); @@ -171,7 +171,7 @@ void FavIconWebGrabber::slotMimetype(KIO::Job *job, const TQString & /*type*/) { m_part->openURL(m_url); } -void FavIconWebGrabber::slotFinished(KIO::Job *job) { +void FavIconWebGrabber::slotFinished(TDEIO::Job *job) { if (job->error()) { // kdDebug() << "FavIconWebGrabber::slotFinished() " << job->errorString() << endl; } diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h index 62e034744..454b51672 100644 --- a/konqueror/keditbookmarks/updater.h +++ b/konqueror/keditbookmarks/updater.h @@ -35,8 +35,8 @@ public: ~FavIconWebGrabber() {} protected slots: - void slotMimetype(KIO::Job *job, const TQString &_type); - void slotFinished(KIO::Job *job); + void slotMimetype(TDEIO::Job *job, const TQString &_type); + void slotFinished(TDEIO::Job *job); private: KParts::ReadOnlyPart *m_part; diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 4edce07ad..c252cd0dc 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -36,7 +36,7 @@ #include "konq_combo.h" -KConfig * KonqCombo::s_config = 0L; +TDEConfig * KonqCombo::s_config = 0L; const int KonqCombo::temporary = 0; static TQString titleOfURL( const TQString& urlStr ) @@ -103,7 +103,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) Q_ASSERT( s_config ); - KConfigGroupSaver cs( s_config, "Location Bar" ); + TDEConfigGroupSaver cs( s_config, "Location Bar" ); setMaxCount( s_config->readNumEntry("Maximum of URLs in combo", 20 )); // We should also connect the completionBox' highlighted signal to @@ -594,7 +594,7 @@ void KonqCombo::slotActivated( const TQString& text ) m_modifier = Qt::NoButton; } -void KonqCombo::setConfig( KConfig *kc ) +void KonqCombo::setConfig( TDEConfig *kc ) { s_config = kc; } diff --git a/konqueror/konq_combo.h b/konqueror/konq_combo.h index 3650eb9a4..d3bdd436e 100644 --- a/konqueror/konq_combo.h +++ b/konqueror/konq_combo.h @@ -26,7 +26,7 @@ #include <konq_historymgr.h> class KCompletion; -class KConfig; +class TDEConfig; // we use KHistoryCombo _only_ for the up/down keyboard handling, otherwise // KComboBox would do fine. @@ -56,7 +56,7 @@ public: void loadItems(); void saveItems(); - static void setConfig( KConfig * ); + static void setConfig( TDEConfig * ); virtual void popup(); @@ -109,7 +109,7 @@ private: TQPoint m_dragStart; int m_pageSecurity; - static KConfig *s_config; + static TDEConfig *s_config; static const int temporary; // the index of our temporary item }; diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index 34efa99e5..ef53fd684 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -60,7 +60,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai d->activePart = activePart; // There's a limitation of KPluginSelector here... It assumes that all plugins in a given widget (as created by addPlugins) - // have their config in the same KConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab. + // have their config in the same TDEConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab. d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", TDEGlobal::config()); if ( activePart ) { TDEInstance* instance = activePart->instance(); diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index d53c9154c..0764cf0b1 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -232,7 +232,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) TQString sizeStr; if ( bytesPerSecond > 0 ) - sizeStr = i18n( "%1/s" ).arg( KIO::convertSize( bytesPerSecond ) ); + sizeStr = i18n( "%1/s" ).arg( TDEIO::convertSize( bytesPerSecond ) ); else sizeStr = i18n( "Stalled" ); @@ -324,7 +324,7 @@ void KonqFrame::listViews( ChildViewList *viewList ) viewList->append( childView() ); } -void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) +void KonqFrame::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { if (saveURLs) config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ), @@ -516,7 +516,7 @@ void KonqFrameContainer::listViews( ChildViewList *viewList ) m_pSecondChild->listViews( viewList ); } -void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) +void KonqFrameContainer::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { int idSecond = id + (int)pow( 2.0, depth ); diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index 7f3226faf..0b5ea4771 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -46,7 +46,7 @@ class KonqFrame; class KonqFrameContainerBase; class KonqFrameContainer; class KonqFrameTabs; -class KConfig; +class TDEConfig; class KSeparator; class KProgress; class KAction; @@ -154,7 +154,7 @@ class KonqFrameBase public: virtual ~KonqFrameBase() {} - virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0; + virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0) = 0; virtual void copyHistory( KonqFrameBase *other ) = 0; @@ -242,7 +242,7 @@ public: void setView( KonqView* child ); virtual void listViews( ChildViewList *viewList ); - virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); + virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); virtual void copyHistory( KonqFrameBase *other ); virtual void printFrameInfo( const TQString& spaces ); @@ -357,7 +357,7 @@ public: virtual void listViews( ChildViewList *viewList ); - virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); + virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); virtual void copyHistory( KonqFrameBase *other ); KonqFrameBase* firstChild() { return m_pFirstChild; } diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 30a6b7bec..f6451155b 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -122,7 +122,7 @@ template class TQPtrList<TQPixmap>; template class TQPtrList<KToggleAction>; TQPtrList<KonqMainWindow> *KonqMainWindow::s_lstViews = 0; -KConfig * KonqMainWindow::s_comboConfig = 0; +TDEConfig * KonqMainWindow::s_comboConfig = 0; KCompletion * KonqMainWindow::s_pCompletion = 0; TQFile * KonqMainWindow::s_crashlog_file = 0; bool KonqMainWindow::s_preloaded = false; @@ -208,7 +208,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqPixmapProvider *prov = KonqPixmapProvider::self(); if ( !s_comboConfig ) { - s_comboConfig = new KConfig( "konq_history", false, false ); + s_comboConfig = new TDEConfig( "konq_history", false, false ); KonqCombo::setConfig( s_comboConfig ); s_comboConfig->setGroup( "Location Bar" ); prov->load( s_comboConfig, "ComboIconCache" ); @@ -429,7 +429,7 @@ static TQString detectNameFilter( KURL & url ) if ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) { // Check that a file or dir with all the special chars in the filename doesn't exist - if ( url.isLocalFile() ? !TQFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) ) + if ( url.isLocalFile() ? !TQFile::exists( path ) : !TDEIO::NetAccess::exists( url, false, 0 ) ) { nameFilter = fileName; url.setFileName( TQString::null ); @@ -711,7 +711,7 @@ bool KonqMainWindow::openView( TQString serviceType, const KURL &_url, KonqView // Second argument is referring URL if ( !kapp->authorizeURLAction("open", childView ? childView->url() : KURL(), _url) ) { - TQString msg = KIO::buildErrorString(KIO::ERR_ACCESS_DENIED, _url.prettyURL()); + TQString msg = TDEIO::buildErrorString(TDEIO::ERR_ACCESS_DENIED, _url.prettyURL()); KMessageBox::queuedMessageBox( this, KMessageBox::Error, msg ); return true; // Nothing else to do. } @@ -1349,7 +1349,7 @@ void KonqMainWindow::slotDuplicateWindow() { KTempFile tempFile; tempFile.setAutoDelete( true ); - KConfig config( tempFile.name() ); + TDEConfig config( tempFile.name() ); config.setGroup( "View Profile" ); m_pViewManager->saveViewProfile( config, true, true ); @@ -1442,7 +1442,7 @@ void KonqMainWindow::slotOpenTerminal() // If the given directory is not local, it can still be the URL of an // ioslave using UDS_LOCAL_PATH which to be converted first. - u = KIO::NetAccess::mostLocalURL(u, this); + u = TDEIO::NetAccess::mostLocalURL(u, this); //If the URL is local after the above conversion, set the directory. if ( u.isLocalFile() ) @@ -2728,8 +2728,8 @@ void KonqMainWindow::slotPopupThisWindow() void KonqMainWindow::slotPopupNewTabAtFront() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, TQString::fromLatin1("FMSettings") ); bool openAfterCurrentPage = config->readBoolEntry( "OpenAfterCurrentPage", false ); popupNewTab(true, openAfterCurrentPage); } @@ -4981,14 +4981,14 @@ void KonqMainWindow::reparseConfiguration() (*it)->reparseConfiguration(); } -void KonqMainWindow::saveProperties( KConfig *config ) +void KonqMainWindow::saveProperties( TDEConfig *config ) { m_pViewManager->saveViewProfile( *config, true /* save URLs */, false ); } -void KonqMainWindow::readProperties( KConfig *config ) +void KonqMainWindow::readProperties( TDEConfig *config ) { - kdDebug(1202) << "KonqMainWindow::readProperties( KConfig *config )" << endl; + kdDebug(1202) << "KonqMainWindow::readProperties( TDEConfig *config )" << endl; m_pViewManager->loadViewProfile( *config, TQString::null /*no profile name*/ ); } @@ -5107,7 +5107,7 @@ void KonqMainWindow::updateViewModeActions() // Another temporary map, the preferred service for each library (2 entries in our example) TQMap<TQString,TQString> preferredServiceMap; - KConfig * config = TDEGlobal::config(); + TDEConfig * config = TDEGlobal::config(); config->setGroup( "ModeToolBarServices" ); KTrader::OfferList::ConstIterator it = services.begin(); @@ -5225,7 +5225,7 @@ void KonqMainWindow::updateViewModeActions() #ifndef NDEBUG // Note that this can happen (map not empty) when a inode/directory view is removed, - // and remains in the KConfig file. + // and remains in the TDEConfig file. Q_ASSERT( preferredServiceMap.isEmpty() ); TQMap<TQString,TQString>::Iterator debugIt = preferredServiceMap.begin(); TQMap<TQString,TQString>::Iterator debugEnd = preferredServiceMap.end(); @@ -5243,7 +5243,7 @@ void KonqMainWindow::saveToolBarServicesMap() { TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.begin(); TQMap<TQString,KService::Ptr>::ConstIterator serviceEnd = m_viewModeToolBarServices.end(); - KConfig * config = TDEGlobal::config(); + TDEConfig * config = TDEGlobal::config(); config->setGroup( "ModeToolBarServices" ); for ( ; serviceIt != serviceEnd ; ++serviceIt ) config->writeEntry( serviceIt.key(), serviceIt.data()->desktopEntryName() ); @@ -5295,8 +5295,8 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) KonqFrameTabs* tabContainer = static_cast<KonqFrameTabs*>(viewManager()->docContainer()); if ( tabContainer->count() > 1 ) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); if ( !config->hasKey( "MultipleTabConfirm" ) ) { @@ -5742,7 +5742,7 @@ void KonqMainWindow::removeChildFrame( KonqFrameBase * /*frame*/ ) m_pActiveChild = 0L; } -void KonqMainWindow::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); } +void KonqMainWindow::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { if( m_pChildFrame ) m_pChildFrame->saveConfig( config, prefix, saveURLs, docContainer, id, depth); } void KonqMainWindow::copyHistory( KonqFrameBase *other ) { if( m_pChildFrame ) m_pChildFrame->copyHistory( other ); } @@ -5807,7 +5807,7 @@ void KonqMainWindow::setPreloadedWindow( KonqMainWindow* window ) if( window == NULL ) return; window->viewManager()->clear(); - KIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) ); + TDEIO::Scheduler::unregisterWindow( TQT_TQOBJECT(window) ); } // used by preloading - this KonqMainWindow will be reused, reset everything diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index c0dd75692..fe016b18c 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -142,8 +142,8 @@ public: virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ); virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ); - virtual void saveProperties( KConfig *config ); - virtual void readProperties( KConfig *config ); + virtual void saveProperties( TDEConfig *config ); + virtual void readProperties( TDEConfig *config ); void setInitialFrameName( const TQString &name ); @@ -275,7 +275,7 @@ public: */ void removeChildFrame( KonqFrameBase * frame ); - void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); + void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); void copyHistory( KonqFrameBase *other ); @@ -727,7 +727,7 @@ private: TQLabel* m_locationLabel; TQGuardedPtr<KonqCombo> m_combo; - static KConfig *s_comboConfig; + static TDEConfig *s_comboConfig; KURLCompletion *m_pURLCompletion; // just a reference to KonqHistoryManager's completionObject static KCompletion *s_pCompletion; diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 5802d47c9..cee752015 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -144,7 +144,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const TQString &path, } else { - KConfig cfg( path, true ); + TDEConfig cfg( path, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); TQString xmluiFile=cfg.readEntry("XMLUIFile","konqueror.rc"); diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index 4c5fa868b..07d0b5b77 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -48,7 +48,7 @@ KonqProfileMap KonqProfileDlg::readAllProfiles() for (; pIt != pEnd; ++pIt ) { TQFileInfo info( *pIt ); - TQString profileName = KIO::decodeFileName( info.baseName() ); + TQString profileName = TDEIO::decodeFileName( info.baseName() ); KSimpleConfig cfg( *pIt, true ); if ( cfg.hasGroup( "Profile" ) ) { @@ -156,7 +156,7 @@ void KonqProfileDlg::loadAllProfiles(const TQString & preselectProfile) void KonqProfileDlg::slotUser3() // Save button { - TQString name = KIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/' + TQString name = TDEIO::encodeFileName( m_pProfileNameLineEdit->text() ); // in case of '/' // Reuse filename of existing item, if any if ( m_pListView->selectedItem() ) diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cc index a23513bd0..f5e10897c 100644 --- a/konqueror/konq_run.cc +++ b/konqueror/konq_run.cc @@ -130,7 +130,7 @@ void KonqRun::foundMimeType( const TQString & _type ) KRun::foundMimeType( mimeType ); } -void KonqRun::handleError( KIO::Job *job ) +void KonqRun::handleError( TDEIO::Job *job ) { kdDebug(1202) << "KonqRun::handleError error:" << job->errorString() << endl; if (!m_mailto.isEmpty()) @@ -148,10 +148,10 @@ void KonqRun::init() KParts::BrowserRun::init(); // Maybe init went to the "let's try stat'ing" part. Then connect to info messages. // (in case it goes to scanFile, this will be done below) - KIO::StatJob *job = tqt_dynamic_cast<KIO::StatJob*>( m_job ); + TDEIO::StatJob *job = tqt_dynamic_cast<TDEIO::StatJob*>( m_job ); if ( job && !job->error() && m_pView ) { - connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) ); + connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } @@ -160,20 +160,20 @@ void KonqRun::scanFile() KParts::BrowserRun::scanFile(); // could be a static cast as of now, but who would notify when // BrowserRun changes - KIO::TransferJob *job = tqt_dynamic_cast<KIO::TransferJob*>( m_job ); + TDEIO::TransferJob *job = tqt_dynamic_cast<TDEIO::TransferJob*>( m_job ); if ( job && !job->error() ) { - connect( job, TQT_SIGNAL( redirection( KIO::Job *, const KURL& )), - TQT_SLOT( slotRedirection( KIO::Job *, const KURL& ) )); + connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )), + TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) )); if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") { - connect( job, TQT_SIGNAL( infoMessage( KIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(KIO::Job*, const TQString& ) ) ); + connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } } -void KonqRun::slotRedirection( KIO::Job *job, const KURL& redirectedToURL ) +void KonqRun::slotRedirection( TDEIO::Job *job, const KURL& redirectedToURL ) { - KURL redirectFromURL = static_cast<KIO::TransferJob *>(job)->url(); + KURL redirectFromURL = static_cast<TDEIO::TransferJob *>(job)->url(); kdDebug(1202) << "KonqRun::slotRedirection from " << redirectFromURL.prettyURL() << " to " << redirectedToURL.prettyURL() << endl; KonqHistoryManager::kself()->confirmPending( redirectFromURL ); diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h index 4084584a7..0fb97a1cf 100644 --- a/konqueror/konq_run.h +++ b/konqueror/konq_run.h @@ -55,12 +55,12 @@ public: protected: virtual void foundMimeType( const TQString & _type ); - virtual void handleError( KIO::Job * job ); + virtual void handleError( TDEIO::Job * job ); virtual void init(); virtual void scanFile(); protected slots: - void slotRedirection( KIO::Job *, const KURL& ); + void slotRedirection( TDEIO::Job *, const KURL& ); protected: TQGuardedPtr<KonqMainWindow> m_pMainWindow; diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 8a5ff3e87..eca93d7c6 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -187,7 +187,7 @@ void KonqFrameTabs::listViews( ChildViewList *viewList ) { it.current()->listViews(viewList); } -void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, +void KonqFrameTabs::saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id, int depth ) { //write children diff --git a/konqueror/konq_tabs.h b/konqueror/konq_tabs.h index b4aa6e873..d07948149 100644 --- a/konqueror/konq_tabs.h +++ b/konqueror/konq_tabs.h @@ -36,7 +36,7 @@ class KonqFrameBase; class KonqFrame; class KonqFrameContainerBase; class KonqFrameContainer; -class KConfig; +class TDEConfig; class KSeparator; class KProgress; class KAction; @@ -53,7 +53,7 @@ public: virtual void listViews( ChildViewList *viewList ); - virtual void saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, + virtual void saveConfig( TDEConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int id = 0, int depth = 0 ); virtual void copyHistory( KonqFrameBase *other ); diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 6a7234c60..ffa12321c 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -372,8 +372,8 @@ bool KonqView::changeViewMode( const TQString &serviceType, void KonqView::connectPart( ) { //kdDebug(1202) << "KonqView::connectPart" << endl; - connect( m_pPart, TQT_SIGNAL( started( KIO::Job * ) ), - this, TQT_SLOT( slotStarted( KIO::Job * ) ) ); + connect( m_pPart, TQT_SIGNAL( started( TDEIO::Job * ) ), + this, TQT_SLOT( slotStarted( TDEIO::Job * ) ) ); connect( m_pPart, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); connect( m_pPart, TQT_SIGNAL( completed(bool) ), @@ -518,7 +518,7 @@ void KonqView::slotResizeTopLevelWidget( int w, int h ) m_pMainWindow->resize( w, h ); } -void KonqView::slotStarted( KIO::Job * job ) +void KonqView::slotStarted( TDEIO::Job * job ) { //kdDebug(1202) << "KonqView::slotStarted" << job << endl; setLoading( true ); @@ -532,9 +532,9 @@ void KonqView::slotStarted( KIO::Job * job ) job->setWindow (m_pMainWindow->topLevelWidget ()); } - connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( speed( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( KIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( KIO::Job *, const TQString & ) ) ); + connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); } } @@ -554,17 +554,17 @@ void KonqView::setLoading( bool loading, bool hasPending /*= false*/) m_pMainWindow->viewManager()->setLoading( this, loading || hasPending ); } -void KonqView::slotPercent( KIO::Job *, unsigned long percent ) +void KonqView::slotPercent( TDEIO::Job *, unsigned long percent ) { m_pKonqFrame->statusbar()->slotLoadingProgress( percent ); } -void KonqView::slotSpeed( KIO::Job *, unsigned long bytesPerSecond ) +void KonqView::slotSpeed( TDEIO::Job *, unsigned long bytesPerSecond ) { m_pKonqFrame->statusbar()->slotSpeedProgress( bytesPerSecond ); } -void KonqView::slotInfoMessage( KIO::Job *, const TQString &msg ) +void KonqView::slotInfoMessage( TDEIO::Job *, const TQString &msg ) { m_pKonqFrame->statusbar()->message( msg ); } diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 2af897dd3..6a63bff9f 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -358,18 +358,18 @@ public slots: void setPageSecurity( int ); - // connected to the KROP's KIO::Job + // connected to the KROP's TDEIO::Job // but also to KonqRun's job - void slotInfoMessage( KIO::Job *, const TQString &msg ); + void slotInfoMessage( TDEIO::Job *, const TQString &msg ); protected slots: - // connected to the KROP's KIO::Job - void slotStarted( KIO::Job * job ); + // connected to the KROP's TDEIO::Job + void slotStarted( TDEIO::Job * job ); void slotCompleted(); void slotCompleted( bool ); void slotCanceled( const TQString & errMsg ); - void slotPercent( KIO::Job *, unsigned long percent ); - void slotSpeed( KIO::Job *, unsigned long bytesPerSecond ); + void slotPercent( TDEIO::Job *, unsigned long percent ); + void slotSpeed( TDEIO::Job *, unsigned long bytesPerSecond ); /** * Connected to the BrowserExtension diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 4413416fb..f765006b5 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -420,7 +420,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KTempFile tempFile; tempFile.setAutoDelete( true ); - KConfig config( tempFile.name() ); + TDEConfig config( tempFile.name() ); config.setGroup( "View Profile" ); TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); @@ -490,7 +490,7 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KTempFile tempFile; tempFile.setAutoDelete( true ); - KConfig config( tempFile.name() ); + TDEConfig config( tempFile.name() ); config.setGroup( "View Profile" ); TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); @@ -1092,7 +1092,7 @@ void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString } -void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize ) +void KonqViewManager::saveViewProfile( TDEConfig & cfg, bool saveURLs, bool saveWindowSize ) { //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; if( m_pMainWindow->childFrame() != 0L ) { @@ -1126,13 +1126,13 @@ void KonqViewManager::loadViewProfile( const TQString & path, const TQString & f const KURL & forcedURL, const KonqOpenURLRequest &req, bool resetWindow, bool openURL ) { - KConfig cfg( path, true ); + TDEConfig cfg( path, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); loadViewProfile( cfg, filename, forcedURL, req, resetWindow, openURL ); } -void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, +void KonqViewManager::loadViewProfile( TDEConfig &cfg, const TQString & filename, const KURL & forcedURL, const KonqOpenURLRequest &req, bool resetWindow, bool openURL ) { @@ -1401,7 +1401,7 @@ void KonqViewManager::emitActivePartChanged() } -TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) +TQSize KonqViewManager::readConfigSize( TDEConfig &cfg, TQWidget *widget ) { bool ok; @@ -1446,7 +1446,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) return TQSize( width, height ); } -void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, +void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage ) { TQString prefix; diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 9b5c4e5b3..0323bd504 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -35,7 +35,7 @@ class TQString; class TQStringList; class TQTimer; -class KConfig; +class TDEConfig; class KonqMainWindow; class KonqFrameBase; class KonqFrameContainer; @@ -178,7 +178,7 @@ public: * @param saveURLs whether to save the URLs in the profile * @param saveWindowSize whether to save the size of the window in the profile */ - void saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize ); + void saveViewProfile( TDEConfig & cfg, bool saveURLs, bool saveWindowSize ); /** * Saves the current view layout to a config file. @@ -201,7 +201,7 @@ public: * @param resetWindow if the profile doesn't have attributes like size or toolbar * settings, they will be reset to the defaults */ - void loadViewProfile( KConfig &cfg, const TQString & filename, + void loadViewProfile( TDEConfig &cfg, const TQString & filename, const KURL & forcedURL = KURL(), const KonqOpenURLRequest &req = KonqOpenURLRequest(), bool resetWindow = false, bool openURL = true ); @@ -274,7 +274,7 @@ public: /** * The widget is the one which you are referring to. */ - static TQSize readConfigSize( KConfig &cfg, TQWidget *widget = NULL); + static TQSize readConfigSize( TDEConfig &cfg, TQWidget *widget = NULL); #ifndef NDEBUG void printFullHierarchy( KonqFrameContainerBase * container ); @@ -309,7 +309,7 @@ protected: * @param openURL whether to open urls at all (from the profile or using @p defaultURL). * (this is set to false when we have a forcedURL to open) */ - void loadItem( KConfig &cfg, KonqFrameContainerBase *parent, + void loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false ); // Disabled - we do it ourselves diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index 188c3c394..2082821a8 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -67,36 +67,36 @@ void KonqInfoListViewItem::updateContents() { switch (tmpColumn->udsId) { - case KIO::UDS_USER: + case TDEIO::UDS_USER: setText(tmpColumn->displayInColumn,m_fileitem->user()); break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: setText(tmpColumn->displayInColumn,m_fileitem->group()); break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimeComment()); break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimetype()); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL()); break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: setText(tmpColumn->displayInColumn,m_fileitem->linkDest()); break; - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() ) setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" "); else - setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" "); + setText(tmpColumn->displayInColumn,TDEIO::convertSize(m_fileitem->size())+" "); break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: setText(tmpColumn->displayInColumn,m_fileitem->permissionsString()); break; - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: - case KIO::UDS_CREATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: + case TDEIO::UDS_CREATION_TIME: { TQDateTime dt; time_t _time = m_fileitem->time( tmpColumn->udsId ); @@ -265,12 +265,12 @@ void KonqBaseListViewItem::mimetypeFound() for (unsigned int i=0; i<KonqBaseListViewWidget::NumberOfAtoms && done < 2; i++) { ColumnInfo *tmpColumn=&lv->columnConfigInfo()[i]; - if (lv->columnConfigInfo()[i].udsId==KIO::UDS_FILE_TYPE && tmpColumn->displayThisOne) + if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_FILE_TYPE && tmpColumn->displayThisOne) { setText(tmpColumn->displayInColumn, m_fileitem->mimeComment()); done++; } - if (lv->columnConfigInfo()[i].udsId==KIO::UDS_MIME_TYPE && tmpColumn->displayThisOne) + if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_MIME_TYPE && tmpColumn->displayThisOne) { setText(tmpColumn->displayInColumn, m_fileitem->mimetype()); done++; diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index ff829c4c0..cb942dfe8 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -235,10 +235,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) } else { - m_metaInfoJob = KIO::fileMetaInfo(list); + m_metaInfoJob = TDEIO::fileMetaInfo(list); connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), this, TQT_SLOT( slotMetaInfoResult())); } } @@ -255,10 +255,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list) } else { - m_metaInfoJob = KIO::fileMetaInfo(list); + m_metaInfoJob = TDEIO::fileMetaInfo(list); connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), this, TQT_SLOT( slotMetaInfoResult())); } KonqBaseListViewWidget::slotRefreshItems(list); @@ -311,10 +311,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult() } else { - m_metaInfoJob = KIO::fileMetaInfo(m_metaInfoTodo); + m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo); connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( KIO::Job*)), + connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), this, TQT_SLOT( slotMetaInfoResult())); m_metaInfoTodo.clear(); } diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index 5ae497ac2..c4dcf5076 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -25,7 +25,7 @@ #include <tqmap.h> #include <tqpair.h> -namespace KIO {class MetaInfoJob;} +namespace TDEIO {class MetaInfoJob;} class KonqListView; class KSelectAction; @@ -82,7 +82,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget KonqILVMimeType m_favorite; KSelectAction* m_mtSelector; - KIO::MetaInfoJob* m_metaInfoJob; + TDEIO::MetaInfoJob* m_metaInfoJob; KFileItemList m_metaInfoTodo; }; diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 94f9211ac..a1f522bf6 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -264,18 +264,18 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char setupActions(); m_pListView->confColumns.resize( 11 ); - m_pListView->confColumns[0].setData(I18N_NOOP("MimeType"),"Type",KIO::UDS_MIME_TYPE,m_paShowMimeType); - m_pListView->confColumns[1].setData(I18N_NOOP("Size"),"Size",KIO::UDS_SIZE,m_paShowSize); - m_pListView->confColumns[2].setData(I18N_NOOP("Modified"),"Date",KIO::UDS_MODIFICATION_TIME,m_paShowTime); - m_pListView->confColumns[3].setData(I18N_NOOP("Accessed"),"AccessDate",KIO::UDS_ACCESS_TIME,m_paShowAccessTime); - m_pListView->confColumns[4].setData(I18N_NOOP("Created"),"CreationDate",KIO::UDS_CREATION_TIME,m_paShowCreateTime); - m_pListView->confColumns[5].setData(I18N_NOOP("Permissions"),"Access",KIO::UDS_ACCESS,m_paShowPermissions); - m_pListView->confColumns[6].setData(I18N_NOOP("Owner"),"Owner",KIO::UDS_USER,m_paShowOwner); - m_pListView->confColumns[7].setData(I18N_NOOP("Group"),"Group",KIO::UDS_GROUP,m_paShowGroup); - m_pListView->confColumns[8].setData(I18N_NOOP("Link"),"Link",KIO::UDS_LINK_DEST,m_paShowLinkDest); - m_pListView->confColumns[9].setData(I18N_NOOP("URL"),"URL",KIO::UDS_URL,m_paShowURL); + m_pListView->confColumns[0].setData(I18N_NOOP("MimeType"),"Type",TDEIO::UDS_MIME_TYPE,m_paShowMimeType); + m_pListView->confColumns[1].setData(I18N_NOOP("Size"),"Size",TDEIO::UDS_SIZE,m_paShowSize); + m_pListView->confColumns[2].setData(I18N_NOOP("Modified"),"Date",TDEIO::UDS_MODIFICATION_TIME,m_paShowTime); + m_pListView->confColumns[3].setData(I18N_NOOP("Accessed"),"AccessDate",TDEIO::UDS_ACCESS_TIME,m_paShowAccessTime); + m_pListView->confColumns[4].setData(I18N_NOOP("Created"),"CreationDate",TDEIO::UDS_CREATION_TIME,m_paShowCreateTime); + m_pListView->confColumns[5].setData(I18N_NOOP("Permissions"),"Access",TDEIO::UDS_ACCESS,m_paShowPermissions); + m_pListView->confColumns[6].setData(I18N_NOOP("Owner"),"Owner",TDEIO::UDS_USER,m_paShowOwner); + m_pListView->confColumns[7].setData(I18N_NOOP("Group"),"Group",TDEIO::UDS_GROUP,m_paShowGroup); + m_pListView->confColumns[8].setData(I18N_NOOP("Link"),"Link",TDEIO::UDS_LINK_DEST,m_paShowLinkDest); + m_pListView->confColumns[9].setData(I18N_NOOP("URL"),"URL",TDEIO::UDS_URL,m_paShowURL); // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/ - m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",KIO::UDS_FILE_TYPE,m_paShowType); + m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType); connect( m_pListView, TQT_SIGNAL( selectionChanged() ), diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 616559bad..925f33f8f 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -30,12 +30,12 @@ static TQString retrieveExtraEntry( KFileItem* fileitem, int numExtra ) { /// ######## SLOOOOW - KIO::UDSEntry::ConstIterator it = fileitem->entry().begin(); - const KIO::UDSEntry::ConstIterator end = fileitem->entry().end(); + TDEIO::UDSEntry::ConstIterator it = fileitem->entry().begin(); + const TDEIO::UDSEntry::ConstIterator end = fileitem->entry().end(); int n = 0; for( ; it != end; ++it ) { - if ((*it).m_uds == KIO::UDS_EXTRA) + if ((*it).m_uds == TDEIO::UDS_EXTRA) { ++n; if ( n == numExtra ) @@ -99,36 +99,36 @@ void KonqListViewItem::updateContents() { switch (tmpColumn->udsId) { - case KIO::UDS_USER: + case TDEIO::UDS_USER: setText(tmpColumn->displayInColumn,m_fileitem->user()); break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: setText(tmpColumn->displayInColumn,m_fileitem->group()); break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimeComment()); break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimetype()); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL()); break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: setText(tmpColumn->displayInColumn,m_fileitem->linkDest()); break; - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: if ( m_pListViewWidget->m_pSettings->fileSizeInBytes() ) setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber( m_fileitem->size(),0)+" "); else - setText(tmpColumn->displayInColumn,KIO::convertSize(m_fileitem->size())+" "); + setText(tmpColumn->displayInColumn,TDEIO::convertSize(m_fileitem->size())+" "); break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: setText(tmpColumn->displayInColumn,m_fileitem->permissionsString()); break; - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: - case KIO::UDS_CREATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: + case TDEIO::UDS_CREATION_TIME: { TQDateTime dt; time_t _time = m_fileitem->time( tmpColumn->udsId ); @@ -139,7 +139,7 @@ void KonqListViewItem::updateContents() } } break; - case KIO::UDS_EXTRA: + case TDEIO::UDS_EXTRA: { const TQString entryStr = retrieveExtraEntry( m_fileitem, numExtra ); if ( tmpColumn->type == TQVariant::DateTime ) @@ -251,27 +251,27 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending for ( unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms; i++ ) { ColumnInfo *cInfo = &m_pListViewWidget->columnConfigInfo()[i]; - if ( cInfo->udsId == KIO::UDS_EXTRA ) + if ( cInfo->udsId == TDEIO::UDS_EXTRA ) ++numExtra; if ( col == cInfo->displayInColumn ) { switch ( cInfo->udsId ) { - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: - case KIO::UDS_CREATION_TIME: + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: + case TDEIO::UDS_CREATION_TIME: { time_t t1 = m_fileitem->time( cInfo->udsId ); time_t t2 = k->m_fileitem->time( cInfo->udsId ); return ( t1 > t2 ) ? 1 : ( t1 < t2 ) ? -1 : 0; } - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: { - KIO::filesize_t s1 = m_fileitem->size(); - KIO::filesize_t s2 = k->m_fileitem->size(); + TDEIO::filesize_t s1 = m_fileitem->size(); + TDEIO::filesize_t s2 = k->m_fileitem->size(); return ( s1 > s2 ) ? 1 : ( s1 < s2 ) ? -1 : 0; } - case KIO::UDS_EXTRA: + case TDEIO::UDS_EXTRA: { if ( cInfo->type & TQVariant::DateTime ) { const TQString entryStr1 = retrieveExtraEntry( m_fileitem, numExtra ); @@ -434,12 +434,12 @@ void KonqBaseListViewItem::mimetypeFound() for (unsigned int i=0; i<m_pListViewWidget->NumberOfAtoms && done < 2; i++) { ColumnInfo *tmpColumn=&lv->columnConfigInfo()[i]; - if (lv->columnConfigInfo()[i].udsId==KIO::UDS_FILE_TYPE && tmpColumn->displayThisOne) + if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_FILE_TYPE && tmpColumn->displayThisOne) { setText(tmpColumn->displayInColumn, m_fileitem->mimeComment()); done++; } - if (lv->columnConfigInfo()[i].udsId==KIO::UDS_MIME_TYPE && tmpColumn->displayThisOne) + if (lv->columnConfigInfo()[i].udsId==TDEIO::UDS_MIME_TYPE && tmpColumn->displayThisOne) { setText(tmpColumn->displayInColumn, m_fileitem->mimetype()); done++; diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 8c4b17319..1dd7a25ad 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -238,7 +238,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) t = TQVariant::DateTime; else kdWarning() << "Unsupported ExtraType '" << type << "'" << endl; - confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), KIO::UDS_EXTRA, t, 0); + confColumns[extraIndex++].setData( column, TQString("Extra%1").arg(num), TDEIO::UDS_EXTRA, t, 0); } //disable everything @@ -275,24 +275,24 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) ColumnInfo *tmpColumn = &confColumns[j]; TQString str; - if ( tmpColumn->udsId == KIO::UDS_SIZE ) + if ( tmpColumn->udsId == TDEIO::UDS_SIZE ) str = TDEGlobal::locale()->formatNumber( 888888888, 0 ) + " "; - else if ( tmpColumn->udsId == KIO::UDS_ACCESS ) + else if ( tmpColumn->udsId == TDEIO::UDS_ACCESS ) str = "--Permissions--"; - else if ( tmpColumn->udsId == KIO::UDS_USER ) + else if ( tmpColumn->udsId == TDEIO::UDS_USER ) str = "a_long_username"; - else if ( tmpColumn->udsId == KIO::UDS_GROUP ) + else if ( tmpColumn->udsId == TDEIO::UDS_GROUP ) str = "a_groupname"; - else if ( tmpColumn->udsId == KIO::UDS_LINK_DEST ) + else if ( tmpColumn->udsId == TDEIO::UDS_LINK_DEST ) str = "a_quite_long_filename_for_link_dest"; - else if ( tmpColumn->udsId == KIO::UDS_FILE_TYPE ) + else if ( tmpColumn->udsId == TDEIO::UDS_FILE_TYPE ) str = "a_long_comment_for_mimetype"; - else if ( tmpColumn->udsId == KIO::UDS_MIME_TYPE ) + else if ( tmpColumn->udsId == TDEIO::UDS_MIME_TYPE ) str = "_a_long_/_mimetype_"; - else if ( tmpColumn->udsId == KIO::UDS_URL ) + else if ( tmpColumn->udsId == TDEIO::UDS_URL ) str = "a_long_lonq_long_very_long_url"; - else if ( (tmpColumn->udsId & KIO::UDS_TIME) - || (tmpColumn->udsId == KIO::UDS_EXTRA && + else if ( (tmpColumn->udsId & TDEIO::UDS_TIME) + || (tmpColumn->udsId == TDEIO::UDS_EXTRA && (tmpColumn->type & TQVariant::DateTime)) ) { TQDateTime dt( TQDate( 2000, 10, 10 ), TQTime( 20, 20, 20 ) ); @@ -318,8 +318,8 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) listingList.append( "MimeType" ); for ( unsigned int i = 0; i < NumberOfAtoms; i++ ) { - if ( confColumns[i].udsId == KIO::UDS_URL || - confColumns[i].udsId == KIO::UDS_MIME_TYPE || + if ( confColumns[i].udsId == TDEIO::UDS_URL || + confColumns[i].udsId == TDEIO::UDS_MIME_TYPE || !confColumns[i].displayThisOne ) { continue; @@ -364,7 +364,7 @@ void KonqBaseListViewWidget::createColumns() addColumn( i18n(confColumns[i].name.utf8()), confColumns[i].width ); if ( sortedByColumn == confColumns[i].desktopFileName ) setSorting( currentColumn, m_bAscending ); - if ( confColumns[i].udsId == KIO::UDS_SIZE ) + if ( confColumns[i].udsId == TDEIO::UDS_SIZE ) setColumnAlignment( currentColumn, AlignRight ); i = -1; currentColumn++; @@ -870,7 +870,7 @@ void KonqBaseListViewWidget::slotItemRenamed( TQListViewItem *item, const TQStri if( !name.isEmpty() ) { // Actually attempt the rename. If it succeeds, KDirLister will update the name. - KonqOperations::rename( this, renamedItem->item()->url(), KIO::encodeFileName( name ) ); + KonqOperations::rename( this, renamedItem->item()->url(), TDEIO::encodeFileName( name ) ); } // When the KListViewLineEdit loses focus, focus tends to go to the location bar... diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index b1d536df9..5dd6aca11 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -30,7 +30,7 @@ #include <konq_propsview.h> #include "konq_listviewitems.h" -namespace KIO { class Job; } +namespace TDEIO { class Job; } class TQCursor; class TQRect; diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index e594e8a9a..4b989a9e7 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -44,16 +44,16 @@ int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) c ColumnInfo *cInfo=&lv->columnConfigInfo()[i]; if (_column==cInfo->displayInColumn) { - if ((cInfo->udsId==KIO::UDS_MODIFICATION_TIME) - || (cInfo->udsId==KIO::UDS_ACCESS_TIME) - || (cInfo->udsId==KIO::UDS_CREATION_TIME)) + if ((cInfo->udsId==TDEIO::UDS_MODIFICATION_TIME) + || (cInfo->udsId==TDEIO::UDS_ACCESS_TIME) + || (cInfo->udsId==TDEIO::UDS_CREATION_TIME)) { tmp += TQString::number( m_fileitem->time(cInfo->udsId) ).rightJustify( 14, '0' ); return tmp; } - else if (cInfo->udsId==KIO::UDS_SIZE) + else if (cInfo->udsId==TDEIO::UDS_SIZE) { - tmp += KIO::number( m_fileitem->size() ).rightJustify( 20, '0' ); + tmp += TDEIO::number( m_fileitem->size() ).rightJustify( 20, '0' ); return tmp; } else break; @@ -68,7 +68,7 @@ int KonqTextViewItem::compare( TQListViewItem *item, int col, bool ascending ) c void KonqTextViewItem::updateContents() { TQString tmp; - KIO::filesize_t size=m_fileitem->size(); + TDEIO::filesize_t size=m_fileitem->size(); mode_t m=m_fileitem->mode(); // The order is: .dir (0), dir (1), .file (2), file (3) @@ -151,37 +151,37 @@ void KonqTextViewItem::updateContents() { switch (tmpColumn->udsId) { - case KIO::UDS_USER: + case TDEIO::UDS_USER: setText(tmpColumn->displayInColumn,m_fileitem->user()); break; - case KIO::UDS_GROUP: + case TDEIO::UDS_GROUP: setText(tmpColumn->displayInColumn,m_fileitem->group()); break; - case KIO::UDS_LINK_DEST: + case TDEIO::UDS_LINK_DEST: setText(tmpColumn->displayInColumn,m_fileitem->linkDest()); break; - case KIO::UDS_FILE_TYPE: + case TDEIO::UDS_FILE_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimeComment()); break; - case KIO::UDS_MIME_TYPE: + case TDEIO::UDS_MIME_TYPE: setText(tmpColumn->displayInColumn,m_fileitem->mimetype()); break; - case KIO::UDS_URL: + case TDEIO::UDS_URL: setText(tmpColumn->displayInColumn,m_fileitem->url().prettyURL()); break; - case KIO::UDS_SIZE: + case TDEIO::UDS_SIZE: if ( static_cast<KonqBaseListViewWidget *>(listView())->m_pSettings->fileSizeInBytes() ) setText(tmpColumn->displayInColumn,TDEGlobal::locale()->formatNumber(size, 0)+" "); else - setText(tmpColumn->displayInColumn,KIO::convertSize(size)+" "); + setText(tmpColumn->displayInColumn,TDEIO::convertSize(size)+" "); break; - case KIO::UDS_ACCESS: + case TDEIO::UDS_ACCESS: setText(tmpColumn->displayInColumn,m_fileitem->permissionsString()); break; - case KIO::UDS_MODIFICATION_TIME: - case KIO::UDS_ACCESS_TIME: - case KIO::UDS_CREATION_TIME: - for( KIO::UDSEntry::ConstIterator it = m_fileitem->entry().begin(); it != m_fileitem->entry().end(); it++ ) + case TDEIO::UDS_MODIFICATION_TIME: + case TDEIO::UDS_ACCESS_TIME: + case TDEIO::UDS_CREATION_TIME: + for( TDEIO::UDSEntry::ConstIterator it = m_fileitem->entry().begin(); it != m_fileitem->entry().end(); it++ ) { if ((*it).m_uds==(unsigned int)tmpColumn->udsId) { diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index a927f37e0..9ae297285 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -135,7 +135,7 @@ KRemoteEncodingPlugin::updateMenu() for (unsigned i = 0; i < m_menu->popupMenu()->count(); i++) m_menu->popupMenu()->setItemChecked(m_menu->popupMenu()->idAt(i), false); - TQString charset = KIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(), + TQString charset = TDEIO::SlaveConfig::self()->configData(m_currentURL.protocol(), m_currentURL.host(), DATA_KEY); if (!charset.isEmpty()) { @@ -167,7 +167,7 @@ KRemoteEncodingPlugin::slotAboutToShow() void KRemoteEncodingPlugin::slotItemSelected(int id) { - KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); + TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); TQString host = m_currentURL.host(); if (!m_menu->popupMenu()->isItemChecked(id)) @@ -188,7 +188,7 @@ KRemoteEncodingPlugin::slotDefault() { // We have no choice but delete all higher domain level // settings here since it affects what will be matched. - KConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); + TDEConfig config(("kio_" + m_currentURL.protocol() + "rc").latin1()); TQStringList partList = TQStringList::split('.', m_currentURL.host(), false); if (!partList.isEmpty()) @@ -248,7 +248,7 @@ KRemoteEncodingPlugin::updateBrowser() { TQCString rtype; TQByteArray rdata; - client->call( *it, "KIO::Scheduler", "reparseSlaveConfiguration(TQString)", + client->call( *it, "TDEIO::Scheduler", "reparseSlaveConfiguration(TQString)", data, rtype, rdata); } delete client; diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index b518da326..d663baf6c 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -27,7 +27,7 @@ #include <kparts/plugin.h> class KActionMenu; -class KConfig; +class TDEConfig; class KonqDirPart; class KRemoteEncodingPlugin: public KParts::Plugin diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index fefc52de4..16975c405 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -45,7 +45,7 @@ void KShellCmdPlugin::slotExecuteShellCommand() KMessageBox::sorry(0L, "KShellCmdPlugin::slotExecuteShellCommand: Program error, please report a bug."); return; } - KURL url = KIO::NetAccess::mostLocalURL(part->url(),NULL); + KURL url = TDEIO::NetAccess::mostLocalURL(part->url(),NULL); if ( !url.isLocalFile() ) { KMessageBox::sorry(part->widget(),i18n("Executing shell commands works only on local directories.")); diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 61e0f3b82..db0421c52 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -32,8 +32,8 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, // this should be your custom internal widget m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); - connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), - this, TQT_SIGNAL(started(KIO::Job*))); + connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)), + this, TQT_SIGNAL(started(TDEIO::Job*))); connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index ad859d025..b9225edfa 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -51,7 +51,7 @@ class KDE_EXPORT KonqSidebarPlugin : public TQObject signals: void requestURL(KURL&); - void started(KIO::Job *); + void started(TDEIO::Job *); void completed(); void setIcon(const TQString& icon); void setCaption(const TQString& caption); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index f1dd6ad22..6a5ecd22d 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -130,7 +130,7 @@ void addBackEnd::doRollBack() dirEntries.remove(".."); for ( TQStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) { if ((*it)!="add") - KIO::NetAccess::del(KURL( loc+(*it) ), m_parent); + TDEIO::NetAccess::del(KURL( loc+(*it) ), m_parent); } emit initialCopyNeeded(); } @@ -303,11 +303,11 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (universalMode) { - m_config = new KConfig("konqsidebartng_kicker.rc"); + m_config = new TDEConfig("konqsidebartng_kicker.rc"); } else { - m_config = new KConfig("konqsidebartng.rc"); + m_config = new TDEConfig("konqsidebartng.rc"); m_config->setGroup(currentProfile); } readConfig(); @@ -1195,8 +1195,8 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { - if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) { - connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); + if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) { + connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*))); } if (mod->metaObject()->findSignal("completed()") != -1) { diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index d258c9c3b..da5b0888b 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -130,7 +130,7 @@ protected slots: void saveConfig(); signals: - void started(KIO::Job *); + void started(TDEIO::Job *); void completed(); void fileSelection(const KFileItemList& iems); void fileMouseOver(const KFileItem& item); @@ -191,7 +191,7 @@ private: TQGuardedPtr<ButtonInfo> m_activeModule; TQGuardedPtr<ButtonInfo> m_currentButton; - KConfig *m_config; + TDEConfig *m_config; TQTimer m_configTimer; KURL m_storedUrl; diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 16520d0e0..9c31acdf5 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -203,7 +203,7 @@ void KonqSidebarDirTreeItem::paste() kdDebug(1201) << "move (from clipboard data) = " << move << endl; } - KIO::pasteClipboard( m_fileItem->url(), move ); + TDEIO::pasteClipboard( m_fileItem->url(), move ); } void KonqSidebarDirTreeItem::trash() diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 7d8f7b1fd..40dd324e8 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -42,7 +42,7 @@ KonqSidebarDirTreeModule::KonqSidebarDirTreeModule( KonqSidebarTree * parentTree universalMode = ksi ? ksi->universalMode() : false; } */ - KConfig * config = new KConfig( universalMode ? "konqsidebartng_kicker.rc" : "konqsidebartng.rc" ); + TDEConfig * config = new TDEConfig( universalMode ? "konqsidebartng_kicker.rc" : "konqsidebartng.rc" ); config->setGroup(""); m_showArchivesAsFolders = config->readBoolEntry("ShowArchivesAsFolders",true); delete config; @@ -90,7 +90,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it TQString configured = cfg.readEntry("X-TDE-ConfiguredURL"); if (!configured.isEmpty()) { TQStringList list = TQStringList::split(':', configured); - KConfig config(list[0]); + TDEConfig config(list[0]); if (list[1] != "noGroup") config.setGroup(list[1]); TQString conf_url = config.readEntry(list[2]); if (!conf_url.isEmpty()) { @@ -378,7 +378,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) KonqSidebarDirTreeItem *dirTreeItem = new KonqSidebarDirTreeItem( parentItem, m_topLevelItem, fileItem ); dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) ); - dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) ); + dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) ); oldItem = static_cast<KonqSidebarDirTreeItem *> (oldItem->nextSibling()); } @@ -447,7 +447,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) KonqSidebarDirTreeItem *dirTreeItem = new KonqSidebarDirTreeItem( parentItem, m_topLevelItem, fileItem ); dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) ); - dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) ); + dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) ); } } while ((parentItem = parentItemList ? parentItemList->take(0) : 0)); @@ -494,7 +494,7 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries ) dirTreeItem->reset(); // Reset id dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) ); - dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) ); + dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) ); // Make sure the item doesn't get inserted twice! // dirTreeItem->id points to the new name @@ -504,7 +504,7 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries ) else { dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) ); - dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) ); + dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) ); } } while ((item = itemList ? itemList->take(0) : 0)); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 71c1b5a44..30d96f060 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -56,8 +56,8 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree m_dict.setAutoDelete( true ); m_currentTime = TQDateTime::currentDateTime(); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver cs( kc, "HistorySettings" ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver cs( kc, "HistorySettings" ); m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName"; @@ -111,8 +111,8 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule() ++it; } - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver cs( kc, "HistorySettings" ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver cs( kc, "HistorySettings" ); kc->writeEntry("OpenGroups", openGroups); kc->sync(); } @@ -143,8 +143,8 @@ void KonqSidebarHistoryModule::slotCreateItems() ++it; } - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver cs( kc, "HistorySettings" ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver cs( kc, "HistorySettings" ); TQStringList openGroups = kc->readListEntry("OpenGroups"); TQStringList::Iterator it2 = openGroups.begin(); KonqSidebarHistoryGroupItem *group; @@ -297,8 +297,8 @@ void KonqSidebarHistoryModule::sortingChanged() { m_topLevelItem->sort(); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver cs( kc, "HistorySettings" ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver cs( kc, "HistorySettings" ); kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" ); kc->sync(); } diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index 3e8c8a5de..701f72776 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -42,7 +42,7 @@ KonqSidebarHistorySettings::~KonqSidebarHistorySettings() void KonqSidebarHistorySettings::readSettings(bool global) { - KConfig *config; + TDEConfig *config; TQString oldgroup; if (global) { @@ -50,7 +50,7 @@ void KonqSidebarHistorySettings::readSettings(bool global) oldgroup= config->group(); } else - config = new KConfig("konquerorrc"); + config = new TDEConfig("konquerorrc"); config->setGroup("HistorySettings"); m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 ); @@ -77,7 +77,7 @@ void KonqSidebarHistorySettings::readSettings(bool global) void KonqSidebarHistorySettings::applySettings() { - KConfig *config = new KConfig("konquerorrc"); + TDEConfig *config = new TDEConfig("konquerorrc"); config->setGroup("HistorySettings"); config->writeEntry("Value youngerThan", m_valueYoungerThan ); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index a1ef792d6..967616bd5 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -49,7 +49,7 @@ typedef KGenericFactory<HistorySidebarConfig, TQWidget > KCMHistoryFactory; K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") ) HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & ) - : KCModule (KCMHistoryFactory::instance(), parent, name) + : TDECModule (KCMHistoryFactory::instance(), parent, name) { TDEGlobal::locale()->insertCatalogue("konqueror"); @@ -115,7 +115,7 @@ void HistorySidebarConfig::configChanged() void HistorySidebarConfig::load() { - KConfig config("konquerorrc"); + TDEConfig config("konquerorrc"); config.setGroup("HistorySettings"); dialog->spinExpire->setValue( config.readNumEntry( "Maximum age of History entries", 90) ); dialog->spinEntries->setValue( config.readNumEntry( "Maximum of History entries", 500 ) ); @@ -147,7 +147,7 @@ void HistorySidebarConfig::save() TQ_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0; TQ_UINT32 count = dialog->spinEntries->value(); - KConfig config("konquerorrc"); + TDEConfig config("konquerorrc"); config.setGroup("HistorySettings"); config.writeEntry( "Maximum of History entries", count ); config.writeEntry( "Maximum age of History entries", age ); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h index 0e354af65..5731ae267 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.h +++ b/konqueror/sidebar/trees/history_module/kcmhistory.h @@ -27,7 +27,7 @@ class KonqHistoryManager; class KonqSidebarHistorySettings; class KonqSidebarHistoryDlg; -class HistorySidebarConfig : public KCModule +class HistorySidebarConfig : public TDECModule { Q_OBJECT diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 7ba7c3014..b156c071d 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -380,7 +380,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url { TQString filename = findUniqueFilename(path, url.fileName()); destUrl.setPath(filename); - KIO::NetAccess::copy(url, destUrl, this); + TDEIO::NetAccess::copy(url, destUrl, this); } else { @@ -760,7 +760,7 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQSt TQFileInfo inf( filename ); TQString path = filename; - TQString name = KIO::decodeFileName( inf.fileName() ); + TQString name = TDEIO::decodeFileName( inf.fileName() ); if ( name.length() > 8 && name.right( 8 ) == ".desktop" ) name.truncate( name.length() - 8 ); if ( name.length() > 7 && name.right( 7 ) == ".kdelnk" ) diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index 4ce6fe445..8c9b787f8 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -169,7 +169,7 @@ void KonqSidebarTreeTopLevelItem::paste() else destURL = m_externalURL; - KIO::pasteClipboard( destURL, move ); + TDEIO::pasteClipboard( destURL, move ); } void KonqSidebarTreeTopLevelItem::rename() diff --git a/konsole/ChangeLog b/konsole/ChangeLog index 55aacd580..07bdf7be7 100644 --- a/konsole/ChangeLog +++ b/konsole/ChangeLog @@ -27,7 +27,7 @@ Lots happened here... - Added checks for new schema files when accessing the schema menu. - When schema files are removed the corresponding schemas are removed too. - Fixed some i18n problems in schema.C. -- Laid groundwork for switch to KConfig (from schema files). +- Laid groundwork for switch to TDEConfig (from schema files). - Check for new schema's every time the schema menu is accessed. I realise this may be resource intensive on some people's machines. Maybe we need a little timeout mechanism to prevent checks all too often. diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index e13a5eb1d..c00349022 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -2238,7 +2238,7 @@ void TEWidget::dropEvent(TQDropEvent* event) dropText += " "; m_drop->setItemEnabled(cd,false); } - KURL url = KIO::NetAccess::mostLocalURL( *it, 0 ); + KURL url = TDEIO::NetAccess::mostLocalURL( *it, 0 ); TQString tmp; if (url.isLocalFile()) { tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 225f6687d..b9940e697 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -297,7 +297,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo // read and apply default values /////////////////////////////////////////// resize(321, 321); // Dummy. TQSize currentSize = size(); - KConfig * config = TDEGlobal::config(); + TDEConfig * config = TDEGlobal::config(); config->setDesktopGroup(); applyMainWindowSettings(config); if (currentSize != size()) @@ -316,7 +316,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (isRestored) { n_tabbar = wanted_tabbar; - KConfig *c = TDEApplication::kApplication()->sessionConfig(); + TDEConfig *c = TDEApplication::kApplication()->sessionConfig(); // c->setDesktopGroup(); // Reads from wrong group b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false); } @@ -1167,7 +1167,7 @@ void Konsole::makeBasicGUI() new KAction(i18n("Toggle Bidi"), Qt::CTRL+Qt::ALT+Qt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. - if ( KConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { + if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { b_sessionShortcutsEnabled = true; loadSessionCommands(); loadScreenSessions(); @@ -1449,7 +1449,7 @@ void Konsole::slotSaveSessionsProfile() } } -void Konsole::saveProperties(KConfig* config) { +void Konsole::saveProperties(TDEConfig* config) { uint counter=0; uint active=0; TQString key; @@ -1554,7 +1554,7 @@ void Konsole::saveProperties(KConfig* config) { // Called by constructor (with config = TDEGlobal::config()) // and by session-management (with config = sessionconfig). // So it has to apply the settings when reading them. -void Konsole::readProperties(KConfig* config) +void Konsole::readProperties(TDEConfig* config) { readProperties(config, TQString::null, false); } @@ -1564,7 +1564,7 @@ void Konsole::readProperties(KConfig* config) // // When globalConfigOnly is true only the options that are shared among all // konsoles are being read. -void Konsole::readProperties(KConfig* config, const TQString &schema, bool globalConfigOnly) +void Konsole::readProperties(TDEConfig* config, const TQString &schema, bool globalConfigOnly) { if (config==TDEGlobal::config()) @@ -1840,7 +1840,7 @@ void Konsole::slotInstallBitmapFonts() it != sl_installFonts.end(); ++it ) { TQString sf = "fonts/" + *it; - if ( KIO::NetAccess::copy( locate( "appdata", sf ), + if ( TDEIO::NetAccess::copy( locate( "appdata", sf ), "fonts:/Personal/", 0 ) ) { b_installBitmapFonts = false; @@ -2013,7 +2013,7 @@ void Konsole::slotSelectTabbar() { void Konsole::slotSaveSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setDesktopGroup(); saveProperties(config); saveMainWindowSettings(config); @@ -2047,7 +2047,7 @@ void Konsole::slotConfigureKeys() m_shortcuts->action( i )->shortcut().count() && TQString(m_shortcuts->action( i )->name()).startsWith("SSC_") ) { b_sessionShortcutsEnabled = true; - KConfigGroup group(TDEGlobal::config(), "General"); + TDEConfigGroup group(TDEGlobal::config(), "General"); group.writeEntry("SessionShortcutsEnabled", true); } } @@ -2727,7 +2727,7 @@ void Konsole::allowPrevNext() KSimpleConfig *Konsole::defaultSession() { if (!m_defaultSession) { - KConfig * config = TDEGlobal::config(); + TDEConfig * config = TDEGlobal::config(); config->setDesktopGroup(); setDefaultSession(config->readEntry("DefaultSession","shell.desktop")); } @@ -4086,7 +4086,7 @@ void Konsole::slotSaveHistory() KURL s_url = KFileDialog::getSaveURL(TQString::null, TQString::null, 0L, i18n("Save History")); if( s_url.isEmpty()) return; - KURL url = KIO::NetAccess::mostLocalURL( s_url, 0 ); + KURL url = TDEIO::NetAccess::mostLocalURL( s_url, 0 ); if( !url.isLocalFile() ) { KMessageBox::sorry(this, i18n("This is not a local file.\n")); diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index cdf1ebad1..f24f823ce 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -118,7 +118,7 @@ public: virtual bool processDynamic(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData); virtual QCStringList functionsDynamic(); - void callReadPropertiesInternal(KConfig *config, int number) { readPropertiesInternal(config,number); } + void callReadPropertiesInternal(TDEConfig *config, int number) { readPropertiesInternal(config,number); } enum TabPosition { TabNone, TabTop, TabBottom }; enum TabViewModes { ShowIconAndText = 0, ShowTextOnly = 1, ShowIconOnly = 2 }; @@ -138,8 +138,8 @@ public slots: protected: bool queryClose(); - void saveProperties(KConfig* config); - void readProperties(KConfig* config); + void saveProperties(TDEConfig* config); + void readProperties(TDEConfig* config); private slots: void configureRequest(TEWidget*,int,int,int); @@ -260,7 +260,7 @@ private: TQString newSession(KSimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(), const TQString &_term = TQString::null, const TQString &_icon = TQString::null, const TQString &_title = TQString::null, const TQString &_cwd = TQString::null); - void readProperties(KConfig *config, const TQString &schema, bool globalConfigOnly); + void readProperties(TDEConfig *config, const TQString &schema, bool globalConfigOnly); void applySettingsToGUI(); void makeTabWidget(); void makeBasicGUI(); diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 34550fd30..6562ea0d9 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -150,7 +150,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje colors->sort(); // Check to see which config file we use: konsolepartrc or konsolerc - KConfig* config = new KConfig("konsolepartrc", true); + TDEConfig* config = new TDEConfig("konsolepartrc", true); config->setDesktopGroup(); b_useKonsoleSettings = config->readBoolEntry("use_konsole_settings", false); delete config; @@ -524,7 +524,7 @@ void konsolePart::applyProperties() se->setKeymapNo( n_keytab ); // FIXME: Move this somewhere else... - KConfig* config = new KConfig("konsolerc",true); + TDEConfig* config = new TDEConfig("konsolerc",true); config->setGroup("UTMP"); se->setAddToUtmp( config->readBoolEntry("AddToUtmp",true)); delete config; @@ -550,12 +550,12 @@ void konsolePart::setSettingsMenuEnabled( bool enable ) void konsolePart::readProperties() { - KConfig* config; + TDEConfig* config; if ( b_useKonsoleSettings ) - config = new KConfig( "konsolerc", true ); + config = new TDEConfig( "konsolerc", true ); else - config = new KConfig( "konsolepartrc", true ); + config = new TDEConfig( "konsolepartrc", true ); config->setDesktopGroup(); @@ -616,7 +616,7 @@ void konsolePart::readProperties() delete config; - config = new KConfig("konsolerc",true); + config = new TDEConfig("konsolerc",true); config->setDesktopGroup(); te->setTerminalSizeHint( config->readBoolEntry("TerminalSizeHint",true) ); delete config; @@ -624,7 +624,7 @@ void konsolePart::readProperties() void konsolePart::saveProperties() { - KConfig* config = new KConfig("konsolepartrc"); + TDEConfig* config = new TDEConfig("konsolepartrc"); config->setDesktopGroup(); if ( b_useKonsoleSettings ) { // Don't save Settings if using konsolerc diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp index c2e31ab4d..b5960727e 100644 --- a/konsole/konsole/konsolebookmarkhandler.cpp +++ b/konsole/konsole/konsolebookmarkhandler.cpp @@ -44,9 +44,9 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel TQString old_bm_file = locateLocal( "data", "kfile/bookmarks.xml" ); if ( TQFile::exists( old_bm_file ) ) // We want sync here... - if ( !KIO::NetAccess::copy( KURL( old_bm_file ), + if ( !TDEIO::NetAccess::copy( KURL( old_bm_file ), KURL ( new_bm_file ), 0 ) ) { - kdWarning()<<KIO::NetAccess::lastErrorString()<<endl; + kdWarning()<<TDEIO::NetAccess::lastErrorString()<<endl; } } diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 2ea4ff58b..f3dba695a 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -366,13 +366,13 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) if (args->isSet("schema")) schema = args->getOption("schema"); - KConfig * sessionconfig = 0; + TDEConfig * sessionconfig = 0; TQString profile = ""; if (args->isSet("profile")) { profile = args->getOption("profile"); TQString path = locate( "data", "konsole/profiles/" + profile ); if ( TQFile::exists( path ) ) - sessionconfig=new KConfig( path, true ); + sessionconfig=new TDEConfig( path, true ); else profile = ""; } diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8befb2e56..2d3e3901f 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -158,7 +158,7 @@ ColorSchema::ColorSchema() m_numb = 0; } -ColorSchema::ColorSchema(KConfig& c) +ColorSchema::ColorSchema(TDEConfig& c) :m_fileRead(false) ,fRelPath(TQString::null) ,lastRead(0L) @@ -240,22 +240,22 @@ void ColorSchema::setDefaultSchema() return TQString(colornames[i]); } -void ColorSchema::writeConfigColor(KConfig& c, +void ColorSchema::writeConfigColor(TDEConfig& c, const TQString& name, const ColorEntry& e) const { - KConfigGroupSaver(&c,name); + TDEConfigGroupSaver(&c,name); c.setGroup(name); c.writeEntry("Color",e.color); c.writeEntry("Transparency",(bool) e.transparent); c.writeEntry("Bold",(bool) e.bold); } -void ColorSchema::readConfigColor(KConfig& c, +void ColorSchema::readConfigColor(TDEConfig& c, const TQString& name, ColorEntry& e) { - KConfigGroupSaver(&c,name); + TDEConfigGroupSaver(&c,name); c.setGroup(name); e.color = c.readColorEntry("Color"); @@ -268,7 +268,7 @@ void ColorSchema::writeConfig(const TQString& path) const { // KONSOLEDEBUG << "Writing schema " << relPath << " to file " << path << endl; - KConfig c(path,false,false); + TDEConfig c(path,false,false); c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index fa9f32412..618683c17 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -56,7 +56,7 @@ #endif class TQDateTime; -class KConfig; +class TDEConfig; class ColorSchema { @@ -76,7 +76,7 @@ public: * because that reads the hackneyed schema file syntax and * this is a KDE config file) */ - ColorSchema(KConfig&); + ColorSchema(TDEConfig&); /** * Constructor for the default schema (with no path). @@ -136,13 +136,13 @@ protected: * Write a single ColorEntry to the config file * under the given name (ie. in the group name). */ - void writeConfigColor(KConfig& c, + void writeConfigColor(TDEConfig& c, const TQString& name, const ColorEntry& e) const; /** * Read a single ColorEntry from the config file. */ - void readConfigColor(KConfig& c, + void readConfigColor(TDEConfig& c, const TQString& name, ColorEntry& e) ; diff --git a/kpager/config.cpp b/kpager/config.cpp index 5ff0d3def..e92d1ce4f 100644 --- a/kpager/config.cpp +++ b/kpager/config.cpp @@ -146,7 +146,7 @@ void KPagerConfigDialog::loadConfiguration() void KPagerConfigDialog::initConfiguration(void) { - KConfig *cfg= kapp->config(); + TDEConfig *cfg= kapp->config(); cfg->setGroup("KPager"); m_windowDrawMode=cfg->readNumEntry("windowDrawMode", Desktop::c_defWindowDrawMode); diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index f8a14c221..f713ca4f6 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -62,7 +62,7 @@ Desktop::Desktop( int desk, TQString desktopName, TQWidget *parent, const char * setBackgroundMode(NoBackground); if (m_desk==1) Desktop::m_windowPixmaps.setAutoDelete(true); - KConfig *cfg= TDEGlobal::config(); + TDEConfig *cfg= TDEGlobal::config(); m_transparentMode=static_cast<WindowTransparentMode> (cfg->readNumEntry("windowTransparentMode", c_defWindowTransparentMode)); resize(67, 50); diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index ff79f5e45..e2477a254 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -67,7 +67,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) m_pPager = new KPager(this, 0); setCentralWidget(m_pPager); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup("KPager"); // Update the last used geometry @@ -122,7 +122,7 @@ extern bool closed_by_sm; bool KPagerMainWindow::queryClose() { - KConfig *cfg=TDEGlobal::config(); + TDEConfig *cfg=TDEGlobal::config(); cfg->setGroup("KPager"); cfg->writeEntry("layoutType", static_cast<int>(m_pPager->m_layoutType)); @@ -195,7 +195,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) KPagerConfigDialog::initConfiguration(); - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup("KPager"); m_showStickyOption=cfg->readBoolEntry("ShowStickyOption",false); @@ -356,7 +356,7 @@ void KPager::configureDialog() if (dialog->exec()) { m_layoutType=static_cast<enum KPager::LayoutTypes>(KPagerConfigDialog::m_layoutType); - KConfig *cfg=TDEGlobal::config(); + TDEConfig *cfg=TDEGlobal::config(); int nWd = (parent() ? ((TQWidget *)parent())->width() : width()); int nHg = (parent() ? ((TQWidget *)parent())->width() : width()); diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index eb4b5da91..e3efd2f85 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -149,7 +149,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) { /** No descriptions */ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLang) { kdDebug() << "KCountryPage::save()" << endl; - KConfigBase *config = TDEGlobal::config(); + TDEConfigBase *config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Locale")); config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true); diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index 4aecabc6e..6faea6540 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -49,12 +49,12 @@ KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { - twinconf = new KConfig("twinrc", false, true); - twineventconf = new KConfig("twin.eventsrc", false, false); - kickerconf = new KConfig("kickerrc",false, false); - konquerorconf = new KConfig("konquerorrc",false, false); - konqiconconf = new KConfig("konqiconviewrc",false,false); - kdesktopconf = new KConfig("kdesktoprc", false, false); + twinconf = new TDEConfig("twinrc", false, true); + twineventconf = new TDEConfig("twin.eventsrc", false, false); + kickerconf = new TDEConfig("kickerrc",false, false); + konquerorconf = new TDEConfig("konquerorrc",false, false); + konqiconconf = new TDEConfig("konqiconviewrc",false,false); + kdesktopconf = new TDEConfig("kdesktoprc", false, false); sys = new KSysInfo(); @@ -614,7 +614,7 @@ void KEyeCandyPage::save(bool currSettings){ kdDebug() << "KEyeCandyPage::save()" << endl; // currSettings==true: save selections. currSettings==false: save user-def. saveCheckState(currSettings); - // save all the KConfig-objects to their respective files + // save all the TDEConfig-objects to their respective files twinconf->sync(); twineventconf->sync(); konquerorconf->sync(); diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h index 016502e2f..63889a67c 100644 --- a/kpersonalizer/keyecandypage.h +++ b/kpersonalizer/keyecandypage.h @@ -179,13 +179,13 @@ private: } st_UserSnd; // DEFAULT VALLUES SET BY USER (END) - KConfig* twinconf; - KConfig* twineventconf; - KConfig* kickerconf; - KConfig* konquerorconf; - KConfig* konqiconconf; - KConfig* kdesktopconf; - KConfig* kdeglobals; + TDEConfig* twinconf; + TDEConfig* twineventconf; + TDEConfig* kickerconf; + TDEConfig* konquerorconf; + TDEConfig* konqiconconf; + TDEConfig* kdesktopconf; + TDEConfig* kdeglobals; KSysInfo* sys; diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index b0c390395..83d1c1614 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -29,7 +29,7 @@ #include "kfindlanguage.h" KFindLanguage::KFindLanguage() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Locale"); m_oldlang = config->readEntry("Language"); diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 401016d24..bc514d9c8 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -41,15 +41,15 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) // initialize the textview with the default description - Trinity of course slotKDEDescription(); // Set the configfiles - cglobal = new KConfig("kdeglobals"); - claunch = new KConfig("klaunchrc", false, false); - cwin = new KConfig("twinrc"); - cdesktop = new KConfig("kdesktoprc"); - ckcminput = new KConfig("kcminputrc"); - ckcmdisplay = new KConfig("kcmdisplayrc"); - ckonqueror = new KConfig("konquerorrc"); - cklipper = new KConfig("klipperrc", false, false); - ckaccess = new KConfig("kaccessrc"); + cglobal = new TDEConfig("kdeglobals"); + claunch = new TDEConfig("klaunchrc", false, false); + cwin = new TDEConfig("twinrc"); + cdesktop = new TDEConfig("kdesktoprc"); + ckcminput = new TDEConfig("kcminputrc"); + ckcmdisplay = new TDEConfig("kcmdisplayrc"); + ckonqueror = new TDEConfig("konquerorrc"); + cklipper = new TDEConfig("klipperrc", false, false); + ckaccess = new TDEConfig("kaccessrc"); // Save the current user defaults getUserDefaults(); // set default-selections for this page diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h index 69bd2d959..2797f4572 100644 --- a/kpersonalizer/kospage.h +++ b/kpersonalizer/kospage.h @@ -52,15 +52,15 @@ signals: // Signals on the selection made by the user. */ void selectedOS(const TQString&); private: - KConfig* cglobal; - KConfig* claunch; - KConfig* cwin; - KConfig* cdesktop; - KConfig* ckcminput; - KConfig* ckcmdisplay; - KConfig* ckonqueror; - KConfig* cklipper; - KConfig* ckaccess; + TDEConfig* cglobal; + TDEConfig* claunch; + TDEConfig* cwin; + TDEConfig* cdesktop; + TDEConfig* ckcminput; + TDEConfig* ckcmdisplay; + TDEConfig* ckonqueror; + TDEConfig* cklipper; + TDEConfig* ckaccess; // DEFAULT VALUES SET BY USER bool b_Gestures, b_MacMenuBar, b_SingleClick, b_BusyCursor, b_ShowMenuBar, b_DesktopUnderline, b_KonqUnderline, b_ChangeCursor, b_syncClipboards; diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 1c48dd6c9..1b10d3082 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -106,7 +106,7 @@ void KStylePage::save(bool curSettings){ /** save the widget-style */ void KStylePage::saveStyle(bool curSettings){ TQString style = curSettings ? currentStyle : origStyle; - KConfig cfg( "kdeglobals" ); + TDEConfig cfg( "kdeglobals" ); cfg.setGroup("General"); cfg.writeEntry( "widgetStyle", style, true, true ); cfg.sync(); @@ -160,7 +160,7 @@ void KStylePage::saveColors(bool curSettings){ // the GLOBAL config entries must be taken from the kcsrc file and written to it. Use the default values // equals that the file is <default> which is no file. TODO: use the default values in that case (kde selected) - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "General" ); config->writeEntry("foreground", toSave->foreground, true, true); config->writeEntry("background", toSave->background, true, true); @@ -206,7 +206,7 @@ void KStylePage::saveColors(bool curSettings){ config->sync(); // background color changes - KConfig kdesktop("kdesktoprc"); + TDEConfig kdesktop("kdesktoprc"); kdesktop.setGroup("Desktop0"); // we only need to set one desktop kdesktop.writeEntry("BackgroundMode", toSave->bgMode); @@ -320,7 +320,7 @@ void KStylePage::setDefaults(){ /** Fill a colorSet with a colorfile, or the default. */ void KStylePage::getColors(colorSet *set, bool colorfile ){ - KConfig* config; + TDEConfig* config; bool deleteConfig = false; // get the color scheme file and go to the color scheme group if(colorfile){ @@ -369,7 +369,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){ deleteConfig = true; } else { - KConfig kdesktop("kdesktoprc"); + TDEConfig kdesktop("kdesktoprc"); kdesktop.setGroup("Desktop0"); // set Background (userSettings if available, else default) set->bgMode=kdesktop.readEntry("BackgroundMode", "Flat"); @@ -473,7 +473,7 @@ void KStylePage::getUserDefaults() { origStyle = TDEGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() ); // get the user's current KWin-style - ctwin = new KConfig("twinrc"); + ctwin = new TDEConfig("twinrc"); ctwin->setGroup("Style"); origKWinStyle = ctwin->readEntry("PluginLib", defaultKWinStyle); diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/kstylepage.h index a82168768..2a3f554e0 100644 --- a/kpersonalizer/kstylepage.h +++ b/kpersonalizer/kstylepage.h @@ -44,7 +44,7 @@ private: TQString origIcons; TQString defaultKWinStyle; TQString currentStyle; - KConfig* ctwin; + TDEConfig* ctwin; struct colorSet { TQString colorFile, bgMode; int contrast; diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp index 2748e3bfe..5e41137a6 100644 --- a/kreadconfig/kreadconfig.cpp +++ b/kreadconfig/kreadconfig.cpp @@ -1,4 +1,4 @@ -/* Read KConfig() entries - for use in shell scripts. +/* Read TDEConfig() entries - for use in shell scripts. * (c) 2001 Red Hat, Inc. * Programmed by Bernhard Rosenkraenzer <[email protected]> * @@ -45,7 +45,7 @@ int main(int argc, char **argv) { TDEAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"), "1.0.1", - I18N_NOOP("Read KConfig entries - for use in shell scripts"), + I18N_NOOP("Read TDEConfig entries - for use in shell scripts"), TDEAboutData::License_GPL, "(c) 2001 Red Hat, Inc."); aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "[email protected]"); @@ -67,13 +67,13 @@ int main(int argc, char **argv) TDEInstance inst(&aboutData); TDEGlobal::config(); - KConfig *konfig; + TDEConfig *konfig; bool configMustDeleted = false; if (file.isEmpty()) konfig = TDEGlobal::config(); else { - konfig = new KConfig(file, true, false); + konfig = new TDEConfig(file, true, false); configMustDeleted=true; } konfig->setGroup(group); diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 259c37ffc..9e8d75a1e 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -1,4 +1,4 @@ -/* Write KConfig() entries - for use in shell scripts. +/* Write TDEConfig() entries - for use in shell scripts. * (c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho * Programmed by Lu�s Pedro Coelho <[email protected]> * based on kreadconfig by Bernhard Rosenkraenzer <[email protected]> @@ -27,7 +27,7 @@ int main(int argc, char **argv) { TDEAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"), "1.0.0", - I18N_NOOP("Write KConfig entries - for use in shell scripts"), + I18N_NOOP("Write TDEConfig entries - for use in shell scripts"), TDEAboutData::License_GPL, "(c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho"); aboutData.addAuthor("Lu�s Pedro Coelho", 0, "[email protected]"); @@ -50,14 +50,14 @@ int main(int argc, char **argv) TDEInstance inst(&aboutData); - KConfig *konfig; + TDEConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + konfig = new TDEConfig(TQString::fromLatin1("kdeglobals"), false, false); else - konfig = new KConfig(file, false, false); + konfig = new TDEConfig(file, false, false); konfig->setGroup(group); - if ( konfig->getConfigState() != KConfig::ReadWrite || konfig->entryIsImmutable( key ) ) return 2; + if ( konfig->getConfigState() != TDEConfig::ReadWrite || konfig->entryIsImmutable( key ) ) return 2; if(type=="bool") { // For symmetry with kreadconfig we accept a wider range of values as true than Qt diff --git a/kscreensaver/blankscrn.cpp b/kscreensaver/blankscrn.cpp index 10d4c18d4..3691e98af 100644 --- a/kscreensaver/blankscrn.cpp +++ b/kscreensaver/blankscrn.cpp @@ -75,7 +75,7 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) // read settings from config file void KBlankSetup::readSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); color = config->readColorEntry( "Color", &black ); @@ -90,7 +90,7 @@ void KBlankSetup::slotColor( const TQColor &col ) // Ok pressed - save settings and exit void KBlankSetup::slotOk() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); config->writeEntry( "Color", color ); config->sync(); @@ -121,7 +121,7 @@ void KBlankSaver::setColor( const TQColor &col ) // read configuration settings from config file void KBlankSaver::readSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); color = config->readColorEntry( "Color", &black ); diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index 3f9e69479..f7421ae7d 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) TQStringList saverFileList; - KConfig type("krandom.kssrc"); + TDEConfig type("krandom.kssrc"); type.setGroup("Settings"); bool opengl = type.readBoolEntry("OpenGL", hasDirectRendering()); kdDebug() << "hasOPEN " << opengl << endl; @@ -273,7 +273,7 @@ KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) setMinimumSize( sizeHint() ); - KConfig config("krandom.kssrc"); + TDEConfig config("krandom.kssrc"); config.setGroup("Settings"); openGL->setChecked(config.readBoolEntry("OpenGL", hasDirectRendering())); manipulateScreen->setChecked(config.readBoolEntry("ManipulateScreen", true)); @@ -281,7 +281,7 @@ KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) void KRandomSetup::slotOk() { - KConfig config("krandom.kssrc"); + TDEConfig config("krandom.kssrc"); config.setGroup("Settings"); config.writeEntry("OpenGL", openGL->isChecked()); config.writeEntry("ManipulateScreen", manipulateScreen->isChecked()); diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index ecef6423b..27e45611c 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -209,11 +209,11 @@ void KSMServer::performLegacySessionSave() /*! Stores legacy session management data */ -void KSMServer::storeLegacySession( KConfig* config ) +void KSMServer::storeLegacySession( TDEConfig* config ) { // Write LegacySession data config->deleteGroup( "Legacy" + sessionGroup ); - KConfigGroupSaver saver( config, "Legacy" + sessionGroup ); + TDEConfigGroupSaver saver( config, "Legacy" + sessionGroup ); int count = 0; for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) { if ( (*it).type != SM_ERROR) { @@ -234,13 +234,13 @@ void KSMServer::storeLegacySession( KConfig* config ) /*! Restores legacy session management data (i.e. restart applications) */ -void KSMServer::restoreLegacySession( KConfig* config ) +void KSMServer::restoreLegacySession( TDEConfig* config ) { if( config->hasGroup( "Legacy" + sessionGroup )) { - KConfigGroupSaver saver( config, "Legacy" + sessionGroup ); + TDEConfigGroupSaver saver( config, "Legacy" + sessionGroup ); restoreLegacySessionInternal( config ); } else if( wm == "twin" ) { // backwards comp. - get it from twinrc - KConfigGroupSaver saver( config, sessionGroup ); + TDEConfigGroupSaver saver( config, sessionGroup ); int count = config->readNumEntry( "count", 0 ); for ( int i = 1; i <= count; i++ ) { TQString n = TQString::number(i); @@ -254,7 +254,7 @@ void KSMServer::restoreLegacySession( KConfig* config ) if( (*it) == "-session" ) { ++it; if( it != restartCommand.end()) { - KConfig cfg( "session/" + wm + "_" + (*it), true ); + TDEConfig cfg( "session/" + wm + "_" + (*it), true ); cfg.setGroup( "LegacySession" ); restoreLegacySessionInternal( &cfg, ' ' ); } @@ -264,7 +264,7 @@ void KSMServer::restoreLegacySession( KConfig* config ) } } -void KSMServer::restoreLegacySessionInternal( KConfig* config, char sep ) +void KSMServer::restoreLegacySessionInternal( TDEConfig* config, char sep ) { int count = config->readNumEntry( "count" ); for ( int i = 1; i <= count; i++ ) { diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 0f7d699d0..402f395e5 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -225,7 +225,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) IceSetIOErrorHandler( IoErrorHandler ); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "General" ); int realScreenCount = ScreenCount( tqt_xdisplay() ); diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 03a0e0b15..6f93549d9 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -592,7 +592,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag dialogActive = false; saveSession = false; wmPhase1WaitingCount = 0; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General" ); clientInteracting = 0; xonCommand = config->readEntry( "xonCommand", "xon" ); @@ -802,12 +802,12 @@ TQString KSMServer::currentSession() { if ( sessionGroup.startsWith( "Session: " ) ) return sessionGroup.mid( 9 ); - return ""; // empty, not null, since used for KConfig::setGroup + return ""; // empty, not null, since used for TDEConfig::setGroup } void KSMServer::discardSession() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup( sessionGroup ); int count = config->readNumEntry( "count", 0 ); for ( KSMClient* c = clients.first(); c; c = clients.next() ) { @@ -828,7 +828,7 @@ void KSMServer::discardSession() void KSMServer::storeSession() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->reparseConfiguration(); // config may have changed in the KControl module config->setGroup("General" ); excludeApps = TQStringList::split( TQRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower()); @@ -895,7 +895,7 @@ void KSMServer::storeSession() TQStringList KSMServer::sessionList() { TQStringList sessions = "default"; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); TQStringList groups = config->groupList(); for ( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); it++ ) if ( (*it).startsWith( "Session: " ) ) diff --git a/ksmserver/server.h b/ksmserver/server.h index 79c1629bd..c2207ec95 100644 --- a/ksmserver/server.h +++ b/ksmserver/server.h @@ -156,9 +156,9 @@ private: TQString bootOption = TQString::null ); void performLegacySessionSave(); - void storeLegacySession( KConfig* config ); - void restoreLegacySession( KConfig* config ); - void restoreLegacySessionInternal( KConfig* config, char sep = ',' ); + void storeLegacySession( TDEConfig* config ); + void restoreLegacySession( TDEConfig* config ); + void restoreLegacySessionInternal( TDEConfig* config, char sep = ',' ); TQStringList windowWmCommand(WId w); TQString windowWmClientMachine(WId w); WId windowWmClientLeader(WId w); diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 87c8d37cb..08d934069 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -125,7 +125,7 @@ bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, return false; } - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->reparseConfiguration(); // config may have changed in the KControl module config->setGroup("General" ); @@ -156,7 +156,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, if ( !checkStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) ) return; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General" ); if (!maysd) { @@ -168,7 +168,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, sdmode = TDEApplication::ShutdownModeInteractive; // shall we show a logout status dialog box? - bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true); + bool showLogoutStatusDlg = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true); if (showLogoutStatusDlg) { KSMShutdownIPFeedback::start(); @@ -188,7 +188,7 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, if (selection != 0) { // respect lock on resume & disable suspend/hibernate settings // from power-manager - KConfig config("power-managerrc"); + TDEConfig config("power-managerrc"); bool lockOnResume = config.readBoolEntry("lockOnResume", true); if (lockOnResume) { DCOPRef("kdesktop", "KScreensaverIface").send("lock"); @@ -294,7 +294,7 @@ void KSMServer::logoutTimed( int sdtype, int sdmode, TQString bootOption ) { int confirmDelay; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup( "General" ); if ( sdtype == TDEApplication::ShutdownTypeHalt ) @@ -525,7 +525,7 @@ void KSMServer::completeShutdownOrCheckpoint() if ( waitForPhase2 ) return; - bool showLogoutStatusDlg = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true); + bool showLogoutStatusDlg = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("showLogoutStatusDlg", true); if (showLogoutStatusDlg && state != Checkpoint) { KSMShutdownIPFeedback::showit(); // hide the UGLY logout process from the user shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP(); diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index ecc1ed5b4..254aa9966 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -119,14 +119,14 @@ void KSMShutdownFeedback::fadeBack( void ) void KSMShutdownFeedback::slotPaintEffect() { // determine which fade to use - if (KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true)) + if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doFancyLogout", true)) { - float doFancyLogoutAdditionalDarkness = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6); + float doFancyLogoutAdditionalDarkness = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutAdditionalDarkness", 0.6); - float doFancyLogoutFadeTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000); + float doFancyLogoutFadeTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeTime", 4000); - float doFancyLogoutFadeBackTime = (float)KConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000); + float doFancyLogoutFadeBackTime = (float)TDEConfigGroup(TDEGlobal::config(), "Logout").readDoubleNumEntry("doFancyLogoutFadeBackTime", 1000); if (kapp->isX11CompositionAvailable()) { // We can do this in a different (simpler) manner because we have compositing support! @@ -697,7 +697,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, 2 * KDialog::spacingHint() ); // default factor - bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); + bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); // slighty more space for the new logout int factor = 2; @@ -775,7 +775,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // respect lock on resume & disable suspend/hibernate settings // from power-manager - KConfig config("power-managerrc"); + TDEConfig config("power-managerrc"); bool disableSuspend = config.readBoolEntry("disableSuspend", false); bool disableHibernate = config.readBoolEntry("disableHibernate", false); m_lockOnResume = config.readBoolEntry("lockOnResume", true); diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 33620e79b..fd383aa54 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -95,8 +95,8 @@ bool trinity_startup_main_sequence_done = FALSE; */ void KSMServer::restoreSession( TQString sessionName ) { - showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); - KConfig ksplashcfg( "ksplashrc", true ); + showFancyLogin = TDEConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); + TDEConfig ksplashcfg( "ksplashrc", true ); ksplashcfg.setGroup( "KSplash" ); if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("Unified") ) showFancyLogin = false; @@ -107,7 +107,7 @@ void KSMServer::restoreSession( TQString sessionName ) kdDebug( 1218 ) << "KSMServer::restoreSession " << sessionName << endl; upAndRunning( "restore session"); - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); sessionGroup = "Session: " + sessionName; @@ -161,8 +161,8 @@ void KSMServer::restoreSession( TQString sessionName ) */ void KSMServer::startDefaultSession() { - showFancyLogin = KConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); - KConfig ksplashcfg( "ksplashrc", true ); + showFancyLogin = TDEConfigGroup(TDEGlobal::config(), "Login").readBoolEntry("showFancyLogin", true); + TDEConfig ksplashcfg( "ksplashrc", true ); ksplashcfg.setGroup( "KSplash" ); if ( ksplashcfg.readEntry( "Theme", "Default" ) != TQString("None") ) showFancyLogin = false; @@ -286,7 +286,7 @@ void KSMServer::tryRestoreNext() if( state != Restoring ) return; restoreTimer.stop(); - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup( sessionGroup ); while ( lastAppStarted < appsToStart ) { diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index a1fa7a033..1e17a301a 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -171,10 +171,10 @@ void SplashInstaller::addNewTheme(const KURL &srcURL) url.setPath(locateLocal("tmp",filename)); // Remove file from temporary directory if it aleady exists - usually the result of a failed install. - if ( KIO::NetAccess::exists( url, true, 0 ) ) - KIO::NetAccess::del( url, 0 ); + if ( TDEIO::NetAccess::exists( url, true, 0 ) ) + TDEIO::NetAccess::del( url, 0 ); - bool rc = KIO::NetAccess::copy(srcURL, url, 0); + bool rc = TDEIO::NetAccess::copy(srcURL, url, 0); if (!rc) { kdWarning() << "Failed to copy theme " << srcURL.fileName() @@ -208,7 +208,7 @@ void SplashInstaller::addNewTheme(const KURL &srcURL) // TODO: Warn the user if we overwrite something. ad->copyTo(locateLocal("ksplashthemes","/")); tarFile.close(); - KIO::NetAccess::del( url, 0 ); + TDEIO::NetAccess::del( url, 0 ); // TODO: Update only the entries from this installation. readThemesList(); @@ -258,7 +258,7 @@ void SplashInstaller::load() void SplashInstaller::load( bool useDefaults ) { - KConfig cnf("ksplashrc"); + TDEConfig cnf("ksplashrc"); cnf.setReadDefaults( useDefaults ); cnf.setGroup("KSplash"); TQString curTheme = cnf.readEntry("Theme","Default"); @@ -269,7 +269,7 @@ void SplashInstaller::load( bool useDefaults ) //----------------------------------------------------------------------------- void SplashInstaller::save() { - KConfig cnf("ksplashrc"); + TDEConfig cnf("ksplashrc"); cnf.setGroup("KSplash"); int cur = mThemesList->currentItem(); if (cur < 0) @@ -298,7 +298,7 @@ void SplashInstaller::slotRemove() KURL url; url.setPath(themeDir); if (KMessageBox::warningContinueCancel(this,i18n("Delete folder %1 and its contents?").arg(themeDir),"",KGuiItem(i18n("&Delete"),"editdelete"))==KMessageBox::Continue) - rc = KIO::NetAccess::del(url,this); + rc = TDEIO::NetAccess::del(url,this); else return; } @@ -343,19 +343,19 @@ void SplashInstaller::slotSetTheme(int id) if (i >= 0) themeName = path.mid(i+1); url.setPath( path + "/Theme.rc" ); - if (!KIO::NetAccess::exists(url, true, 0)) + if (!TDEIO::NetAccess::exists(url, true, 0)) { url.setPath( path + "/Theme.RC" ); - if (!KIO::NetAccess::exists(url, true, 0)) + if (!TDEIO::NetAccess::exists(url, true, 0)) { url.setPath( path + "/theme.rc" ); - if (!KIO::NetAccess::exists(url, true, 0)) + if (!TDEIO::NetAccess::exists(url, true, 0)) url.setPath( path + "/" + themeName + ".rc" ); } } - if (KIO::NetAccess::exists(url, true, 0)) + if (TDEIO::NetAccess::exists(url, true, 0)) { - KConfig cnf(url.path()); + TDEConfig cnf(url.path()); cnf.setGroup( TQString("KSplash Theme: %1").arg(themeName) ); // Get theme information. @@ -391,7 +391,7 @@ void SplashInstaller::slotSetTheme(int id) if (!enabled) { url.setPath( path + "/" + "Preview.png" ); - if (KIO::NetAccess::exists(url, true, 0)) + if (TDEIO::NetAccess::exists(url, true, 0)) mPreview->setPixmap(TQPixmap(url.path())); else mPreview->setText(i18n("(Could not load theme)")); @@ -400,7 +400,7 @@ void SplashInstaller::slotSetTheme(int id) else { url.setPath( path + "/" + "Preview.png" ); - if (KIO::NetAccess::exists(url, true, 0)) + if (TDEIO::NetAccess::exists(url, true, 0)) mPreview->setPixmap(TQPixmap(url.path())); else mPreview->setText(i18n("No preview available.")); diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp index 7c062ea51..cceebc0e1 100644 --- a/ksplashml/kcmksplash/main.cpp +++ b/ksplashml/kcmksplash/main.cpp @@ -23,7 +23,7 @@ #include "installer.h" -class KSplashThemeMgr : public KCModule +class KSplashThemeMgr : public TDECModule { public: KSplashThemeMgr( TQWidget *parent, const char *name, const TQStringList &/*unused*/); @@ -46,7 +46,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_ksplashthemes, KSplashThemeMgrFactory("ksplashth // ----------------------------------------------------------------------------------------- KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQStringList &) - : KCModule( KSplashThemeMgrFactory::instance(), parent, name ), mInstaller(new SplashInstaller(this)) + : TDECModule( KSplashThemeMgrFactory::instance(), parent, name ), mInstaller(new SplashInstaller(this)) { init(); diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index de8aac2b5..39839cca6 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -31,7 +31,7 @@ #include "themelegacy.h" #include "themelegacy.moc" -DefaultConfig::DefaultConfig( TQWidget *parent, KConfig *config ) +DefaultConfig::DefaultConfig( TQWidget *parent, TDEConfig *config ) :ThemeEngineConfig( parent, config ) { mConfig->setGroup( TQString("KSplash Theme: Default") ); @@ -200,7 +200,7 @@ void ThemeDefault::_readSettings() if( !mTheme ) return; - KConfig *cfg = mTheme->themeConfig(); + TDEConfig *cfg = mTheme->themeConfig(); if( !cfg ) return; diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h index 852425414..0f73e80c1 100644 --- a/ksplashml/themeengine/default/themelegacy.h +++ b/ksplashml/themeengine/default/themelegacy.h @@ -28,7 +28,7 @@ class DefaultConfig: public ThemeEngineConfig { Q_OBJECT public: - DefaultConfig( TQWidget *, KConfig * ); + DefaultConfig( TQWidget *, TDEConfig * ); void save(); protected: TQCheckBox *mFlash, *mAlwaysShow; @@ -45,7 +45,7 @@ public: ThemeDefault( TQWidget *, const char *, const TQStringList& ); virtual ~ThemeDefault(); - inline const DefaultConfig *config( TQWidget *p, KConfig *c ) + inline const DefaultConfig *config( TQWidget *p, TDEConfig *c ) { return new DefaultConfig( p, c ); }; diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 533697dc4..df7556bac 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -32,7 +32,7 @@ ObjKsTheme::ObjKsTheme( const TQString& theme ) :mActiveTheme (theme), mThemeDir("/"), mThemeConfig (0L), mThemePrefix( "Themes/" ), d(0) { // Get Xinerama config. - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup( "Xinerama" ); TQDesktopWidget *desktop = kapp->desktop(); mXineramaScreen = config->readNumEntry("KSplashScreen", desktop->primaryScreen()); @@ -63,7 +63,7 @@ bool ObjKsTheme::loadThemeRc( const TQString& activeTheme, bool force ) //kdDebug() << "ObjKsTheme::loadThemeRc: " << activeTheme << endl; TQString prefix("Themes/"); TQString themeFile; - KConfig *cf = 0L; + TDEConfig *cf = 0L; // Try our best to find a theme file. themeFile = locate( "appdata", prefix + activeTheme + "/" + TQString("Theme.rc") ); @@ -72,13 +72,13 @@ bool ObjKsTheme::loadThemeRc( const TQString& activeTheme, bool force ) themeFile = themeFile.isEmpty() ? locate("appdata",prefix+activeTheme+"/"+activeTheme+TQString(".rc")):themeFile; if( !themeFile.isEmpty() ) - cf = new KConfig( themeFile ); + cf = new TDEConfig( themeFile ); if( cf ) { mActiveTheme = activeTheme; mThemeDir = prefix + activeTheme+"/"; - if( loadKConfig( cf, activeTheme, force ) ) + if( loadTDEConfig( cf, activeTheme, force ) ) { mThemeConfig = cf; return true; @@ -92,14 +92,14 @@ bool ObjKsTheme::loadThemeRc( const TQString& activeTheme, bool force ) bool ObjKsTheme::loadLocalConfig( const TQString& activeTheme, bool force ) { //kdDebug() << "ObjKsTheme::loadLocalConfig" << endl; - KConfig *cfg = kapp->config(); - return( loadKConfig( cfg, activeTheme, force ) ); + TDEConfig *cfg = kapp->config(); + return( loadTDEConfig( cfg, activeTheme, force ) ); } -// ObjKsConfig::loadKConfig(): Load our settings from a KConfig object. -bool ObjKsTheme::loadKConfig( KConfig *cfg, const TQString& activeTheme, bool force ) +// ObjKsConfig::loadTDEConfig(): Load our settings from a TDEConfig object. +bool ObjKsTheme::loadTDEConfig( TDEConfig *cfg, const TQString& activeTheme, bool force ) { - //kdDebug() << "ObjKsTheme::loadKConfig" << endl; + //kdDebug() << "ObjKsTheme::loadTDEConfig" << endl; if( !cfg ) return false; diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index 4d88276ba..34ea2fdf1 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/ksplashml/themeengine/objkstheme.h @@ -17,7 +17,7 @@ #include <tqstring.h> #include <tqstringlist.h> -class KConfig; +class TDEConfig; /** * @short Theme reader. * A Theme is read in from the file @@ -37,7 +37,7 @@ public: TQString theme() const { return( mActiveTheme ); } TQString themeEngine() const { return( mThemeEngine ); } - KConfig *themeConfig() const { return( mThemeConfig ); } + TDEConfig *themeConfig() const { return( mThemeConfig ); } TQString themeDir() const { return( mThemeDir ); } bool loColor() const { return( mLoColor ); } bool testing() const { return( mTesting ); } @@ -50,11 +50,11 @@ public: protected: bool loadThemeRc( const TQString&, bool ); bool loadLocalConfig( const TQString&, bool ); - bool loadKConfig( KConfig *, const TQString&, bool ); + bool loadTDEConfig( TDEConfig *, const TQString&, bool ); private: TQString mActiveTheme, mThemeDir; - KConfig *mThemeConfig; + TDEConfig *mThemeConfig; int mXineramaScreen; bool mLoColor, mTesting, mManagedMode; diff --git a/ksplashml/themeengine/redmond/main.cpp b/ksplashml/themeengine/redmond/main.cpp index 3f4dc0124..7b4a6bb2e 100644 --- a/ksplashml/themeengine/redmond/main.cpp +++ b/ksplashml/themeengine/redmond/main.cpp @@ -20,7 +20,7 @@ extern "C" { - ThemeEngineConfig *KsThemeConfig( TQWidget *parent, KConfig *config ) + ThemeEngineConfig *KsThemeConfig( TQWidget *parent, TDEConfig *config ) { return new CfgRedmond( parent, config ); } diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 5e5bf1031..0328c0365 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -41,7 +41,7 @@ K_EXPORT_COMPONENT_FACTORY( ksplashredmond, KGenericFactory<ThemeRedmond>( "ksplash" ) ) -CfgRedmond::CfgRedmond( TQWidget *p, KConfig *c ) +CfgRedmond::CfgRedmond( TQWidget *p, TDEConfig *c ) :ThemeEngineConfig( p, c ) { TQVBox *vbox = new TQVBox( this ); @@ -195,7 +195,7 @@ void ThemeRedmond::_initUi() const int fUserOnly = fUserFirst+1; int faceSource = fAdminOnly; - KConfig *tdmconfig = new KConfig("tdm/tdmrc", true); + TDEConfig *tdmconfig = new TDEConfig("tdm/tdmrc", true); tdmconfig->setGroup("X-*-Greeter"); TQString userPicsDir = tdmconfig->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/'; TQString fs = tdmconfig->readEntry( "FaceSource" ); @@ -313,7 +313,7 @@ void ThemeRedmond::_readSettings() if( !mTheme ) return; - KConfig *cfg = mTheme->themeConfig(); + TDEConfig *cfg = mTheme->themeConfig(); if( !cfg ) return; diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h index 6f8cc1550..c2ce0a6f3 100644 --- a/ksplashml/themeengine/redmond/themeredmond.h +++ b/ksplashml/themeengine/redmond/themeredmond.h @@ -25,7 +25,7 @@ class CfgRedmond: public ThemeEngineConfig { Q_OBJECT public: - CfgRedmond( TQWidget *, KConfig * ); + CfgRedmond( TQWidget *, TDEConfig * ); protected: TQCheckBox *mShowUsername; diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index a7c41692f..26c47eea0 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -135,7 +135,7 @@ void ThemeStandard::_readSettings() if ( !mTheme ) return; - KConfig *cfg = mTheme->themeConfig(); + TDEConfig *cfg = mTheme->themeConfig(); if ( !cfg ) return; diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h index 2e5d1aeb0..a1fb61ccf 100644 --- a/ksplashml/themeengine/standard/themestandard.h +++ b/ksplashml/themeengine/standard/themestandard.h @@ -45,7 +45,7 @@ class ThemeStandard: public ThemeEngine Q_OBJECT public: ThemeStandard( TQWidget *, const char*, const TQStringList& ); - //inline const ThemeEngineConfig *config( TQWidget *p, KConfig *kc ) { return 0L; } + //inline const ThemeEngineConfig *config( TQWidget *p, TDEConfig *kc ) { return 0L; } public slots: inline void slotUpdateProgress( int i ) diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h index 026351b5b..fa2f15a65 100644 --- a/ksplashml/themeengine/themeengine.h +++ b/ksplashml/themeengine/themeengine.h @@ -18,7 +18,7 @@ #include <kdemacros.h> -class KConfig; +class TDEConfig; class ObjKsTheme; class TQMouseEvent; @@ -30,18 +30,18 @@ class KDE_EXPORT ThemeEngineConfig: public TQVBox Q_OBJECT public: - ThemeEngineConfig( TQWidget *p, KConfig *c ) + ThemeEngineConfig( TQWidget *p, TDEConfig *c ) :TQVBox( p ), mConfig( c ) {} - KConfig* config()const { return mConfig; } + TDEConfig* config()const { return mConfig; } public slots: virtual void load() {} virtual void save() {} protected: - KConfig *mConfig; + TDEConfig *mConfig; }; /** @@ -54,7 +54,7 @@ class KDE_EXPORT ThemeEngine: public TQVBox public: ThemeEngine( TQWidget *parent, const char *name, const TQStringList &args ); virtual ~ThemeEngine() = 0; - virtual const ThemeEngineConfig *config( TQWidget *, KConfig * ) { return 0L; } + virtual const ThemeEngineConfig *config( TQWidget *, TDEConfig * ) { return 0L; } virtual ObjKsTheme *ksTheme() { return mTheme; } virtual bool eventFilter( TQObject* o, TQEvent* e ); diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp index 1e86054f7..21c899adc 100644 --- a/ksplashml/themeengine/unified/themeunified.cpp +++ b/ksplashml/themeengine/unified/themeunified.cpp @@ -32,7 +32,7 @@ #include "themeunified.h" #include "themeunified.moc" -UnifiedConfig::UnifiedConfig( TQWidget *parent, KConfig *config ) +UnifiedConfig::UnifiedConfig( TQWidget *parent, TDEConfig *config ) :ThemeEngineConfig( parent, config ) { mConfig->setGroup( TQString("KSplash Theme: Default") ); @@ -91,7 +91,7 @@ void ThemeUnified::_readSettings() if( !mTheme ) return; - KConfig *cfg = mTheme->themeConfig(); + TDEConfig *cfg = mTheme->themeConfig(); if( !cfg ) return; diff --git a/ksplashml/themeengine/unified/themeunified.h b/ksplashml/themeengine/unified/themeunified.h index a8f9e12e2..cd6a1d1ca 100644 --- a/ksplashml/themeengine/unified/themeunified.h +++ b/ksplashml/themeengine/unified/themeunified.h @@ -30,7 +30,7 @@ class UnifiedConfig: public ThemeEngineConfig { Q_OBJECT public: - UnifiedConfig( TQWidget *, KConfig * ); + UnifiedConfig( TQWidget *, TDEConfig * ); void save(); protected: TQCheckBox *mAlwaysShow; @@ -47,7 +47,7 @@ public: ThemeUnified( TQWidget *, const char *, const TQStringList& ); virtual ~ThemeUnified(); - inline const UnifiedConfig *config( TQWidget *p, KConfig *c ) + inline const UnifiedConfig *config( TQWidget *p, TDEConfig *c ) { return new UnifiedConfig( p, c ); }; diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index 2efe5bb83..cb71de070 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -46,7 +46,7 @@ KSplash::KSplash(const char *name) mSessMgrCalled = false; mTimeToGo = false; - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); slotReadProperties(config); prepareSplashScreen(); @@ -88,7 +88,7 @@ KSplash::~KSplash() KLibLoader::self()->unloadLibrary( mThemeLibName.latin1() ); } -void KSplash::slotReadProperties( KConfig *config ) +void KSplash::slotReadProperties( TDEConfig *config ) { TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs(); mTheme = arg->getOption("theme"); diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h index 7ece50bdd..f74f48f32 100644 --- a/ksplashml/wndmain.h +++ b/ksplashml/wndmain.h @@ -34,7 +34,7 @@ typedef struct class WndStatus; class ObjKsTheme; class ThemeEngine; -class KConfig; +class TDEConfig; class KSplash: public TQWidget, virtual public KSplashIface { @@ -87,7 +87,7 @@ private slots: void slotExec(); void nextIcon(); void slotInsertAction( const TQString&, const TQString& ); - void slotReadProperties( KConfig * ); + void slotReadProperties( TDEConfig * ); void slotSetText( const TQString& ); void slotSetTextIndex( const int ); diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index 1fb1e1e62..7271bab8e 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -66,7 +66,7 @@ Workspace::~Workspace() TQT_SLOT( updateCaption( TQWidget* ) ) ); } -void Workspace::saveProperties( KConfig *cfg ) +void Workspace::saveProperties( TDEConfig *cfg ) { cfg->writePathEntry( "WorkDir", mWorkDir ); cfg->writeEntry( "CurrentSheet", tabLabel( currentPage() ) ); @@ -81,7 +81,7 @@ void Workspace::saveProperties( KConfig *cfg ) cfg->writePathEntry( "Sheets", list ); } -void Workspace::readProperties( KConfig *cfg ) +void Workspace::readProperties( TDEConfig *cfg ) { TQString currentSheet; @@ -195,7 +195,7 @@ void Workspace::loadWorkSheet( const KURL &url ) * transparent. Unless s/o beats me up I use this pseudo transparent * code. */ TQString tmpFile; - KIO::NetAccess::download( url, tmpFile, this ); + TDEIO::NetAccess::download( url, tmpFile, this ); mWorkDir = tmpFile.left( tmpFile.findRev( '/' ) ); // Load sheet from file. @@ -208,7 +208,7 @@ void Workspace::loadWorkSheet( const KURL &url ) tmpFileUrl.setPath( tmpFile ); if ( tmpFileUrl != url.url() ) mSheetList.last()->setFileName( TQString::null ); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); emit announceRecentURL( KURL( url ) ); } diff --git a/ksysguard/gui/Workspace.h b/ksysguard/gui/Workspace.h index 924e2b732..40302ac4a 100644 --- a/ksysguard/gui/Workspace.h +++ b/ksysguard/gui/Workspace.h @@ -27,7 +27,7 @@ #include <tqptrlist.h> #include <tqtabwidget.h> -class KConfig; +class TDEConfig; class KURL; class TQString; class WorkSheet; @@ -40,8 +40,8 @@ class Workspace : public TQTabWidget Workspace( TQWidget* parent, const char* name = 0 ); ~Workspace(); - void saveProperties( KConfig* ); - void readProperties( KConfig* ); + void saveProperties( TDEConfig* ); + void readProperties( TDEConfig* ); bool saveOnQuit(); diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc index 43f878cda..4cf69d516 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cc +++ b/ksysguard/gui/ksgrd/SensorManager.cc @@ -408,14 +408,14 @@ TQString SensorManager::translateSensor( const TQString &sensor ) const return out; } -void SensorManager::readProperties( KConfig *cfg ) +void SensorManager::readProperties( TDEConfig *cfg ) { mHostConnector->setHostNames( cfg->readListEntry( "HostList" ) ); mHostConnector->setCommands( cfg->readListEntry( "CommandList" ) ); } void -SensorManager::saveProperties( KConfig *cfg ) +SensorManager::saveProperties( TDEConfig *cfg ) { cfg->writeEntry( "HostList", mHostConnector->hostNames() ); cfg->writeEntry( "CommandList", mHostConnector->commands() ); diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h index 7f4e85da7..a362de351 100644 --- a/ksysguard/gui/ksgrd/SensorManager.h +++ b/ksysguard/gui/ksgrd/SensorManager.h @@ -80,8 +80,8 @@ class KDE_EXPORT SensorManager : public QObject const TQString& translateSensorType( const TQString &type ) const; TQString translateSensor(const TQString& u) const; - void readProperties( KConfig *cfg ); - void saveProperties( KConfig *cfg ); + void readProperties( TDEConfig *cfg ); + void saveProperties( TDEConfig *cfg ); void disconnectClient( SensorClient *client ); diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cc index 0fee27c95..6289e4405 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cc @@ -100,19 +100,19 @@ void SensorSocketAgent::connectionClosed() void SensorSocketAgent::error( int id ) { switch ( id ) { - case KNetwork::KSocketBase::ConnectionRefused: + case KNetwork::TDESocketBase::ConnectionRefused: SensorMgr->notify( i18n( "Connection to %1 refused" ) .arg( hostName() ) ); break; - case KNetwork::KSocketBase::LookupFailure: + case KNetwork::TDESocketBase::LookupFailure: SensorMgr->notify( i18n( "Host %1 not found" ) .arg( hostName() ) ); break; - case KNetwork::KSocketBase::Timeout: + case KNetwork::TDESocketBase::Timeout: SensorMgr->notify( i18n( "Timeout at host %1") .arg( hostName() ) ); break; - case KNetwork::KSocketBase::NetFailure: + case KNetwork::TDESocketBase::NetFailure: SensorMgr->notify( i18n( "Network failure host %1") .arg( hostName() ) ); break; diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc index d05af4ec8..8b0613cf9 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cc +++ b/ksysguard/gui/ksgrd/StyleEngine.cc @@ -59,7 +59,7 @@ StyleEngine::~StyleEngine() { } -void StyleEngine::readProperties( KConfig *cfg ) +void StyleEngine::readProperties( TDEConfig *cfg ) { mFirstForegroundColor = cfg->readColorEntry( "fgColor1", &mFirstForegroundColor ); mSecondForegroundColor = cfg->readColorEntry( "fgColor2", &mSecondForegroundColor ); @@ -76,7 +76,7 @@ void StyleEngine::readProperties( KConfig *cfg ) } } -void StyleEngine::saveProperties( KConfig *cfg ) +void StyleEngine::saveProperties( TDEConfig *cfg ) { cfg->writeEntry( "fgColor1", mFirstForegroundColor ); cfg->writeEntry( "fgColor2", mSecondForegroundColor ); diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h index 4263a85c8..50ec06e0b 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.h +++ b/ksysguard/gui/ksgrd/StyleEngine.h @@ -30,7 +30,7 @@ #include <kdemacros.h> -class KConfig; +class TDEConfig; class TQListBoxItem; @@ -46,8 +46,8 @@ class KDE_EXPORT StyleEngine : public QObject StyleEngine(); ~StyleEngine(); - void readProperties( KConfig* ); - void saveProperties( KConfig* ); + void readProperties( TDEConfig* ); + void saveProperties( TDEConfig* ); const TQColor& firstForegroundColor() const; const TQColor& secondForegroundColor() const; diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 00d3ac727..aeac861af 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -378,7 +378,7 @@ bool TopLevel::queryClose() return true; } -void TopLevel::readProperties( KConfig *cfg ) +void TopLevel::readProperties( TDEConfig *cfg ) { /* we can ignore 'isMaximized' because we can't set the window maximized, so we save the coordinates instead */ @@ -403,7 +403,7 @@ void TopLevel::readProperties( KConfig *cfg ) applyMainWindowSettings( cfg ); } -void TopLevel::saveProperties( KConfig *cfg ) +void TopLevel::saveProperties( TDEConfig *cfg ) { mActionOpenRecent->saveEntries( cfg ); diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index fe2e7fce1..674ff0851 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -49,8 +49,8 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje public: TopLevel( const char *name = 0 ); - virtual void saveProperties( KConfig* ); - virtual void readProperties( KConfig* ); + virtual void saveProperties( TDEConfig* ); + virtual void readProperties( TDEConfig* ); virtual void answerReceived( int id, const TQString& ); diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 0c9a3ce21..86d6fd750 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -143,8 +143,8 @@ void KSysTrayCmd::refresh() TQToolTip::remove( this ); if ( win ) { - KConfig *appCfg = kapp->config(); - KConfigGroupSaver configSaver(appCfg, "System Tray"); + TDEConfig *appCfg = kapp->config(); + TDEConfigGroupSaver configSaver(appCfg, "System Tray"); int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); // ksystraycmd's icon or app's icon @@ -14,7 +14,7 @@ - prevent application/window list from growing endlessly - bug 59203: call kcontrol/keys/modifiers.cpp: - KConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); + TDEConfigGroupSaver cgs( TDEGlobal::config(), "Keyboard" ); bool bMacSwap = TDEGlobal::config()->readBoolEntry( "Mac Modifier Swap", false ); if( bMacSwap ) ModifiersModule::setupMacModifierKeys(); diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index 09b3ad204..c73fb620f 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -95,7 +95,7 @@ static TQListViewItem* copyLVI(const TQListViewItem* src, TQListView* parent) LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), m_rules(NULL) { TQVBoxLayout *main = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -263,7 +263,7 @@ void LayoutConfig::initUI() { } updateOptionsCommand(); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); } @@ -325,7 +325,7 @@ void LayoutConfig::save() m_kxkbConfig.save(); kapp->tdeinitExec("kxkb"); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); } @@ -672,7 +672,7 @@ void LayoutConfig::updateLayoutCommand() void LayoutConfig::changed() { updateLayoutCommand(); - emit KCModule::changed( true ); + emit TDECModule::changed( true ); } @@ -762,7 +762,7 @@ void LayoutConfig::defaults() initUI(); - emit KCModule::changed( true ); + emit TDECModule::changed( true ); } @@ -795,12 +795,12 @@ OptionListItem * OptionListItem::findChildItem( const TQString& optionName ) extern "C" { - KDE_EXPORT KCModule *create_keyboard_layout(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_keyboard_layout(TQWidget *parent, const char *) { return new LayoutConfig(parent, "kcmlayout"); } - KDE_EXPORT KCModule *create_keyboard(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_keyboard(TQWidget *parent, const char *) { return new KeyboardConfig(parent, "kcmlayout"); } diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h index 6f61e9e06..14d9e734e 100644 --- a/kxkb/kcmlayout.h +++ b/kxkb/kcmlayout.h @@ -14,7 +14,7 @@ class OptionListItem; class LayoutConfigWidget; class XkbRules; -class LayoutConfig : public KCModule +class LayoutConfig : public TDECModule { Q_OBJECT diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index 63e4d25aa..e3f8f66c8 100644 --- a/kxkb/kcmmisc.cpp +++ b/kxkb/kcmmisc.cpp @@ -51,7 +51,7 @@ #include <X11/Xlib.h> KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *) - : KCModule (parent, "kcmlayout") + : TDECModule (parent, "kcmlayout") { TQString wtstr; TQBoxLayout* lay = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -129,7 +129,7 @@ void KeyboardConfig::setNumLockState( int s ) void KeyboardConfig::load() { - KConfig config("kcminputrc"); + TDEConfig config("kcminputrc"); XKeyboardState kbd; @@ -150,7 +150,7 @@ void KeyboardConfig::load() void KeyboardConfig::save() { - KConfig config("kcminputrc"); + TDEConfig config("kcminputrc"); XKeyboardControl kbd; @@ -201,7 +201,7 @@ void KeyboardConfig::delaySliderChanged (int value) { ui->delay->setValue((int)floor(0.5 + linearValue)); - emit KCModule::changed(true); + emit TDECModule::changed(true); } void KeyboardConfig::delaySpinboxChanged (int value) { @@ -210,24 +210,24 @@ void KeyboardConfig::delaySpinboxChanged (int value) { ui->delaySlider->setValue ((int)floor (0.5 + logVal)); - emit KCModule::changed(true); + emit TDECModule::changed(true); } void KeyboardConfig::rateSliderChanged (int value) { ui->rate->setValue(value/100.0); - emit KCModule::changed(true); + emit TDECModule::changed(true); } void KeyboardConfig::rateSpinboxChanged (double value) { ui->rateSlider->setValue ((int)(value*100)); - emit KCModule::changed(true); + emit TDECModule::changed(true); } void KeyboardConfig::changed() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } /* @@ -541,7 +541,7 @@ void set_repeatrate(int delay, double rate) void KeyboardConfig::init_keyboard() { - KConfig *config = new KConfig("kcminputrc", true); // Read-only, no globals + TDEConfig *config = new TDEConfig("kcminputrc", true); // Read-only, no globals config->setGroup("Keyboard"); XKeyboardState kbd; diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h index 52b7a046f..b40f50a0d 100644 --- a/kxkb/kcmmisc.h +++ b/kxkb/kcmmisc.h @@ -30,7 +30,7 @@ class KeyboardConfigWidget; -class KeyboardConfig : public KCModule +class KeyboardConfig : public TDECModule { Q_OBJECT public: diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp index 0e62fbc21..5ddfe8b9a 100644 --- a/kxkb/kxkbconfig.cpp +++ b/kxkb/kxkbconfig.cpp @@ -40,7 +40,7 @@ LayoutUnit KxkbConfig::getDefaultLayout() bool KxkbConfig::load(int loadMode) { - KConfig *config = new KConfig("kxkbrc", true, false); + TDEConfig *config = new TDEConfig("kxkbrc", true, false); config->setGroup("Layout"); // Even if the layouts have been disabled we still want to set Xkb options @@ -171,7 +171,7 @@ bool KxkbConfig::load(int loadMode) void KxkbConfig::save() { - KConfig *config = new KConfig("kxkbrc", false, false); + TDEConfig *config = new TDEConfig("kxkbrc", false, false); config->setGroup("Layout"); config->writeEntry("Model", m_model); diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index ed4cd39b5..1bf9feb83 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -45,11 +45,11 @@ struct FaviconsModulePrivate bool isHost; TQByteArray iconData; }; - TQMap<KIO::Job *, DownloadInfo> downloads; + TQMap<TDEIO::Job *, DownloadInfo> downloads; TQStringList failedDownloads; KSimpleConfig *config; - TQPtrList<KIO::Job> killJobs; - KIO::MetaData metaData; + TQPtrList<TDEIO::Job> killJobs; + TDEIO::MetaData metaData; TQString faviconsDir; TQCache<TQString> faviconsCache; }; @@ -184,18 +184,18 @@ void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const if (d->failedDownloads.contains(iconURL.url())) return; - KIO::Job *job = KIO::get(iconURL, false, false); + TDEIO::Job *job = TDEIO::get(iconURL, false, false); job->addMetaData(d->metaData); - connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *))); - connect(job, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(KIO::Job *, const TQString &))); + connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); FaviconsModulePrivate::DownloadInfo download; download.hostOrURL = hostOrURL; download.isHost = isHost; d->downloads.insert(job, download); } -void FaviconsModule::slotData(KIO::Job *job, const TQByteArray &data) +void FaviconsModule::slotData(TDEIO::Job *job, const TQByteArray &data) { FaviconsModulePrivate::DownloadInfo &download = d->downloads[job]; unsigned int oldSize = download.iconData.size(); @@ -208,11 +208,11 @@ void FaviconsModule::slotData(KIO::Job *job, const TQByteArray &data) memcpy(download.iconData.data() + oldSize, data.data(), data.size()); } -void FaviconsModule::slotResult(KIO::Job *job) +void FaviconsModule::slotResult(TDEIO::Job *job) { FaviconsModulePrivate::DownloadInfo download = d->downloads[job]; d->downloads.remove(job); - KURL iconURL = static_cast<KIO::TransferJob *>(job)->url(); + KURL iconURL = static_cast<TDEIO::TransferJob *>(job)->url(); TQString iconName; if (!job->error()) { @@ -254,9 +254,9 @@ void FaviconsModule::slotResult(KIO::Job *job) emit iconChanged(download.isHost, download.hostOrURL, iconName); } -void FaviconsModule::slotInfoMessage(KIO::Job *job, const TQString &msg) +void FaviconsModule::slotInfoMessage(TDEIO::Job *job, const TQString &msg) { - emit infoMessage(static_cast<KIO::TransferJob *>( job )->url(), msg); + emit infoMessage(static_cast<TDEIO::TransferJob *>( job )->url(), msg); } void FaviconsModule::slotKill() diff --git a/libkonq/favicons/favicons.h b/libkonq/favicons/favicons.h index 1ca337713..72767f8de 100644 --- a/libkonq/favicons/favicons.h +++ b/libkonq/favicons/favicons.h @@ -22,7 +22,7 @@ #include <kdedmodule.h> #include <kurl.h> -namespace KIO { class Job; } +namespace TDEIO { class Job; } /** * KDED Module to handle shortcut icons ("favicons") @@ -91,9 +91,9 @@ private: bool isIconOld(const TQString &); private slots: - void slotData(KIO::Job *, const TQByteArray &); - void slotResult(KIO::Job *); - void slotInfoMessage(KIO::Job *, const TQString &); + void slotData(TDEIO::Job *, const TQByteArray &); + void slotResult(TDEIO::Job *); + void slotInfoMessage(TDEIO::Job *, const TQString &); void slotKill(); private: diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 8b7a9f53e..f962adafc 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -422,9 +422,9 @@ void KNewMenu::slotNewFile() text.replace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename KURL defaultFile( *it ); - defaultFile.addPath( KIO::encodeFileName( text ) ); + defaultFile.addPath( TDEIO::encodeFileName( text ) ); if ( defaultFile.isLocalFile() && TQFile::exists( defaultFile.path() ) ) - text = KIO::RenameDlg::suggestName( *it, text); + text = TDEIO::RenameDlg::suggestName( *it, text); KURL templateURL; templateURL.setPath( entry.templatePath ); @@ -442,9 +442,9 @@ void KNewMenu::slotNewFile() text.replace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename KURL defaultFile( *(popupFiles.begin()) ); - defaultFile.addPath( KIO::encodeFileName( text ) ); + defaultFile.addPath( TDEIO::encodeFileName( text ) ); if ( defaultFile.isLocalFile() && TQFile::exists( defaultFile.path() ) ) - text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text); + text = TDEIO::RenameDlg::suggestName( *(popupFiles.begin()), text); name = KInputDialog::getText( TQString::null, entry.comment, text, &ok, d->m_parentWidget ); @@ -460,19 +460,19 @@ void KNewMenu::slotNewFile() for ( ; it != popupFiles.end(); ++it ) { KURL dest( *it ); - dest.addPath( KIO::encodeFileName(name) ); // Chosen destination file name + dest.addPath( TDEIO::encodeFileName(name) ); // Chosen destination file name d->m_destPath = dest.path(); // will only be used if m_isURLDesktopFile and dest is local KURL uSrc; uSrc.setPath( src ); - //kdDebug(1203) << "KNewMenu : KIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl; - KIO::CopyJob * job = KIO::copyAs( uSrc, dest ); + //kdDebug(1203) << "KNewMenu : TDEIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl; + TDEIO::CopyJob * job = TDEIO::copyAs( uSrc, dest ); job->setDefaultPermissions( true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); if ( m_isURLDesktopFile ) - connect( job, TQT_SIGNAL( renamed( KIO::Job *, const KURL&, const KURL& ) ), - TQT_SLOT( slotRenamed( KIO::Job *, const KURL&, const KURL& ) ) ); + connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ), + TQT_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) ); KURL::List lst; lst.append( uSrc ); (void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job ); @@ -481,7 +481,7 @@ void KNewMenu::slotNewFile() // Special case (filename conflict when creating a link=url file) // We need to update m_destURL -void KNewMenu::slotRenamed( KIO::Job *, const KURL& from , const KURL& to ) +void KNewMenu::slotRenamed( TDEIO::Job *, const KURL& from , const KURL& to ) { if ( from.isLocalFile() ) { @@ -491,13 +491,13 @@ void KNewMenu::slotRenamed( KIO::Job *, const KURL& from , const KURL& to ) } } -void KNewMenu::slotResult( KIO::Job * job ) +void KNewMenu::slotResult( TDEIO::Job * job ) { if (job->error()) job->showErrorDialog(); else { - KURL destURL = static_cast<KIO::CopyJob*>(job)->destURL(); + KURL destURL = static_cast<TDEIO::CopyJob*>(job)->destURL(); if ( destURL.isLocalFile() ) { if ( m_isURLDesktopFile ) diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h index 6935ae7a4..9e2181329 100644 --- a/libkonq/knewmenu.h +++ b/libkonq/knewmenu.h @@ -28,7 +28,7 @@ #include <kurl.h> #include <libkonq_export.h> -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KDirWatch; class KLineEdit; @@ -96,9 +96,9 @@ protected slots: */ void slotFillTemplates(); - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); // Special case (filename conflict when creating a link=url file) - void slotRenamed( KIO::Job *, const KURL&, const KURL& ); + void slotRenamed( TDEIO::Job *, const KURL&, const KURL& ); private: diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 472ea1dbb..86f945742 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -430,7 +430,7 @@ void KonqDirPart::slotClipboardDataChanged() void KonqDirPart::updatePasteAction() // KDE4: merge into method above { - TQString actionText = KIO::pasteActionText(); + TQString actionText = TDEIO::pasteActionText(); bool paste = !actionText.isEmpty(); if ( paste ) emit m_extension->setActionText( "paste", actionText ); @@ -476,7 +476,7 @@ void KonqDirPart::emitTotalCount() } TQString summary = - KIO::itemsSummaryString(m_lFileCount + m_lDirCount, + TDEIO::itemsSummaryString(m_lFileCount + m_lDirCount, m_lFileCount, m_lDirCount, m_lDirSize, @@ -513,7 +513,7 @@ void KonqDirPart::emitCounts( const KFileItemList & lst ) } } - emit setStatusBarText( KIO::itemsSummaryString( fileCount + dirCount, + emit setStatusBarText( TDEIO::itemsSummaryString( fileCount + dirCount, fileCount, dirCount, fileSizeSum, true ) ); } diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h index 90ae1f65e..9c5d0735e 100644 --- a/libkonq/konq_dirpart.h +++ b/libkonq/konq_dirpart.h @@ -312,7 +312,7 @@ protected: // Remove all those in KDE4 int m_iIconSize[5]; - KIO::filesize_t m_lDirSize; + TDEIO::filesize_t m_lDirSize; uint m_lFileCount; uint m_lDirCount; diff --git a/libkonq/konq_events.h b/libkonq/konq_events.h index cade20d63..c047d904e 100644 --- a/libkonq/konq_events.h +++ b/libkonq/konq_events.h @@ -10,7 +10,7 @@ namespace KParts class ReadOnlyPart; } -class KConfig; +class TDEConfig; class KFileItem; typedef TQPtrList<KFileItem> KFileItemList; @@ -51,9 +51,9 @@ private: class LIBKONQ_EXPORT KonqConfigEvent : public KParts::Event { public: - KonqConfigEvent( KConfig *config, const TQString &prefix, bool save ) : KParts::Event( s_configEventName ), m_config( config ), m_prefix( prefix ), m_save( save ) {} + KonqConfigEvent( TDEConfig *config, const TQString &prefix, bool save ) : KParts::Event( s_configEventName ), m_config( config ), m_prefix( prefix ), m_save( save ) {} - KConfig * config() const { return m_config; } + TDEConfig * config() const { return m_config; } TQString prefix() const { return m_prefix; } bool save() const { return m_save; } @@ -62,7 +62,7 @@ public: private: static const char *s_configEventName; - KConfig *m_config; + TDEConfig *m_config; TQString m_prefix; bool m_save; }; diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc index fe1092f4c..c576a043a 100644 --- a/libkonq/konq_filetip.cc +++ b/libkonq/konq_filetip.cc @@ -260,10 +260,10 @@ void KonqFileTip::startDelayed() KFileItemList oneItem; oneItem.append( m_item ); - m_previewJob = KIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); + m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); - connect( m_previewJob, TQT_SIGNAL( result( KIO::Job * ) ), + connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( gotPreviewResult() ) ); } diff --git a/libkonq/konq_filetip.h b/libkonq/konq_filetip.h index 2c30a0a8f..93c82780b 100644 --- a/libkonq/konq_filetip.h +++ b/libkonq/konq_filetip.h @@ -89,7 +89,7 @@ class LIBKONQ_EXPORT KonqFileTip : public TQFrame int m_num; TQScrollView* m_view; KFileItem* m_item; - KIO::PreviewJob* m_previewJob; + TDEIO::PreviewJob* m_previewJob; TQRect m_rect; TQTimer* m_timer; }; diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc index 6d5f314b7..c9367130d 100644 --- a/libkonq/konq_historymgr.cc +++ b/libkonq/konq_historymgr.cc @@ -40,8 +40,8 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) m_updateTimer = new TQTimer( this ); // defaults - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "HistorySettings" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "HistorySettings" ); m_maxCount = config->readNumEntry( "Maximum of History entries", 500 ); m_maxCount = TQMAX( 1, m_maxCount ); m_maxAgeDays = config->readNumEntry( "Maximum age of History entries", 90); @@ -493,8 +493,8 @@ void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString ) clearPending(); adjustSize(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "HistorySettings" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "HistorySettings" ); config->writeEntry( "Maximum of History entries", m_maxCount ); if ( isSenderOfBroadcast() ) { @@ -509,8 +509,8 @@ void KonqHistoryManager::notifyMaxAge( TQ_UINT32 days, TQCString ) clearPending(); adjustSize(); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "HistorySettings" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "HistorySettings" ); config->writeEntry( "Maximum age of History entries", m_maxAgeDays ); if ( isSenderOfBroadcast() ) { diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 4be11a989..b82610d33 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -101,7 +101,7 @@ struct KonqIconViewWidgetPrivate int m_movieBlocked; TQString movieFileName; - KIO::PreviewJob *pPreviewJob; + TDEIO::PreviewJob *pPreviewJob; KonqFileTip* pFileTip; TQStringList previewSettings; bool renameItem; @@ -206,7 +206,7 @@ void KonqIconViewWidget::slotItemRenamed(TQIconViewItem *item, const TQString &n // Actually attempt the rename. If it succeeds, KDirLister will update the name. KURL oldurl( fileItem->url() ); KURL newurl( oldurl ); - newurl.setPath( newurl.directory(false) + KIO::encodeFileName( name ) ); + newurl.setPath( newurl.directory(false) + TDEIO::encodeFileName( name ) ); kdDebug(1203)<<" newurl :"<<newurl<<endl; // We use url()+name so that it also works if the name is a relative path (#51176) KonqOperations::rename( this, oldurl, newurl ); @@ -227,7 +227,7 @@ void KonqIconViewWidget::slotIconChanged( int group ) void KonqIconViewWidget::readAnimatedIconsConfig() { - KConfigGroup cfgGroup( TDEGlobal::config(), "DesktopIcons" ); + TDEConfigGroup cfgGroup( TDEGlobal::config(), "DesktopIcons" ); d->doAnimations = cfgGroup.readBoolEntry( "Animated", true /*default*/ ); } @@ -607,7 +607,7 @@ bool KonqIconViewWidget::boostPreview() const { if ( m_bDesktop ) return false; - KConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); + TDEConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); return group.readBoolEntry( "BoostSize", false ); } @@ -684,7 +684,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQStringList& mimeList ) const { - // Code duplication from KIO::PreviewJob + // Code duplication from TDEIO::PreviewJob KMimeType::Ptr mime = KMimeType::mimeType( mimeType ); for (TQStringList::ConstIterator mt = mimeList.begin(); mt != mimeList.end(); ++mt) { @@ -867,12 +867,12 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force ) if ( !d->bBoostPreview ) iconSize /= 2; - d->pPreviewJob = KIO::filePreview( items, size, size, iconSize, + d->pPreviewJob = TDEIO::filePreview( items, size, size, iconSize, m_pSettings->textPreviewIconTransparency(), true /* scale */, true /* save */, &(d->previewSettings) ); connect( d->pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) ); - connect( d->pPreviewJob, TQT_SIGNAL( result( KIO::Job * ) ), + connect( d->pPreviewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotPreviewResult() ) ); } @@ -916,7 +916,7 @@ void KonqIconViewWidget::slotDropped( TQDropEvent *ev, const TQValueList<TQIconD KonqOperations::doDrop( m_rootItem /* may be 0L */, dirURL, ev, this ); } -void KonqIconViewWidget::slotAboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &) +void KonqIconViewWidget::slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &) { // Do nothing :-) } diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h index 85d743782..2625055d8 100644 --- a/libkonq/konq_iconviewwidget.h +++ b/libkonq/konq_iconviewwidget.h @@ -31,7 +31,7 @@ class KonqFMSettings; class KFileIVI; class KonqIconDrag; -namespace KIO { class Job; } +namespace TDEIO { class Job; } /** * A file-aware icon view, implementing drag'n'drop, KDE icon sizes, @@ -299,7 +299,7 @@ protected slots: void slotMovieStatus( int status ); void slotReenableAnimation(); - void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files); + void slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files); void doubleClickTimeout(); protected: diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index 1f81c1027..40a30aa10 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -109,7 +109,7 @@ void KonqOperations::restoreTrashedItems( const KURL::List& urls ) void KonqOperations::mkdir( TQWidget *parent, const KURL & url ) { - KIO::Job * job = KIO::mkdir( url ); + TDEIO::Job * job = TDEIO::mkdir( url ); KonqOperations * op = new KonqOperations( parent ); op->setOperation( job, MKDIR, KURL::List(), url ); (void) new KonqCommandRecorder( KonqCommand::MKDIR, KURL(), url, job ); // no support yet, apparently @@ -130,11 +130,11 @@ void KonqOperations::doPaste( TQWidget * parent, const KURL & destURL, const TQP kdDebug(1203) << "move (from clipboard data) = " << move << endl; } - KIO::Job *job = KIO::pasteClipboard( destURL, move ); + TDEIO::Job *job = TDEIO::pasteClipboard( destURL, move ); if ( job ) { KonqOperations * op = new KonqOperations( parent ); - KIO::CopyJob * copyJob = static_cast<KIO::CopyJob *>(job); + TDEIO::CopyJob * copyJob = static_cast<TDEIO::CopyJob *>(job); KIOPasteInfo * pi = new KIOPasteInfo; pi->mousePos = pos; op->setPasteInfo( pi ); @@ -158,13 +158,13 @@ void KonqOperations::copy( TQWidget * parent, int method, const KURL::List & sel } KonqOperations * op = new KonqOperations( parent ); - KIO::Job* job(0); + TDEIO::Job* job(0); if (method==LINK) - job= KIO::link( selectedURLs, destUrl); + job= TDEIO::link( selectedURLs, destUrl); else if (method==MOVE) - job= KIO::move( selectedURLs, destUrl); + job= TDEIO::move( selectedURLs, destUrl); else - job= KIO::copy( selectedURLs, destUrl); + job= TDEIO::copy( selectedURLs, destUrl); op->setOperation( job, method, selectedURLs, destUrl ); @@ -188,13 +188,13 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) ) { //m_srcURLs = selectedURLs; - KIO::Job *job; + TDEIO::Job *job; m_method = method; switch( method ) { case TRASH: { - job = KIO::trash( selectedURLs ); + job = TDEIO::trash( selectedURLs ); (void) new KonqCommandRecorder( KonqCommand::TRASH, selectedURLs, "trash:/", job ); break; } @@ -204,23 +204,23 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)1; - job = KIO::special( "trash:/", packedArgs ); + job = TDEIO::special( "trash:/", packedArgs ); KNotifyClient::event(0, "Trash: emptied"); break; } case DEL: - job = KIO::del( selectedURLs ); + job = TDEIO::del( selectedURLs ); break; case SHRED: - job = KIO::del( selectedURLs, true ); + job = TDEIO::del( selectedURLs, true ); break; default: kdWarning() << "Unknown operation: " << method << endl; delete this; return; } - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } else delete this; } @@ -229,8 +229,8 @@ void KonqOperations::_restoreTrashedItems( const KURL::List& urls ) { m_method = RESTORE; KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget ) @@ -241,7 +241,7 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int bool ask = ( confirmation == FORCE_CONFIRMATION ); if ( !ask ) { - KConfig config("konquerorrc", true, false); + TDEConfig config("konquerorrc", true, false); config.setGroup( "Trash" ); keyName = ( method == DEL ? "ConfirmDelete" : method == SHRED ? "ConfirmShred" : "ConfirmTrash" ); bool defaultValue = ( method == DEL ? DEFAULT_CONFIRMDELETE : method == SHRED ? DEFAULT_CONFIRMSHRED : DEFAULT_CONFIRMTRASH ); @@ -294,13 +294,13 @@ bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int if (!keyName.isEmpty()) { // Check kmessagebox setting... erase & copy to konquerorrc. - KConfig *config = kapp->config(); - KConfigGroupSaver saver(config, "Notification Messages"); + TDEConfig *config = kapp->config(); + TDEConfigGroupSaver saver(config, "Notification Messages"); if (!config->readBoolEntry(keyName, true)) { config->writeEntry(keyName, true); config->sync(); - KConfig konq_config("konquerorrc", false); + TDEConfig konq_config("konquerorrc", false); konq_config.setGroup( "Trash" ); konq_config.writeEntry( keyName, false ); } @@ -384,7 +384,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, TQDr { //kdDebug(1203) << "Pasting to " << dest.url() << endl; KonqOperations * op = new KonqOperations(parent); - KIO::CopyJob* job = KIO::pasteMimeSource( ev, dest, + TDEIO::CopyJob* job = TDEIO::pasteMimeSource( ev, dest, i18n( "File name for dropped contents:" ), parent ); if ( job ) // 0 if canceled by user @@ -447,7 +447,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem ) TQString point = desktopFile.readEntry( "MountPoint" ); m_destURL.setPath( point ); TQString dev = desktopFile.readDevice(); - TQString mp = KIO::findDeviceMountPoint( dev ); + TQString mp = TDEIO::findDeviceMountPoint( dev ); // Is the device already mounted ? if ( !mp.isNull() ) doFileCopy(); @@ -597,10 +597,10 @@ void KonqOperations::doFileCopy() } } - KIO::Job * job = 0; + TDEIO::Job * job = 0; switch ( action ) { case TQDropEvent::Move : - job = KIO::move( lst, m_destURL ); + job = TDEIO::move( lst, m_destURL ); job->setMetaData( m_info->metaData ); setOperation( job, m_method == TRASH ? TRASH : MOVE, lst, m_destURL ); (void) new KonqCommandRecorder( @@ -608,14 +608,14 @@ void KonqOperations::doFileCopy() lst, m_destURL, job ); return; // we still have stuff to do -> don't delete ourselves case TQDropEvent::Copy : - job = KIO::copy( lst, m_destURL ); + job = TDEIO::copy( lst, m_destURL ); job->setMetaData( m_info->metaData ); setOperation( job, COPY, lst, m_destURL ); (void) new KonqCommandRecorder( KonqCommand::COPY, lst, m_destURL, job ); return; case TQDropEvent::Link : kdDebug(1203) << "KonqOperations::asyncDrop lst.count=" << lst.count() << endl; - job = KIO::link( lst, m_destURL ); + job = TDEIO::link( lst, m_destURL ); job->setMetaData( m_info->metaData ); setOperation( job, LINK, lst, m_destURL ); (void) new KonqCommandRecorder( KonqCommand::LINK, lst, m_destURL, job ); @@ -633,7 +633,7 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL& KURL::List lst; lst.append(oldurl); - KIO::Job * job = KIO::moveAs( oldurl, newurl, !oldurl.isLocalFile() ); + TDEIO::Job * job = TDEIO::moveAs( oldurl, newurl, !oldurl.isLocalFile() ); KonqOperations * op = new KonqOperations( parent ); op->setOperation( job, MOVE, lst, newurl ); (void) new KonqCommandRecorder( KonqCommand::MOVE, lst, newurl, job ); @@ -641,38 +641,38 @@ void KonqOperations::rename( TQWidget * parent, const KURL & oldurl, const KURL& if ( oldurl.isLocalFile() && oldurl.path(1) == TDEGlobalSettings::desktopPath() ) { kdDebug(1203) << "That rename was the Desktop path, updating config files" << endl; - KConfig *globalConfig = TDEGlobal::config(); - KConfigGroupSaver cgs( globalConfig, "Paths" ); + TDEConfig *globalConfig = TDEGlobal::config(); + TDEConfigGroupSaver cgs( globalConfig, "Paths" ); globalConfig->writePathEntry("Desktop" , newurl.path(), true, true ); globalConfig->sync(); KIPC::sendMessageAll(KIPC::SettingsChanged, TDEApplication::SETTINGS_PATHS); } } -void KonqOperations::setOperation( KIO::Job * job, int method, const KURL::List & /*src*/, const KURL & dest ) +void KonqOperations::setOperation( TDEIO::Job * job, int method, const KURL::List & /*src*/, const KURL & dest ) { m_method = method; //m_srcURLs = src; m_destURL = dest; if ( job ) { - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotResult( KIO::Job * ) ) ); - KIO::CopyJob *copyJob = tqt_dynamic_cast<KIO::CopyJob*>(job); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + TDEIO::CopyJob *copyJob = tqt_dynamic_cast<TDEIO::CopyJob*>(job); KonqIconViewWidget *iconView = tqt_dynamic_cast<KonqIconViewWidget*>(parent()); if (copyJob && iconView) { - connect(copyJob, TQT_SIGNAL(aboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &)), - this, TQT_SLOT(slotAboutToCreate(KIO::Job *,const TQValueList<KIO::CopyInfo> &))); - connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &)), - iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<KIO::CopyInfo> &))); + connect(copyJob, TQT_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)), + this, TQT_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &))); + connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)), + iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &))); } } else // for link slotResult( 0L ); } -void KonqOperations::slotAboutToCreate(KIO::Job *, const TQValueList<KIO::CopyInfo> &files) +void KonqOperations::slotAboutToCreate(TDEIO::Job *, const TQValueList<TDEIO::CopyInfo> &files) { emit aboutToCreate( m_info ? m_info->mousePos : m_pasteInfo ? m_pasteInfo->mousePos : TQPoint(), files); } @@ -687,18 +687,18 @@ void KonqOperations::statURL( const KURL & url, const TQObject *receiver, const void KonqOperations::_statURL( const KURL & url, const TQObject *receiver, const char *member ) { connect( this, TQT_SIGNAL( statFinished( const KFileItem * ) ), receiver, member ); - KIO::StatJob * job = KIO::stat( url /*, false?*/ ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotStatResult( KIO::Job * ) ) ); + TDEIO::StatJob * job = TDEIO::stat( url /*, false?*/ ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); } -void KonqOperations::slotStatResult( KIO::Job * job ) +void KonqOperations::slotStatResult( TDEIO::Job * job ) { if ( job->error()) job->showErrorDialog( (TQWidget*)parent() ); else { - KIO::StatJob * statJob = static_cast<KIO::StatJob*>(job); + TDEIO::StatJob * statJob = static_cast<TDEIO::StatJob*>(job); KFileItem * item = new KFileItem( statJob->statResult(), statJob->url() ); emit statFinished( item ); delete item; @@ -708,7 +708,7 @@ void KonqOperations::slotStatResult( KIO::Job * job ) delete this; } -void KonqOperations::slotResult( KIO::Job * job ) +void KonqOperations::slotResult( TDEIO::Job * job ) { if (job && job->error()) job->showErrorDialog( (TQWidget*)parent() ); @@ -733,7 +733,7 @@ void KonqOperations::newDir( TQWidget * parent, const KURL & baseURL ) bool ok; TQString name = i18n( "New Folder" ); if ( baseURL.isLocalFile() && TQFileInfo( baseURL.path(+1) + name ).exists() ) - name = KIO::RenameDlg::suggestName( baseURL, i18n( "New Folder" ) ); + name = TDEIO::RenameDlg::suggestName( baseURL, i18n( "New Folder" ) ); name = KInputDialog::getText ( i18n( "New Folder" ), i18n( "Enter folder name:" ), name, &ok, parent ); @@ -746,7 +746,7 @@ void KonqOperations::newDir( TQWidget * parent, const KURL & baseURL ) } else { - name = KIO::encodeFileName( name ); + name = TDEIO::encodeFileName( name ); url = baseURL; url.addPath( name ); } @@ -757,7 +757,7 @@ void KonqOperations::newDir( TQWidget * parent, const KURL & baseURL ) //// KonqMultiRestoreJob::KonqMultiRestoreJob( const KURL::List& urls, bool showProgressInfo ) - : KIO::Job( showProgressInfo ), + : TDEIO::Job( showProgressInfo ), m_urls( urls ), m_urlsIterator( m_urls.begin() ), m_progress( 0 ) { @@ -788,7 +788,7 @@ void KonqMultiRestoreJob::slotStart() TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream << (int)3 << new_url; - KIO::Job* job = KIO::special( new_url, packedArgs ); + TDEIO::Job* job = TDEIO::special( new_url, packedArgs ); addSubjob( job ); } else // done! @@ -799,11 +799,11 @@ void KonqMultiRestoreJob::slotStart() } } -void KonqMultiRestoreJob::slotResult( KIO::Job *job ) +void KonqMultiRestoreJob::slotResult( TDEIO::Job *job ) { if ( job->error() ) { - KIO::Job::slotResult( job ); // will set the error and emit result(this) + TDEIO::Job::slotResult( job ); // will set the error and emit result(this) return; } subjobs.remove( job ); diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h index 66e04ee0d..1ffd14690 100644 --- a/libkonq/konq_operations.h +++ b/libkonq/konq_operations.h @@ -25,7 +25,7 @@ #include <tqobject.h> #include <tqevent.h> -namespace KIO { class Job; class CopyInfo; } +namespace TDEIO { class Job; class CopyInfo; } class TQWidget; class KFileItem; class KonqMainWindow; @@ -139,7 +139,7 @@ public: signals: void statFinished( const KFileItem * item ); - void aboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files); + void aboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::CopyInfo> &files); protected: void _del( int method, const KURL::List & selectedURLs, ConfirmationType confirmation ); @@ -147,7 +147,7 @@ protected: void _statURL( const KURL & url, const TQObject *receiver, const char *member ); // internal, for COPY/MOVE/LINK/MKDIR - void setOperation( KIO::Job * job, int method, const KURL::List & src, const KURL & dest ); + void setOperation( TDEIO::Job * job, int method, const KURL::List & src, const KURL & dest ); struct DropInfo { @@ -177,9 +177,9 @@ private: protected slots: - void slotAboutToCreate(KIO::Job *job, const TQValueList<KIO::CopyInfo> &files); - void slotResult( KIO::Job * job ); - void slotStatResult( KIO::Job * job ); + void slotAboutToCreate(TDEIO::Job *job, const TQValueList<TDEIO::CopyInfo> &files); + void slotResult( TDEIO::Job * job ); + void slotStatResult( TDEIO::Job * job ); void asyncDrop( const KFileItem * item ); void doFileCopy(); @@ -195,7 +195,7 @@ private: #include <kio/job.h> /// Restore multiple trashed files -class KonqMultiRestoreJob : public KIO::Job +class KonqMultiRestoreJob : public TDEIO::Job { Q_OBJECT @@ -204,7 +204,7 @@ public: protected slots: virtual void slotStart(); - virtual void slotResult( KIO::Job *job ); + virtual void slotResult( TDEIO::Job *job ); private: const KURL::List m_urls; diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 291857887..72f24b8c6 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -93,7 +93,7 @@ TQPixmap KonqPixmapProvider::pixmapFor( const TQString& url, int size ) return loadIcon( url, iconNameFor( url ), size ); } -void KonqPixmapProvider::load( KConfig *kc, const TQString& key ) +void KonqPixmapProvider::load( TDEConfig *kc, const TQString& key ) { iconMap.clear(); TQStringList list; @@ -113,7 +113,7 @@ void KonqPixmapProvider::load( KConfig *kc, const TQString& key ) // only saves the cache for the given list of items to prevent the cache // from growing forever. -void KonqPixmapProvider::save( KConfig *kc, const TQString& key, +void KonqPixmapProvider::save( TDEConfig *kc, const TQString& key, const TQStringList& items ) { TQStringList list; diff --git a/libkonq/konq_pixmapprovider.h b/libkonq/konq_pixmapprovider.h index cb20879a6..ca259915f 100644 --- a/libkonq/konq_pixmapprovider.h +++ b/libkonq/konq_pixmapprovider.h @@ -27,7 +27,7 @@ #include <libkonq_export.h> -class KConfig; +class TDEConfig; class LIBKONQ_EXPORT KonqPixmapProvider : public KonqFavIconMgr, virtual public KPixmapProvider { @@ -42,14 +42,14 @@ public: virtual TQPixmap pixmapFor( const TQString& url, int size = 0 ); /** - * Loads the cache to @p kc from the current KConfig-group from key @p key. + * Loads the cache to @p kc from the current TDEConfig-group from key @p key. */ - void load( KConfig * kc, const TQString& key ); + void load( TDEConfig * kc, const TQString& key ); /** - * Saves the cache to @p kc into the current KConfig-group as key @p key. + * Saves the cache to @p kc into the current TDEConfig-group as key @p key. * Only those @p items are saved, otherwise the cache would grow forever. */ - void save( KConfig *, const TQString& key, const TQStringList& items ); + void save( TDEConfig *, const TQString& key, const TQStringList& items ); /** * Clears the pixmap cache diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 9e2f0bf53..8d2503c30 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -306,7 +306,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, return count; } -bool KonqPopupMenu::KIOSKAuthorizedAction(KConfig& cfg) +bool KonqPopupMenu::KIOSKAuthorizedAction(TDEConfig& cfg) { if ( !cfg.hasKey( "X-TDE-AuthorizeAction") ) { @@ -423,9 +423,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) // If a local path is available, monitor that instead of the given remote URL... KURL realURL = m_sViewURL; if (!realURL.isLocalFile()) { - KIO::LocalURLJob* localURLJob = KIO::localURL(m_sViewURL); + TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL); if (localURLJob) { - connect(localURLJob, TQT_SIGNAL(localURL(KIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(KIO::Job*, const KURL&, bool))); + connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::Job*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::Job*, const KURL&, bool))); connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); d->localURLSlotFired = false; while (!d->localURLSlotFired) { @@ -593,7 +593,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) addDel = true; } else { - KConfigGroup configGroup( kapp->config(), "KDE" ); + TDEConfigGroup configGroup( kapp->config(), "KDE" ); if ( configGroup.readBoolEntry( "ShowDeleteCommand", false ) ) addDel = true; } @@ -1226,7 +1226,7 @@ KURL::List KonqPopupMenu::popupURLList() const return m_lstPopupURLs; } -void KonqPopupMenu::slotLocalURL(KIO::Job *job, const KURL& url, bool isLocal) +void KonqPopupMenu::slotLocalURL(TDEIO::Job *job, const KURL& url, bool isLocal) { d->localURLSlotFired = true; d->localURLResultURL = url; diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index a190ae98f..744d67c4d 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -178,7 +178,7 @@ protected: KActionCollection m_ownActions; private slots: - void slotLocalURL( KIO::Job *, const KURL&, bool ); + void slotLocalURL( TDEIO::Job *, const KURL&, bool ); void slotLocalURLKIODestroyed( ); private: @@ -187,7 +187,7 @@ private: void addPlugins( ); int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin); int insertServices(const ServiceList& list, TQDomElement& menu, bool isBuiltin); - bool KIOSKAuthorizedAction(KConfig& cfg); + bool KIOSKAuthorizedAction(TDEConfig& cfg); KPropertiesDialog* showPropertiesDialog(); class KonqPopupMenuPrivate; diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc index 84d6fa5c5..8a179672e 100644 --- a/libkonq/konq_propsview.cc +++ b/libkonq/konq_propsview.cc @@ -80,8 +80,8 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro m_defaultProps( defaultProps ) { - KConfig *config = instance->config(); - KConfigGroupSaver cgs(config, "Settings"); + TDEConfig *config = instance->config(); + TDEConfigGroupSaver cgs(config, "Settings"); d = new Private; d->previewsToShow = 0; @@ -121,7 +121,7 @@ KonqPropsView::KonqPropsView( TDEInstance * instance, KonqPropsView * defaultPro // So now we read the settings from the app global file, if this is the default props if (!defaultProps) { - KConfigGroupSaver cgs2(TDEGlobal::config(), "Settings"); + TDEConfigGroupSaver cgs2(TDEGlobal::config(), "Settings"); m_textColor = TDEGlobal::config()->readColorEntry( "TextColor", &m_textColor ); m_bgColor = TDEGlobal::config()->readColorEntry( "BgColor", &m_bgColor ); m_bgPixmapFile = TDEGlobal::config()->readPathEntry( "BgImage", m_bgPixmapFile ); @@ -147,7 +147,7 @@ bool KonqPropsView::isDescending() const return d->descending; } -KConfigBase * KonqPropsView::currentConfig() +TDEConfigBase * KonqPropsView::currentConfig() { if ( !m_currentConfig ) { @@ -162,7 +162,7 @@ KConfigBase * KonqPropsView::currentConfig() return m_currentConfig; } -KConfigBase * KonqPropsView::currentColorConfig() +TDEConfigBase * KonqPropsView::currentColorConfig() { // Saving locally ? if ( m_bSaveViewPropertiesLocally && !isDefaultProperties() ) @@ -281,7 +281,7 @@ void KonqPropsView::setIconSize( int size ) m_defaultProps->setIconSize( size ); else if (currentConfig()) { - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "IconSize", m_iIconSize ); currentConfig()->sync(); } @@ -294,7 +294,7 @@ void KonqPropsView::setItemTextPos( int pos ) m_defaultProps->setItemTextPos( pos ); else if (currentConfig()) { - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "ItemTextPos", m_iItemTextPos ); currentConfig()->sync(); } @@ -307,7 +307,7 @@ void KonqPropsView::setSortCriterion( const TQString &criterion ) m_defaultProps->setSortCriterion( criterion ); else if (currentConfig()) { - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "SortingCriterion", d->sortcriterion ); currentConfig()->sync(); } @@ -320,7 +320,7 @@ void KonqPropsView::setDirsFirst( bool first) m_defaultProps->setDirsFirst( first ); else if (currentConfig()) { - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "SortDirsFirst", d->dirsfirst ); currentConfig()->sync(); } @@ -333,7 +333,7 @@ void KonqPropsView::setDescending( bool descend) m_defaultProps->setDescending( descend ); else if (currentConfig()) { - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "SortDescending", d->descending ); currentConfig()->sync(); } @@ -351,7 +351,7 @@ void KonqPropsView::setShowingDotFiles( bool show ) else if (currentConfig()) { kdDebug(1203) << "Saving in current config" << endl; - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "ShowDotFiles", m_bShowDot ); currentConfig()->sync(); } @@ -369,7 +369,7 @@ void KonqPropsView::setCaseInsensitiveSort( bool on ) else if (currentConfig()) { kdDebug(1203) << "Saving in current config" << endl; - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "CaseInsensitiveSort", d->caseInsensitiveSort ); currentConfig()->sync(); } @@ -387,7 +387,7 @@ void KonqPropsView::setShowingDirectoryOverlays( bool show ) else if (currentConfig()) { kdDebug(1203) << "Saving in current config" << endl; - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "ShowDirectoryOverlays", m_bShowDirectoryOverlays ); currentConfig()->sync(); } @@ -405,7 +405,7 @@ void KonqPropsView::setShowingPreview( const TQString &preview, bool show ) m_defaultProps->setShowingPreview( preview, show ); else if (currentConfig()) { - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); //Audio is special-cased, as we use a binary setting //for it to get it to follow the defaults right. @@ -438,7 +438,7 @@ void KonqPropsView::setShowingPreview( bool show ) else if (currentConfig()) { kdDebug(1203) << "Saving in current config" << endl; - KConfigGroupSaver cgs(currentConfig(), currentGroup()); + TDEConfigGroupSaver cgs(currentConfig(), currentGroup()); currentConfig()->writeEntry( "PreviewsEnabled", d->previewsEnabled ); currentConfig()->sync(); } @@ -461,10 +461,10 @@ void KonqPropsView::setBgColor( const TQColor & color ) } else { - KConfigBase * colorConfig = currentColorConfig(); + TDEConfigBase * colorConfig = currentColorConfig(); if (colorConfig) // 0L when saving locally but remote URL { - KConfigGroupSaver cgs(colorConfig, currentGroup()); + TDEConfigGroupSaver cgs(colorConfig, currentGroup()); colorConfig->writeEntry( "BgColor", m_bgColor ); colorConfig->sync(); } @@ -488,10 +488,10 @@ void KonqPropsView::setTextColor( const TQColor & color ) } else { - KConfigBase * colorConfig = currentColorConfig(); + TDEConfigBase * colorConfig = currentColorConfig(); if (colorConfig) // 0L when saving locally but remote URL { - KConfigGroupSaver cgs(colorConfig, currentGroup()); + TDEConfigGroupSaver cgs(colorConfig, currentGroup()); colorConfig->writeEntry( "TextColor", m_textColor ); colorConfig->sync(); } @@ -516,10 +516,10 @@ void KonqPropsView::setBgPixmapFile( const TQString & file ) } else { - KConfigBase * colorConfig = currentColorConfig(); + TDEConfigBase * colorConfig = currentColorConfig(); if (colorConfig) // 0L when saving locally but remote URL { - KConfigGroupSaver cgs(colorConfig, currentGroup()); + TDEConfigGroupSaver cgs(colorConfig, currentGroup()); colorConfig->writePathEntry( "BgImage", file ); colorConfig->sync(); } diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index 4edfe8246..fb0383072 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -27,8 +27,8 @@ #include <libkonq_export.h> class TDEInstance; -class KConfigBase; -class KConfig; +class TDEConfigBase; +class TDEConfig; /** * The class KonqPropsView holds the properties for a Konqueror View @@ -126,10 +126,10 @@ protected: TQPixmap loadPixmap() const; // Current config object for _saving_ - KConfigBase * currentConfig(); + TDEConfigBase * currentConfig(); // Current config object for _saving_ settings related to colors - KConfigBase * currentColorConfig(); + TDEConfigBase * currentColorConfig(); TQString currentGroup() const { return isDefaultProperties() ? @@ -160,8 +160,8 @@ private: // save-view-properties-locally mode, otherwise to the global config // It is set to 0L to mark it as "needs to be constructed". // This is to be used for SAVING only. - // Can be a KConfig or a KSimpleConfig - KConfigBase * m_currentConfig; + // Can be a TDEConfig or a KSimpleConfig + TDEConfigBase * m_currentConfig; // If this is not a "default properties" instance (but one used by a view) // then m_defaultProps points to the "default properties" instance diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc index 3d67c6798..aef17475b 100644 --- a/libkonq/konq_settings.cc +++ b/libkonq/konq_settings.cc @@ -48,8 +48,8 @@ KonqFMSettings * KonqFMSettings::settings() { if (!s_pSettings) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cgs(config, "FMSettings"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cgs(config, "FMSettings"); s_pSettings = new KonqFMSettings(config); } return s_pSettings; @@ -60,13 +60,13 @@ void KonqFMSettings::reparseConfiguration() { if (s_pSettings) { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cgs(config, "FMSettings"); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cgs(config, "FMSettings"); s_pSettings->init( config ); } } -KonqFMSettings::KonqFMSettings( KConfig * config ) +KonqFMSettings::KonqFMSettings( TDEConfig * config ) { d = new KonqFMSettingsPrivate; init( config ); @@ -77,7 +77,7 @@ KonqFMSettings::~KonqFMSettings() delete d; } -void KonqFMSettings::init( KConfig * config ) +void KonqFMSettings::init( TDEConfig * config ) { // Fonts and colors m_standardFont = config->readFontEntry( "StandardFont" ); diff --git a/libkonq/konq_settings.h b/libkonq/konq_settings.h index b81457e02..daca8babe 100644 --- a/libkonq/konq_settings.h +++ b/libkonq/konq_settings.h @@ -20,7 +20,7 @@ #ifndef __konq_settings_h__ #define __konq_settings_h__ -class KConfig; +class TDEConfig; #include <tqcolor.h> #include <tqstring.h> #include <tqfont.h> @@ -48,7 +48,7 @@ protected: * @internal * Constructs a KonqFMSettings instance from a config file. */ - KonqFMSettings( KConfig * config ); + KonqFMSettings( TDEConfig * config ); /** Destructor. Don't delete any instance by yourself. */ virtual ~KonqFMSettings(); @@ -128,7 +128,7 @@ private: int m_iconTransparency; /** Called by constructor and reparseConfiguration */ - void init( KConfig * config ); + void init( TDEConfig * config ); struct KonqFMSettingsPrivate * d; diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc index 6c170050a..4c3599816 100644 --- a/libkonq/konq_undo.cc +++ b/libkonq/konq_undo.cc @@ -63,13 +63,13 @@ inline const char *dcopTypeName( const KonqCommand::Stack & ) { return "KonqComm * move files -> rename -> works */ -class KonqUndoJob : public KIO::Job +class KonqUndoJob : public TDEIO::Job { public: - KonqUndoJob() : KIO::Job( true ) { KonqUndoManager::incRef(); }; + KonqUndoJob() : TDEIO::Job( true ) { KonqUndoManager::incRef(); }; virtual ~KonqUndoJob() { KonqUndoManager::decRef(); } - virtual void kill( bool q) { KonqUndoManager::self()->stopUndo( true ); KIO::Job::kill( q ); } + virtual void kill( bool q) { KonqUndoManager::self()->stopUndo( true ); TDEIO::Job::kill( q ); } }; class KonqCommandRecorder::KonqCommandRecorderPrivate @@ -85,7 +85,7 @@ public: KonqCommand m_cmd; }; -KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, KIO::Job *job ) +KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, TDEIO::Job *job ) : TQObject( job, "konqcmdrecorder" ) { d = new KonqCommandRecorderPrivate; @@ -93,14 +93,14 @@ KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List d->m_cmd.m_valid = true; d->m_cmd.m_src = src; d->m_cmd.m_dst = dst; - 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 * ) ) ); if ( op != KonqCommand::MKDIR ) { - connect( job, TQT_SIGNAL( copyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ), - this, TQT_SLOT( slotCopyingDone( KIO::Job *, const KURL &, const KURL &, bool, bool ) ) ); - connect( job, TQT_SIGNAL( copyingLinkDone( KIO::Job *, const KURL &, const TQString &, const KURL & ) ), - this, TQT_SLOT( slotCopyingLinkDone( KIO::Job *, const KURL &, const TQString &, const KURL & ) ) ); + connect( job, TQT_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ), + this, TQT_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) ); + connect( job, TQT_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ), + this, TQT_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) ); } KonqUndoManager::incRef(); @@ -112,7 +112,7 @@ KonqCommandRecorder::~KonqCommandRecorder() delete d; } -void KonqCommandRecorder::slotResult( KIO::Job *job ) +void KonqCommandRecorder::slotResult( TDEIO::Job *job ) { if ( job->error() ) return; @@ -120,7 +120,7 @@ void KonqCommandRecorder::slotResult( KIO::Job *job ) KonqUndoManager::self()->addCommand( d->m_cmd ); } -void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ) +void KonqCommandRecorder::slotCopyingDone( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ) { KonqBasicOperation op; op.m_valid = true; @@ -145,7 +145,7 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons d->m_cmd.m_opStack.prepend( op ); } -void KonqCommandRecorder::slotCopyingLinkDone( KIO::Job *, const KURL &from, const TQString &target, const KURL &to ) +void KonqCommandRecorder::slotCopyingLinkDone( TDEIO::Job *, const KURL &from, const TQString &target, const KURL &to ) { KonqBasicOperation op; op.m_valid = true; @@ -179,7 +179,7 @@ public: KonqCommand::Stack m_commands; KonqCommand m_current; - KIO::Job *m_currentJob; + TDEIO::Job *m_currentJob; UndoState m_undoState; TQValueStack<KURL> m_dirStack; TQValueStack<KURL> m_dirCleanupStack; @@ -369,7 +369,7 @@ void KonqUndoManager::stopUndo( bool step ) undoStep(); } -void KonqUndoManager::slotResult( KIO::Job *job ) +void KonqUndoManager::slotResult( TDEIO::Job *job ) { d->m_uiserver->jobFinished( d->m_uiserverJobId ); if ( job->error() ) @@ -411,8 +411,8 @@ void KonqUndoManager::undoStep() undoRemovingDirectories(); if ( d->m_currentJob ) - connect( d->m_currentJob, TQT_SIGNAL( result( KIO::Job * ) ), - this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + connect( d->m_currentJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); } void KonqUndoManager::undoMakingDirectories() @@ -420,7 +420,7 @@ void KonqUndoManager::undoMakingDirectories() if ( !d->m_dirStack.isEmpty() ) { KURL dir = d->m_dirStack.pop(); kdDebug(1203) << "KonqUndoManager::undoStep creatingDir " << dir.prettyURL() << endl; - d->m_currentJob = KIO::mkdir( dir ); + d->m_currentJob = TDEIO::mkdir( dir ); d->m_uiserver->creatingDir( d->m_uiserverJobId, dir ); } else @@ -439,7 +439,7 @@ void KonqUndoManager::undoMovingFiles() if ( op.m_renamed ) { kdDebug(1203) << "KonqUndoManager::undoStep rename " << op.m_dst.prettyURL() << " " << op.m_src.prettyURL() << endl; - d->m_currentJob = KIO::rename( op.m_dst, op.m_src, false ); + d->m_currentJob = TDEIO::rename( op.m_dst, op.m_src, false ); d->m_uiserver->moving( d->m_uiserverJobId, op.m_dst, op.m_src ); } else @@ -448,19 +448,19 @@ void KonqUndoManager::undoMovingFiles() else if ( op.m_link ) { kdDebug(1203) << "KonqUndoManager::undoStep symlink " << op.m_target << " " << op.m_src.prettyURL() << endl; - d->m_currentJob = KIO::symlink( op.m_target, op.m_src, true, false ); + d->m_currentJob = TDEIO::symlink( op.m_target, op.m_src, true, false ); } else if ( d->m_current.m_type == KonqCommand::COPY ) { kdDebug(1203) << "KonqUndoManager::undoStep file_delete " << op.m_dst.prettyURL() << endl; - d->m_currentJob = KIO::file_delete( op.m_dst ); + d->m_currentJob = TDEIO::file_delete( op.m_dst ); d->m_uiserver->deleting( d->m_uiserverJobId, op.m_dst ); } else if ( d->m_current.m_type == KonqCommand::MOVE || d->m_current.m_type == KonqCommand::TRASH ) { kdDebug(1203) << "KonqUndoManager::undoStep file_move " << op.m_dst.prettyURL() << " " << op.m_src.prettyURL() << endl; - d->m_currentJob = KIO::file_move( op.m_dst, op.m_src, -1, true ); + d->m_currentJob = TDEIO::file_move( op.m_dst, op.m_src, -1, true ); d->m_uiserver->moving( d->m_uiserverJobId, op.m_dst, op.m_src ); } @@ -485,7 +485,7 @@ void KonqUndoManager::undoRemovingFiles() { KURL file = d->m_fileCleanupStack.pop(); kdDebug(1203) << "KonqUndoManager::undoStep file_delete " << file.prettyURL() << endl; - d->m_currentJob = KIO::file_delete( file ); + d->m_currentJob = TDEIO::file_delete( file ); d->m_uiserver->deleting( d->m_uiserverJobId, file ); KURL url( file ); @@ -507,7 +507,7 @@ void KonqUndoManager::undoRemovingDirectories() { KURL dir = d->m_dirCleanupStack.pop(); kdDebug(1203) << "KonqUndoManager::undoStep rmdir " << dir.prettyURL() << endl; - d->m_currentJob = KIO::rmdir( dir ); + d->m_currentJob = TDEIO::rmdir( dir ); d->m_uiserver->deleting( d->m_uiserverJobId, dir ); addDirToUpdate( dir ); } diff --git a/libkonq/konq_undo.h b/libkonq/konq_undo.h index 6be92033b..fa908de67 100644 --- a/libkonq/konq_undo.h +++ b/libkonq/konq_undo.h @@ -28,7 +28,7 @@ #include <kurl.h> #include <libkonq_export.h> -namespace KIO +namespace TDEIO { class Job; } @@ -72,14 +72,14 @@ class KonqCommandRecorder : public TQObject { Q_OBJECT public: - KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, KIO::Job *job ); + KonqCommandRecorder( KonqCommand::Type op, const KURL::List &src, const KURL &dst, TDEIO::Job *job ); virtual ~KonqCommandRecorder(); private slots: - void slotResult( KIO::Job *job ); + void slotResult( TDEIO::Job *job ); - void slotCopyingDone( KIO::Job *, const KURL &from, const KURL &to, bool directory, bool renamed ); - void slotCopyingLinkDone( KIO::Job *, const KURL &from, const TQString &target, const KURL &to ); + void slotCopyingDone( TDEIO::Job *, const KURL &from, const KURL &to, bool directory, bool renamed ); + void slotCopyingLinkDone( TDEIO::Job *, const KURL &from, const TQString &target, const KURL &to ); private: class KonqCommandRecorderPrivate; @@ -129,7 +129,7 @@ k_dcop: virtual KonqCommand::Stack get() const; private slots: - void slotResult( KIO::Job *job ); + void slotResult( TDEIO::Job *job ); private: void undoStep(); diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp index 7b3bddabd..16234c62f 100644 --- a/nsplugins/kcm_nsplugins.cpp +++ b/nsplugins/kcm_nsplugins.cpp @@ -67,7 +67,7 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam ++it, ++t ) { TQDateTime current = lastChanged( *it ); - // store non-existent directory as "N" string rather than empty string, KConfig + // store non-existent directory as "N" string rather than empty string, TDEConfig // has a bug with storing a list of empty items if( *t == "N" ? !current.isNull() : current != TQDateTime::fromString( *t, Qt::ISODate )) changed = true; @@ -75,7 +75,7 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam } if( changed ) { - KConfig config("kcmnspluginrc"); + TDEConfig config("kcmnspluginrc"); config.setGroup("Misc"); config.writeEntry( "lastSearchPaths", paths ); config.writeEntry( "lastSearchTimestamps", currentTimestamps ); @@ -88,7 +88,7 @@ extern "C" { KDE_EXPORT void init_nsplugin() { - KConfig *config = new KConfig("kcmnspluginrc", true /* readonly */, false /* no globals*/); + TDEConfig *config = new TDEConfig("kcmnspluginrc", true /* readonly */, false /* no globals*/); config->setGroup("Misc"); bool scan = config->readBoolEntry( "starttdeScan", false ); bool firstTime = config->readBoolEntry( "firstTime", true ); @@ -120,7 +120,7 @@ extern "C" } if (firstTime) { - config= new KConfig("kcmnspluginrc", false); + config= new TDEConfig("kcmnspluginrc", false); config->setGroup("Misc"); config->writeEntry( "firstTime", false ); config->sync(); diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 71f6d588d..55fd769cf 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -64,7 +64,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj) { stub = new NSPluginInstanceIface_stub( app, obj ); TQGridLayout *_layout = new TQGridLayout(this, 1, 1); - KConfig cfg("kcmnspluginrc", false); + TDEConfig cfg("kcmnspluginrc", false); cfg.setGroup("Misc"); if (cfg.readBoolEntry("demandLoad", false)) { _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this)); @@ -207,7 +207,7 @@ NSPluginLoader::NSPluginLoader() this, TQT_SLOT(applicationRegistered(const TQCString&))); // load configuration - KConfig cfg("kcmnspluginrc", false); + TDEConfig cfg("kcmnspluginrc", false); cfg.setGroup("Misc"); _useArtsdsp = cfg.readBoolEntry( "useArtsdsp", false ); } diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 9dab88c36..714a4c269 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -405,7 +405,7 @@ void PluginPart::changeSrc(const TQString& url) { void PluginPart::saveAs() { KURL savefile = KFileDialog::getSaveURL(TQString::null, TQString::null, _widget); - KIO::NetAccess::copy(m_url, savefile, _widget); + TDEIO::NetAccess::copy(m_url, savefile, _widget); } diff --git a/nsplugins/plugin_paths.cpp b/nsplugins/plugin_paths.cpp index 448a08f1f..121fc9d64 100644 --- a/nsplugins/plugin_paths.cpp +++ b/nsplugins/plugin_paths.cpp @@ -32,7 +32,7 @@ TQStringList getSearchPaths() { TQStringList searchPaths; - KConfig *config = new KConfig("kcmnspluginrc", false); + TDEConfig *config = new TDEConfig("kcmnspluginrc", false); config->setGroup("Misc"); // setup default paths diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 29d4b6b4d..867497ef4 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -107,7 +107,7 @@ void pullInXt() XtFree( NULL ); } -KConfig *infoConfig = 0; +TDEConfig *infoConfig = 0; bool isPluginMimeType( TQString fname ) @@ -566,7 +566,7 @@ int main( int argc, char **argv ) TQStringList searchPaths = getSearchPaths(); TQStringList mimeInfoList; - infoConfig = new KConfig( TDEGlobal::dirs()->saveLocation("data", "nsplugins") + + infoConfig = new TDEConfig( TDEGlobal::dirs()->saveLocation("data", "nsplugins") + "/pluginsinfo" ); infoConfig->writeEntry( "number", 0 ); diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 493f149b6..535502a87 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -849,7 +849,7 @@ void NSPluginInstance::timer() TQString NSPluginInstance::normalizedURL(const TQString& url) const { KURL bu( _baseURL ); KURL inURL(bu, url); - KConfig cfg("kcmnspluginrc", true); + TDEConfig cfg("kcmnspluginrc", true); cfg.setGroup("Misc"); if (!cfg.readBoolEntry("HTTP URLs Only", false) || @@ -1896,22 +1896,22 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType, // create new stream if ( create( url, mimeType, notify ) ) { // start the kio job - _job = KIO::get(KURL( url ), false, false); + _job = TDEIO::get(KURL( url ), false, false); _job->addMetaData("errorPage", "false"); _job->addMetaData("AllowCompressedPage", "false"); _job->addMetaData("PropagateHttpHeader", "true"); if (reload) { _job->addMetaData("cache", "reload"); } - connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - TQT_SLOT(data(KIO::Job *, const TQByteArray &))); - connect(_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(result(KIO::Job *))); - connect(_job, TQT_SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )), - TQT_SLOT(totalSize(KIO::Job *, KIO::filesize_t))); - connect(_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - TQT_SLOT(mimetype(KIO::Job *, const TQString &))); - connect(_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)), - TQT_SLOT(redirection(KIO::Job *, const KURL&))); + connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQT_SLOT(data(TDEIO::Job *, const TQByteArray &))); + connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *))); + connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), + TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + TQT_SLOT(mimetype(TDEIO::Job *, const TQString &))); + connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQT_SLOT(redirection(TDEIO::Job *, const KURL&))); } return false; @@ -1924,27 +1924,27 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data, // create new stream if ( create( url, mimeType, notify ) ) { // start the kio job - _job = KIO::http_post(KURL( url ), data, false); + _job = TDEIO::http_post(KURL( url ), data, false); _job->addMetaData("content-type", args.contentType()); _job->addMetaData("errorPage", "false"); _job->addMetaData("PropagateHttpHeader", "true"); _job->addMetaData("AllowCompressedPage", "false"); - connect(_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), - TQT_SLOT(data(KIO::Job *, const TQByteArray &))); - connect(_job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(result(KIO::Job *))); - connect(_job, TQT_SIGNAL(totalSize(KIO::Job *, KIO::filesize_t )), - TQT_SLOT(totalSize(KIO::Job *, KIO::filesize_t))); - connect(_job, TQT_SIGNAL(mimetype(KIO::Job *, const TQString &)), - TQT_SLOT(mimetype(KIO::Job *, const TQString &))); - connect(_job, TQT_SIGNAL(redirection(KIO::Job *, const KURL&)), - TQT_SLOT(redirection(KIO::Job *, const KURL&))); + connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQT_SLOT(data(TDEIO::Job *, const TQByteArray &))); + connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *))); + connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), + TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + TQT_SLOT(mimetype(TDEIO::Job *, const TQString &))); + connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQT_SLOT(redirection(TDEIO::Job *, const KURL&))); } return false; } -void NSPluginStream::data(KIO::Job * job, const TQByteArray &data) +void NSPluginStream::data(TDEIO::Job * job, const TQByteArray &data) { //kdDebug(1431) << "NSPluginStream::data - job=" << (void*)job << " data size=" << data.size() << endl; queue( data ); @@ -1954,18 +1954,18 @@ void NSPluginStream::data(KIO::Job * job, const TQByteArray &data) } } -void NSPluginStream::redirection(KIO::Job * /*job*/, const KURL& url) +void NSPluginStream::redirection(TDEIO::Job * /*job*/, const KURL& url) { updateURL( url ); } -void NSPluginStream::totalSize(KIO::Job * job, KIO::filesize_t size) +void NSPluginStream::totalSize(TDEIO::Job * job, TDEIO::filesize_t size) { - kdDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << KIO::number(size) << endl; + kdDebug(1431) << "NSPluginStream::totalSize - job=" << (void*)job << " size=" << TDEIO::number(size) << endl; _stream->end = size; } -void NSPluginStream::mimetype(KIO::Job * job, const TQString &mimeType) +void NSPluginStream::mimetype(TDEIO::Job * job, const TQString &mimeType) { kdDebug(1431) << "NSPluginStream::mimetype - job=" << (void*)job << " mimeType=" << mimeType << endl; _mimeType = mimeType; @@ -1992,7 +1992,7 @@ void NSPluginStream::resume() } -void NSPluginStream::result(KIO::Job *job) +void NSPluginStream::result(TDEIO::Job *job) { int err = job->error(); _job = 0; diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h index 2a2af35d5..d06ffada3 100644 --- a/nsplugins/viewer/nsplugin.h +++ b/nsplugins/viewer/nsplugin.h @@ -125,15 +125,15 @@ public: bool post(const TQString& url, const TQByteArray& data, const TQString& mimeType, void *notifyData, const KParts::URLArgs& args); protected slots: - void data(KIO::Job *job, const TQByteArray &data); - void totalSize(KIO::Job *job, KIO::filesize_t size); - void mimetype(KIO::Job * job, const TQString &mimeType); - void result(KIO::Job *job); - void redirection(KIO::Job *job, const KURL& url); + void data(TDEIO::Job *job, const TQByteArray &data); + void totalSize(TDEIO::Job *job, TDEIO::filesize_t size); + void mimetype(TDEIO::Job * job, const TQString &mimeType); + void result(TDEIO::Job *job); + void redirection(TDEIO::Job *job, const KURL& url); void resume(); protected: - TQGuardedPtr<KIO::TransferJob> _job; + TQGuardedPtr<TDEIO::TransferJob> _job; TQTimer *_resumeTimer; }; diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index 654ba68e6..af72ef6cc 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -254,7 +254,7 @@ int main(int argc, char** argv) #endif { - KConfig cfg("kcmnspluginrc", true); + TDEConfig cfg("kcmnspluginrc", true); cfg.setGroup("Misc"); int v = KCLAMP(cfg.readNumEntry("Nice Level", 0), 0, 19); if (v > 0) { diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index 467aa9b41..4790db560 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -56,7 +56,7 @@ int main(int argc, char **argv) TDEApplication::disableAutoDcopRegistration(); TDEApplication app; - KConfig config("twinrc", true); + TDEConfig config("twinrc", true); config.setGroup( "ThirdPartyWM" ); TQString wmToLaunch = config.readEntry("WMExecutable", ""); TQString wmArguments = config.readEntry("WMAdditionalArguments", ""); diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index 97e2cad8f..be6546214 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -306,7 +306,7 @@ void PrintWrapper::slotPrintRequested(KPrinter *kprinter) TQString tmpFile; KURL url = KURL::fromPathOrURL(*it); kdDebug( 500 ) << url.url() << endl; - if (KIO::NetAccess::download(url, tmpFile, this)) + if (TDEIO::NetAccess::download(url, tmpFile, this)) { filestoprint << tmpFile; kprinter->setDocName(url.fileName()); diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp index 4dba35e70..3a1de59fe 100644 --- a/tdeprint/printmgr/kcmprintmgr.cpp +++ b/tdeprint/printmgr/kcmprintmgr.cpp @@ -31,9 +31,9 @@ typedef KGenericFactory<KCMPrintMgr, TQWidget> KPrintMgrFactory; K_EXPORT_COMPONENT_FACTORY( kcm_printmgr, KPrintMgrFactory("kcmprintmgr") ) KCMPrintMgr::KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList &) -: KCModule(KPrintMgrFactory::instance(),parent,name) +: TDECModule(KPrintMgrFactory::instance(),parent,name) { - setButtons(KCModule::Ok); + setButtons(TDECModule::Ok); setRootOnlyMsg( i18n( "Print management as normal user\n" "Some print management operations may need administrator privileges. Use the\n" diff --git a/tdeprint/printmgr/kcmprintmgr.h b/tdeprint/printmgr/kcmprintmgr.h index e82bc730f..18cf68a91 100644 --- a/tdeprint/printmgr/kcmprintmgr.h +++ b/tdeprint/printmgr/kcmprintmgr.h @@ -24,7 +24,7 @@ class KMMainView; -class KCMPrintMgr : public KCModule +class KCMPrintMgr : public TDECModule { public: KCMPrintMgr(TQWidget *parent, const char *name, const TQStringList &); diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index 79ad48058..8c8001ddc 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -53,38 +53,38 @@ extern "C" int KDE_EXPORT kdemain(int argc, char **argv); } -void addAtom(KIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString()) +void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString()) { - KIO::UDSAtom atom; + TDEIO::UDSAtom atom; atom.m_uds = ID; atom.m_long = l; atom.m_str = s; entry.append(atom); } -static void createDirEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) +static void createDirEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, name); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFDIR); - addAtom(entry, KIO::UDS_ACCESS, 0500); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); - addAtom(entry, KIO::UDS_URL, 0, url); + addAtom(entry, TDEIO::UDS_NAME, 0, name); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR); + addAtom(entry, TDEIO::UDS_ACCESS, 0500); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime); + addAtom(entry, TDEIO::UDS_URL, 0, url); PRINT_DEBUG << "creating dir entry url=" << url << " mimetype=" << mime << endl; - addAtom(entry, KIO::UDS_SIZE, 0); - //addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); + addAtom(entry, TDEIO::UDS_SIZE, 0); + //addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); } -static void createFileEntry(KIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) +static void createFileEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString& url, const TQString& mime) { entry.clear(); - addAtom(entry, KIO::UDS_NAME, 0, name); - addAtom(entry, KIO::UDS_FILE_TYPE, S_IFREG); - addAtom(entry, KIO::UDS_URL, 0, url); - addAtom(entry, KIO::UDS_ACCESS, 0400); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, mime); - addAtom(entry, KIO::UDS_SIZE, 0); - addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); + addAtom(entry, TDEIO::UDS_NAME, 0, name); + addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFREG); + addAtom(entry, TDEIO::UDS_URL, 0, url); + addAtom(entry, TDEIO::UDS_ACCESS, 0400); + addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime); + addAtom(entry, TDEIO::UDS_SIZE, 0); + addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); } TQString buildMenu(const TQStringList& items, const TQStringList& links, int active) @@ -158,7 +158,7 @@ int kdemain(int argc, char **argv) } KIO_Print::KIO_Print(const TQCString& pool, const TQCString& app) -: KIO::SlaveBase("print", pool, app) +: TDEIO::SlaveBase("print", pool, app) { } @@ -182,7 +182,7 @@ void KIO_Print::listDir(const KURL& url) int mask; TQString mimeType; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; if (group == "printers") { @@ -201,7 +201,7 @@ void KIO_Print::listDir(const KURL& url) } else { - error(KIO::ERR_DOES_NOT_EXIST, url.url()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.url()); return; } @@ -220,14 +220,14 @@ void KIO_Print::listDir(const KURL& url) listEntry(entry, false); } - listEntry(KIO::UDSEntry(), true); + listEntry(TDEIO::UDSEntry(), true); finished(); } else { - //error(KIO::ERR_UNSUPPORTED_ACTION, i18n("Unsupported path %1").arg(url.path())); + //error(TDEIO::ERR_UNSUPPORTED_ACTION, i18n("Unsupported path %1").arg(url.path())); // better do nothing - listEntry(KIO::UDSEntry(), true); + listEntry(TDEIO::UDSEntry(), true); totalSize(0); finished(); } @@ -237,7 +237,7 @@ void KIO_Print::listRoot() { PRINT_DEBUG << "listing root entry" << endl; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; // Classes entry createDirEntry(entry, i18n("Classes"), "print:/classes", "print/folder"); @@ -291,7 +291,7 @@ void KIO_Print::listDirDB( const KURL& url ) remUrl.addQueryItem( "printer", pathComps[ 1 ] ); break; default: - error( KIO::ERR_UNSUPPORTED_ACTION, "Not implemented" ); + error( TDEIO::ERR_UNSUPPORTED_ACTION, "Not implemented" ); return; } remUrl.addQueryItem( "format", "xml" ); @@ -302,7 +302,7 @@ void KIO_Print::listDirDB( const KURL& url ) if ( doc.setContent( &m_httpBuffer, false ) ) { TQDomNodeList l; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; switch ( pathComps.size() ) { case 0: @@ -353,18 +353,18 @@ void KIO_Print::listDirDB( const KURL& url ) } break; default: - error( KIO::ERR_UNSUPPORTED_ACTION, "Not implemented" ); + error( TDEIO::ERR_UNSUPPORTED_ACTION, "Not implemented" ); return; } - listEntry( KIO::UDSEntry(), true ); + listEntry( TDEIO::UDSEntry(), true ); finished(); } else { if ( m_httpBuffer.buffer().size() == 0 ) - error( KIO::ERR_INTERNAL, i18n( "Empty data received (%1)." ).arg( url.host() ) ); + error( TDEIO::ERR_INTERNAL, i18n( "Empty data received (%1)." ).arg( url.host() ) ); else - error( KIO::ERR_INTERNAL, i18n( "Corrupted/incomplete data or server error (%1)." ).arg( url.host() ) ); + error( TDEIO::ERR_INTERNAL, i18n( "Corrupted/incomplete data or server error (%1)." ).arg( url.host() ) ); } } /* @@ -383,7 +383,7 @@ void KIO_Print::stat(const KURL& url) PRINT_DEBUG << "stat: " << url.url() << endl; TQStringList path = TQStringList::split('/', url.encodedPathAndQuery(-1), false); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQString mime; bool err(false); @@ -427,13 +427,13 @@ void KIO_Print::stat(const KURL& url) finished(); } else - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); } void KIO_Print::statDB( const KURL& url ) { PRINT_DEBUG << "statDB: " << url << endl; - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList pathComps = TQStringList::split( '/', url.path(), false ); if ( pathComps.size() == 3 ) createFileEntry( entry, i18n( "Printer driver" ), url.url(), "print/driver" ); @@ -454,11 +454,11 @@ bool KIO_Print::getDBFile( const KURL& src ) m_httpBuffer.open( IO_WriteOnly|IO_Truncate ); // be sure to erase the existing data /* start the transfer job */ - KIO::TransferJob *job = KIO::get( src, false, false ); - 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( totalSize( KIO::Job*, KIO::filesize_t ) ), TQT_SLOT( slotTotalSize( KIO::Job*, KIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) ); + TDEIO::TransferJob *job = TDEIO::get( src, false, false ); + 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& ) ) ); + connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); kapp->enter_loop(); m_httpBuffer.close(); @@ -474,7 +474,7 @@ void KIO_Print::getDB( const KURL& url ) TQStringList pathComps = TQStringList::split( '/', url.path(), false ); if ( pathComps.size() != 3 ) - error( KIO::ERR_MALFORMED_URL, url.url() ); + error( TDEIO::ERR_MALFORMED_URL, url.url() ); else { KURL remUrl; @@ -498,7 +498,7 @@ void KIO_Print::getDB( const KURL& url ) } } -void KIO_Print::slotResult( KIO::Job *j ) +void KIO_Print::slotResult( TDEIO::Job *j ) { /* * store slave results for later user (job gets deleted @@ -513,7 +513,7 @@ void KIO_Print::slotResult( KIO::Job *j ) kapp->exit_loop(); } -void KIO_Print::slotData( KIO::Job *j, const TQByteArray& d ) +void KIO_Print::slotData( TDEIO::Job *j, const TQByteArray& d ) { PRINT_DEBUG << "HTTP data received (size=" << d.size() << ")" << endl; if ( d.size() > 0 ) @@ -521,19 +521,19 @@ void KIO_Print::slotData( KIO::Job *j, const TQByteArray& d ) int len = m_httpBuffer.writeBlock( d ); if ( len == -1 || len != ( int )d.size() ) { - m_httpError = KIO::ERR_INTERNAL; + m_httpError = TDEIO::ERR_INTERNAL; m_httpErrorTxt = "Unable to write to the internal buffer."; j->kill( false ); } } } -void KIO_Print::slotTotalSize( KIO::Job*, KIO::filesize_t sz ) +void KIO_Print::slotTotalSize( TDEIO::Job*, TDEIO::filesize_t sz ) { totalSize( sz ); } -void KIO_Print::slotProcessedSize( KIO::Job*, KIO::filesize_t sz ) +void KIO_Print::slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t sz ) { processedSize( sz ); } @@ -568,7 +568,7 @@ void KIO_Print::get(const KURL& url) query = group.mid(p+1); if (!query.isEmpty() && query != "jobs" && query != "completed_jobs") { - error(KIO::ERR_MALFORMED_URL, TQString()); + error(TDEIO::ERR_MALFORMED_URL, TQString()); return; } PRINT_DEBUG << "listing jobs for all printers" << endl; @@ -594,7 +594,7 @@ void KIO_Print::get(const KURL& url) if (elems.count() > 2 || (path.isEmpty() && group != "printers" && group != "classes" && group != "specials") || (mprinter == 0 && path.isEmpty())) { - error(KIO::ERR_DOES_NOT_EXIST, url.path()); + error(TDEIO::ERR_DOES_NOT_EXIST, url.path()); return; } @@ -609,7 +609,7 @@ void KIO_Print::get(const KURL& url) else if (query == "driver") showDriver(mprinter); else - error(KIO::ERR_MALFORMED_URL, KURL::decode_string(elems[1])); + error(TDEIO::ERR_MALFORMED_URL, KURL::decode_string(elems[1])); } else if (group == "printers" && mprinter->isPrinter()) showPrinterInfo(mprinter); @@ -618,18 +618,18 @@ void KIO_Print::get(const KURL& url) else if (group == "specials" && mprinter->isSpecial()) showSpecialInfo(mprinter); else - error(KIO::ERR_INTERNAL, i18n("Unable to determine object type for %1.").arg(printer)); + error(TDEIO::ERR_INTERNAL, i18n("Unable to determine object type for %1.").arg(printer)); } else if (!path.isEmpty()) showData(path); else - error(KIO::ERR_INTERNAL, i18n("Unable to determine source type for %1.").arg(printer)); + error(TDEIO::ERR_INTERNAL, i18n("Unable to determine source type for %1.").arg(printer)); } void KIO_Print::showPrinterInfo(KMPrinter *printer) { if (!KMManager::self()->completePrinter(printer)) - error(KIO::ERR_INTERNAL, i18n("Unable to retrieve printer information for %1.").arg(printer->name())); + error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve printer information for %1.").arg(printer->name())); else { mimeType("text/html"); @@ -637,7 +637,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) TQString content; if (!loadTemplate(TQString::fromLatin1("printer.template"), content)) { - error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template")); + error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template")); return; } @@ -670,7 +670,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) void KIO_Print::showClassInfo(KMPrinter *printer) { if (!KMManager::self()->completePrinter(printer)) - error(KIO::ERR_INTERNAL, i18n("Unable to retrieve class information for %1.").arg(printer->name())); + error(TDEIO::ERR_INTERNAL, i18n("Unable to retrieve class information for %1.").arg(printer->name())); else { mimeType("text/html"); @@ -678,7 +678,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) TQString content; if (!loadTemplate(TQString::fromLatin1("class.template"), content)) { - error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template")); + error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template")); return; } @@ -721,7 +721,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) TQString content; if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content)) { - error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); + error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; } @@ -783,7 +783,7 @@ void KIO_Print::showData(const TQString& pathname) else { PRINT_DEBUG << "file not found" << endl; - error(KIO::ERR_DOES_NOT_EXIST, pathname); + error(TDEIO::ERR_DOES_NOT_EXIST, pathname); } } @@ -822,7 +822,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) TQString content; if (!loadTemplate(TQString::fromLatin1("jobs.template"), content)) { - error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); + error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; } @@ -893,7 +893,7 @@ void KIO_Print::showDriver(KMPrinter *prt) TQString content; if (!loadTemplate(TQString::fromLatin1("driver.template"), content)) { - error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); + error(TDEIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; } diff --git a/tdeprint/slave/kio_print.h b/tdeprint/slave/kio_print.h index 954a3045f..afd337ba6 100644 --- a/tdeprint/slave/kio_print.h +++ b/tdeprint/slave/kio_print.h @@ -26,11 +26,11 @@ #include <tqbuffer.h> class KMPrinter; -namespace KIO { +namespace TDEIO { class Job; } -class KIO_Print : public TQObject, public KIO::SlaveBase +class KIO_Print : public TQObject, public TDEIO::SlaveBase { Q_OBJECT public: @@ -41,10 +41,10 @@ public: void stat(const KURL& url); protected slots: - void slotResult( KIO::Job* ); - void slotData( KIO::Job*, const TQByteArray& ); - void slotTotalSize( KIO::Job*, KIO::filesize_t ); - void slotProcessedSize( KIO::Job*, KIO::filesize_t ); + void slotResult( TDEIO::Job* ); + void slotData( TDEIO::Job*, const TQByteArray& ); + void slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ); + void slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ); private: void listRoot(); diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp index e36916b83..97d5e036a 100644 --- a/tdeprint/tdeprintfax/conffax.cpp +++ b/tdeprint/tdeprintfax/conffax.cpp @@ -61,7 +61,7 @@ ConfFax::ConfFax(TQWidget *parent, const char *name) void ConfFax::load() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Fax"); TQString v = conf->readEntry("Page", TDEGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter"); if (v == "letter") m_pagesize->setCurrentItem(1); @@ -73,7 +73,7 @@ void ConfFax::load() void ConfFax::save() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Fax"); conf->writeEntry("Resolution", (m_resolution->currentItem() == 0 ? "High" : "Low")); conf->writeEntry("Page", (m_pagesize->currentItem() == 0 ? "a4" : (m_pagesize->currentItem() == 1 ? "letter" : "legal"))); diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp index be3025e65..0526ee684 100644 --- a/tdeprint/tdeprintfax/confgeneral.cpp +++ b/tdeprint/tdeprintfax/confgeneral.cpp @@ -69,7 +69,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) void ConfGeneral::load() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Personal"); m_name->setText(conf->readEntry("Name", getenv("USER"))); m_number->setText(conf->readEntry("Number")); @@ -80,7 +80,7 @@ void ConfGeneral::load() void ConfGeneral::save() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Personal"); conf->writeEntry("Name", m_name->text()); conf->writeEntry("Number", m_number->text()); diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp index a116af180..e1171962a 100644 --- a/tdeprint/tdeprintfax/confsystem.cpp +++ b/tdeprint/tdeprintfax/confsystem.cpp @@ -97,7 +97,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) void ConfSystem::load() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); m_commands << conf->readPathEntry("EFax", defaultCommand(efax_default_cmd)); m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd)); @@ -130,7 +130,7 @@ void ConfSystem::load() void ConfSystem::save() { m_commands[ m_current ] = m_command->text(); - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); if (m_commands[EFAX_ID] != defaultCommand(efax_default_cmd)) conf->writePathEntry("EFax", m_commands[EFAX_ID]); diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index c9b183b27..fd0073b7a 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -60,7 +60,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) l2->addWidget(m_ok, 0); l2->addWidget(m_cancel, 0); - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup( "General" ); TQSize defsize( 400, 200 ); resize( conf->readSizeEntry( "ABSize", &defsize ) ); @@ -71,7 +71,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) FaxAB::~FaxAB() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup( "General" ); conf->writeEntry( "ABSize", size() ); } diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 7e70a5e71..2c8faffc6 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -75,14 +75,14 @@ char const* pageSizeText(int size) */ static TQString pageSize() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Fax"); return conf->readEntry("Page", pageSizeText(TDEGlobal::locale()->pageSize())); } static TQString stripNumber( const TQString& s ) { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup( "Personal" ); // removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools) @@ -193,7 +193,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa // unquote variables (they will be replaced with quoted values later) TQValueStack<bool> stack; - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); TQString cmd = s; @@ -426,7 +426,7 @@ void FaxCtrl::slotProcessExited(TDEProcess*) TQString FaxCtrl::faxCommand() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); TQString sys = conf->readPathEntry("System", "efax"); TQString cmd; @@ -576,7 +576,7 @@ void FaxCtrl::addLog(const TQString& s, bool isTitle) TQString FaxCtrl::faxSystem() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); TQString s = conf->readEntry("System", "efax"); s[0] = s[0].upper(); diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 047b4cb3c..95266a95b 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -274,7 +274,7 @@ void KdeprintFax::slotKab() void KdeprintFax::addURL(KURL url) { TQString target; - if (KIO::NetAccess::download(url,target,this)) + if (TDEIO::NetAccess::download(url,target,this)) { m_files->insertItem(KMimeType::pixmapForURL(url,0,KIcon::Small),target); actionCollection()->action("file_remove")->setEnabled(true); diff --git a/tdesu/tdesu/sudlg.cpp b/tdesu/tdesu/sudlg.cpp index eaffec584..a32298dad 100644 --- a/tdesu/tdesu/sudlg.cpp +++ b/tdesu/tdesu/sudlg.cpp @@ -17,7 +17,7 @@ KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout) : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon) { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("super-user-command"); TQString superUserCommand = config->readEntry("super-user-command", DEFAULT_SUPER_USER_COMMAND); if ( superUserCommand != "sudo" && superUserCommand != "su" ) { diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 8027555e4..209b985b4 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -332,7 +332,7 @@ static int startApp() } // Read configuration - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Passwords"); int timeout = config->readNumEntry("Timeout", defTimeout); @@ -383,7 +383,7 @@ static int startApp() change_uid = false; password = dlg.password(); keep = dlg.keep(); - KConfigGroup(config,"Passwords").writeEntry("Keep", keep); + TDEConfigGroup(config,"Passwords").writeEntry("Keep", keep); data.setSilent( KStartupInfoData::No ); KStartupInfo::sendChange( id, data ); } diff --git a/tdm/kfrontend/gentdmconf.c b/tdm/kfrontend/gentdmconf.c index 4605a923a..e81ff11bd 100644 --- a/tdm/kfrontend/gentdmconf.c +++ b/tdm/kfrontend/gentdmconf.c @@ -1014,7 +1014,7 @@ ReadWord( File *file, int EOFatEOL ) goto mloop; } -/* backslashes are double-escaped - for KConfig and for parseArgs */ +/* backslashes are double-escaped - for TDEConfig and for parseArgs */ static const char * joinArgs( StrList *argv ) { diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index 2b2a99cea..14d8deeaf 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/tdm/kfrontend/tdmclock.cpp @@ -41,7 +41,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) timer->start( 1000 ); // reading rc file - //KConfig *config = kapp->config(); + //TDEConfig *config = kapp->config(); //config->setGroup( "Option" ); mDate = false;//config->readNumEntry( "date", FALSE ); diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index c93dfbfaa..db598aed2 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -472,7 +472,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) { setCaption(i18n("Shutdown TDE")); - bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); + bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); TQFrame* lfrm = new TQFrame( this ); TQHBoxLayout* hbuttonbox; diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 027987b9c..4e174cf44 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -103,7 +103,7 @@ static void read_config(B2ClientFactory *f) buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e; if (buttonSize < 16) buttonSize = 16; - KConfig conf("twinb2rc"); + TDEConfig conf("twinb2rc"); conf.setGroup("General"); colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false); do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true); diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp index 6289ec992..ca2e77c4a 100644 --- a/twin/clients/b2/config/config.cpp +++ b/twin/clients/b2/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new B2Config(conf, parent)); } @@ -30,11 +30,11 @@ extern "C" * Configure tab in twindecoration */ -B2Config::B2Config( KConfig* conf, TQWidget* parent ) +B2Config::B2Config( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { TDEGlobal::locale()->insertCatalogue("twin_b2_config"); - b2Config = new KConfig("twinb2rc"); + b2Config = new TDEConfig("twinb2rc"); gb = new TQVBox(parent); cbColorBorder = new TQCheckBox( @@ -96,7 +96,7 @@ void B2Config::slotSelectionChanged() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void B2Config::load(KConfig * /*conf*/) +void B2Config::load(TDEConfig * /*conf*/) { b2Config->setGroup("General"); @@ -141,7 +141,7 @@ static TQString opToString(int op) // Saves the configurable options to the twinrc config file -void B2Config::save(KConfig * /*conf*/) +void B2Config::save(TDEConfig * /*conf*/) { b2Config->setGroup("General"); b2Config->writeEntry("UseTitleBarBorderColors", cbColorBorder->isChecked()); diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h index 99d664ad1..53bd42767 100644 --- a/twin/clients/b2/config/config.h +++ b/twin/clients/b2/config/config.h @@ -21,7 +21,7 @@ class B2Config: public TQObject Q_OBJECT public: - B2Config( KConfig* conf, TQWidget* parent ); + B2Config( TDEConfig* conf, TQWidget* parent ); ~B2Config(); // These public signals/slots work similar to KCM modules @@ -29,15 +29,15 @@ class B2Config: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: void slotSelectionChanged(); // Internal use private: - KConfig* b2Config; + TDEConfig* b2Config; TQCheckBox* cbColorBorder; TQCheckBox* showGrabHandleCb; TQHGroupBox* actionsGB; diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 43302b552..8e53dcc75 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -17,7 +17,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new KDEDefaultConfig(conf, parent)); } @@ -29,7 +29,7 @@ extern "C" // 'parent' is the parent of the TQObject, which is a VBox inside the // Configure tab in twindecoration -KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent ) +KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { TDEGlobal::locale()->insertCatalogue("twin_clients"); @@ -88,7 +88,7 @@ void KDEDefaultConfig::slotSelectionChanged() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void KDEDefaultConfig::load( KConfig* conf ) +void KDEDefaultConfig::load( TDEConfig* conf ) { conf->setGroup("KDEDefault"); bool override = conf->readBoolEntry( "ShowTitleBarStipple", true ); @@ -105,7 +105,7 @@ void KDEDefaultConfig::load( KConfig* conf ) // Saves the configurable options to the twinrc config file -void KDEDefaultConfig::save( KConfig* conf ) +void KDEDefaultConfig::save( TDEConfig* conf ) { conf->setGroup("KDEDefault"); conf->writeEntry( "ShowTitleBarStipple", cbShowStipple->isChecked() ); diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h index 733b96141..fcd9fbf23 100644 --- a/twin/clients/default/config/config.h +++ b/twin/clients/default/config/config.h @@ -22,7 +22,7 @@ class KDEDefaultConfig: public TQObject Q_OBJECT public: - KDEDefaultConfig( KConfig* conf, TQWidget* parent ); + KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ); ~KDEDefaultConfig(); // These public signals/slots work similar to KCM modules @@ -30,8 +30,8 @@ class KDEDefaultConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index 3c8ce2365..52fff00f3 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -192,7 +192,7 @@ bool KDEDefaultHandler::reset( unsigned long changed ) unsigned long KDEDefaultHandler::readConfig( bool update ) { unsigned long changed = 0; - KConfig* conf = TDEGlobal::config(); + TDEConfig* conf = TDEGlobal::config(); conf->setGroup("KDEDefault"); bool new_showGrabBar = conf->readBoolEntry("ShowGrabBar", true); diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp index a11695dd2..6d4695da2 100644 --- a/twin/clients/keramik/config/config.cpp +++ b/twin/clients/keramik/config/config.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return ( new KeramikConfig( conf, parent ) ); } @@ -48,11 +48,11 @@ extern "C" * Configure tab in twindecoration */ -KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent ) +KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { TDEGlobal::locale()->insertCatalogue("twin_clients"); - c = new KConfig( "twinkeramikrc" ); + c = new TDEConfig( "twinkeramikrc" ); ui = new KeramikConfigUI( parent ); connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); @@ -74,7 +74,7 @@ KeramikConfig::~KeramikConfig() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void KeramikConfig::load( KConfig* ) +void KeramikConfig::load( TDEConfig* ) { c->setGroup("General"); ui->showAppIcons->setChecked( c->readBoolEntry("ShowAppIcons", true) ); @@ -85,7 +85,7 @@ void KeramikConfig::load( KConfig* ) // Saves the configurable options to the twinrc config file -void KeramikConfig::save( KConfig* ) +void KeramikConfig::save( TDEConfig* ) { c->setGroup( "General" ); c->writeEntry( "ShowAppIcons", ui->showAppIcons->isChecked() ); diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h index 911af89fb..4138fe958 100644 --- a/twin/clients/keramik/config/config.h +++ b/twin/clients/keramik/config/config.h @@ -35,7 +35,7 @@ class KeramikConfig: public TQObject public: - KeramikConfig( KConfig* conf, TQWidget* parent ); + KeramikConfig( TDEConfig* conf, TQWidget* parent ); ~KeramikConfig(); // These public signals/slots work similar to KCM modules @@ -43,13 +43,13 @@ class KeramikConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); private: KeramikConfigUI *ui; - KConfig *c; + TDEConfig *c; }; diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 2ffbbdfee..3825a851a 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -562,7 +562,7 @@ void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) void KeramikHandler::readConfig() { - KConfig *c = new KConfig( "twinkeramikrc" ); + TDEConfig *c = new TDEConfig( "twinkeramikrc" ); c->setGroup( "General" ); showIcons = c->readBoolEntry( "ShowAppIcons", true ); diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index 2d944e344..4e5166c2e 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/twin/clients/kwmtheme/cli_installer/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char **argv) TQFileInfo fi(f); KSimpleConfig input(fi.absFilePath()); srcStr = fi.dirPath(true) + "/"; - KConfig *output = TDEGlobal::config(); + TDEConfig *output = TDEGlobal::config(); input.setGroup("Window Border"); output->setGroup("General"); diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index 012cacc0e..33b71994e 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -83,7 +83,7 @@ static void create_pixmaps() return; pixmaps_created = true; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); TQString tmpStr; @@ -270,7 +270,7 @@ void KWMThemeClient::init() TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); layout->addLayout( hb, 1, 1 ); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Buttons"); TQString val; MyButton *btn; diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 84bc23506..4c87829be 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -12,7 +12,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config(KConfig* conf, TQWidget* parent) + KDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent) { return(new ModernSysConfig(conf, parent)); } @@ -25,9 +25,9 @@ extern "C" // 'parent' is the parent of the TQObject, which is a VBox inside the // Configure tab in twindecoration -ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent) +ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(parent) { - clientrc = new KConfig("twinmodernsysrc"); + clientrc = new TDEConfig("twinmodernsysrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); mainw = new TQWidget(parent); vbox = new TQVBoxLayout(mainw); @@ -95,7 +95,7 @@ void ModernSysConfig::slotSelectionChanged() } -void ModernSysConfig::load(KConfig* /*conf*/) +void ModernSysConfig::load(TDEConfig* /*conf*/) { clientrc->setGroup("General"); bool i = clientrc->readBoolEntry("ShowHandle", true ); @@ -109,7 +109,7 @@ void ModernSysConfig::load(KConfig* /*conf*/) } -void ModernSysConfig::save(KConfig* /*conf*/) +void ModernSysConfig::save(TDEConfig* /*conf*/) { clientrc->setGroup("General"); clientrc->writeEntry("ShowHandle", cbShowHandle->isChecked()); diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h index 3a04573cf..20ce5539e 100644 --- a/twin/clients/modernsystem/config/config.h +++ b/twin/clients/modernsystem/config/config.h @@ -13,7 +13,7 @@ class ModernSysConfig : public TQObject Q_OBJECT public: - ModernSysConfig(KConfig* conf, TQWidget* parent); + ModernSysConfig(TDEConfig* conf, TQWidget* parent); ~ModernSysConfig(); // These public signals/slots work similar to KCM modules @@ -21,15 +21,15 @@ class ModernSysConfig : public TQObject void changed(); public slots: - void load(KConfig* conf); - void save(KConfig* conf); + void load(TDEConfig* conf); + void save(TDEConfig* conf); void defaults(); protected slots: void slotSelectionChanged(); // Internal use private: - KConfig *clientrc; + TDEConfig *clientrc; TQWidget *mainw; TQVBoxLayout *vbox; TQWidget *handleBox; diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index 3d71afd7e..8fbd1e38c 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -217,7 +217,7 @@ void ModernSysFactory::read_config() bool showh; int hsize, hwidth, bwidth, theight; - KConfig c("twinmodernsysrc"); + TDEConfig c("twinmodernsysrc"); c.setGroup("General"); showh = c.readBoolEntry("ShowHandle", true); diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index 73a749bdb..d79800d4a 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -34,11 +34,11 @@ #include "config.h" #include "configdialog.h" -PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent) +PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent) : TQObject(parent), m_config(0), m_dialog(0) { // create the configuration object - m_config = new KConfig("twinplastikrc"); + m_config = new TDEConfig("twinplastikrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); // create and show the configuration dialog @@ -67,7 +67,7 @@ PlastikConfig::~PlastikConfig() if (m_config) delete m_config; } -void PlastikConfig::load(KConfig*) +void PlastikConfig::load(TDEConfig*) { m_config->setGroup("General"); @@ -85,7 +85,7 @@ void PlastikConfig::load(KConfig*) m_dialog->coloredBorder->setChecked(coloredBorder); } -void PlastikConfig::save(KConfig*) +void PlastikConfig::save(TDEConfig*) { m_config->setGroup("General"); @@ -115,7 +115,7 @@ void PlastikConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_config(KConfig* config, TQWidget* parent) { + KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new PlastikConfig(config, parent)); } } diff --git a/twin/clients/plastik/config/config.h b/twin/clients/plastik/config/config.h index d06bd30b8..73231c50f 100644 --- a/twin/clients/plastik/config/config.h +++ b/twin/clients/plastik/config/config.h @@ -27,26 +27,26 @@ class TQButtonGroup; class TQGroupBox; -class KConfig; +class TDEConfig; class ConfigDialog; class PlastikConfig : public TQObject { Q_OBJECT public: - PlastikConfig(KConfig* config, TQWidget* parent); + PlastikConfig(TDEConfig* config, TQWidget* parent); ~PlastikConfig(); signals: void changed(); public slots: - void load(KConfig *config); - void save(KConfig *config); + void load(TDEConfig *config); + void save(TDEConfig *config); void defaults(); private: - KConfig *m_config; + TDEConfig *m_config; ConfigDialog *m_dialog; }; diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index 76d643904..2072302d7 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -162,7 +162,7 @@ bool PlastikHandler::supports( Ability ability ) void PlastikHandler::readConfig() { // create a config object - KConfig config("twinplastikrc"); + TDEConfig config("twinplastikrc"); config.setGroup("General"); // grab settings diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp index 31ac3b83b..d3364af14 100644 --- a/twin/clients/quartz/config/config.cpp +++ b/twin/clients/quartz/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new QuartzConfig(conf, parent)); } @@ -30,10 +30,10 @@ extern "C" * Configure tab in twindecoration */ -QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent ) +QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { - quartzConfig = new KConfig("twinquartzrc"); + quartzConfig = new TDEConfig("twinquartzrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); gb = new TQVBox( parent ); cbColorBorder = new TQCheckBox( @@ -72,7 +72,7 @@ void QuartzConfig::slotSelectionChanged() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void QuartzConfig::load( KConfig* /*conf*/ ) +void QuartzConfig::load( TDEConfig* /*conf*/ ) { quartzConfig->setGroup("General"); bool override = quartzConfig->readBoolEntry( "UseTitleBarBorderColors", true ); @@ -83,7 +83,7 @@ void QuartzConfig::load( KConfig* /*conf*/ ) // Saves the configurable options to the twinrc config file -void QuartzConfig::save( KConfig* /*conf*/ ) +void QuartzConfig::save( TDEConfig* /*conf*/ ) { quartzConfig->setGroup("General"); quartzConfig->writeEntry( "UseTitleBarBorderColors", cbColorBorder->isChecked() ); diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h index 6bd1ba384..d334930c8 100644 --- a/twin/clients/quartz/config/config.h +++ b/twin/clients/quartz/config/config.h @@ -19,7 +19,7 @@ class QuartzConfig: public TQObject Q_OBJECT public: - QuartzConfig( KConfig* conf, TQWidget* parent ); + QuartzConfig( TDEConfig* conf, TQWidget* parent ); ~QuartzConfig(); // These public signals/slots work similar to KCM modules @@ -27,15 +27,15 @@ class QuartzConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: void slotSelectionChanged(); // Internal use private: - KConfig* quartzConfig; + TDEConfig* quartzConfig; TQCheckBox* cbColorBorder; TQCheckBox* cbExtraSmall; TQVBox* gb; diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp index 21b4c039c..09d3ccf52 100644 --- a/twin/clients/quartz/quartz.cpp +++ b/twin/clients/quartz/quartz.cpp @@ -201,7 +201,7 @@ bool QuartzHandler::supports( Ability ability ) void QuartzHandler::readConfig() { - KConfig conf("twinquartzrc"); + TDEConfig conf("twinquartzrc"); conf.setGroup("General"); coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true ); extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp index f799e1b8b..94bf98f35 100644 --- a/twin/clients/web/Web.cpp +++ b/twin/clients/web/Web.cpp @@ -183,7 +183,7 @@ WebClient::init() if (0 != titleHeight_ % 2) titleHeight_ += 1; - KConfig c("twinwebrc"); + TDEConfig c("twinwebrc"); c.setGroup("General"); shape_ = c.readBoolEntry("Shape", true); diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index 349c0c6e5..61b03d3c4 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -27,8 +27,8 @@ int main( int argc, char* argv[] ) kdWarning() << "File " << argv[ 1 ] << " not found!" << endl; return 1; } - KConfig src_cfg( file ); - KConfig dest_cfg( "twinrulesrc" ); + TDEConfig src_cfg( file ); + TDEConfig dest_cfg( "twinrulesrc" ); src_cfg.setGroup( "General" ); dest_cfg.setGroup( "General" ); int count = src_cfg.readNumEntry( "count", 0 ); diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index 0cbd28353..40b25db9c 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -62,7 +62,7 @@ NET::WindowType txtToWindowType( const char* txt ) return static_cast< NET::WindowType >( -2 ); // undefined } -void loadFakeSessionInfo( KConfig* config ) +void loadFakeSessionInfo( TDEConfig* config ) { fakeSession.clear(); config->setGroup("FakeSession" ); @@ -97,7 +97,7 @@ void loadFakeSessionInfo( KConfig* config ) config->deleteGroup( "FakeSession" ); } -void writeRules( KConfig& cfg ) +void writeRules( TDEConfig& cfg ) { cfg.setGroup( "General" ); int pos = cfg.readNumEntry( "count" ); @@ -156,8 +156,8 @@ void writeRules( KConfig& cfg ) int main() { TDEInstance inst( "twin_update_window_settings" ); - KConfig src_cfg( "twinrc" ); - KConfig dest_cfg( "twinrulesrc" ); + TDEConfig src_cfg( "twinrc" ); + TDEConfig dest_cfg( "twinrulesrc" ); loadFakeSessionInfo( &src_cfg ); writeRules( dest_cfg ); src_cfg.sync(); diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp index 43555ef60..8c12f9048 100644 --- a/twin/kcmtwin/twindecoration/preview.cpp +++ b/twin/kcmtwin/twindecoration/preview.cpp @@ -454,7 +454,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions() unsigned long KDecorationPreviewOptions::updateSettings() { - KConfig cfg( "twinrc", true ); + TDEConfig cfg( "twinrc", true ); unsigned long changed = 0; changed |= d->updateKWinSettings( &cfg ); diff --git a/twin/kcmtwin/twindecoration/preview.h b/twin/kcmtwin/twindecoration/preview.h index 2a753db69..56a342cfc 100644 --- a/twin/kcmtwin/twindecoration/preview.h +++ b/twin/kcmtwin/twindecoration/preview.h @@ -138,11 +138,11 @@ class KDecorationPreviewPlugins : public KDecorationPlugins { public: - KDecorationPreviewPlugins( KConfig* cfg ); + KDecorationPreviewPlugins( TDEConfig* cfg ); virtual bool provides( Requirement ); }; -inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( KConfig* cfg ) +inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( TDEConfig* cfg ) : KDecorationPlugins( cfg ) { } diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index efe46c1bc..30695cdef 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -62,14 +62,14 @@ #include <kdecoration_plugins_p.h> #include <kdecorationfactory.h> -// KCModule plugin interface +// TDECModule plugin interface // ========================= typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory; K_EXPORT_COMPONENT_FACTORY( kcm_twindecoration, KWinDecoFactory("kcmtwindecoration") ) KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &) : DCOPObject("KWinClientDecoration"), - KCModule(KWinDecoFactory::instance(), parent, name), + TDECModule(KWinDecoFactory::instance(), parent, name), twinConfig("twinrc"), pluginObject(0) { @@ -477,7 +477,7 @@ void KWinDecorationModule::createThirdPartyWMList() // Reset the decoration plugin to what the user just selected void KWinDecorationModule::slotChangeDecoration( const TQString & text) { - KConfig twinConfig("twinrc"); + TDEConfig twinConfig("twinrc"); twinConfig.setGroup("Style"); // Let the user see config options for the currently selected decoration @@ -488,7 +488,7 @@ void KWinDecorationModule::slotChangeDecoration( const TQString & text) // This is the selection handler setting void KWinDecorationModule::slotSelectionChanged() { - emit KCModule::changed(true); + emit TDECModule::changed(true); processEnabledDisabledTabs(); } @@ -555,7 +555,7 @@ void KWinDecorationModule::slotBorderChanged( int size ) { if( lBorder->isHidden()) return; - emit KCModule::changed( true ); + emit TDECModule::changed( true ); TQValueList< BorderSize > sizes; if( plugins->factory() != NULL ) sizes = plugins->factory()->borderSizes(); @@ -611,7 +611,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name ) // Loads/unloads and inserts the decoration config plugin into the // pluginConfigWidget, allowing for dynamic configuration of decorations -void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName ) +void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& currentDecoName ) { // Config names are "twin_icewm_config" // for "twin3_icewm" twin client @@ -656,13 +656,13 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDe if (alloc_ptr != NULL) { - allocatePlugin = (TQObject* (*)(KConfig* conf, TQWidget* parent))alloc_ptr; + allocatePlugin = (TQObject* (*)(TDEConfig* conf, TQWidget* parent))alloc_ptr; pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget )); // connect required signals and slots together... connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); - connect( this, TQT_SIGNAL(pluginLoad(KConfig*)), pluginObject, TQT_SLOT(load(KConfig*)) ); - connect( this, TQT_SIGNAL(pluginSave(KConfig*)), pluginObject, TQT_SLOT(save(KConfig*)) ); + connect( this, TQT_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQT_SLOT(load(TDEConfig*)) ); + connect( this, TQT_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQT_SLOT(save(TDEConfig*)) ); connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) ); pluginConfigWidget->show(); return; @@ -675,7 +675,7 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDe // Reads the twin config settings, and sets all UI controls to those settings // Updating the config plugin if required -void KWinDecorationModule::readConfig( KConfig* conf ) +void KWinDecorationModule::readConfig( TDEConfig* conf ) { // General tab // ============ @@ -767,17 +767,17 @@ void KWinDecorationModule::readConfig( KConfig* conf ) processEnabledDisabledTabs(); - emit KCModule::changed(false); + emit TDECModule::changed(false); } // Writes the selected user configuration to the twin config file -void KWinDecorationModule::writeConfig( KConfig* conf ) +void KWinDecorationModule::writeConfig( TDEConfig* conf ) { TQString name = decorationList->currentText(); TQString libName = decorationLibName( name ); - KConfig twinConfig("twinrc"); + TDEConfig twinConfig("twinrc"); twinConfig.setGroup("Style"); // General settings @@ -835,7 +835,7 @@ void KWinDecorationModule::writeConfig( KConfig* conf ) currentLibraryName = libName; // We saved, so tell kcmodule that there have been no new user changes made. - emit KCModule::changed(false); + emit TDECModule::changed(false); } @@ -843,7 +843,7 @@ void KWinDecorationModule::dcopUpdateClientList() { // Changes the current active ListBox item, and // Loads a new plugin configuration tab if required. - KConfig twinConfig("twinrc"); + TDEConfig twinConfig("twinrc"); twinConfig.setGroup("Style"); readConfig( &twinConfig ); @@ -851,10 +851,10 @@ void KWinDecorationModule::dcopUpdateClientList() } -// Virutal functions required by KCModule +// Virutal functions required by TDECModule void KWinDecorationModule::load() { - KConfig twinConfig("twinrc"); + TDEConfig twinConfig("twinrc"); twinConfig.setGroup("Style"); // Reset by re-reading the config @@ -865,7 +865,7 @@ void KWinDecorationModule::load() void KWinDecorationModule::save() { - KConfig twinConfig("twinrc"); + TDEConfig twinConfig("twinrc"); twinConfig.setGroup("Style"); writeConfig( &twinConfig ); diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h index aa9855408..14e24c777 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.h +++ b/twin/kcmtwin/twindecoration/twindecoration.h @@ -59,7 +59,7 @@ struct DecorationInfo }; -class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface, public KDecorationDefines +class KWinDecorationModule : public TDECModule, virtual public KWinDecorationIface, public KDecorationDefines { Q_OBJECT @@ -76,8 +76,8 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface virtual void dcopUpdateClientList(); signals: - void pluginLoad( KConfig* conf ); - void pluginSave( KConfig* conf ); + void pluginLoad( TDEConfig* conf ); + void pluginSave( TDEConfig* conf ); void pluginDefaults(); protected slots: @@ -88,8 +88,8 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface void slotButtonsChanged(); private: - void readConfig( KConfig* conf ); - void writeConfig( KConfig* conf ); + void readConfig( TDEConfig* conf ); + void writeConfig( TDEConfig* conf ); void findDecorations(); void createDecorationList(); void createThirdPartyWMList(); @@ -98,7 +98,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface TQString decorationLibName( const TQString& name ); TQString decorationName ( TQString& libName ); static TQString styleToConfigLib( TQString& styleLib ); - void resetPlugin( KConfig* conf, const TQString& currentDecoName = TQString::null ); + void resetPlugin( TDEConfig* conf, const TQString& currentDecoName = TQString::null ); void resetKWin(); void checkSupportedBorderSizes(); static int borderSizeToIndex( BorderSize size, TQValueList< BorderSize > sizes ); @@ -117,7 +117,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface KDecorationPreview* preview; KDecorationPlugins* plugins; - KConfig twinConfig; + TDEConfig twinConfig; TQCheckBox* cbUseCustomButtonPositions; // TQCheckBox* cbUseMiniWindows; @@ -130,7 +130,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface TQWidget* pluginConfigWidget; TQString currentLibraryName; TQString oldLibraryName; - TQObject* (*allocatePlugin)( KConfig* conf, TQWidget* parent ); + TQObject* (*allocatePlugin)( TDEConfig* conf, TQWidget* parent ); // Page 2 ButtonPositionWidget *buttonPositionWidget; diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index 3c072996b..0743ca31f 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -36,46 +36,46 @@ extern "C" { - KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_twinfocus(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("twinrc", false, true); + TDEConfig *c = new TDEConfig("twinrc", false, true); return new KFocusConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_twinactions(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); return new KActionsOptions( parent, name); } - KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("twinrc", false, true); + TDEConfig *c = new TDEConfig("twinrc", false, true); return new KMovingConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("twinrc", false, true); + TDEConfig *c = new TDEConfig("twinrc", false, true); return new KAdvancedConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name) + KDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("twinrc", false, true); + TDEConfig *c = new TDEConfig("twinrc", false, true); return new KTranslucencyConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name) + KDE_EXPORT TDECModule *create_twinoptions ( TQWidget *parent, const char* name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); @@ -84,9 +84,9 @@ extern "C" } KWinOptions::KWinOptions(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { - mConfig = new KConfig("twinrc", false, true); + mConfig = new TDEConfig("twinrc", false, true); TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); @@ -153,7 +153,7 @@ void KWinOptions::load() mMoving->load(); mAdvanced->load(); mTranslucency->load(); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); } @@ -166,7 +166,7 @@ void KWinOptions::save() mAdvanced->save(); mTranslucency->save(); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); // Send signal to twin mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) @@ -197,14 +197,14 @@ TQString KWinOptions::quickHelp() const void KWinOptions::moduleChanged(bool state) { - emit KCModule::changed(state); + emit TDECModule::changed(state); } KActionsOptions::KActionsOptions(TQWidget *parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { - mConfig = new KConfig("twinrc", false, true); + mConfig = new TDEConfig("twinrc", false, true); TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); @@ -230,7 +230,7 @@ void KActionsOptions::load() { mTitleBarActions->load(); mWindowActions->load(); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); } @@ -239,7 +239,7 @@ void KActionsOptions::save() mTitleBarActions->save(); mWindowActions->save(); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); // Send signal to twin mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) @@ -256,7 +256,7 @@ void KActionsOptions::defaults() void KActionsOptions::moduleChanged(bool state) { - emit KCModule::changed(state); + emit TDECModule::changed(state); } #include "main.moc" diff --git a/twin/kcmtwin/twinoptions/main.h b/twin/kcmtwin/twinoptions/main.h index 2465c6766..4935cf39f 100644 --- a/twin/kcmtwin/twinoptions/main.h +++ b/twin/kcmtwin/twinoptions/main.h @@ -28,14 +28,14 @@ #include <tqtabwidget.h> #include <kcmodule.h> -class KConfig; +class TDEConfig; class KFocusConfig; class KTitleBarActionsConfig; class KWindowActionsConfig; class KAdvancedConfig; class KTranslucencyConfig; -class KWinOptions : public KCModule +class KWinOptions : public TDECModule { Q_OBJECT @@ -66,10 +66,10 @@ private: KAdvancedConfig *mAdvanced; KTranslucencyConfig *mTranslucency; - KConfig *mConfig; + TDEConfig *mConfig; }; -class KActionsOptions : public KCModule +class KActionsOptions : public TDECModule { Q_OBJECT @@ -94,7 +94,7 @@ private: KTitleBarActionsConfig *mTitleBarActions; KWindowActionsConfig *mWindowActions; - KConfig *mConfig; + TDEConfig *mConfig; }; #endif diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 76b4ba2f9..5c1e22d35 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -132,8 +132,8 @@ void KTitleBarActionsConfig::paletteChanged() } -KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *) - : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) +KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *) + : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3; TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -584,8 +584,8 @@ void KTitleBarActionsConfig::defaults() } -KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *) - : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) +KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *) + : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW; TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); diff --git a/twin/kcmtwin/twinoptions/mouse.h b/twin/kcmtwin/twinoptions/mouse.h index 49591e5d8..70ff2bfca 100644 --- a/twin/kcmtwin/twinoptions/mouse.h +++ b/twin/kcmtwin/twinoptions/mouse.h @@ -22,7 +22,7 @@ #ifndef __KKWMMOUSECONFIG_H__ #define __KKWMMOUSECONFIG_H__ -class KConfig; +class TDEConfig; #include <tqwidget.h> #include <kcmodule.h> @@ -48,13 +48,13 @@ protected: -class KTitleBarActionsConfig : public KCModule +class KTitleBarActionsConfig : public TDECModule { Q_OBJECT public: - KTitleBarActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 ); + KTitleBarActionsConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 ); ~KTitleBarActionsConfig( ); void load(); @@ -62,7 +62,7 @@ public: void defaults(); public slots: - void changed() { emit KCModule::changed(true); } + void changed() { emit TDECModule::changed(true); } private: TQComboBox* coTiDbl; @@ -77,7 +77,7 @@ private: ToolTipComboBox * coMax[3]; - KConfig *config; + TDEConfig *config; bool standAlone; const char* functionTiDbl(int); @@ -94,13 +94,13 @@ private slots: }; -class KWindowActionsConfig : public KCModule +class KWindowActionsConfig : public TDECModule { Q_OBJECT public: - KWindowActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 ); + KWindowActionsConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 ); ~KWindowActionsConfig( ); void load(); @@ -108,7 +108,7 @@ public: void defaults(); public slots: - void changed() { emit KCModule::changed(true); } + void changed() { emit TDECModule::changed(true); } private: TQComboBox* coWin1; @@ -121,7 +121,7 @@ private: TQComboBox* coAll3; TQComboBox* coAllW; - KConfig *config; + TDEConfig *config; bool standAlone; const char* functionWin(int); diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index fd2152db2..41a593388 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -101,8 +101,8 @@ KFocusConfig::~KFocusConfig () } // removed the LCD display over the slider - this is not good GUI design :) RNolden 051701 -KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *) - : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) +KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * parent, const char *) + : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString wtstr; TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint()); @@ -437,7 +437,7 @@ void KFocusConfig::setActiveMouseScreen(bool a) { void KFocusConfig::updateActiveMouseScreen() { // on by default for non click to focus policies - KConfigGroup cfg( config, "Windows" ); + TDEConfigGroup cfg( config, "Windows" ); if( !cfg.hasKey( KWIN_ACTIVE_MOUSE_SCREEN )) setActiveMouseScreen( focusCombo->currentItem() != 0 ); } @@ -514,7 +514,7 @@ void KFocusConfig::load( void ) setTraverseAll( config->readBoolEntry(KWIN_TRAVERSE_ALL, false )); config->setGroup("Desktops"); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KFocusConfig::save( void ) @@ -583,7 +583,7 @@ void KFocusConfig::save( void ) kapp->dcopClient()->attach(); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KFocusConfig::defaults() @@ -604,7 +604,7 @@ void KFocusConfig::defaults() // setFocusStealing(2); // TODO default to low for now setFocusStealing(1); - emit KCModule::changed(true); + emit TDECModule::changed(true); } KAdvancedConfig::~KAdvancedConfig () @@ -613,8 +613,8 @@ KAdvancedConfig::~KAdvancedConfig () delete config; } -KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *) - : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) +KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *) + : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString wtstr; TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint()); @@ -741,7 +741,7 @@ void KAdvancedConfig::load( void ) setHideUtilityWindowsForInactive( config->readBoolEntry( KWIN_HIDE_UTILITY, true )); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KAdvancedConfig::save( void ) @@ -771,7 +771,7 @@ void KAdvancedConfig::save( void ) kapp->dcopClient()->attach(); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KAdvancedConfig::defaults() @@ -782,7 +782,7 @@ void KAdvancedConfig::defaults() setElectricBorders(0); setElectricBorderDelay(150); setHideUtilityWindowsForInactive( true ); - emit KCModule::changed(true); + emit TDECModule::changed(true); } void KAdvancedConfig::setEBorders() @@ -826,8 +826,8 @@ KMovingConfig::~KMovingConfig () delete config; } -KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *) - : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) +KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *) + : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString wtstr; TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint()); @@ -1163,7 +1163,7 @@ void KMovingConfig::load( void ) else setWindowSnapZone(v); OverlapSnap->setChecked(config->readBoolEntry("SnapOnlyWhenOverlapping",false)); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KMovingConfig::save( void ) @@ -1225,7 +1225,7 @@ void KMovingConfig::save( void ) kapp->dcopClient()->attach(); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KMovingConfig::defaults() @@ -1243,7 +1243,7 @@ void KMovingConfig::defaults() setMinimizeAnim( true ); setMinimizeAnimSpeed( 5 ); - emit KCModule::changed(true); + emit TDECModule::changed(true); } int KMovingConfig::getBorderSnapZone() { @@ -1270,8 +1270,8 @@ KTranslucencyConfig::~KTranslucencyConfig () kompmgr->detach(); } -KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *) - : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) +KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, TQWidget *parent, const char *) + : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { kompmgr = 0L; resetKompmgr_ = FALSE; @@ -1558,7 +1558,7 @@ void KTranslucencyConfig::load( void ) movingWindowOpacity->setEnabled(movingWindowTransparency->isChecked()); dockWindowOpacity->setEnabled(dockWindowTransparency->isChecked()); - KConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc"); + TDEConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc"); conf_.setGroup("xcompmgr"); disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE)); @@ -1589,7 +1589,7 @@ void KTranslucencyConfig::load( void ) fadeInSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeInStep",0.070)*1000.0)); fadeOutSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeOutStep",0.070)*1000.0)); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KTranslucencyConfig::save( void ) @@ -1625,7 +1625,7 @@ void KTranslucencyConfig::save( void ) config->writeEntry("OnlyDecoTranslucent", onlyDecoTranslucent->isChecked()); config->writeEntry("ResetKompmgr",resetKompmgr_); - KConfig *conf_ = new KConfig(TQDir::homeDirPath() + "/.xcompmgrrc"); + TDEConfig *conf_ = new TDEConfig(TQDir::homeDirPath() + "/.xcompmgrrc"); conf_->setGroup("xcompmgr"); conf_->writeEntry("Compmode",useShadows->isChecked()?"CompClientShadows":""); @@ -1659,7 +1659,7 @@ void KTranslucencyConfig::save( void ) startKompmgr(); else stopKompmgr(); - emit KCModule::changed(false); + emit TDECModule::changed(false); } void KTranslucencyConfig::defaults() @@ -1701,7 +1701,7 @@ void KTranslucencyConfig::defaults() fadeOnOpacityChange->setChecked(FALSE); fadeInSpeed->setValue(70); fadeOutSpeed->setValue(70); - emit KCModule::changed(true); + emit TDECModule::changed(true); } diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h index 4c6290a4e..f0b0bcd9f 100644 --- a/twin/kcmtwin/twinoptions/windows.h +++ b/twin/kcmtwin/twinoptions/windows.h @@ -68,11 +68,11 @@ class KIntNumInput; class TQSpinBox; -class KFocusConfig : public KCModule +class KFocusConfig : public TDECModule { Q_OBJECT public: - KFocusConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 ); + KFocusConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 ); ~KFocusConfig(); void load(); @@ -87,7 +87,7 @@ private slots: void clickRaiseOnTog(bool); void updateAltTabMode(); void updateActiveMouseScreen(); - void changed() { emit KCModule::changed(true); } + void changed() { emit TDECModule::changed(true); } private: @@ -127,15 +127,15 @@ private: TQCheckBox *rollOverDesktops; TQCheckBox *showPopupinfo; - KConfig *config; + TDEConfig *config; bool standAlone; }; -class KMovingConfig : public KCModule +class KMovingConfig : public TDECModule { Q_OBJECT public: - KMovingConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 ); + KMovingConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 ); ~KMovingConfig(); void load(); @@ -145,7 +145,7 @@ public: private slots: void setMinimizeAnim( bool ); void setMinimizeAnimSpeed( int ); - void changed() { emit KCModule::changed(true); } + void changed() { emit TDECModule::changed(true); } void slotBrdrSnapChanged( int ); void slotWndwSnapChanged( int ); @@ -174,7 +174,7 @@ private: TQComboBox *placementCombo; - KConfig *config; + TDEConfig *config; bool standAlone; int getBorderSnapZone(); @@ -188,11 +188,11 @@ private: }; -class KAdvancedConfig : public KCModule +class KAdvancedConfig : public TDECModule { Q_OBJECT public: - KAdvancedConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 ); + KAdvancedConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 ); ~KAdvancedConfig(); void load(); @@ -205,7 +205,7 @@ private slots: //copied from kcontrol/konq/twindesktop, aleXXX void setEBorders(); - void changed() { emit KCModule::changed(true); } + void changed() { emit TDECModule::changed(true); } private: @@ -219,7 +219,7 @@ private: TQCheckBox *shadeHoverOn; KIntNumInput *shadeHover; - KConfig *config; + TDEConfig *config; bool standAlone; int getElectricBorders( void ); @@ -239,11 +239,11 @@ private: }; class TDEProcess; -class KTranslucencyConfig : public KCModule +class KTranslucencyConfig : public TDECModule { Q_OBJECT public: - KTranslucencyConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 ); + KTranslucencyConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 ); ~KTranslucencyConfig(); void load(); @@ -281,7 +281,7 @@ private: KIntNumInput *fadeInSpeed; KIntNumInput *fadeOutSpeed; KColorButton *shadowColor; - KConfig *config; + TDEConfig *config; bool standAlone; bool alphaActivated; bool resetKompmgr_; diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index 9b3b1676e..c80869147 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -28,7 +28,7 @@ #include "ruleslist.h" extern "C" - KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name ) + KDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name ) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" ); @@ -39,7 +39,7 @@ namespace KWinInternal { KCMRules::KCMRules( TQWidget *parent, const char *name ) -: KCModule( parent, name ) +: TDECModule( parent, name ) , config( "twinrulesrc" ) { TQVBoxLayout *layout = new TQVBoxLayout( this ); @@ -57,13 +57,13 @@ void KCMRules::load() { config.reparseConfiguration(); widget->load(); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); } void KCMRules::save() { widget->save(); - emit KCModule::changed( false ); + emit TDECModule::changed( false ); // Send signal to twin config.sync(); if( !kapp->dcopClient()->isAttached()) @@ -87,7 +87,7 @@ TQString KCMRules::quickHelp() const void KCMRules::moduleChanged( bool state ) { - emit KCModule::changed( state ); + emit TDECModule::changed( state ); } } diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h index d02bfc112..1237a5a64 100644 --- a/twin/kcmtwin/twinrules/kcm.h +++ b/twin/kcmtwin/twinrules/kcm.h @@ -23,7 +23,7 @@ #include <kcmodule.h> #include <kconfig.h> -class KConfig; +class TDEConfig; class TDEAboutData; namespace KWinInternal @@ -32,7 +32,7 @@ namespace KWinInternal class KCMRulesList; class KCMRules - : public KCModule + : public TDECModule { Q_OBJECT public: @@ -45,7 +45,7 @@ class KCMRules void moduleChanged( bool state ); private: KCMRulesList* widget; - KConfig config; + TDEConfig config; }; } // namespace diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index b97db201a..4b36bd795 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/twin/kcmtwin/twinrules/main.cpp @@ -34,7 +34,7 @@ namespace KWinInternal static void loadRules( TQValueList< Rules* >& rules ) { - KConfig cfg( "twinrulesrc", true ); + TDEConfig cfg( "twinrulesrc", true ); cfg.setGroup( "General" ); int count = cfg.readNumEntry( "count" ); for( int i = 1; @@ -49,7 +49,7 @@ static void loadRules( TQValueList< Rules* >& rules ) static void saveRules( const TQValueList< Rules* >& rules ) { - KConfig cfg( "twinrulesrc" ); + TDEConfig cfg( "twinrulesrc" ); TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp index 29e02549d..c7634c3ac 100644 --- a/twin/kcmtwin/twinrules/ruleslist.cpp +++ b/twin/kcmtwin/twinrules/ruleslist.cpp @@ -150,7 +150,7 @@ void KCMRulesList::load() ++it ) delete *it; rules.clear(); - KConfig cfg( "twinrulesrc", true ); + TDEConfig cfg( "twinrulesrc", true ); cfg.setGroup( "General" ); int count = cfg.readNumEntry( "count" ); rules.reserve( count ); @@ -171,7 +171,7 @@ void KCMRulesList::load() void KCMRulesList::save() { - KConfig cfg( "twinrulesrc" ); + TDEConfig cfg( "twinrulesrc" ); TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp index fbf35c285..66d886aec 100644 --- a/twin/lib/kdecoration_p.cpp +++ b/twin/lib/kdecoration_p.cpp @@ -63,7 +63,7 @@ void KDecorationOptionsPrivate::defaultKWinSettings() OpMaxButtonLeftClick = HMaximizeOp; } -unsigned long KDecorationOptionsPrivate::updateKWinSettings( KConfig* config ) +unsigned long KDecorationOptionsPrivate::updateKWinSettings( TDEConfig* config ) { unsigned long changed = 0; TQString old_group = config->group(); diff --git a/twin/lib/kdecoration_p.h b/twin/lib/kdecoration_p.h index 58f386c9b..2634ea140 100644 --- a/twin/lib/kdecoration_p.h +++ b/twin/lib/kdecoration_p.h @@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE. #include <tqwidget.h> #include <tqvaluelist.h> -class KConfig; +class TDEConfig; class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines { @@ -41,7 +41,7 @@ class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines KDecorationOptionsPrivate(); virtual ~KDecorationOptionsPrivate(); void defaultKWinSettings(); // shared implementation - unsigned long updateKWinSettings( KConfig* ); // shared implementation + unsigned long updateKWinSettings( TDEConfig* ); // shared implementation BorderSize findPreferredBorderSize( BorderSize size, TQValueList< BorderSize > ) const; // shared implementation TQColor colors[NUM_COLORS*2]; diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp index b680170c3..e6c6cfe36 100644 --- a/twin/lib/kdecoration_plugins_p.cpp +++ b/twin/lib/kdecoration_plugins_p.cpp @@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE. #include "kdecorationfactory.h" -KDecorationPlugins::KDecorationPlugins( KConfig* cfg ) +KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg ) : create_ptr( NULL ), library( NULL ), fact( NULL ), @@ -95,7 +95,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) { if( nameStr.isEmpty()) { - KConfigGroupSaver saver( config, "Style" ); + TDEConfigGroupSaver saver( config, "Style" ); nameStr = config->readEntry("PluginLib", defaultPlugin ); } // make sure people can switch between HEAD and twin_iii branch diff --git a/twin/lib/kdecoration_plugins_p.h b/twin/lib/kdecoration_plugins_p.h index 81dbb6b68..e45f5b674 100644 --- a/twin/lib/kdecoration_plugins_p.h +++ b/twin/lib/kdecoration_plugins_p.h @@ -37,7 +37,7 @@ DEALINGS IN THE SOFTWARE. #include "kdecoration.h" class KLibrary; -class KConfig; +class TDEConfig; class KDecoration; class KDecorationBridge; class KDecorationFactory; @@ -46,7 +46,7 @@ class KWIN_EXPORT KDecorationPlugins : public KDecorationProvides { public: - KDecorationPlugins( KConfig* cfg ); + KDecorationPlugins( TDEConfig* cfg ); virtual ~KDecorationPlugins(); bool loadPlugin( TQString name ); void destroyPreviousPlugin(); @@ -64,7 +64,7 @@ class KWIN_EXPORT KDecorationPlugins KLibrary *old_library; KDecorationFactory* old_fact; TQString pluginStr; - KConfig* config; + TDEConfig* config; }; /* diff --git a/twin/options.cpp b/twin/options.cpp index c78cec2d9..d1dc123c5 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -46,7 +46,7 @@ Options::~Options() unsigned long Options::updateSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); unsigned long changed = 0; changed |= d->updateKWinSettings( config ); // read decoration settings @@ -84,7 +84,7 @@ unsigned long Options::updateSettings() if( !focusPolicyIsReasonable()) // #48786, comments #7 and later focusStealingPreventionLevel = 0; - KConfig *gc = new KConfig("kdeglobals", false, false); + TDEConfig *gc = new TDEConfig("kdeglobals", false, false); gc->setGroup("Windows"); xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", true ); xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true); @@ -218,11 +218,11 @@ unsigned long Options::updateSettings() // Since we want to allow users to enable window decoration tooltips // and not kstyle tooltips and vise-versa, we don't read the // "EffectNoTooltip" setting from kdeglobals. - KConfig globalConfig("kdeglobals"); + TDEConfig globalConfig("kdeglobals"); globalConfig.setGroup("KDE"); topmenus = globalConfig.readBoolEntry( "macStyle", false ); - KConfig kdesktopcfg( "kdesktoprc", true ); + TDEConfig kdesktopcfg( "kdesktoprc", true ); kdesktopcfg.setGroup( "Menubar" ); desktop_topmenu = kdesktopcfg.readBoolEntry( "ShowMenubar", false ); if( desktop_topmenu ) diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index ea05dae04..e047981cc 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -116,7 +116,7 @@ void PopupInfo::hide() void PopupInfo::reconfigure() { - KConfig * c(TDEGlobal::config()); + TDEConfig * c(TDEGlobal::config()); c->setGroup("PopupInfo"); m_show = c->readBoolEntry("ShowPopup", false ); m_delayTime = c->readNumEntry("PopupHideDelay", 350 ); diff --git a/twin/rules.cpp b/twin/rules.cpp index 6d2d66906..6f2b3b615 100644 --- a/twin/rules.cpp +++ b/twin/rules.cpp @@ -107,7 +107,7 @@ Rules::Rules( const TQString& str, bool temporary ) var##rule = readForceRule( cfg, #var "rule" ); -Rules::Rules( KConfig& cfg ) +Rules::Rules( TDEConfig& cfg ) : temporary_state( 0 ) { readFromCfg( cfg ); @@ -115,7 +115,7 @@ Rules::Rules( KConfig& cfg ) static int limit0to4( int i ) { return QMAX( 0, QMIN( 4, i )); } -void Rules::readFromCfg( KConfig& cfg ) +void Rules::readFromCfg( TDEConfig& cfg ) { description = cfg.readEntry( "Description" ); if( description.isEmpty()) // capitalized first, lowercase for backwards compatibility @@ -216,7 +216,7 @@ void Rules::readFromCfg( KConfig& cfg ) cfg.deleteEntry( #var ); -void Rules::write( KConfig& cfg ) const +void Rules::write( TDEConfig& cfg ) const { cfg.writeEntry( "Description", description ); // always write wmclass @@ -293,7 +293,7 @@ bool Rules::isEmpty() const && disableglobalshortcutsrule == UnusedForceRule ); } -Rules::SetRule Rules::readSetRule( KConfig& cfg, const TQString& key ) +Rules::SetRule Rules::readSetRule( TDEConfig& cfg, const TQString& key ) { int v = cfg.readNumEntry( key ); if( v >= DontAffect && v <= ForceTemporarily ) @@ -301,7 +301,7 @@ Rules::SetRule Rules::readSetRule( KConfig& cfg, const TQString& key ) return UnusedSetRule; } -Rules::ForceRule Rules::readForceRule( KConfig& cfg, const TQString& key ) +Rules::ForceRule Rules::readForceRule( TDEConfig& cfg, const TQString& key ) { int v = cfg.readNumEntry( key ); if( v == DontAffect || v == Force || v == ForceTemporarily ) @@ -309,7 +309,7 @@ Rules::ForceRule Rules::readForceRule( KConfig& cfg, const TQString& key ) return UnusedForceRule; } -NET::WindowType Rules::readType( KConfig& cfg, const TQString& key ) +NET::WindowType Rules::readType( TDEConfig& cfg, const TQString& key ) { int v = cfg.readNumEntry( key ); if( v >= NET::Normal && v <= NET::Splash ) @@ -960,7 +960,7 @@ void Workspace::loadWindowRules() delete rules.front(); rules.pop_front(); } - KConfig cfg( "twinrulesrc", true ); + TDEConfig cfg( "twinrulesrc", true ); cfg.setGroup( "General" ); int count = cfg.readNumEntry( "count" ); for( int i = 1; @@ -976,7 +976,7 @@ void Workspace::loadWindowRules() void Workspace::writeWindowRules() { rulesUpdatedTimer.stop(); - KConfig cfg( "twinrulesrc" ); + TDEConfig cfg( "twinrulesrc" ); TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); diff --git a/twin/rules.h b/twin/rules.h index 061f0ce80..38e0bf2df 100644 --- a/twin/rules.h +++ b/twin/rules.h @@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms. #include "options.h" #include "utils.h" -class KConfig; +class TDEConfig; namespace KWinInternal { @@ -83,9 +83,9 @@ class Rules { public: Rules(); - Rules( KConfig& ); + Rules( TDEConfig& ); Rules( const TQString&, bool temporary ); - void write( KConfig& ) const; + void write( TDEConfig& ) const; bool isEmpty() const; #ifndef KCMRULES void discardUsed( bool withdrawn ); @@ -160,10 +160,10 @@ class Rules RegExpMatch, LastStringMatch = RegExpMatch }; - void readFromCfg( KConfig& cfg ); - static SetRule readSetRule( KConfig&, const TQString& key ); - static ForceRule readForceRule( KConfig&, const TQString& key ); - static NET::WindowType readType( KConfig&, const TQString& key ); + void readFromCfg( TDEConfig& cfg ); + static SetRule readSetRule( TDEConfig&, const TQString& key ); + static ForceRule readForceRule( TDEConfig&, const TQString& key ); + static NET::WindowType readType( TDEConfig&, const TQString& key ); #ifndef KCMRULES static bool checkSetRule( SetRule rule, bool init ); static bool checkForceRule( ForceRule rule ); diff --git a/twin/sm.cpp b/twin/sm.cpp index 752ea988c..af8217bfb 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -67,7 +67,7 @@ bool SessionManaged::commitData( TQSessionManager& sm ) \sa loadSessionInfo() */ -void Workspace::storeSession( KConfig* config, SMSavePhase phase ) +void Workspace::storeSession( TDEConfig* config, SMSavePhase phase ) { config->setGroup("Session" ); int count = 0; @@ -149,7 +149,7 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase ) void Workspace::loadSessionInfo() { session.clear(); - KConfig* config = kapp->sessionConfig(); + TDEConfig* config = kapp->sessionConfig(); config->setGroup("Session" ); int count = config->readNumEntry( "count" ); int active_client = config->readNumEntry( "active" ); diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index b66e0df71..de5006903 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -667,7 +667,7 @@ void TabBox::hide() void TabBox::reconfigure() { - KConfig * c(TDEGlobal::config()); + TDEConfig * c(TDEGlobal::config()); c->setGroup("TabBox"); options_traverse_all = c->readBoolEntry("TraverseAll", false ); } @@ -692,7 +692,7 @@ void TabBox::reconfigure() */ void TabBox::delayedShow() { - KConfig * c(TDEGlobal::config()); + TDEConfig * c(TDEGlobal::config()); c->setGroup("TabBox"); bool delay = c->readBoolEntry("ShowDelay", true); @@ -1060,7 +1060,7 @@ void Workspace::CDEWalkThroughWindows( bool forward ) Client* nc = c; bool options_traverse_all; { - KConfigGroupSaver saver( TDEGlobal::config(), "TabBox" ); + TDEConfigGroupSaver saver( TDEGlobal::config(), "TabBox" ); options_traverse_all = TDEGlobal::config()->readBoolEntry("TraverseAll", false ); } diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index 8115c3534..db625ba15 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -49,7 +49,7 @@ DecoBenchApplication::DecoBenchApplication(const TQString &library, Tests tests, m_tests(tests), m_count(count) { - KConfig twinConfig("twinrc"); + TDEConfig twinConfig("twinrc"); twinConfig.setGroup("Style"); plugins = new KDecorationPreviewPlugins( &twinConfig ); diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp index 2accb7644..ece91c734 100644 --- a/twin/tools/decobenchmark/preview.cpp +++ b/twin/tools/decobenchmark/preview.cpp @@ -397,7 +397,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions() unsigned long KDecorationPreviewOptions::updateSettings() { - KConfig cfg( "twinrc", true ); + TDEConfig cfg( "twinrc", true ); unsigned long changed = 0; changed |= d->updateKWinSettings( &cfg ); diff --git a/twin/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h index 9f2445036..2138c51b7 100644 --- a/twin/tools/decobenchmark/preview.h +++ b/twin/tools/decobenchmark/preview.h @@ -125,11 +125,11 @@ class KDecorationPreviewPlugins : public KDecorationPlugins { public: - KDecorationPreviewPlugins( KConfig* cfg ); + KDecorationPreviewPlugins( TDEConfig* cfg ); virtual bool provides( Requirement ); }; -inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( KConfig* cfg ) +inline KDecorationPreviewPlugins::KDecorationPreviewPlugins( TDEConfig* cfg ) : KDecorationPlugins( cfg ) { } diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 85491fe76..4778caaa3 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -388,7 +388,7 @@ void Workspace::init() initial_desktop = client_info.currentDesktop(); else { - KConfigGroupSaver saver( kapp->sessionConfig(), "Session" ); + TDEConfigGroupSaver saver( kapp->sessionConfig(), "Session" ); initial_desktop = kapp->sessionConfig()->readNumEntry( "desktop", 1 ); } if( !setCurrentDesktop( initial_desktop )) @@ -1146,13 +1146,13 @@ void Workspace::slotReconfigure() void Workspace::loadDesktopSettings() { - KConfig* c = TDEGlobal::config(); + TDEConfig* c = TDEGlobal::config(); TQCString groupname; if (screen_number == 0) groupname = "Desktops"; else groupname.sprintf("Desktops-screen-%d", screen_number); - KConfigGroupSaver saver(c,groupname); + TDEConfigGroupSaver saver(c,groupname); int n = c->readNumEntry("Number", 4); number_of_desktops = n; @@ -1175,13 +1175,13 @@ void Workspace::loadDesktopSettings() void Workspace::saveDesktopSettings() { - KConfig* c = TDEGlobal::config(); + TDEConfig* c = TDEGlobal::config(); TQCString groupname; if (screen_number == 0) groupname = "Desktops"; else groupname.sprintf("Desktops-screen-%d", screen_number); - KConfigGroupSaver saver(c,groupname); + TDEConfigGroupSaver saver(c,groupname); c->writeEntry("Number", number_of_desktops ); for(int i = 1; i <= number_of_desktops; i++) @@ -2765,7 +2765,7 @@ void Workspace::helperDialog( const TQString& message, const Client* c ) proc << "kdialog" << args; if( !type.isEmpty()) { - KConfig cfg( "twin_dialogsrc" ); + TDEConfig cfg( "twin_dialogsrc" ); cfg.setGroup( "Notification Messages" ); // this depends on KMessageBox if( !cfg.readBoolEntry( type, true )) // has don't show again checked return; // save launching kdialog diff --git a/twin/workspace.h b/twin/workspace.h index 386219e07..8abb669f8 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -27,7 +27,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <X11/Xlib.h> class TQPopupMenu; -class KConfig; +class TDEConfig; class TDEGlobalAccel; class KShortcutDialog; class KStartupInfo; @@ -222,7 +222,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin void performWindowOperation( Client* c, WindowOperation op ); - void storeSession( KConfig* config, SMSavePhase phase ); + void storeSession( TDEConfig* config, SMSavePhase phase ); SessionInfo* takeSessionInfo( Client* ); WindowRules findWindowRules( const Client*, bool ); |