summaryrefslogtreecommitdiffstats
path: root/kweather
diff options
context:
space:
mode:
Diffstat (limited to 'kweather')
-rw-r--r--kweather/dockwidget.cpp38
-rw-r--r--kweather/kcmweather.cpp6
-rw-r--r--kweather/kcmweatherservice.cpp4
-rw-r--r--kweather/prefdialogdata.ui2
-rw-r--r--kweather/reportview.cpp2
-rw-r--r--kweather/serviceconfigdata.ui2
6 files changed, 27 insertions, 27 deletions
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index f5205d4..b8c5024 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -184,12 +184,12 @@ void dockwidget::initDock()
mainLayout->setMargin(0);
mainLayout->addWidget(m_button, 0, TQt::AlignCenter);
- TQBoxLayout *tqlayout = new TQBoxLayout(mainLayout, TQBoxLayout::TopToBottom);
- tqlayout->setSpacing(0);
- tqlayout->setMargin(0);
- tqlayout->addWidget(m_lblTemp);
- tqlayout->addWidget(m_lblWind);
- tqlayout->addWidget(m_lblPres);
+ TQBoxLayout *layout = new TQBoxLayout(mainLayout, TQBoxLayout::TopToBottom);
+ layout->setSpacing(0);
+ layout->setMargin(0);
+ layout->addWidget(m_lblTemp);
+ layout->addWidget(m_lblWind);
+ layout->addWidget(m_lblPres);
mainLayout->addSpacing(8);
@@ -210,16 +210,16 @@ void dockwidget::resizeView( const TQSize &size )
if ( m_mode == ShowAll )
{
- if ( h <= 128 ) // left to right tqlayout
+ if ( h <= 128 ) // left to right layout
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
}
else // top to bottom
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
TQFontMetrics fm(m_font);
h = 128 - (3 * fm.height()); // 3 lines of text below the button
m_lblTemp->setAlignment(TQt::AlignCenter);
@@ -232,12 +232,12 @@ void dockwidget::resizeView( const TQSize &size )
{
if ( h <= 32 ) // left to right
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
}
else // top to bottom
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
TQFontMetrics fm(m_font);
h = TQMIN(128, h) - fm.height();
m_lblTemp->setAlignment(TQt::AlignCenter);
@@ -259,7 +259,7 @@ void dockwidget::resizeView( const TQSize &size )
{
if ( w <= 128 ) // top to bottom
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
m_lblTemp->setAlignment(TQt::AlignCenter);
m_lblWind->setAlignment(TQt::AlignCenter);
m_lblPres->setAlignment(TQt::AlignCenter);
@@ -268,9 +268,9 @@ void dockwidget::resizeView( const TQSize &size )
h = h - (3 * fm.height()); // 3 lines of text below the button
h = TQMIN(w, h);
}
- else // left to right tqlayout
+ else // left to right layout
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
@@ -281,14 +281,14 @@ void dockwidget::resizeView( const TQSize &size )
{
if ( w <= 128 ) // top to bottom
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
m_lblTemp->setAlignment(TQt::AlignCenter);
h = w;
}
- else // left to right tqlayout
+ else // left to right layout
{
- static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
+ static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
h = static_cast<int>(w * 0.33);
@@ -310,7 +310,7 @@ int dockwidget::widthForHeight(int h)
if ( m_mode == ShowAll )
{
- if ( h <= 128 ) // left to right tqlayout
+ if ( h <= 128 ) // left to right layout
{
int pixelSize = h/3 - 3;
pixelSize = TQMIN(pixelSize, fi.pixelSize()); // don't make it too large
@@ -337,7 +337,7 @@ int dockwidget::widthForHeight(int h)
}
else if ( m_mode == ShowTempOnly )
{
- if ( h <= 32 ) // left to right tqlayout
+ if ( h <= 32 ) // left to right layout
{
int pixelSize = h - 3;
pixelSize = TQMIN(pixelSize, fi.pixelSize()); // don't make it too large
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index d49d3a0..528b26b 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -54,12 +54,12 @@ KCMWeather::KCMWeather( TQWidget *parent, const char *name )
{
mWeatherService = new WeatherService_stub( "KWeatherService",
"WeatherService" );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
mWidget = new prefsDialogData( this );
mWidget->m_reportLocation->setFocus();
- tqlayout->addWidget( mWidget );
- tqlayout->addStretch();
+ layout->addWidget( mWidget );
+ layout->addStretch();
fillStationList();
load();
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index db8325d..49bf792 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -41,13 +41,13 @@ extern "C"
KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name )
: KCModule( parent, name )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
mWidget = new ServiceConfigWidget( this );
// not needed, as a change immediately changes the service
//connect(mWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
- tqlayout->addWidget( mWidget );
+ layout->addWidget( mWidget );
KAboutData *about = new KAboutData( "kcmweatherservice",
I18N_NOOP( "KWeather Configure Dialog" ),
0, 0, KAboutData::License_GPL,
diff --git a/kweather/prefdialogdata.ui b/kweather/prefdialogdata.ui
index 7b61ead..c0878ce 100644
--- a/kweather/prefdialogdata.ui
+++ b/kweather/prefdialogdata.ui
@@ -284,7 +284,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index 3ef28b4..39b5536 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -72,7 +72,7 @@ void reportView::render(){
TQString textColor = KGlobalSettings::textColor().name();
TQString baseColor = KGlobalSettings::baseColor().name();
- TQColorGroup cg = tqpalette().active();
+ TQColorGroup cg = palette().active();
TQString bgColor = cg.background().name();
TQString hlColor = cg.highlight().name();
TQString hlTextColor = cg.highlightedText().name();
diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui
index 2e8e9e1..71f6099 100644
--- a/kweather/serviceconfigdata.ui
+++ b/kweather/serviceconfigdata.ui
@@ -169,7 +169,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-02 08:42:04 +0000