From c97b553d6150c31db243502b996e1f4919628413 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:12:01 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kradio3/src/include/kradioapp.h | 8 ++++---- kradio3/src/include/plugin_configuration_dialog.h | 4 ++-- kradio3/src/include/pluginmanager.h | 6 +++--- kradio3/src/include/plugins.h | 6 +++--- kradio3/src/include/radiostation-listview.h | 4 ++-- kradio3/src/include/soundformat.h | 4 ++-- kradio3/src/include/stationselector.h | 4 ++-- kradio3/src/include/widgetplugins.h | 6 +++--- kradio3/src/kradioapp.cpp | 4 ++-- kradio3/src/plugin_configuration_dialog.cpp | 4 ++-- kradio3/src/pluginmanager.cpp | 4 ++-- kradio3/src/plugins.cpp | 4 ++-- kradio3/src/radiostation-listview.cpp | 4 ++-- kradio3/src/soundformat.cpp | 4 ++-- kradio3/src/stationlist.cpp | 6 +++--- kradio3/src/stationselector.cpp | 4 ++-- kradio3/src/widgetplugins.cpp | 6 +++--- 17 files changed, 41 insertions(+), 41 deletions(-) (limited to 'kradio3/src') diff --git a/kradio3/src/include/kradioapp.h b/kradio3/src/include/kradioapp.h index facecae..fabe04f 100644 --- a/kradio3/src/include/kradioapp.h +++ b/kradio3/src/include/kradioapp.h @@ -41,8 +41,8 @@ public: virtual ConfigPageInfo createConfigurationPage () { return ConfigPageInfo(); } virtual AboutPageInfo createAboutPage (); - virtual void saveState (KConfig *) const {} - virtual void restoreState (KConfig *) {} + virtual void saveState (TDEConfig *) const {} + virtual void restoreState (TDEConfig *) {} }; @@ -88,8 +88,8 @@ public: KRadioApp(); virtual ~KRadioApp(); - virtual void saveState (KConfig *c); - virtual void restoreState (KConfig *c); + virtual void saveState (TDEConfig *c); + virtual void restoreState (TDEConfig *c); virtual PluginManager *createNewInstance(const TQString &name); diff --git a/kradio3/src/include/plugin_configuration_dialog.h b/kradio3/src/include/plugin_configuration_dialog.h index 4f3f6c0..b273207 100644 --- a/kradio3/src/include/plugin_configuration_dialog.h +++ b/kradio3/src/include/plugin_configuration_dialog.h @@ -42,8 +42,8 @@ public: virtual TQString pluginClassName() const { return "PluginConfigurationDialog"; } - virtual void saveState (KConfig *) const; - virtual void restoreState (KConfig *); + virtual void saveState (TDEConfig *) const; + virtual void restoreState (TDEConfig *); protected : diff --git a/kradio3/src/include/pluginmanager.h b/kradio3/src/include/pluginmanager.h index 635a50c..e450284 100644 --- a/kradio3/src/include/pluginmanager.h +++ b/kradio3/src/include/pluginmanager.h @@ -32,7 +32,7 @@ class WidgetPluginBase; class PluginConfigurationDialog; class PluginManagerConfiguration; class TQWidget; -class KConfig; +class TDEConfig; class TQFrame; class KAboutDialog; class KDialogBase; @@ -79,8 +79,8 @@ public : // operations on all plugins - virtual void saveState (KConfig *) const; - virtual void restoreState (KConfig *); + virtual void saveState (TDEConfig *) const; + virtual void restoreState (TDEConfig *); virtual void startPlugins(); // configuration dialog handling diff --git a/kradio3/src/include/plugins.h b/kradio3/src/include/plugins.h index 023e35d..808d0bb 100644 --- a/kradio3/src/include/plugins.h +++ b/kradio3/src/include/plugins.h @@ -34,7 +34,7 @@ class PluginManager; class PluginBase; class TQWidget; -class KConfig; +class TDEConfig; typedef TQPtrList PluginList; typedef TQPtrListIterator PluginIterator; @@ -115,8 +115,8 @@ public: // save/restore status, window position, etc... - virtual void saveState (KConfig *) const = 0; - virtual void restoreState (KConfig *) = 0; + virtual void saveState (TDEConfig *) const = 0; + virtual void restoreState (TDEConfig *) = 0; virtual void startPlugin(); virtual void aboutToQuit(); diff --git a/kradio3/src/include/radiostation-listview.h b/kradio3/src/include/radiostation-listview.h index 36ed7cf..d6210b9 100644 --- a/kradio3/src/include/radiostation-listview.h +++ b/kradio3/src/include/radiostation-listview.h @@ -52,8 +52,8 @@ public: int count() const { return childCount(); } - void saveState (KConfig *) const; - void restoreState (KConfig *); + void saveState (TDEConfig *) const; + void restoreState (TDEConfig *); protected: diff --git a/kradio3/src/include/soundformat.h b/kradio3/src/include/soundformat.h index ea11f09..0fcca24 100644 --- a/kradio3/src/include/soundformat.h +++ b/kradio3/src/include/soundformat.h @@ -60,8 +60,8 @@ struct SoundFormat { int minValue() const; int maxValue() const; - void restoreConfig(const TQString &prefix, KConfig *c); - void saveConfig(const TQString &prefix, KConfig *c) const; + void restoreConfig(const TQString &prefix, TDEConfig *c); + void saveConfig(const TQString &prefix, TDEConfig *c) const; int convertSampleToInt(const char *sample, bool do_scale) const; void convertIntToSample(int src, char *dst, bool is_scaled) const; diff --git a/kradio3/src/include/stationselector.h b/kradio3/src/include/stationselector.h index e18c87e..009293e 100644 --- a/kradio3/src/include/stationselector.h +++ b/kradio3/src/include/stationselector.h @@ -60,8 +60,8 @@ public : bool noticeCurrentSoundStreamIDChanged(SoundStreamID) { return false; } - void saveState (KConfig *) const; - void restoreState (KConfig *); + void saveState (TDEConfig *) const; + void restoreState (TDEConfig *); bool isDirty () const { return m_dirty; } diff --git a/kradio3/src/include/widgetplugins.h b/kradio3/src/include/widgetplugins.h index c3339c4..69bb0bf 100644 --- a/kradio3/src/include/widgetplugins.h +++ b/kradio3/src/include/widgetplugins.h @@ -31,9 +31,9 @@ class WidgetPluginBase : public PluginBase public : WidgetPluginBase(const TQString &name, const TQString &description); - virtual void saveState (KConfig *) const; - virtual void restoreState (KConfig *); - virtual void restoreState (KConfig *, bool showByDefault); + virtual void saveState (TDEConfig *) const; + virtual void restoreState (TDEConfig *); + virtual void restoreState (TDEConfig *, bool showByDefault); virtual void startPlugin(); virtual TQWidget *getWidget() = 0; diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp index c008a1d..d281285 100644 --- a/kradio3/src/kradioapp.cpp +++ b/kradio3/src/kradioapp.cpp @@ -144,7 +144,7 @@ void KRadioApp::saveState() saveState(TDEGlobal::config()); } -void KRadioApp::saveState (KConfig *c) +void KRadioApp::saveState (TDEConfig *c) { c->setGroup("Global"); c->writeEntry("instances", m_Instances.count()); @@ -169,7 +169,7 @@ void KRadioApp::saveState (KConfig *c) } -void KRadioApp::restoreState (KConfig *c) +void KRadioApp::restoreState (TDEConfig *c) { BlockProfiler profiler("KRadioApp::restoreState - loadLibraries"); diff --git a/kradio3/src/plugin_configuration_dialog.cpp b/kradio3/src/plugin_configuration_dialog.cpp index 3482bf3..e2e4013 100644 --- a/kradio3/src/plugin_configuration_dialog.cpp +++ b/kradio3/src/plugin_configuration_dialog.cpp @@ -34,13 +34,13 @@ PluginConfigurationDialog::PluginConfigurationDialog( // PluginBase -void PluginConfigurationDialog::saveState (KConfig *c) const +void PluginConfigurationDialog::saveState (TDEConfig *c) const { c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name()); WidgetPluginBase::saveState(c); } -void PluginConfigurationDialog::restoreState (KConfig *c) +void PluginConfigurationDialog::restoreState (TDEConfig *c) { c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name()); WidgetPluginBase::restoreState(c, true); diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp index 5c7ea56..2ba5715 100644 --- a/kradio3/src/pluginmanager.cpp +++ b/kradio3/src/pluginmanager.cpp @@ -410,7 +410,7 @@ void PluginManager::createAboutDialog(const TQString &title) } -void PluginManager::saveState (KConfig *c) const +void PluginManager::saveState (TDEConfig *c) const { c->setGroup("PluginManager-" + m_Name); c->writeEntry("show-progress-bar", m_showProgressBar); @@ -434,7 +434,7 @@ void PluginManager::saveState (KConfig *c) const } -void PluginManager::restoreState (KConfig *c) +void PluginManager::restoreState (TDEConfig *c) { BlockProfiler profile_all("PluginManager::restoreState"); c->setGroup("PluginManager-" + m_Name); diff --git a/kradio3/src/plugins.cpp b/kradio3/src/plugins.cpp index f711bf0..3c386b3 100644 --- a/kradio3/src/plugins.cpp +++ b/kradio3/src/plugins.cpp @@ -62,13 +62,13 @@ bool PluginBase::isManagerSet () const } -void PluginBase::saveState (KConfig *) const +void PluginBase::saveState (TDEConfig *) const { // do nothing } -void PluginBase::restoreState (KConfig *) +void PluginBase::restoreState (TDEConfig *) { // do nothing } diff --git a/kradio3/src/radiostation-listview.cpp b/kradio3/src/radiostation-listview.cpp index 6502286..0a4148d 100644 --- a/kradio3/src/radiostation-listview.cpp +++ b/kradio3/src/radiostation-listview.cpp @@ -192,7 +192,7 @@ void RadioStationListView::slotCurrentStationChanged(TQListViewItem *item) } -void RadioStationListView::saveState (KConfig *cfg) const +void RadioStationListView::saveState (TDEConfig *cfg) const { if (!cfg) return; @@ -201,7 +201,7 @@ void RadioStationListView::saveState (KConfig *cfg) const } -void RadioStationListView::restoreState (KConfig *cfg) +void RadioStationListView::restoreState (TDEConfig *cfg) { if (!cfg) return; diff --git a/kradio3/src/soundformat.cpp b/kradio3/src/soundformat.cpp index 50e0c75..57f9aa1 100644 --- a/kradio3/src/soundformat.cpp +++ b/kradio3/src/soundformat.cpp @@ -47,7 +47,7 @@ int SoundFormat::maxValue() const } -void SoundFormat::restoreConfig(const TQString &prefix, KConfig *c) +void SoundFormat::restoreConfig(const TQString &prefix, TDEConfig *c) { m_SampleBits = c->readNumEntry (prefix + "bits", 16); m_IsSigned = c->readBoolEntry(prefix + "sign", true); @@ -59,7 +59,7 @@ void SoundFormat::restoreConfig(const TQString &prefix, KConfig *c) } -void SoundFormat::saveConfig(const TQString &prefix, KConfig *c) const +void SoundFormat::saveConfig(const TQString &prefix, TDEConfig *c) const { c->writeEntry(prefix + "bits", m_SampleBits); c->writeEntry(prefix + "sign", m_IsSigned); diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp index 8c6bf80..6de71fb 100644 --- a/kradio3/src/stationlist.cpp +++ b/kradio3/src/stationlist.cpp @@ -337,7 +337,7 @@ bool StationList::readXML (const TQString &dat, const IErrorLogClient &logger, b bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool enableMessageBox) { TQString tmpfile; - if (!KIO::NetAccess::download(url, tmpfile, NULL)) { + if (!TDEIO::NetAccess::download(url, tmpfile, NULL)) { if (enableMessageBox) { logger.logError("StationList::readXML: " + i18n("error downloading preset file %1").arg(url.url())); @@ -393,7 +393,7 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool presetFile.close(); - KIO::NetAccess::removeTempFile(tmpfile); + TDEIO::NetAccess::removeTempFile(tmpfile); return readXML(xmlData, logger, enableMessageBox); } @@ -477,7 +477,7 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").arg(count())); } else { - if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) { + if (!TDEIO::NetAccess::upload(tmpFile.name(), url, NULL)) { logger.logError("StationList::writeXML: " + i18n("error uploading preset file %1").arg(url.url())); diff --git a/kradio3/src/stationselector.cpp b/kradio3/src/stationselector.cpp index 87a5d59..d604ea8 100644 --- a/kradio3/src/stationselector.cpp +++ b/kradio3/src/stationselector.cpp @@ -297,14 +297,14 @@ void StationSelector::slotCancel() } -void StationSelector::saveState (KConfig *cfg) const +void StationSelector::saveState (TDEConfig *cfg) const { listSelected->saveState(cfg); listAvailable->saveState(cfg); } -void StationSelector::restoreState (KConfig *cfg) +void StationSelector::restoreState (TDEConfig *cfg) { listSelected->restoreState(cfg); listAvailable->restoreState(cfg); diff --git a/kradio3/src/widgetplugins.cpp b/kradio3/src/widgetplugins.cpp index c7e866d..21ddce1 100644 --- a/kradio3/src/widgetplugins.cpp +++ b/kradio3/src/widgetplugins.cpp @@ -186,7 +186,7 @@ void WidgetPluginBase::getKWinState(const TQWidget *_w) const } -void WidgetPluginBase::saveState (KConfig *config) const +void WidgetPluginBase::saveState (TDEConfig *config) const { const TQWidget *w = getWidget(); getKWinState(w); @@ -201,7 +201,7 @@ void WidgetPluginBase::saveState (KConfig *config) const } -void WidgetPluginBase::restoreState (KConfig *config, bool showByDefault) +void WidgetPluginBase::restoreState (TDEConfig *config, bool showByDefault) { m_geoCacheValid = config->readBoolEntry("geoCacheValid", false); m_saveDesktop = config->readNumEntry ("desktop", 1); @@ -214,7 +214,7 @@ void WidgetPluginBase::restoreState (KConfig *config, bool showByDefault) } -void WidgetPluginBase::restoreState (KConfig *config) +void WidgetPluginBase::restoreState (TDEConfig *config) { restoreState(config, true); } -- cgit v1.2.1