From f21aaec952493cb5688c73de6e82a569ddbd7fb2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:36:20 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kppp/ChangeLog | 12 ++++++------ kppp/HISTORY | 2 +- kppp/kpppwidget.cpp | 2 +- kppp/modemdb.cpp | 4 ++-- kppp/modemdb.h | 6 +++--- kppp/pppdata.cpp | 2 +- kppp/pppdata.h | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kppp') diff --git a/kppp/ChangeLog b/kppp/ChangeLog index 8aea4f64..6c532c03 100644 --- a/kppp/ChangeLog +++ b/kppp/ChangeLog @@ -270,7 +270,7 @@ * connect.cpp: skip setting the volume if command is empty * switched from KWizard to QWizard - * adaption to new KConfig iterators + * adaption to new TDEConfig iterators * partly switched to KStandardDirs 1999-05-07 Harri Porten @@ -643,7 +643,7 @@ 1998-12-22 Harri Porten * pppdata.cpp: Give users upgrading from KDE 1.0 instructions how - to modify their kppprc if it is owned by root (KConfig bug back then). + to modify their kppprc if it is owned by root (TDEConfig bug back then). 1998-12-21 Mario Weilguni @@ -915,7 +915,7 @@ * modem.cpp: disentangled Modem class from other Widgets, i.e. removed the Multiple Inheritance I introduced earlier. Drawback: another global pointer :( - * main.cpp: since KConfig neglects the real user id when creating + * main.cpp: since TDEConfig neglects the real user id when creating config files we have to give kppprc back to the user ourself. * connect.cpp: pass something more useful to parseModemSpeed() * removed lots of unused/redundant code and variables @@ -1188,7 +1188,7 @@ 1998-06-02 Harri Porten - * pppdata.cpp: removed workaround, since KConfig fix is in place now + * pppdata.cpp: removed workaround, since TDEConfig fix is in place now Mon Jun 1 16:13:06 1998 Mario Weilguni @@ -1208,7 +1208,7 @@ Mon May 18 19:51:56 1998 Mario Weilguni 1998-05-15 Harri Porten - * pppdata.cpp: temporary workaround for KConfig bug concerning + * pppdata.cpp: temporary workaround for TDEConfig bug concerning lists without a trailing separator Fri May 15 22:27:02 1998 Mario Weilguni @@ -1659,7 +1659,7 @@ Thu Dec 25 11:46:34 1997 Bernd Johannes Wuebben * Added new script keywords: PwPrompt and ID * Added ID and Password LineEdits on the main dialog window - * KConfig transition is now complete, one more time the data + * TDEConfig transition is now complete, one more time the data storage format has changed. ( Hopefully the last time ) * All sorts of little cosmetic changes diff --git a/kppp/HISTORY b/kppp/HISTORY index fe784cad..f75ca11f 100644 --- a/kppp/HISTORY +++ b/kppp/HISTORY @@ -11,7 +11,7 @@ of kppp. kppp 0.6 Nov 26 97: -The data savings scheme has been switched over to to the use of KConfig. +The data savings scheme has been switched over to to the use of TDEConfig. I consider kppp virtually free of any ezppp code. I challenge anyone who doubts this to verify my claim by doing a 'diff' on the sources. diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 6380ba8f..9894cb9b 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -197,7 +197,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) if(setup_b->sizeHint().width() > minw) minw = setup_b->sizeHint().width(); - if(gpppdata.access() != KConfig::ReadWrite) + if(gpppdata.access() != TDEConfig::ReadWrite) setup_b->setEnabled(false); help_b = new KPushButton(KStdGuiItem::help(), this); diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index 4f9e521e..406a45c5 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -202,7 +202,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { void ModemDatabase::load() { - modemDB = new KConfig("DB/modemDB.rc", 0); + modemDB = new TDEConfig("DB/modemDB.rc", 0); lvendors = new TQStringList; modems.setAutoDelete(true); @@ -238,7 +238,7 @@ void ModemDatabase::load() { } -void ModemDatabase::save(KConfig *) { +void ModemDatabase::save(TDEConfig *) { } #include "modemdb.moc" diff --git a/kppp/modemdb.h b/kppp/modemdb.h index 184f9859..d5eff508 100644 --- a/kppp/modemdb.h +++ b/kppp/modemdb.h @@ -39,7 +39,7 @@ #include #include #include -class KConfig; +class TDEConfig; class TQListBox; typedef TQDict CharDict; @@ -52,7 +52,7 @@ public: const TQStringList *vendors(); TQStringList *models(TQString vendor); - void save(KConfig *); + void save(TDEConfig *); private: void load(); @@ -61,7 +61,7 @@ private: TQStringList *lvendors; - KConfig *modemDB; + TDEConfig *modemDB; }; diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index c7b2f044..1d681352 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -58,7 +58,7 @@ bool PPPData::open() { config = kapp->config(); - if (config->getConfigState() == KConfig::NoAccess) { + if (config->getConfigState() == TDEConfig::NoAccess) { KMessageBox::error(0L, i18n("The application-specific config file could not " "be opened in either read-write or read-only mode.\n" diff --git a/kppp/pppdata.h b/kppp/pppdata.h index 7879d1fa..824665a6 100644 --- a/kppp/pppdata.h +++ b/kppp/pppdata.h @@ -37,7 +37,7 @@ #include "kpppconfig.h" -class KConfig; +class TDEConfig; // string lengths @@ -491,7 +491,7 @@ public: private: TQString passwd; - KConfig* config; // configuration object + TDEConfig* config; // configuration object int accounthighcount; // index of highest account int caccount; // index of the current account int modemhighcount; // index of highest modem -- cgit v1.2.1