Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent d9b70de56a
commit c97b553d61

@ -28,7 +28,7 @@ AlsaConfigMixerSetting::AlsaConfigMixerSetting()
{ {
} }
AlsaConfigMixerSetting::AlsaConfigMixerSetting(KConfig *c, const TQString &prefix) AlsaConfigMixerSetting::AlsaConfigMixerSetting(TDEConfig *c, const TQString &prefix)
{ {
m_card = c->readNumEntry (prefix+"card", -1); m_card = c->readNumEntry (prefix+"card", -1);
m_name = c->readEntry (prefix+"name", TQString()); m_name = c->readEntry (prefix+"name", TQString());
@ -55,7 +55,7 @@ TQString AlsaConfigMixerSetting::getIDString(int card, const TQString &name)
return TQString::number(card) + "-" + name; return TQString::number(card) + "-" + name;
} }
void AlsaConfigMixerSetting::saveState(KConfig *c, const TQString &prefix) const void AlsaConfigMixerSetting::saveState(TDEConfig *c, const TQString &prefix) const
{ {
c->writeEntry(prefix+"card", m_card); c->writeEntry(prefix+"card", m_card);
c->writeEntry(prefix+"name", m_name); c->writeEntry(prefix+"name", m_name);

@ -20,20 +20,20 @@
#include <tqstring.h> #include <tqstring.h>
class KConfig; class TDEConfig;
class AlsaConfigMixerSetting class AlsaConfigMixerSetting
{ {
public: public:
AlsaConfigMixerSetting(); AlsaConfigMixerSetting();
AlsaConfigMixerSetting(KConfig *c, const TQString &prefix); AlsaConfigMixerSetting(TDEConfig *c, const TQString &prefix);
AlsaConfigMixerSetting(int card, const TQString &name, bool use, bool active, float volume); AlsaConfigMixerSetting(int card, const TQString &name, bool use, bool active, float volume);
~AlsaConfigMixerSetting(); ~AlsaConfigMixerSetting();
TQString getIDString() const { return getIDString(m_card, m_name); } TQString getIDString() const { return getIDString(m_card, m_name); }
static TQString getIDString(int card, const TQString &m_name); static TQString getIDString(int card, const TQString &m_name);
void saveState(KConfig *c, const TQString &prefix) const; void saveState(TDEConfig *c, const TQString &prefix) const;
int m_card; int m_card;
TQString m_name; TQString m_name;

@ -132,7 +132,7 @@ void AlsaSoundDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_vali
// PluginBase // PluginBase
void AlsaSoundDevice::saveState (KConfig *c) const void AlsaSoundDevice::saveState (TDEConfig *c) const
{ {
c->setGroup(TQString("alsa-sound-") + PluginBase::name()); c->setGroup(TQString("alsa-sound-") + PluginBase::name());
@ -157,7 +157,7 @@ void AlsaSoundDevice::saveState (KConfig *c) const
} }
void AlsaSoundDevice::restoreState (KConfig *c) void AlsaSoundDevice::restoreState (TDEConfig *c)
{ {
c->setGroup(TQString("alsa-sound-") + PluginBase::name()); c->setGroup(TQString("alsa-sound-") + PluginBase::name());

@ -101,8 +101,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual TQString pluginClassName() const { return "AlsaSoundDevice"; } virtual TQString pluginClassName() const { return "AlsaSoundDevice"; }

@ -118,7 +118,7 @@ bool RadioDocking::setStationSelection(const TQStringList &sl)
// PluginBase // PluginBase
void RadioDocking::restoreState (KConfig *config) void RadioDocking::restoreState (TDEConfig *config)
{ {
config->setGroup(TQString("radiodocking-") + name()); config->setGroup(TQString("radiodocking-") + name());
@ -146,7 +146,7 @@ void RadioDocking::restoreState (KConfig *config)
} }
void RadioDocking::saveState (KConfig *config) const void RadioDocking::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("radiodocking-") + name()); config->setGroup(TQString("radiodocking-") + name());

@ -61,8 +61,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();
virtual AboutPageInfo createAboutPage(); virtual AboutPageInfo createAboutPage();

@ -134,14 +134,14 @@ bool ErrorLog::disconnectI (Interface *i)
return a || b; return a || b;
} }
void ErrorLog::restoreState (KConfig *config) void ErrorLog::restoreState (TDEConfig *config)
{ {
config->setGroup(TQString("errorlog-") + WidgetPluginBase::name()); config->setGroup(TQString("errorlog-") + WidgetPluginBase::name());
WidgetPluginBase::restoreState(config, false); WidgetPluginBase::restoreState(config, false);
} }
void ErrorLog::saveState (KConfig *config) const void ErrorLog::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("errorlog-") + WidgetPluginBase::name()); config->setGroup(TQString("errorlog-") + WidgetPluginBase::name());
WidgetPluginBase::saveState(config); WidgetPluginBase::saveState(config);
@ -251,7 +251,7 @@ void ErrorLog::slotUser1()
// close hopefully flushes buffers ;) // close hopefully flushes buffers ;)
outf->close(); outf->close();
if (!KIO::NetAccess::upload(tmpFile.name(), url, this)) { if (!TDEIO::NetAccess::upload(tmpFile.name(), url, this)) {
logError("ErrorLogger: " + logError("ErrorLogger: " +
i18n("error uploading preset file %1").arg(url.url())); i18n("error uploading preset file %1").arg(url.url()));
} }

@ -44,8 +44,8 @@ public:
// WidgetPluginBase // WidgetPluginBase
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
public slots: public slots:
virtual void showOnOrgDesktop(); virtual void showOnOrgDesktop();

@ -96,7 +96,7 @@ bool QuickBar::setStationSelection(const TQStringList &sl)
// PluginBase methods // PluginBase methods
void QuickBar::restoreState (KConfig *config) void QuickBar::restoreState (TDEConfig *config)
{ {
config->setGroup(TQString("quickBar-") + name()); config->setGroup(TQString("quickBar-") + name());
@ -115,7 +115,7 @@ void QuickBar::restoreState (KConfig *config)
} }
void QuickBar::saveState (KConfig *config) const void QuickBar::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("quickBar-") + name()); config->setGroup(TQString("quickBar-") + name());

@ -30,7 +30,7 @@
class ButtonFlowLayout; class ButtonFlowLayout;
class TQButtonGroup; class TQButtonGroup;
class KConfig; class TDEConfig;
class TQToolButton; class TQToolButton;
/** /**
@ -68,8 +68,8 @@ ANSWERS:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();
virtual AboutPageInfo createAboutPage(); virtual AboutPageInfo createAboutPage();

@ -506,7 +506,7 @@ bool RadioView::noticeCountdownZero()
// WidgetPluginBase // WidgetPluginBase
void RadioView::saveState (KConfig *config) const void RadioView::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("radioview-") + name()); config->setGroup(TQString("radioview-") + name());
@ -520,7 +520,7 @@ void RadioView::saveState (KConfig *config) const
} }
void RadioView::restoreState (KConfig *config) void RadioView::restoreState (TDEConfig *config)
{ {
config->setGroup(TQString("radioview-") + name()); config->setGroup(TQString("radioview-") + name());

@ -61,8 +61,8 @@ public:
// WidgetPluginBase // WidgetPluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual bool connectI(Interface *i); virtual bool connectI(Interface *i);
virtual bool disconnectI(Interface *i); virtual bool disconnectI(Interface *i);

@ -54,8 +54,8 @@ public:
// Configuration ?? // Configuration ??
virtual ConfigPageInfo createConfigurationPage() { return ConfigPageInfo(); } virtual ConfigPageInfo createConfigurationPage() { return ConfigPageInfo(); }
virtual void saveState (KConfig *) const {} virtual void saveState (TDEConfig *) const {}
virtual void restoreState (KConfig *) {} virtual void restoreState (TDEConfig *) {}
protected : protected :

@ -61,7 +61,7 @@ float RadioViewFrequencyRadio::getUsability (Interface *i) const
} }
void RadioViewFrequencyRadio::saveState (KConfig *config) const void RadioViewFrequencyRadio::saveState (TDEConfig *config) const
{ {
config->writeEntry("frequency-view-colorActiveText", m_colorActiveText); config->writeEntry("frequency-view-colorActiveText", m_colorActiveText);
config->writeEntry("frequency-view-colorInactiveText", m_colorInactiveText); config->writeEntry("frequency-view-colorInactiveText", m_colorInactiveText);
@ -70,7 +70,7 @@ void RadioViewFrequencyRadio::saveState (KConfig *config) const
} }
void RadioViewFrequencyRadio::restoreState (KConfig *config) void RadioViewFrequencyRadio::restoreState (TDEConfig *config)
{ {
TQColor defaultActive (20, 244, 20), TQColor defaultActive (20, 244, 20),
defaultInactive(TQColor(10, 117, 10).light(75)), defaultInactive(TQColor(10, 117, 10).light(75)),

@ -41,8 +41,8 @@ public:
float getUsability (Interface *) const; float getUsability (Interface *) const;
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
ConfigPageInfo createConfigurationPage(); ConfigPageInfo createConfigurationPage();

@ -214,7 +214,7 @@ bool LircSupport::disconnectI (Interface *i)
void LircSupport::saveState (KConfig *c) const void LircSupport::saveState (TDEConfig *c) const
{ {
c->writeEntry("LIRC_DIGIT_0", m_Actions[LIRC_DIGIT_0]); c->writeEntry("LIRC_DIGIT_0", m_Actions[LIRC_DIGIT_0]);
c->writeEntry("LIRC_DIGIT_1", m_Actions[LIRC_DIGIT_1]); c->writeEntry("LIRC_DIGIT_1", m_Actions[LIRC_DIGIT_1]);
@ -266,7 +266,7 @@ void LircSupport::saveState (KConfig *c) const
c->writeEntry("ALT_LIRC_APPLICATION_QUIT", m_AlternativeActions[LIRC_APPLICATION_QUIT]); c->writeEntry("ALT_LIRC_APPLICATION_QUIT", m_AlternativeActions[LIRC_APPLICATION_QUIT]);
} }
void LircSupport::restoreState (KConfig *c) void LircSupport::restoreState (TDEConfig *c)
{ {
m_Actions[LIRC_DIGIT_0] = c->readEntry("LIRC_DIGIT_0", "0"); m_Actions[LIRC_DIGIT_0] = c->readEntry("LIRC_DIGIT_0", "0");
m_Actions[LIRC_DIGIT_1] = c->readEntry("LIRC_DIGIT_1", "1"); m_Actions[LIRC_DIGIT_1] = c->readEntry("LIRC_DIGIT_1", "1");

@ -90,8 +90,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();
virtual AboutPageInfo createAboutPage(); virtual AboutPageInfo createAboutPage();

@ -117,7 +117,7 @@ void OSSSoundDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_valid
// PluginBase // PluginBase
void OSSSoundDevice::saveState (KConfig *c) const void OSSSoundDevice::saveState (TDEConfig *c) const
{ {
c->setGroup(TQString("oss-sound-") + PluginBase::name()); c->setGroup(TQString("oss-sound-") + PluginBase::name());
@ -130,7 +130,7 @@ void OSSSoundDevice::saveState (KConfig *c) const
} }
void OSSSoundDevice::restoreState (KConfig *c) void OSSSoundDevice::restoreState (TDEConfig *c)
{ {
c->setGroup(TQString("oss-sound-") + PluginBase::name()); c->setGroup(TQString("oss-sound-") + PluginBase::name());

@ -75,8 +75,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual TQString pluginClassName() const { return "OSSSoundDevice"; } virtual TQString pluginClassName() const { return "OSSSoundDevice"; }

@ -77,7 +77,7 @@ bool Radio::disconnectI (Interface *i)
} }
void Radio::saveState (KConfig *config) const void Radio::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("radio-") + name()); config->setGroup(TQString("radio-") + name());
@ -87,7 +87,7 @@ void Radio::saveState (KConfig *config) const
} }
void Radio::restoreState (KConfig *config) void Radio::restoreState (TDEConfig *config)
{ {
config->setGroup(TQString("radio-") + name()); config->setGroup(TQString("radio-") + name());

@ -63,8 +63,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual TQString pluginClassName() const { return "Radio"; } virtual TQString pluginClassName() const { return "Radio"; }

@ -65,7 +65,7 @@ RecordingConfig::RecordingConfig (const RecordingConfig &c)
} }
void RecordingConfig::restoreConfig(KConfig *c) void RecordingConfig::restoreConfig(TDEConfig *c)
{ {
m_EncodeBufferSize = c->readNumEntry("encodeBufferSize", 256*1024); m_EncodeBufferSize = c->readNumEntry("encodeBufferSize", 256*1024);
m_EncodeBufferCount = c->readNumEntry("encodeBufferCount", 3); m_EncodeBufferCount = c->readNumEntry("encodeBufferCount", 3);
@ -104,7 +104,7 @@ void RecordingConfig::restoreConfig(KConfig *c)
} }
void RecordingConfig::saveConfig(KConfig *c) const void RecordingConfig::saveConfig(TDEConfig *c) const
{ {
c->writeEntry("encodeBufferSize", m_EncodeBufferSize); c->writeEntry("encodeBufferSize", m_EncodeBufferSize);
c->writeEntry("encodeBufferCount", m_EncodeBufferCount); c->writeEntry("encodeBufferCount", m_EncodeBufferCount);

@ -24,7 +24,7 @@
#include "../../src/include/soundformat.h" #include "../../src/include/soundformat.h"
class KConfig; class TDEConfig;
struct SF_INFO; struct SF_INFO;
class RecordingConfig class RecordingConfig
@ -46,8 +46,8 @@ public:
const SoundFormat &, int mp3_q, float ogg_q); const SoundFormat &, int mp3_q, float ogg_q);
RecordingConfig (const RecordingConfig &c); RecordingConfig (const RecordingConfig &c);
void restoreConfig(KConfig *c); void restoreConfig(TDEConfig *c);
void saveConfig(KConfig *c) const; void saveConfig(TDEConfig *c) const;
void getSoundFileInfo(SF_INFO &info, bool input); void getSoundFileInfo(SF_INFO &info, bool input);

@ -84,7 +84,7 @@ RecordingMonitor::~RecordingMonitor()
// WidgetPluginBase // WidgetPluginBase
void RecordingMonitor::saveState (KConfig *config) const void RecordingMonitor::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("recordingmonitor-") + name()); config->setGroup(TQString("recordingmonitor-") + name());
@ -92,7 +92,7 @@ void RecordingMonitor::saveState (KConfig *config) const
} }
void RecordingMonitor::restoreState (KConfig *config) void RecordingMonitor::restoreState (TDEConfig *config)
{ {
config->setGroup(TQString("recordingmonitor-") + name()); config->setGroup(TQString("recordingmonitor-") + name());

@ -55,8 +55,8 @@ public:
// WidgetPluginBase // WidgetPluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual bool connectI(Interface *i); virtual bool connectI(Interface *i);
virtual bool disconnectI(Interface *i); virtual bool disconnectI(Interface *i);

@ -106,14 +106,14 @@ void Recording::noticeConnectedI (ISoundStreamServer *s, bool pointer_valid)
// PluginBase // PluginBase
void Recording::saveState (KConfig *c) const void Recording::saveState (TDEConfig *c) const
{ {
c->setGroup(TQString("recording-") + PluginBase::name()); c->setGroup(TQString("recording-") + PluginBase::name());
m_config.saveConfig(c); m_config.saveConfig(c);
} }
void Recording::restoreState (KConfig *c) void Recording::restoreState (TDEConfig *c)
{ {
c->setGroup(TQString("recording-") + PluginBase::name()); c->setGroup(TQString("recording-") + PluginBase::name());
RecordingConfig cfg; RecordingConfig cfg;

@ -67,8 +67,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();
virtual AboutPageInfo createAboutPage(); virtual AboutPageInfo createAboutPage();

@ -55,11 +55,11 @@ bool SoundServer::disconnectI (Interface *i)
void SoundServer::saveState (KConfig *) const void SoundServer::saveState (TDEConfig *) const
{ {
} }
void SoundServer::restoreState (KConfig *) void SoundServer::restoreState (TDEConfig *)
{ {
} }

@ -44,8 +44,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();
virtual AboutPageInfo createAboutPage(); virtual AboutPageInfo createAboutPage();

@ -105,14 +105,14 @@ void StreamingJob::setBufferSize(size_t buffer_size)
bool StreamingJob::startPutJob() bool StreamingJob::startPutJob()
{ {
m_KIO_Job = KIO::put(m_URL, -1, true, false, false); m_KIO_Job = TDEIO::put(m_URL, -1, true, false, false);
if (!m_KIO_Job) if (!m_KIO_Job)
return false; return false;
m_KIO_Job->setAsyncDataEnabled(true); m_KIO_Job->setAsyncDataEnabled(true);
connect (m_KIO_Job, TQT_SIGNAL(dataReq(KIO::Job *job, TQByteArray &data)), connect (m_KIO_Job, TQT_SIGNAL(dataReq(TDEIO::Job *job, TQByteArray &data)),
this, TQT_SLOT(slotWriteData (KIO::Job *job, TQByteArray &data))); this, TQT_SLOT(slotWriteData (TDEIO::Job *job, TQByteArray &data)));
connect (m_KIO_Job, TQT_SIGNAL(result(KIO::Job *)), connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
this, TQT_SLOT(slotIOJobResult(KIO::Job *))); this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
return true; return true;
} }
@ -150,14 +150,14 @@ bool StreamingJob::stopPlayback()
bool StreamingJob::startGetJob() bool StreamingJob::startGetJob()
{ {
m_KIO_Job = KIO::get(m_URL, false, false); m_KIO_Job = TDEIO::get(m_URL, false, false);
if (!m_KIO_Job) if (!m_KIO_Job)
return false; return false;
m_KIO_Job->setAsyncDataEnabled(true); m_KIO_Job->setAsyncDataEnabled(true);
connect (m_KIO_Job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), connect (m_KIO_Job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotReadData(KIO::Job *, const TQByteArray &))); this, TQT_SLOT(slotReadData(TDEIO::Job *, const TQByteArray &)));
connect (m_KIO_Job, TQT_SIGNAL(result(KIO::Job *)), connect (m_KIO_Job, TQT_SIGNAL(result(TDEIO::Job *)),
this, TQT_SLOT(slotIOJobResult(KIO::Job *))); this, TQT_SLOT(slotIOJobResult(TDEIO::Job *)));
return true; return true;
} }
@ -196,7 +196,7 @@ bool StreamingJob::stopCapture()
} }
void StreamingJob::slotReadData (KIO::Job */*job*/, const TQByteArray &data) void StreamingJob::slotReadData (TDEIO::Job */*job*/, const TQByteArray &data)
{ {
size_t free = m_Buffer.getFreeSize(); size_t free = m_Buffer.getFreeSize();
if (free < data.size()) { if (free < data.size()) {
@ -216,7 +216,7 @@ void StreamingJob::slotReadData (KIO::Job */*job*/, const TQByteArray &data)
} }
void StreamingJob::slotWriteData (KIO::Job */*job*/, TQByteArray &) void StreamingJob::slotWriteData (TDEIO::Job */*job*/, TQByteArray &)
{ {
size_t size = m_Buffer.getFillSize(); size_t size = m_Buffer.getFillSize();
if (size) { if (size) {
@ -268,7 +268,7 @@ void StreamingJob::removeData(size_t size)
} }
} }
void StreamingJob::slotIOJobResult (KIO::Job *job) void StreamingJob::slotIOJobResult (TDEIO::Job *job)
{ {
if (job && job->error()) { if (job && job->error()) {
emit logStreamError(m_URL, job->errorString()); emit logStreamError(m_URL, job->errorString());

@ -65,9 +65,9 @@ public:
protected slots: protected slots:
void slotReadData (KIO::Job *job, const TQByteArray &data); void slotReadData (TDEIO::Job *job, const TQByteArray &data);
void slotWriteData (KIO::Job *job, TQByteArray &data); void slotWriteData (TDEIO::Job *job, TQByteArray &data);
void slotIOJobResult (KIO::Job *job); void slotIOJobResult (TDEIO::Job *job);
signals: signals:
@ -92,7 +92,7 @@ protected:
size_t m_SkipCount; size_t m_SkipCount;
KIO::TransferJob *m_KIO_Job; TDEIO::TransferJob *m_KIO_Job;
bool m_capturing; bool m_capturing;
}; };

@ -90,7 +90,7 @@ void StreamingDevice::noticeConnectedI (ISoundStreamServer *s, bool pointer_vali
// PluginBase // PluginBase
void StreamingDevice::saveState (KConfig *c) const void StreamingDevice::saveState (TDEConfig *c) const
{ {
c->setGroup(TQString("streaming-") + PluginBase::name()); c->setGroup(TQString("streaming-") + PluginBase::name());
c->writeEntry("soundstreamclient-id", m_SoundStreamClientID); c->writeEntry("soundstreamclient-id", m_SoundStreamClientID);
@ -124,7 +124,7 @@ void StreamingDevice::saveState (KConfig *c) const
} }
} }
void StreamingDevice::restoreState (KConfig *c) void StreamingDevice::restoreState (TDEConfig *c)
{ {
c->setGroup(TQString("streaming-") + PluginBase::name()); c->setGroup(TQString("streaming-") + PluginBase::name());
setSoundStreamClientID(c->readEntry("soundstreamclient-id", getSoundStreamClientID())); setSoundStreamClientID(c->readEntry("soundstreamclient-id", getSoundStreamClientID()));

@ -56,8 +56,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual TQString pluginClassName() const { return "StreamingDevice"; } virtual TQString pluginClassName() const { return "StreamingDevice"; }

@ -208,7 +208,7 @@ void TimeControl::slotQTimerAlarmTimeout()
} }
void TimeControl::restoreState (KConfig *config) void TimeControl::restoreState (TDEConfig *config)
{ {
AlarmVector al; AlarmVector al;
@ -241,7 +241,7 @@ void TimeControl::restoreState (KConfig *config)
} }
void TimeControl::saveState (KConfig *config) const void TimeControl::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("timecontrol-") + name()); config->setGroup(TQString("timecontrol-") + name());

@ -61,8 +61,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();
virtual AboutPageInfo createAboutPage(); virtual AboutPageInfo createAboutPage();

@ -84,7 +84,7 @@ void TimeShifter::noticeConnectedI (ISoundStreamServer *s, bool pointer_valid)
} }
void TimeShifter::saveState (KConfig *config) const void TimeShifter::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("timeshifter-") + name()); config->setGroup(TQString("timeshifter-") + name());
@ -96,7 +96,7 @@ void TimeShifter::saveState (KConfig *config) const
} }
void TimeShifter::restoreState (KConfig *config) void TimeShifter::restoreState (TDEConfig *config)
{ {
config->setGroup(TQString("timeshifter-") + name()); config->setGroup(TQString("timeshifter-") + name());

@ -58,8 +58,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();
virtual AboutPageInfo createAboutPage(); virtual AboutPageInfo createAboutPage();

@ -940,7 +940,7 @@ bool V4LRadio::setVolumeZeroOnPowerOff(bool a)
// PluginBase methods // PluginBase methods
void V4LRadio::saveState (KConfig *config) const void V4LRadio::saveState (TDEConfig *config) const
{ {
config->setGroup(TQString("v4lradio-") + name()); config->setGroup(TQString("v4lradio-") + name());
@ -977,7 +977,7 @@ void V4LRadio::saveState (KConfig *config) const
} }
void V4LRadio::restoreState (KConfig *config) void V4LRadio::restoreState (TDEConfig *config)
{ {
BlockProfiler p("V4LRadio::restoreState"); BlockProfiler p("V4LRadio::restoreState");

@ -64,8 +64,8 @@ public:
// PluginBase // PluginBase
public: public:
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual void startPlugin(); virtual void startPlugin();
virtual ConfigPageInfo createConfigurationPage(); virtual ConfigPageInfo createConfigurationPage();

@ -41,8 +41,8 @@ public:
virtual ConfigPageInfo createConfigurationPage () { return ConfigPageInfo(); } virtual ConfigPageInfo createConfigurationPage () { return ConfigPageInfo(); }
virtual AboutPageInfo createAboutPage (); virtual AboutPageInfo createAboutPage ();
virtual void saveState (KConfig *) const {} virtual void saveState (TDEConfig *) const {}
virtual void restoreState (KConfig *) {} virtual void restoreState (TDEConfig *) {}
}; };
@ -88,8 +88,8 @@ public:
KRadioApp(); KRadioApp();
virtual ~KRadioApp(); virtual ~KRadioApp();
virtual void saveState (KConfig *c); virtual void saveState (TDEConfig *c);
virtual void restoreState (KConfig *c); virtual void restoreState (TDEConfig *c);
virtual PluginManager *createNewInstance(const TQString &name); virtual PluginManager *createNewInstance(const TQString &name);

@ -42,8 +42,8 @@ public:
virtual TQString pluginClassName() const { return "PluginConfigurationDialog"; } virtual TQString pluginClassName() const { return "PluginConfigurationDialog"; }
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
protected : protected :

@ -32,7 +32,7 @@ class WidgetPluginBase;
class PluginConfigurationDialog; class PluginConfigurationDialog;
class PluginManagerConfiguration; class PluginManagerConfiguration;
class TQWidget; class TQWidget;
class KConfig; class TDEConfig;
class TQFrame; class TQFrame;
class KAboutDialog; class KAboutDialog;
class KDialogBase; class KDialogBase;
@ -79,8 +79,8 @@ public :
// operations on all plugins // operations on all plugins
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual void startPlugins(); virtual void startPlugins();
// configuration dialog handling // configuration dialog handling

@ -34,7 +34,7 @@
class PluginManager; class PluginManager;
class PluginBase; class PluginBase;
class TQWidget; class TQWidget;
class KConfig; class TDEConfig;
typedef TQPtrList<PluginBase> PluginList; typedef TQPtrList<PluginBase> PluginList;
typedef TQPtrListIterator<PluginBase> PluginIterator; typedef TQPtrListIterator<PluginBase> PluginIterator;
@ -115,8 +115,8 @@ public:
// save/restore status, window position, etc... // save/restore status, window position, etc...
virtual void saveState (KConfig *) const = 0; virtual void saveState (TDEConfig *) const = 0;
virtual void restoreState (KConfig *) = 0; virtual void restoreState (TDEConfig *) = 0;
virtual void startPlugin(); virtual void startPlugin();
virtual void aboutToQuit(); virtual void aboutToQuit();

@ -52,8 +52,8 @@ public:
int count() const { return childCount(); } int count() const { return childCount(); }
void saveState (KConfig *) const; void saveState (TDEConfig *) const;
void restoreState (KConfig *); void restoreState (TDEConfig *);
protected: protected:

@ -60,8 +60,8 @@ struct SoundFormat {
int minValue() const; int minValue() const;
int maxValue() const; int maxValue() const;
void restoreConfig(const TQString &prefix, KConfig *c); void restoreConfig(const TQString &prefix, TDEConfig *c);
void saveConfig(const TQString &prefix, KConfig *c) const; void saveConfig(const TQString &prefix, TDEConfig *c) const;
int convertSampleToInt(const char *sample, bool do_scale) const; int convertSampleToInt(const char *sample, bool do_scale) const;
void convertIntToSample(int src, char *dst, bool is_scaled) const; void convertIntToSample(int src, char *dst, bool is_scaled) const;

@ -60,8 +60,8 @@ public :
bool noticeCurrentSoundStreamIDChanged(SoundStreamID) { return false; } bool noticeCurrentSoundStreamIDChanged(SoundStreamID) { return false; }
void saveState (KConfig *) const; void saveState (TDEConfig *) const;
void restoreState (KConfig *); void restoreState (TDEConfig *);
bool isDirty () const { return m_dirty; } bool isDirty () const { return m_dirty; }

@ -31,9 +31,9 @@ class WidgetPluginBase : public PluginBase
public : public :
WidgetPluginBase(const TQString &name, const TQString &description); WidgetPluginBase(const TQString &name, const TQString &description);
virtual void saveState (KConfig *) const; virtual void saveState (TDEConfig *) const;
virtual void restoreState (KConfig *); virtual void restoreState (TDEConfig *);
virtual void restoreState (KConfig *, bool showByDefault); virtual void restoreState (TDEConfig *, bool showByDefault);
virtual void startPlugin(); virtual void startPlugin();
virtual TQWidget *getWidget() = 0; virtual TQWidget *getWidget() = 0;

@ -144,7 +144,7 @@ void KRadioApp::saveState()
saveState(TDEGlobal::config()); saveState(TDEGlobal::config());
} }
void KRadioApp::saveState (KConfig *c) void KRadioApp::saveState (TDEConfig *c)
{ {
c->setGroup("Global"); c->setGroup("Global");
c->writeEntry("instances", m_Instances.count()); 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"); BlockProfiler profiler("KRadioApp::restoreState - loadLibraries");

@ -34,13 +34,13 @@ PluginConfigurationDialog::PluginConfigurationDialog(
// PluginBase // PluginBase
void PluginConfigurationDialog::saveState (KConfig *c) const void PluginConfigurationDialog::saveState (TDEConfig *c) const
{ {
c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name()); c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name());
WidgetPluginBase::saveState(c); WidgetPluginBase::saveState(c);
} }
void PluginConfigurationDialog::restoreState (KConfig *c) void PluginConfigurationDialog::restoreState (TDEConfig *c)
{ {
c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name()); c->setGroup(TQString("config-dialog-") + WidgetPluginBase::name());
WidgetPluginBase::restoreState(c, true); WidgetPluginBase::restoreState(c, true);

@ -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->setGroup("PluginManager-" + m_Name);
c->writeEntry("show-progress-bar", m_showProgressBar); 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"); BlockProfiler profile_all("PluginManager::restoreState");
c->setGroup("PluginManager-" + m_Name); c->setGroup("PluginManager-" + m_Name);

@ -62,13 +62,13 @@ bool PluginBase::isManagerSet () const
} }
void PluginBase::saveState (KConfig *) const void PluginBase::saveState (TDEConfig *) const
{ {
// do nothing // do nothing
} }
void PluginBase::restoreState (KConfig *) void PluginBase::restoreState (TDEConfig *)
{ {
// do nothing // do nothing
} }

@ -192,7 +192,7 @@ void RadioStationListView::slotCurrentStationChanged(TQListViewItem *item)
} }
void RadioStationListView::saveState (KConfig *cfg) const void RadioStationListView::saveState (TDEConfig *cfg) const
{ {
if (!cfg) if (!cfg)
return; return;
@ -201,7 +201,7 @@ void RadioStationListView::saveState (KConfig *cfg) const
} }
void RadioStationListView::restoreState (KConfig *cfg) void RadioStationListView::restoreState (TDEConfig *cfg)
{ {
if (!cfg) if (!cfg)
return; return;

@ -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_SampleBits = c->readNumEntry (prefix + "bits", 16);
m_IsSigned = c->readBoolEntry(prefix + "sign", true); 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 + "bits", m_SampleBits);
c->writeEntry(prefix + "sign", m_IsSigned); c->writeEntry(prefix + "sign", m_IsSigned);

@ -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) bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool enableMessageBox)
{ {
TQString tmpfile; TQString tmpfile;
if (!KIO::NetAccess::download(url, tmpfile, NULL)) { if (!TDEIO::NetAccess::download(url, tmpfile, NULL)) {
if (enableMessageBox) { if (enableMessageBox) {
logger.logError("StationList::readXML: " + logger.logError("StationList::readXML: " +
i18n("error downloading preset file %1").arg(url.url())); 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(); presetFile.close();
KIO::NetAccess::removeTempFile(tmpfile); TDEIO::NetAccess::removeTempFile(tmpfile);
return readXML(xmlData, logger, enableMessageBox); 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())); i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").arg(count()));
} else { } else {
if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) { if (!TDEIO::NetAccess::upload(tmpFile.name(), url, NULL)) {
logger.logError("StationList::writeXML: " + logger.logError("StationList::writeXML: " +
i18n("error uploading preset file %1").arg(url.url())); i18n("error uploading preset file %1").arg(url.url()));

@ -297,14 +297,14 @@ void StationSelector::slotCancel()
} }
void StationSelector::saveState (KConfig *cfg) const void StationSelector::saveState (TDEConfig *cfg) const
{ {
listSelected->saveState(cfg); listSelected->saveState(cfg);
listAvailable->saveState(cfg); listAvailable->saveState(cfg);
} }
void StationSelector::restoreState (KConfig *cfg) void StationSelector::restoreState (TDEConfig *cfg)
{ {
listSelected->restoreState(cfg); listSelected->restoreState(cfg);
listAvailable->restoreState(cfg); listAvailable->restoreState(cfg);

@ -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(); const TQWidget *w = getWidget();
getKWinState(w); 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_geoCacheValid = config->readBoolEntry("geoCacheValid", false);
m_saveDesktop = config->readNumEntry ("desktop", 1); 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); restoreState(config, true);
} }

Loading…
Cancel
Save