From e61b0b20f7fb93b78e3fd31bf86b375c00a4a9fe Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 29 Mar 2024 15:45:17 +0200 Subject: [PATCH] kcontrol: adjust kio KCM to kdelibs changes Signed-off-by: Ivailo Monev --- kcontrol/kio/ksaveioconfig.cpp | 7 ------- kcontrol/kio/ksaveioconfig.h | 2 -- kcontrol/kio/netpref.cpp | 9 --------- kcontrol/kio/netpref.h | 1 - 4 files changed, 19 deletions(-) diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index 751cbcbc..eb05c03e 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -66,13 +66,6 @@ void KSaveIOConfig::reparseConfiguration () d->config = 0; } -void KSaveIOConfig::setReadTimeout( int _timeout ) -{ - KConfigGroup cfg (config(), QString()); - cfg.writeEntry("ReadTimeout", qMax(MIN_TIMEOUT_VALUE,_timeout)); - cfg.sync(); -} - void KSaveIOConfig::setConnectTimeout( int _timeout ) { KConfigGroup cfg (config(), QString()); diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h index 533a5b53..390469b3 100644 --- a/kcontrol/kio/ksaveioconfig.h +++ b/kcontrol/kio/ksaveioconfig.h @@ -30,8 +30,6 @@ namespace KSaveIOConfig void reparseConfiguration(); /** Timeout Settings */ -void setReadTimeout (int); - void setConnectTimeout (int); void setResponseTimeout (int); diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp index ade9e1f4..07def6db 100644 --- a/kcontrol/kio/netpref.cpp +++ b/kcontrol/kio/netpref.cpp @@ -41,11 +41,6 @@ KIOPreferences::KIOPreferences(QWidget *parent, const QVariantList &) mainLayout->addWidget( gb_Timeout ); QFormLayout* timeoutLayout = new QFormLayout(gb_Timeout); - sb_socketRead = new KIntNumInput( this ); - sb_socketRead->setSuffix( ki18np( " second", " seconds" ) ); - connect(sb_socketRead, SIGNAL(valueChanged(int)), SLOT(configChanged())); - timeoutLayout->addRow(i18n( "Soc&ket read:" ), sb_socketRead); - sb_serverConnect = new KIntNumInput( 0, this ); sb_serverConnect->setSuffix( ki18np( " second", " seconds" ) ); connect(sb_serverConnect, SIGNAL(valueChanged(int)), SLOT(configChanged())); @@ -102,11 +97,9 @@ void KIOPreferences::load() { KProtocolManager proto; - sb_socketRead->setRange( MIN_TIMEOUT_VALUE, MAX_TIMEOUT_VALUE ); sb_serverResponse->setRange( MIN_TIMEOUT_VALUE, MAX_TIMEOUT_VALUE ); sb_serverConnect->setRange( MIN_TIMEOUT_VALUE, MAX_TIMEOUT_VALUE ); - sb_socketRead->setValue( proto.readTimeout() ); sb_serverResponse->setValue( proto.responseTimeout() ); sb_serverConnect->setValue( proto.connectTimeout() ); @@ -122,7 +115,6 @@ void KIOPreferences::load() void KIOPreferences::save() { - KSaveIOConfig::setReadTimeout( sb_socketRead->value() ); KSaveIOConfig::setResponseTimeout( sb_serverResponse->value() ); KSaveIOConfig::setConnectTimeout( sb_serverConnect->value() ); @@ -141,7 +133,6 @@ void KIOPreferences::save() void KIOPreferences::defaults() { - sb_socketRead->setValue( DEFAULT_READ_TIMEOUT ); sb_serverResponse->setValue( DEFAULT_RESPONSE_TIMEOUT ); sb_serverConnect->setValue( DEFAULT_CONNECT_TIMEOUT ); diff --git a/kcontrol/kio/netpref.h b/kcontrol/kio/netpref.h index 576fe8ed..1f4f0156 100644 --- a/kcontrol/kio/netpref.h +++ b/kcontrol/kio/netpref.h @@ -33,7 +33,6 @@ private: QCheckBox* cb_ftpEnablePasv; QCheckBox* cb_ftpMarkPartial; - KIntNumInput* sb_socketRead; KIntNumInput* sb_serverConnect; KIntNumInput* sb_serverResponse;