summaryrefslogtreecommitdiffstats
path: root/kworldwatch
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:35:14 -0600
commit3ee504ecba6caf3c2609a8648fe3659f2b541544 (patch)
tree44f9bf073d7b46a12dfbab0486e6976d960a1aac /kworldwatch
parent4d75f93557ba631d97a56e288a34ca27f4507653 (diff)
downloadtdetoys-3ee504ecba6caf3c2609a8648fe3659f2b541544.tar.gz
tdetoys-3ee504ecba6caf3c2609a8648fe3659f2b541544.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kworldwatch')
-rw-r--r--kworldwatch/about.ui6
-rw-r--r--kworldwatch/clock.ui8
-rw-r--r--kworldwatch/flow.cpp16
-rw-r--r--kworldwatch/flow.h4
-rw-r--r--kworldwatch/mapwidget.cpp10
-rw-r--r--kworldwatch/zoneclock.cpp4
6 files changed, 24 insertions, 24 deletions
diff --git a/kworldwatch/about.ui b/kworldwatch/about.ui
index 18ff889..206a85c 100644
--- a/kworldwatch/about.ui
+++ b/kworldwatch/about.ui
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>31</height>
@@ -151,7 +151,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -179,7 +179,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kworldwatch/clock.ui b/kworldwatch/clock.ui
index 26fed16..3a31234 100644
--- a/kworldwatch/clock.ui
+++ b/kworldwatch/clock.ui
@@ -71,7 +71,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -88,7 +88,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -213,7 +213,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp
index 056f5aa..724275e 100644
--- a/kworldwatch/flow.cpp
+++ b/kworldwatch/flow.cpp
@@ -76,9 +76,9 @@ bool SimpleFlow::hasHeightForWidth() const
return TRUE;
}
-TQSize SimpleFlow::tqsizeHint() const
+TQSize SimpleFlow::sizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
TQSizePolicy::ExpandData SimpleFlow::expanding() const
@@ -116,29 +116,29 @@ int SimpleFlow::doLayout( const TQRect &r, bool testonly )
TQLayoutItem *o;
while ( (o=it.current()) != 0 ) {
++it;
- int nextX = x + o->tqsizeHint().width() + spacing();
+ int nextX = x + o->sizeHint().width() + spacing();
if ( nextX - spacing() > r.right() && h > 0 ) {
x = r.x();
y = y + h + spacing();
- nextX = x + o->tqsizeHint().width() + spacing();
+ nextX = x + o->sizeHint().width() + spacing();
h = 0;
}
if ( !testonly )
- o->setGeometry( TQRect( TQPoint( x, y ), o->tqsizeHint() ) );
+ o->setGeometry( TQRect( TQPoint( x, y ), o->sizeHint() ) );
x = nextX;
- h = TQMAX( h, o->tqsizeHint().height() );
+ h = TQMAX( h, o->sizeHint().height() );
}
return y + h - r.y();
}
-TQSize SimpleFlow::tqminimumSize() const
+TQSize SimpleFlow::minimumSize() const
{
TQSize s(0,0);
TQPtrListIterator<TQLayoutItem> it(list);
TQLayoutItem *o;
while ( (o=it.current()) != 0 ) {
++it;
- s = s.expandedTo( o->tqminimumSize() );
+ s = s.expandedTo( o->minimumSize() );
}
return s;
}
diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h
index e09a9a5..ed13ad4 100644
--- a/kworldwatch/flow.h
+++ b/kworldwatch/flow.h
@@ -37,8 +37,8 @@ public:
void addItem( TQLayoutItem *item);
bool hasHeightForWidth() const;
int heightForWidth( int ) const;
- TQSize tqsizeHint() const;
- TQSize tqminimumSize() const;
+ TQSize sizeHint() const;
+ TQSize minimumSize() const;
TQLayoutIterator iterator();
TQSizePolicy::ExpandData expanding() const;
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 680d8ef..255ce3f 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -143,7 +143,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
_cityIndicator->setIndent(0);
_cityIndicator->setAutoMask(false);
_cityIndicator->setLineWidth(1);
- _cityIndicator->tqsetAlignment(TQLabel::AlignAuto | TQLabel::AlignTop);
+ _cityIndicator->setAlignment(TQLabel::AlignAuto | TQLabel::AlignTop);
_cityIndicator->setAutoResize(true);
_cityIndicator->setFrameStyle(TQFrame::Box | TQFrame::Plain);
_cityIndicator->setPalette(TQToolTip::palette());
@@ -563,13 +563,13 @@ TQPixmap MapWidget::calculatePixmap()
if (gmt_position >= greenwich)
{
- p.tqdrawPixmap(gmt_position-greenwich, 0, map, 0, 0, map.width()-gmt_position+greenwich);
- p.tqdrawPixmap(0,0, map, map.width()-gmt_position+greenwich, 0, gmt_position-greenwich);
+ p.drawPixmap(gmt_position-greenwich, 0, map, 0, 0, map.width()-gmt_position+greenwich);
+ p.drawPixmap(0,0, map, map.width()-gmt_position+greenwich, 0, gmt_position-greenwich);
}
else
{
- p.tqdrawPixmap(0,0, map, greenwich-gmt_position, 0, map.width()+gmt_position-greenwich);
- p.tqdrawPixmap(map.width()+gmt_position-greenwich, 0, map, 0, 0, greenwich-gmt_position);
+ p.drawPixmap(0,0, map, greenwich-gmt_position, 0, map.width()+gmt_position-greenwich);
+ p.drawPixmap(map.width()+gmt_position-greenwich, 0, map, 0, 0, greenwich-gmt_position);
}
return pm;
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 1c81814..bc61c9b 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -218,8 +218,8 @@ void ZoneClockPanel::realign()
int w = 0;
TQPtrListIterator<ZoneClock> it(_clocks);
for ( ; it.current(); ++it)
- if (it.current()->tqsizeHint().width() > w)
- w = it.current()->tqsizeHint().width();
+ if (it.current()->sizeHint().width() > w)
+ w = it.current()->sizeHint().width();
it.toFirst();
for ( ; it.current(); ++it)
it.current()->setFixedWidth(w);