summaryrefslogtreecommitdiffstats
path: root/kweather
diff options
context:
space:
mode:
Diffstat (limited to 'kweather')
-rw-r--r--kweather/dockwidget.cpp20
-rw-r--r--kweather/kweather.cpp4
-rw-r--r--kweather/reportmain.cpp2
-rw-r--r--kweather/reportview.cpp6
-rw-r--r--kweather/weatherbutton.cpp2
-rw-r--r--kweather/weatherlib.cpp10
-rw-r--r--kweather/weatherservice.cpp2
7 files changed, 23 insertions, 23 deletions
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index b8c5024..1e223bd 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -33,7 +33,7 @@
dockwidget::dockwidget(const TQString &location, TQWidget *parent,
const char *name) : TQWidget(parent,name), m_locationCode( location ), m_orientation(Qt::Horizontal )
{
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
setBackgroundOrigin( AncestorOrigin );
initDock();
connect(m_button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( buttonClicked() ));
@@ -306,7 +306,7 @@ void dockwidget::resizeView( const TQSize &size )
int dockwidget::widthForHeight(int h)
{
int w;
- TQFontInfo fi(KGlobalSettings::generalFont());
+ TQFontInfo fi(TDEGlobalSettings::generalFont());
if ( m_mode == ShowAll )
{
@@ -322,7 +322,7 @@ int dockwidget::widthForHeight(int h)
{
if ( fi.pixelSize() * 3 <= (h/2) ) // half icon, half text
{
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
}
else
{
@@ -349,7 +349,7 @@ int dockwidget::widthForHeight(int h)
{
if ( fi.pixelSize() <= (h/2) ) // half icon, half text
{
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
}
else
{
@@ -377,14 +377,14 @@ int dockwidget::heightForWidth( int w )
if ( m_mode == ShowAll )
{
- TQFontMetrics fmg(KGlobalSettings::generalFont());
+ TQFontMetrics fmg(TDEGlobalSettings::generalFont());
int maxWidth = fmg.width("888 km/h NNWW"); // a good approximation
if ( w <= 128 ) // top to bottom
{
if ( maxWidth <= w ) // enough space to use global font
{
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
}
else // we have to reduce the fontsize
{
@@ -398,7 +398,7 @@ int dockwidget::heightForWidth( int w )
{
if ( w >= (maxWidth * 1.5) ) // half of text width shall be icon
{
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
}
else
{
@@ -412,14 +412,14 @@ int dockwidget::heightForWidth( int w )
}
else if ( m_mode == ShowTempOnly )
{
- TQFontMetrics fmg(KGlobalSettings::generalFont());
+ TQFontMetrics fmg(TDEGlobalSettings::generalFont());
int maxWidth = fmg.width("888.88 CC"); // a good approximation
if ( w <= 128 ) // top to bottom
{
if ( maxWidth <= w ) // enough space to use global font
{
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
}
else // we have to reduce the fontsize
{
@@ -433,7 +433,7 @@ int dockwidget::heightForWidth( int w )
{
if ( w >= (maxWidth * 1.5) ) // half of text width shall be icon
{
- m_font = KGlobalSettings::generalFont();
+ m_font = TDEGlobalSettings::generalFont();
}
else
{
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 69fc844..40e5743 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -42,7 +42,7 @@ extern "C"
{
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("kweather");
+ TDEGlobal::locale()->insertCatalogue("kweather");
kweather *theApplet = new kweather(configFile, KPanelApplet::Normal,
0, parent, "kweather");
return theApplet;
@@ -144,7 +144,7 @@ void kweather::about(){
I18N_NOOP( "Improvements and more code cleanups" ), "jratke@comcast.net" );
KAboutApplication about(&aboutData, this, 0);
- about.setProgramLogo( KGlobal::instance()->iconLoader()->iconPath( "kweather", -KIcon::SizeLarge ) );
+ about.setProgramLogo( TDEGlobal::instance()->iconLoader()->iconPath( "kweather", -KIcon::SizeLarge ) );
about.exec();
}
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index 45f08fd..7f1081b 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -25,7 +25,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
aboutData.addAuthor("Nadeem Hasan", I18N_NOOP("Developer"),
"nhasan@kde.org");
- KGlobal::locale()->setMainCatalogue( "kweather" );
+ TDEGlobal::locale()->setMainCatalogue( "kweather" );
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index 39b5536..29e2b40 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -64,14 +64,14 @@ reportView::~reportView(){
/** Render the document */
void reportView::render(){
- TQFont generalFont = KGlobalSettings::generalFont();
+ TQFont generalFont = TDEGlobalSettings::generalFont();
TQString fntFamily = generalFont.family();
int fntSize = generalFont.pointSize();
if (fntSize == -1)
fntSize = TQFontInfo(generalFont).pointSize();
- TQString textColor = KGlobalSettings::textColor().name();
- TQString baseColor = KGlobalSettings::baseColor().name();
+ TQString textColor = TDEGlobalSettings::textColor().name();
+ TQString baseColor = TDEGlobalSettings::baseColor().name();
TQColorGroup cg = palette().active();
TQString bgColor = cg.background().name();
TQString hlColor = cg.highlight().name();
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index 33e4563..355180f 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -110,7 +110,7 @@ void WeatherButton::slotSettingsChanged( int category )
{
if ( category != TDEApplication::SETTINGS_MOUSE ) return;
- bool changeCursor = KGlobalSettings::changeCursorOverIcon();
+ bool changeCursor = TDEGlobalSettings::changeCursorOverIcon();
if ( changeCursor )
setCursor( KCursor::handCursor() );
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index d8b93db..22b2047 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -83,7 +83,7 @@ void WeatherLib::Data::clear()
WeatherLib::WeatherLib(StationDatabase *stationDB, TQObject *parent, const char *name)
: TQObject (parent, name)
{
- KGlobal::locale()->insertCatalogue("kweather");
+ TDEGlobal::locale()->insertCatalogue("kweather");
m_StationDb = stationDB;
@@ -136,7 +136,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job)
if ( !s.isEmpty() )
{
kdDebug( 12006 ) << "Parse: " << s << endl;
- MetarParser parser(m_StationDb, KGlobal::locale()->measureSystem());
+ MetarParser parser(m_StationDb, TDEGlobal::locale()->measureSystem());
d->wi = parser.processData(d->wi.reportLocation, s);
d->age = TQDateTime::currentDateTime().addSecs(1800);
emit fileUpdate(d->wi.reportLocation);
@@ -292,7 +292,7 @@ TQString WeatherLib::date(const TQString &stationID){
{
TQDateTime gmtDateTime(d->wi.qsDate, d->wi.qsTime);
TQDateTime localDateTime = gmtDateTime.addSecs(KRFCDate::localUTCOffset() * 60);
- return KGlobal::locale()->formatDateTime(localDateTime, false, false);
+ return TDEGlobal::locale()->formatDateTime(localDateTime, false, false);
}
}
@@ -327,8 +327,8 @@ void WeatherLib::update(const TQString &stationID)
TQDateTime timeout = TQDateTime::currentDateTime();
- kdDebug (12006) << "Current Time: " << KGlobal::locale()->formatDateTime(timeout, false, false) <<
- " Update at: " << KGlobal::locale()->formatDateTime(d->age, false, false) << endl;
+ kdDebug (12006) << "Current Time: " << TDEGlobal::locale()->formatDateTime(timeout, false, false) <<
+ " Update at: " << TDEGlobal::locale()->formatDateTime(d->age, false, false) << endl;
if( timeout >= d->age || !d->updated)
getData(d, true /* try even if host was down last time */);
else
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index da179b6..c50bca4 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -314,7 +314,7 @@ TQString WeatherService::getTime(const TQString &stationID, TimeType timeType)
kdDebug(12006) << "station, lat, lon, time: " << upperStationID << " " <<
latitude << " " << longitude << " " << time << endl;
- return KGlobal::locale()->formatTime(time);
+ return TDEGlobal::locale()->formatTime(time);
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 05:09:13 +0000