From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdeprint/cups/cupsdconf2/cupsdconf.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 +- tdeprint/cups/cupsinfos.cpp | 4 ++-- tdeprint/cups/kmconfigcups.cpp | 4 ++-- tdeprint/cups/kmconfigcups.h | 4 ++-- tdeprint/cups/kmconfigcupsdir.cpp | 4 ++-- tdeprint/cups/kmconfigcupsdir.h | 4 ++-- tdeprint/cups/kmcupsconfigwidget.cpp | 2 +- tdeprint/cups/kmcupsconfigwidget.h | 4 ++-- tdeprint/cups/kmcupsmanager.cpp | 10 +++++----- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'tdeprint/cups') diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.cpp b/tdeprint/cups/cupsdconf2/cupsdconf.cpp index 971da38ff..a05e44d6f 100644 --- a/tdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -607,7 +607,7 @@ bool CupsdConf::parseOption(const TQString& line) bool CupsdConf::loadAvailableResources() { - KConfig conf("tdeprintrc"); + TDEConfig conf("tdeprintrc"); conf.setGroup("CUPS"); TQString host = conf.readEntry("Host",cupsServer()); int port = conf.readNumEntry("Port",ippPort()); diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index 5e6d4659d..ada83d362 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -95,7 +95,7 @@ const char* getPassword(const char*) TQString user(cupsUser()); TQString pass; - if (KIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) + if (TDEIO::PasswordDialog::getNameAndPassword(user, pass, NULL) == TQDialog::Accepted) { cupsSetUser(user.latin1()); pass_string = pass; diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp index 2f7031503..7962b13ef 100644 --- a/tdeprint/cups/cupsinfos.cpp +++ b/tdeprint/cups/cupsinfos.cpp @@ -117,7 +117,7 @@ const char* CupsInfos::getPasswordCB() void CupsInfos::load() { - KConfig *conf_ = KMFactory::self()->printConfig(); + TDEConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer())); port_ = conf_->readNumEntry("Port",ippPort()); @@ -141,7 +141,7 @@ void CupsInfos::load() void CupsInfos::save() { - KConfig *conf_ = KMFactory::self()->printConfig(); + TDEConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); conf_->writeEntry("Host",host_); conf_->writeEntry("Port",port_); diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp index 7e03dae01..55a96d9d5 100644 --- a/tdeprint/cups/kmconfigcups.cpp +++ b/tdeprint/cups/kmconfigcups.cpp @@ -40,12 +40,12 @@ KMConfigCups::KMConfigCups(TQWidget *parent) lay0->addStretch(1); } -void KMConfigCups::loadConfig(KConfig *) +void KMConfigCups::loadConfig(TDEConfig *) { m_widget->load(); } -void KMConfigCups::saveConfig(KConfig *conf) +void KMConfigCups::saveConfig(TDEConfig *conf) { m_widget->saveConfig(conf); } diff --git a/tdeprint/cups/kmconfigcups.h b/tdeprint/cups/kmconfigcups.h index c0f1ab2ba..5d7032403 100644 --- a/tdeprint/cups/kmconfigcups.h +++ b/tdeprint/cups/kmconfigcups.h @@ -29,8 +29,8 @@ class KMConfigCups : public KMConfigPage public: KMConfigCups(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KMCupsConfigWidget *m_widget; diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index fbec34f2a..2fe66d787 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -52,7 +52,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) m_stddir->setChecked(true); } -void KMConfigCupsDir::loadConfig(KConfig *conf) +void KMConfigCupsDir::loadConfig(TDEConfig *conf) { conf->setGroup("CUPS"); QString dir = conf->readPathEntry("InstallDir"); @@ -60,7 +60,7 @@ void KMConfigCupsDir::loadConfig(KConfig *conf) m_installdir->setURL(dir); } -void KMConfigCupsDir::saveConfig(KConfig *conf) +void KMConfigCupsDir::saveConfig(TDEConfig *conf) { conf->setGroup("CUPS"); conf->writePathEntry("InstallDir",(m_stddir->isChecked() ? TQString::null : m_installdir->url())); diff --git a/tdeprint/cups/kmconfigcupsdir.h b/tdeprint/cups/kmconfigcupsdir.h index 352388c99..6affa62b0 100644 --- a/tdeprint/cups/kmconfigcupsdir.h +++ b/tdeprint/cups/kmconfigcupsdir.h @@ -30,8 +30,8 @@ class KMConfigCupsDir : public KMConfigPage public: KMConfigCupsDir(TQWidget *parent = 0); - void loadConfig(KConfig*); - void saveConfig(KConfig*); + void loadConfig(TDEConfig*); + void saveConfig(TDEConfig*); private: KURLRequester *m_installdir; diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index ca2f4aedb..ce005fc3b 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -143,7 +143,7 @@ void KMCupsConfigWidget::save(bool sync) if (sync) inf->save(); } -void KMCupsConfigWidget::saveConfig(KConfig *conf) +void KMCupsConfigWidget::saveConfig(TDEConfig *conf) { conf->setGroup("CUPS"); conf->writeEntry("Host",m_host->text()); diff --git a/tdeprint/cups/kmcupsconfigwidget.h b/tdeprint/cups/kmcupsconfigwidget.h index 7eee42d80..b8e253ba8 100644 --- a/tdeprint/cups/kmcupsconfigwidget.h +++ b/tdeprint/cups/kmcupsconfigwidget.h @@ -24,7 +24,7 @@ class TQLineEdit; class TQCheckBox; -class KConfig; +class TDEConfig; class KMCupsConfigWidget : public TQWidget { @@ -33,7 +33,7 @@ public: void load(); void save(bool sync = true); - void saveConfig(KConfig*); + void saveConfig(TDEConfig*); protected: TQLineEdit *m_host, *m_port, *m_login, *m_password; diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index e5630652e..b0d61b8ac 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -111,7 +111,7 @@ TQString KMCupsManager::driverDirectory() TQString KMCupsManager::cupsInstallDir() { - KConfig *conf= KMFactory::self()->printConfig(); + TDEConfig *conf= KMFactory::self()->printConfig(); conf->setGroup("CUPS"); TQString dir = conf->readPathEntry("InstallDir"); return dir; @@ -1055,14 +1055,14 @@ void KMCupsManager::slotConnectionFailed( int errcode ) TQString einfo; switch (errcode) { - case KNetwork::KSocketBase::ConnectionRefused: - case KNetwork::KSocketBase::ConnectionTimedOut: + case KNetwork::TDESocketBase::ConnectionRefused: + case KNetwork::TDESocketBase::ConnectionTimedOut: einfo = i18n("connection refused") + TQString(" (%1)").arg(errcode); break; - case KNetwork::KSocketBase::LookupFailure: + case KNetwork::TDESocketBase::LookupFailure: einfo = i18n("host not found") + TQString(" (%1)").arg(errcode); break; - case KNetwork::KSocketBase::WouldBlock: + case KNetwork::TDESocketBase::WouldBlock: default: einfo = i18n("read failed (%1)").arg(errcode); break; -- cgit v1.2.1