summaryrefslogtreecommitdiffstats
path: root/kweather
diff options
context:
space:
mode:
Diffstat (limited to 'kweather')
-rw-r--r--kweather/kcmweather.cpp8
-rw-r--r--kweather/kcmweather.desktop2
-rw-r--r--kweather/kcmweather.h2
-rw-r--r--kweather/kcmweatherservice.cpp4
-rw-r--r--kweather/kcmweatherservice.desktop2
-rw-r--r--kweather/kcmweatherservice.h2
-rw-r--r--kweather/kweather.cpp6
-rw-r--r--kweather/reportview.cpp4
-rw-r--r--kweather/serviceconfigwidget.cpp2
-rw-r--r--kweather/weatherlib.cpp18
-rw-r--r--kweather/weatherlib.h4
-rw-r--r--kweather/weatherservice.cpp4
12 files changed, 29 insertions, 29 deletions
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index 952edb7..650dae8 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -43,14 +43,14 @@
extern "C"
{
- KDE_EXPORT KCModule *create_weather( TQWidget *parent, const char * )
+ KDE_EXPORT TDECModule *create_weather( TQWidget *parent, const char * )
{
return new KCMWeather( parent, "kweather" );
}
}
KCMWeather::KCMWeather( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
mWeatherService = new WeatherService_stub( "KWeatherService",
"WeatherService" );
@@ -162,7 +162,7 @@ void KCMWeather::textColorChanged(const TQColor &)
void KCMWeather::load()
{
kdDebug() << "Load" << endl;
- KConfig config( "weather_panelappletrc" );
+ TDEConfig config( "weather_panelappletrc" );
config.setGroup( "General Options" );
bool enabled = config.readBoolEntry( "logging", false );
@@ -188,7 +188,7 @@ void KCMWeather::load()
void KCMWeather::save()
{
kdDebug() << "Save" << endl;
- KConfig config( "weather_panelappletrc" );
+ TDEConfig config( "weather_panelappletrc" );
config.setGroup( "General Options" );
config.writeEntry( "logging", mWidget->m_enableLog->isChecked() );
diff --git a/kweather/kcmweather.desktop b/kweather/kcmweather.desktop
index 65f5798..4ca67cc 100644
--- a/kweather/kcmweather.desktop
+++ b/kweather/kcmweather.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=configure
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=weather
diff --git a/kweather/kcmweather.h b/kweather/kcmweather.h
index 0204fda..e030e27 100644
--- a/kweather/kcmweather.h
+++ b/kweather/kcmweather.h
@@ -27,7 +27,7 @@
class prefsDialogData;
-class KCMWeather : public KCModule
+class KCMWeather : public TDECModule
{
Q_OBJECT
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index 3df3c0c..1d64ee0 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -33,13 +33,13 @@
extern "C"
{
- KDE_EXPORT KCModule *create_weatherservice( TQWidget *parent, const char * ) {
+ KDE_EXPORT TDECModule *create_weatherservice( TQWidget *parent, const char * ) {
return new KCMWeatherService( parent, "kweather" );
}
}
KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+ : TDECModule( parent, name )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
mWidget = new ServiceConfigWidget( this );
diff --git a/kweather/kcmweatherservice.desktop b/kweather/kcmweatherservice.desktop
index a638269..e1e93d5 100644
--- a/kweather/kcmweatherservice.desktop
+++ b/kweather/kcmweatherservice.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kweather
Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=weatherservice
diff --git a/kweather/kcmweatherservice.h b/kweather/kcmweatherservice.h
index 1af666c..1f870a5 100644
--- a/kweather/kcmweatherservice.h
+++ b/kweather/kcmweatherservice.h
@@ -28,7 +28,7 @@
class ServiceConfigWidget;
-class KCMWeatherService : public KCModule
+class KCMWeatherService : public TDECModule
{
Q_OBJECT
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 40e5743..584f6b3 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -204,7 +204,7 @@ void kweather::slotReportFinished(){
/** load the application */
void kweather::loadPrefs(){
kdDebug(12004) << "Loading Prefs" << endl;
- KConfig *kcConfig = config();
+ TDEConfig *kcConfig = config();
kcConfig->reparseConfiguration();
if (!kcConfig->hasGroup ("General Options") )
@@ -223,7 +223,7 @@ void kweather::loadPrefs(){
/** Save the application mPrefs. */
void kweather::savePrefs(){
kdDebug(12004) << "Saving Prefs..." << endl;
- KConfig *kcConfig = config();
+ TDEConfig *kcConfig = config();
kcConfig->setGroup("General Options");
kcConfig->writeEntry("logging", logOn);
@@ -324,7 +324,7 @@ void kweather::refresh(TQString stationID)
void kweather::slotPrefsAccepted()
{
- // Preferences have been saved in the config file by the KCModule,
+ // Preferences have been saved in the config file by the TDECModule,
// so read them out.
loadPrefs();
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index 29e2b40..afe59b4 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -37,7 +37,7 @@ reportView::reportView(const TQString &reportLocation)
TQVBox *vbox = makeVBoxMainWidget();
m_reportView = new KHTMLPart(vbox, "m_reportView");
- KConfig config( "weather_panelappletrc" );
+ TDEConfig config( "weather_panelappletrc" );
config.setGroup( "General Options" );
TQSize defaultSize( 450, 325 );
resize( config.readSizeEntry( "reportview_size", &defaultSize ) );
@@ -57,7 +57,7 @@ reportView::~reportView(){
// we do not have to delete m_reportView because this class is
// the parent of the TQVBox, and that is the parent of the KHTMLPart.
- KConfig config( "weather_panelappletrc" );
+ TDEConfig config( "weather_panelappletrc" );
config.setGroup( "General Options" );
config.writeEntry( "reportview_size", size() );
}
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index e606031..537354c 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -163,7 +163,7 @@ void ServiceConfigWidget::initGUI()
void ServiceConfigWidget::loadLocations()
{
- KConfig config( locate( "data", "kweatherservice/weather_stations.desktop" ) );
+ TDEConfig config( locate( "data", "kweatherservice/weather_stations.desktop" ) );
config.setGroup( "Main" );
TQStringList regions = TQStringList::split( ' ', config.readEntry( "regions" ) );
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index 22b2047..a595cae 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -57,7 +57,7 @@ class WeatherLib::Data
KTempFile *target;
bool downloading;
bool updated;
- KIO::Job *job;
+ TDEIO::Job *job;
};
WeatherLib::Data::Data()
@@ -94,14 +94,14 @@ WeatherLib::~WeatherLib()
{
}
-void WeatherLib::slotCopyDone(KIO::Job* job)
+void WeatherLib::slotCopyDone(TDEIO::Job* job)
{
kdDebug(12006) << "Copy done..." << endl;
if( job->error())
{
kdDebug(12006) << "Error code: " << job->error() << endl;
//job->showErrorDialog(0L);
- if ((job->error() == KIO::ERR_COULD_NOT_CONNECT || job->error() == KIO::ERR_UNKNOWN_HOST)
+ if ((job->error() == TDEIO::ERR_COULD_NOT_CONNECT || job->error() == TDEIO::ERR_UNKNOWN_HOST)
&& !hostDown)
{
hostDown= true;
@@ -164,15 +164,15 @@ void WeatherLib::slotCopyDone(KIO::Job* job)
d->job = 0L;
}
- else if( job->error() == KIO::ERR_DOES_NOT_EXIST)
+ else if( job->error() == TDEIO::ERR_DOES_NOT_EXIST)
{
data.remove(d->wi.reportLocation);
kdDebug( 12006 ) << "Bad station data so i am going to remove it" << endl;
KPassivePopup::message( i18n("KWeather Error!"),
i18n("The requested station does not exist."), 0L,"error" );
}
- else if(job->error() == KIO::ERR_COULD_NOT_CONNECT ||
- job->error() == KIO::ERR_UNKNOWN_HOST)
+ else if(job->error() == TDEIO::ERR_COULD_NOT_CONNECT ||
+ job->error() == TDEIO::ERR_UNKNOWN_HOST)
{
kdDebug( 12006 ) << "Offline now..." << endl;
d->clear();
@@ -207,10 +207,10 @@ void WeatherLib::getData(Data *d, bool force /* try even if host was down last t
KURL url(u);
KURL local(d->target->name());
- d->job = KIO::file_copy( url, local, -1, true, false, false);
+ d->job = TDEIO::file_copy( url, local, -1, true, false, false);
d->job->addMetaData("cache", "reload"); // Make sure to get fresh info
- connect( d->job, TQT_SIGNAL( result( KIO::Job *)),
- TQT_SLOT(slotCopyDone(KIO::Job *)));
+ connect( d->job, TQT_SIGNAL( result( TDEIO::Job *)),
+ TQT_SLOT(slotCopyDone(TDEIO::Job *)));
kdDebug( 12006 ) << "Copying " << url.prettyURL() << " to "
<< local.prettyURL() << endl;
emit fileUpdating(d->wi.reportLocation);
diff --git a/kweather/weatherlib.h b/kweather/weatherlib.h
index 1f82ada..2e5f8b3 100644
--- a/kweather/weatherlib.h
+++ b/kweather/weatherlib.h
@@ -22,7 +22,7 @@
#include <tqregexp.h>
#include <tqdict.h>
-namespace KIO
+namespace TDEIO
{
class Job;
}
@@ -67,7 +67,7 @@ class WeatherLib : public TQObject
void stationRemoved(const TQString &stationID);
private slots:
- void slotCopyDone(KIO::Job*);
+ void slotCopyDone(TDEIO::Job*);
private:
Data* findData(const TQString &stationID);
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index c50bca4..2c018b9 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -45,7 +45,7 @@ WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (p
connect(m_weatherLib, TQT_SIGNAL(stationRemoved(const TQString&)),
TQT_SLOT(slotStationRemoved(const TQString&)));
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("WEATHERSTATIONS");
TQStringList stations =conf->readListEntry("stations");
@@ -213,7 +213,7 @@ TQStringList WeatherService::listStations()
void WeatherService::saveSettings()
{
- KConfig *conf = kapp->config();
+ TDEConfig *conf = kapp->config();
conf->setGroup("WEATHERSTATIONS");
conf->writeEntry( "stations", m_weatherLib->stations());
conf->sync();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 10:02:18 +0000