From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kcontrol/konq/behaviour.cpp | 12 +++++----- kcontrol/konq/behaviour.h | 8 +++---- kcontrol/konq/browser.cpp | 10 ++++----- kcontrol/konq/browser.h | 14 ++++++------ kcontrol/konq/desktop.cpp | 10 ++++----- kcontrol/konq/desktop.h | 2 +- kcontrol/konq/desktopbehavior_impl.cpp | 14 ++++++------ kcontrol/konq/desktopbehavior_impl.h | 14 ++++++------ kcontrol/konq/fontopts.cpp | 8 +++---- kcontrol/konq/fontopts.h | 8 +++---- kcontrol/konq/main.cpp | 28 ++++++++++++------------ kcontrol/konq/previews.cpp | 8 +++---- kcontrol/konq/previews.h | 4 ++-- kcontrol/konq/rootopts.cpp | 40 +++++++++++++++++----------------- kcontrol/konq/rootopts.h | 10 ++++----- 15 files changed, 95 insertions(+), 95 deletions(-) (limited to 'kcontrol/konq') 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(w); + TDECModule *m = static_cast(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 -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("

Multiple Desktops

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 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 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 -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 -- cgit v1.2.1