Rename old tq methods that no longer need a unique name

pull/1/head
Timothy Pearson 13 years ago
parent 4d75f93557
commit 3ee504ecba

@ -152,7 +152,7 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject()
TQT_SLOT(slotMouseClicked(const TQPoint &))); TQT_SLOT(slotMouseClicked(const TQPoint &)));
connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)), connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)),
TQT_SLOT(slotWidgetDragged(const TQPoint &, bool))); TQT_SLOT(slotWidgetDragged(const TQPoint &, bool)));
mAmor->resize(mTheme.tqmaximumSize()); mAmor->resize(mTheme.maximumSize());
mTimer = new TQTimer(this); mTimer = new TQTimer(this);
connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
@ -288,7 +288,7 @@ void Amor::reset()
mPosition = mCurrAnim->hotspot().x(); mPosition = mCurrAnim->hotspot().x();
mState = Normal; mState = Normal;
mAmor->resize(mTheme.tqmaximumSize()); mAmor->resize(mTheme.maximumSize());
mCurrAnim->reset(); mCurrAnim->reset();
mTimer->start(0, true); mTimer->start(0, true);

@ -227,7 +227,7 @@ bool AmorThemeManager::readGroup(const TQString & seq)
mConfig->setGroup(list.at(i)); mConfig->setGroup(list.at(i));
AmorAnim *anim = new AmorAnim(*mConfig); AmorAnim *anim = new AmorAnim(*mConfig);
animList->append(anim); animList->append(anim);
mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize()); mMaximumSize = mMaximumSize.expandedTo(anim->maximumSize());
} }
// If no animations were available for this group, just add the base anim // If no animations were available for this group, just add the base anim
@ -238,7 +238,7 @@ bool AmorThemeManager::readGroup(const TQString & seq)
if (anim) if (anim)
{ {
animList->append(anim); animList->append(anim);
mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize()); mMaximumSize = mMaximumSize.expandedTo(anim->maximumSize());
entries++; entries++;
} }
} }

@ -59,7 +59,7 @@ public:
{ return (mCurrent < mSequence.count()); } { return (mCurrent < mSequence.count()); }
int totalMovement() const int totalMovement() const
{ return mTotalMovement; } { return mTotalMovement; }
TQSize tqmaximumSize() const TQSize maximumSize() const
{ return mMaximumSize; } { return mMaximumSize; }
int delay() const int delay() const
@ -103,7 +103,7 @@ public:
AmorAnim *random(const TQString & group); AmorAnim *random(const TQString & group);
TQSize tqmaximumSize() const { return mMaximumSize; } TQSize maximumSize() const { return mMaximumSize; }
protected: protected:
TQString mPath; TQString mPath;

@ -55,7 +55,7 @@ AmorBubble::AmorBubble()
mBrowser->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); // too long to fit in one line? mBrowser->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); // too long to fit in one line?
TQColorGroup clgrp = mBrowser->tqcolorGroup(); TQColorGroup clgrp = mBrowser->colorGroup();
clgrp.setColor(TQColorGroup::Text, TQt::black); clgrp.setColor(TQColorGroup::Text, TQt::black);
//Laurent TQTextBrowser didn't have this function FIX me //Laurent TQTextBrowser didn't have this function FIX me
//mBrowser->setPaperColorGroup( clgrp ); //mBrowser->setPaperColorGroup( clgrp );
@ -195,7 +195,7 @@ void AmorBubble::drawBubble(TQPainter &p)
p.drawPolygon(pointArray); p.drawPolygon(pointArray);
p.setPen(pen); p.setPen(pen);
p.tqdrawPolyline(pointArray, 0, 3); p.drawPolyline(pointArray, 0, 3);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

@ -120,7 +120,7 @@ void PiecesTable::paintCell(TQPainter *p, int row, int col)
// draw cell background // draw cell background
if(number == 16) if(number == 16)
p->setBrush(tqcolorGroup().background()); p->setBrush(colorGroup().background());
else else
p->setBrush(_colors[number-1]); p->setBrush(_colors[number-1]);
p->setPen(NoPen); p->setPen(NoPen);
@ -128,7 +128,7 @@ void PiecesTable::paintCell(TQPainter *p, int row, int col)
// draw borders // draw borders
if (height() > 40) { if (height() > 40) {
p->setPen(tqcolorGroup().text()); p->setPen(colorGroup().text());
if(col < numCols()-1) if(col < numCols()-1)
p->drawLine(x2, 0, x2, y2); // right border line p->drawLine(x2, 0, x2, y2); // right border line

@ -34,8 +34,8 @@ enum ScrollBarDirtyFlags {
}; };
#define HSBEXT horizontalScrollBar()->tqsizeHint().height() #define HSBEXT horizontalScrollBar()->sizeHint().height()
#define VSBEXT verticalScrollBar()->tqsizeHint().width() #define VSBEXT verticalScrollBar()->sizeHint().width()
class QCornerSquare : public TQWidget // internal class class QCornerSquare : public TQWidget // internal class
@ -1385,7 +1385,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
// outside the cells. // outside the cells.
TQRect viewR = viewRect(); TQRect viewR = viewRect();
const TQColorGroup g = tqcolorGroup(); const TQColorGroup g = colorGroup();
if ( xPos <= maxX ) { if ( xPos <= maxX ) {
TQRect r = viewR; TQRect r = viewR;
@ -1443,7 +1443,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
#ifndef TQT_NO_CURSOR #ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor ); sb->setCursor( arrowCursor );
#endif #endif
sb->resize( sb->tqsizeHint() ); // height is irrelevant sb->resize( sb->sizeHint() ); // height is irrelevant
Q_CHECK_PTR(sb); Q_CHECK_PTR(sb);
sb->setTracking( FALSE ); sb->setTracking( FALSE );
sb->setFocusPolicy( TQ_NoFocus ); sb->setFocusPolicy( TQ_NoFocus );
@ -1474,7 +1474,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
#ifndef TQT_NO_CURSOR #ifndef TQT_NO_CURSOR
sb->setCursor( arrowCursor ); sb->setCursor( arrowCursor );
#endif #endif
sb->resize( sb->tqsizeHint() ); // width is irrelevant sb->resize( sb->sizeHint() ); // width is irrelevant
sb->setFocusPolicy( TQ_NoFocus ); sb->setFocusPolicy( TQ_NoFocus );
Q_CHECK_PTR(sb); Q_CHECK_PTR(sb);
sb->setTracking( FALSE ); sb->setTracking( FALSE );

@ -104,7 +104,7 @@ void MoonPAWidget::showAbout()
KStdGuiItem::ok() ); KStdGuiItem::ok() );
TQPixmap ret = DesktopIcon("kmoon"); TQPixmap ret = DesktopIcon("kmoon");
TQString text = i18n(description) + TQString::tqfromLatin1("\n\n") + TQString text = i18n(description) + TQString::fromLatin1("\n\n") +
i18n("Written by Stephan Kulow <coolo@kde.org>\n" i18n("Written by Stephan Kulow <coolo@kde.org>\n"
"\n" "\n"
"Made an applet by M G Berberich " "Made an applet by M G Berberich "
@ -144,7 +144,7 @@ void MoonPAWidget::timerEvent( TQTimerEvent * )
time_t clock; time_t clock;
time(&clock); time(&clock);
struct tm *t = localtime(&clock); struct tm *t = localtime(&clock);
moon->calctqStatus(mktime(t)); moon->calcStatus(mktime(t));
moon->tqrepaint(); moon->tqrepaint();
} }

@ -94,7 +94,7 @@ void KMoonDlg::angleChanged(int value) {
} }
void KMoonDlg::help() { void KMoonDlg::help() {
kapp->invokeHelp(TQString::tqfromLatin1("config")); kapp->invokeHelp(TQString::fromLatin1("config"));
} }
void KMoonDlg::toggleHemi() { void KMoonDlg::toggleHemi() {

@ -70,14 +70,14 @@ MoonWidget::MoonWidget(TQWidget *parent, const char *name)
time(&clock); time(&clock);
t = gmtime(&clock); t = gmtime(&clock);
// kdDebug() << "time " << t->tm_isdst << " " << timezone << " " << daylight << endl ; // kdDebug() << "time " << t->tm_isdst << " " << timezone << " " << daylight << endl ;
calctqStatus(mktime(t)); calcStatus(mktime(t));
} }
MoonWidget::~MoonWidget() MoonWidget::~MoonWidget()
{ {
} }
void MoonWidget::calctqStatus( time_t time ) void MoonWidget::calcStatus( time_t time )
{ {
uint lun = 0; uint lun = 0;
time_t last_new = 0; time_t last_new = 0;

@ -37,7 +37,7 @@ public:
MoonWidget(TQWidget *parent = 0, const char *name = 0); MoonWidget(TQWidget *parent = 0, const char *name = 0);
~MoonWidget(); ~MoonWidget();
void calctqStatus( time_t time ); void calcStatus( time_t time );
int angle() const { return _angle; } int angle() const { return _angle; }
void setAngle(int angle); void setAngle(int angle);

@ -30,7 +30,7 @@ KImageNumber::KImageNumber(const TQString& font, TQWidget* parent,const char* na
m_value(0) m_value(0)
{ {
fontPix = new TQPixmap(font); fontPix = new TQPixmap(font);
resize(tqsizeHint()); resize(sizeHint());
} }
KImageNumber::~KImageNumber() KImageNumber::~KImageNumber()
@ -65,7 +65,7 @@ double KImageNumber::value() const
return m_value; return m_value;
} }
TQSize KImageNumber::tqsizeHint() const TQSize KImageNumber::sizeHint() const
{ {
int w = fontPix->width(); int w = fontPix->width();
int each = w/11; int each = w/11;

@ -40,7 +40,7 @@ public:
virtual ~KImageNumber(); virtual ~KImageNumber();
void paintEvent(TQPaintEvent*); void paintEvent(TQPaintEvent*);
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
double value() const; double value() const;
public slots: public slots:

@ -54,16 +54,16 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name)
{ {
tqlayout = new TQHBoxLayout(this); tqlayout = new TQHBoxLayout(this);
minuteBox = new TQSpinBox(0, 300, 1, this); minuteBox = new TQSpinBox(0, 300, 1, this);
// minuteBox->setFixedSize(minuteBox->tqsizeHint()); // minuteBox->setFixedSize(minuteBox->sizeHint());
TQLabel* min = new TQLabel(i18n(" min"), this); TQLabel* min = new TQLabel(i18n(" min"), this);
min->setFixedSize(min->tqsizeHint()); min->setFixedSize(min->sizeHint());
secondBox = new WrappingSpinBox(0, 59, 1, this); secondBox = new WrappingSpinBox(0, 59, 1, this);
secondBox->setWrapping(true); secondBox->setWrapping(true);
// secondBox->setFixedSize(secondBox->tqsizeHint()); // secondBox->setFixedSize(secondBox->sizeHint());
TQLabel* sec = new TQLabel(i18n(" sec"),this); TQLabel* sec = new TQLabel(i18n(" sec"),this);
sec->setFixedSize(sec->tqsizeHint()); sec->setFixedSize(sec->sizeHint());
tqlayout->addWidget(minuteBox); tqlayout->addWidget(minuteBox);
tqlayout->addWidget(min); tqlayout->addWidget(min);

@ -487,10 +487,10 @@ void TopLevel::anonymous()
prop_box->addWidget(propright); prop_box->addWidget(propright);
anon_time = new TimeEdit(propright); anon_time = new TimeEdit(propright);
anon_time->setFixedHeight(anon_time->tqsizeHint().height()); anon_time->setFixedHeight(anon_time->sizeHint().height());
anon_time->setValue(DEFAULT_TEA_TIME); anon_time->setValue(DEFAULT_TEA_TIME);
TQLabel *l = new TQLabel(anon_time, i18n("Tea time:"), propleft); TQLabel *l = new TQLabel(anon_time, i18n("Tea time:"), propleft);
l->setFixedSize(l->tqsizeHint()); l->setFixedSize(l->sizeHint());
top_box->addStretch(); top_box->addStretch();
@ -688,28 +688,28 @@ void TopLevel::config()
btn_new = new TQPushButton(TQString(), listgroup_widget); btn_new = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_new, i18n("New")); TQToolTip::add(btn_new, i18n("New"));
btn_new->setPixmap(SmallIcon("filenew")); btn_new->setPixmap(SmallIcon("filenew"));
btn_new->setMinimumSize(btn_new->tqsizeHint() * 1.2); btn_new->setMinimumSize(btn_new->sizeHint() * 1.2);
connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked())); connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked()));
hbox->addWidget(btn_new); hbox->addWidget(btn_new);
btn_del = new TQPushButton(TQString(), listgroup_widget); btn_del = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_del, i18n("Delete")); TQToolTip::add(btn_del, i18n("Delete"));
btn_del->setIconSet(SmallIconSet("editdelete")); btn_del->setIconSet(SmallIconSet("editdelete"));
btn_del->setMinimumSize(btn_new->tqsizeHint() * 1.2); btn_del->setMinimumSize(btn_new->sizeHint() * 1.2);
connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked())); connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked()));
hbox->addWidget(btn_del); hbox->addWidget(btn_del);
btn_up = new TQPushButton(TQString(), listgroup_widget); btn_up = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_up, i18n("Up")); TQToolTip::add(btn_up, i18n("Up"));
btn_up->setIconSet(SmallIconSet("up")); btn_up->setIconSet(SmallIconSet("up"));
btn_up->setMinimumSize(btn_up->tqsizeHint() * 1.2); btn_up->setMinimumSize(btn_up->sizeHint() * 1.2);
connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked())); connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked()));
hbox->addWidget(btn_up); hbox->addWidget(btn_up);
btn_down = new TQPushButton(TQString(), listgroup_widget); btn_down = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_down, i18n("Down")); TQToolTip::add(btn_down, i18n("Down"));
btn_down->setIconSet(SmallIconSet("down")); btn_down->setIconSet(SmallIconSet("down"));
btn_down->setMinimumSize(btn_down->tqsizeHint() * 1.2); btn_down->setMinimumSize(btn_down->sizeHint() * 1.2);
connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked())); connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked()));
hbox->addWidget(btn_down); hbox->addWidget(btn_down);
@ -726,16 +726,16 @@ void TopLevel::config()
TQVBox *propleft = new TQVBox(propbox); TQVBox *propleft = new TQVBox(propbox);
TQVBox *propright = new TQVBox(propbox); TQVBox *propright = new TQVBox(propbox);
nameEdit = new TQLineEdit(propright); nameEdit = new TQLineEdit(propright);
nameEdit->setFixedHeight(nameEdit->tqsizeHint().height()); nameEdit->setFixedHeight(nameEdit->sizeHint().height());
nameEdit->tqsetAlignment(TQLineEdit::AlignLeft); nameEdit->setAlignment(TQLineEdit::AlignLeft);
TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft); TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft);
l->setFixedSize(l->tqsizeHint()); l->setFixedSize(l->sizeHint());
connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) ); connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) );
timeEdit = new TimeEdit(propright); timeEdit = new TimeEdit(propright);
timeEdit->setFixedHeight(timeEdit->tqsizeHint().height()); timeEdit->setFixedHeight(timeEdit->sizeHint().height());
l = new TQLabel(timeEdit, i18n("Tea time:"), propleft); l = new TQLabel(timeEdit, i18n("Tea time:"), propleft);
l->setFixedSize(l->tqsizeHint()); l->setFixedSize(l->sizeHint());
connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int))); connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)));
/* bottom - timeout actions */ /* bottom - timeout actions */
@ -751,15 +751,15 @@ void TopLevel::config()
eventEnable = new TQCheckBox(i18n("Event"), actiongroup); eventEnable = new TQCheckBox(i18n("Event"), actiongroup);
popupEnable = new TQCheckBox(i18n("Popup"), actiongroup); popupEnable = new TQCheckBox(i18n("Popup"), actiongroup);
eventEnable->setFixedHeight(eventEnable->tqsizeHint().height()); eventEnable->setFixedHeight(eventEnable->sizeHint().height());
popupEnable->setFixedHeight(popupEnable->tqsizeHint().height()); popupEnable->setFixedHeight(popupEnable->sizeHint().height());
TQHBox *actionbox = new TQHBox(actiongroup); TQHBox *actionbox = new TQHBox(actiongroup);
actionEnable = new TQCheckBox(actionbox); actionEnable = new TQCheckBox(actionbox);
// FIXME: add text to this line: // FIXME: add text to this line:
// TQLabel *actionLabel = new TQLabel(i18n("Execute: "), actiongroup); // TQLabel *actionLabel = new TQLabel(i18n("Execute: "), actiongroup);
actionEdit = new TQLineEdit(actionbox); actionEdit = new TQLineEdit(actionbox);
actionEdit->setFixedHeight(actionEdit->tqsizeHint().height()); actionEdit->setFixedHeight(actionEdit->sizeHint().height());
TQToolTip::add(actionEdit, i18n("Enter command here; '%t' will be replaced with name of steeping tea")); TQToolTip::add(actionEdit, i18n("Enter command here; '%t' will be replaced with name of steeping tea"));
connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool))); connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool)));
rightside->addStretch(); rightside->addStretch();

@ -60,7 +60,7 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name )
tl1->addLayout(tl11); tl1->addLayout(tl11);
TQLabel *label = new TQLabel( i18n("Speed:"), this ); TQLabel *label = new TQLabel( i18n("Speed:"), this );
label->setMinimumSize(label->tqsizeHint()); label->setMinimumSize(label->sizeHint());
tl11->addStretch(1); tl11->addStretch(1);
tl11->addWidget(label); tl11->addWidget(label);
@ -203,7 +203,7 @@ void KSpriteSaver::initialise()
{ {
mCanvas = new TQCanvas(); mCanvas = new TQCanvas();
TQPixmap pm( locate("sprite", "bg.png") ); TQPixmap pm( locate("sprite", "bg.png") );
mCanvas->tqsetBackgroundPixmap( pm ); mCanvas->setBackgroundPixmap( pm );
mCanvas->resize( width(), height() ); mCanvas->resize( width(), height() );
mView = new TQCanvasView(mCanvas); mView = new TQCanvasView(mCanvas);
mView->viewport()->setBackgroundColor( black ); mView->viewport()->setBackgroundColor( black );

@ -213,18 +213,18 @@ void dockwidget::resizeView( const TQSize &size )
if ( h <= 128 ) // left to right tqlayout if ( h <= 128 ) // left to right tqlayout
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
} }
else // top to bottom else // top to bottom
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
TQFontMetrics fm(m_font); TQFontMetrics fm(m_font);
h = 128 - (3 * fm.height()); // 3 lines of text below the button h = 128 - (3 * fm.height()); // 3 lines of text below the button
m_lblTemp->tqsetAlignment(TQt::AlignCenter); m_lblTemp->setAlignment(TQt::AlignCenter);
m_lblWind->tqsetAlignment(TQt::AlignCenter); m_lblWind->setAlignment(TQt::AlignCenter);
m_lblPres->tqsetAlignment(TQt::AlignCenter); m_lblPres->setAlignment(TQt::AlignCenter);
} }
m_button->setFixedSize(h, h); m_button->setFixedSize(h, h);
} }
@ -233,14 +233,14 @@ void dockwidget::resizeView( const TQSize &size )
if ( h <= 32 ) // left to right if ( h <= 32 ) // left to right
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
} }
else // top to bottom else // top to bottom
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
TQFontMetrics fm(m_font); TQFontMetrics fm(m_font);
h = TQMIN(128, h) - fm.height(); h = TQMIN(128, h) - fm.height();
m_lblTemp->tqsetAlignment(TQt::AlignCenter); m_lblTemp->setAlignment(TQt::AlignCenter);
} }
m_button->setFixedSize(h, h); m_button->setFixedSize(h, h);
} }
@ -260,9 +260,9 @@ void dockwidget::resizeView( const TQSize &size )
if ( w <= 128 ) // top to bottom if ( w <= 128 ) // top to bottom
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
m_lblTemp->tqsetAlignment(TQt::AlignCenter); m_lblTemp->setAlignment(TQt::AlignCenter);
m_lblWind->tqsetAlignment(TQt::AlignCenter); m_lblWind->setAlignment(TQt::AlignCenter);
m_lblPres->tqsetAlignment(TQt::AlignCenter); m_lblPres->setAlignment(TQt::AlignCenter);
TQFontMetrics fm(m_font); TQFontMetrics fm(m_font);
h = h - (3 * fm.height()); // 3 lines of text below the button h = h - (3 * fm.height()); // 3 lines of text below the button
@ -271,9 +271,9 @@ void dockwidget::resizeView( const TQSize &size )
else // left to right tqlayout else // left to right tqlayout
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
} }
m_button->setFixedSize(h, h); m_button->setFixedSize(h, h);
} }
@ -282,14 +282,14 @@ void dockwidget::resizeView( const TQSize &size )
if ( w <= 128 ) // top to bottom if ( w <= 128 ) // top to bottom
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
m_lblTemp->tqsetAlignment(TQt::AlignCenter); m_lblTemp->setAlignment(TQt::AlignCenter);
h = w; h = w;
} }
else // left to right tqlayout else // left to right tqlayout
{ {
static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight); static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
h = static_cast<int>(w * 0.33); h = static_cast<int>(w * 0.33);
} }

@ -171,7 +171,7 @@ void kweather::preferences()
/** The help handler */ /** The help handler */
void kweather::help() void kweather::help()
{ {
kapp->invokeHelp(TQString(), TQString::tqfromLatin1("kweather")); kapp->invokeHelp(TQString(), TQString::fromLatin1("kweather"));
} }
/** Display the current weather report. */ /** Display the current weather report. */

@ -147,7 +147,7 @@ bool MetarParser::parseCover(const TQString &s)
{ {
if (CoverRegExp.search(s) > -1) if (CoverRegExp.search(s) > -1)
{ {
kdDebug(12006) << "Cover: " << TQString(CoverRegExp.tqcapturedTexts().join("-")) kdDebug(12006) << "Cover: " << TQString(CoverRegExp.capturedTexts().join("-"))
<< endl; << endl;
TQString sCode = CoverRegExp.cap(1); TQString sCode = CoverRegExp.cap(1);
@ -211,7 +211,7 @@ bool MetarParser::parseCurrent(const TQString &s)
TQString sCode = CurrentRegExp.cap(2); TQString sCode = CurrentRegExp.cap(2);
TQString intensity, descriptor, phenomena, currentWeather; TQString intensity, descriptor, phenomena, currentWeather;
kdDebug(12006) << "Current: " << TQString(CurrentRegExp.tqcapturedTexts().join("-")) << endl; kdDebug(12006) << "Current: " << TQString(CurrentRegExp.capturedTexts().join("-")) << endl;
// Decode the intensity // Decode the intensity
if (sIntensity == "+") if (sIntensity == "+")
@ -358,7 +358,7 @@ bool MetarParser::parseTemperature(const TQString &s)
{ {
if (TempRegExp.search(s) > -1) if (TempRegExp.search(s) > -1)
{ {
kdDebug(12006) << "Temp: " << TQString(TempRegExp.tqcapturedTexts().join("-")) kdDebug(12006) << "Temp: " << TQString(TempRegExp.capturedTexts().join("-"))
<< endl; << endl;
float fTemp = TempRegExp.cap(2).toFloat(); float fTemp = TempRegExp.cap(2).toFloat();
@ -379,7 +379,7 @@ bool MetarParser::parseTemperatureTenths(const TQString &s)
{ {
if (TempTenRegExp.search(s) > -1) if (TempTenRegExp.search(s) > -1)
{ {
kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.tqcapturedTexts().join("-")) kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.capturedTexts().join("-"))
<< endl; << endl;
float temperature = TempTenRegExp.cap( 1 ).toFloat() / 10; float temperature = TempTenRegExp.cap( 1 ).toFloat() / 10;
@ -473,7 +473,7 @@ bool MetarParser::parseDate(const TQString &s)
{ {
if (DateRegExp.search(s) > -1) if (DateRegExp.search(s) > -1)
{ {
kdDebug(12006) << "Date: " << TQString(DateRegExp.tqcapturedTexts().join("-")) kdDebug(12006) << "Date: " << TQString(DateRegExp.capturedTexts().join("-"))
<< endl; << endl;
TQString dateString = DateRegExp.cap(1); TQString dateString = DateRegExp.cap(1);
TQString day, month, year; TQString day, month, year;
@ -496,7 +496,7 @@ bool MetarParser::parseTime(const TQString &s)
{ {
if (TimeRegExp.search(s) > -1) if (TimeRegExp.search(s) > -1)
{ {
kdDebug(12006) << "Time: " << TQString(TimeRegExp.tqcapturedTexts().join("-")) kdDebug(12006) << "Time: " << TQString(TimeRegExp.capturedTexts().join("-"))
<< endl; << endl;
TQString hour, minute, dateString; TQString hour, minute, dateString;
@ -521,7 +521,7 @@ bool MetarParser::parseVisibility(TQStringList::ConstIterator it)
{ {
fVisibility = VisRegExp.cap(1).toFloat(); fVisibility = VisRegExp.cap(1).toFloat();
kdDebug(12006) << "Visibility: " << TQString(VisRegExp.tqcapturedTexts().join("-")) kdDebug(12006) << "Visibility: " << TQString(VisRegExp.capturedTexts().join("-"))
<< endl; << endl;
} }
@ -564,7 +564,7 @@ bool MetarParser::parsePressure( const TQString &s)
TQString type = PressRegExp.cap(1); TQString type = PressRegExp.cap(1);
float fPressure = PressRegExp.cap(2).toFloat(); float fPressure = PressRegExp.cap(2).toFloat();
kdDebug(12006) << "Pressure: " << TQString(PressRegExp.tqcapturedTexts().join("-")) kdDebug(12006) << "Pressure: " << TQString(PressRegExp.capturedTexts().join("-"))
<< endl; << endl;
if (m_units == KLocale::Metric) if (m_units == KLocale::Metric)
@ -643,7 +643,7 @@ bool MetarParser::parseWindSpeed(const TQString &s)
float gustSpeed = WindRegExp.cap(3).toFloat(); float gustSpeed = WindRegExp.cap(3).toFloat();
TQString sWindUnit = WindRegExp.cap(4); TQString sWindUnit = WindRegExp.cap(4);
kdDebug(12006) << "Wind: " << WindRegExp.tqcapturedTexts().join("-") kdDebug(12006) << "Wind: " << WindRegExp.capturedTexts().join("-")
<< endl; << endl;
if (m_units == KLocale::Metric) if (m_units == KLocale::Metric)

@ -60,7 +60,7 @@ class MetarParser
public: public:
MetarParser(StationDatabase *stationDB, MetarParser(StationDatabase *stationDB,
KLocale::MeasureSystem units = KLocale::Imperial, KLocale::MeasureSystem units = KLocale::Imperial,
TQDate date = TQDate::tqcurrentDate(), TQDate date = TQDate::currentDate(),
TQTime time = TQTime::currentTime(), TQTime time = TQTime::currentTime(),
unsigned int localUTCOffset = KRFCDate::localUTCOffset()); unsigned int localUTCOffset = KRFCDate::localUTCOffset());

@ -21,7 +21,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -85,7 +85,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -102,7 +102,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -228,7 +228,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>294</width> <width>294</width>
<height>16</height> <height>16</height>
@ -256,7 +256,7 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>252</width> <width>252</width>
<height>0</height> <height>0</height>
@ -318,7 +318,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>170</width> <width>170</width>
<height>20</height> <height>20</height>

@ -60,7 +60,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>86</height> <height>86</height>
@ -121,7 +121,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>85</height> <height>85</height>

@ -61,7 +61,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -37,7 +37,7 @@ class Sun
*/ */
Sun( const TQString &latitude, Sun( const TQString &latitude,
const TQString &longitude, const TQString &longitude,
TQDate date = TQDate::tqcurrentDate(), TQDate date = TQDate::currentDate(),
const int localUTCOffset = KRFCDate::localUTCOffset() ); const int localUTCOffset = KRFCDate::localUTCOffset() );
TQTime computeRiseTime(); TQTime computeRiseTime();

@ -65,7 +65,7 @@ WeatherLib::Data::Data()
void WeatherLib::Data::clear() void WeatherLib::Data::clear()
{ {
age = TQDateTime::tqcurrentDateTime(); age = TQDateTime::currentDateTime();
downloading = false; downloading = false;
updated = false; updated = false;
job = 0; job = 0;
@ -135,7 +135,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job)
kdDebug( 12006 ) << "Parse: " << s << endl; kdDebug( 12006 ) << "Parse: " << s << endl;
MetarParser parser(m_StationDb, KGlobal::locale()->measureSystem()); MetarParser parser(m_StationDb, KGlobal::locale()->measureSystem());
d->wi = parser.processData(d->wi.reportLocation, s); d->wi = parser.processData(d->wi.reportLocation, s);
d->age = TQDateTime::tqcurrentDateTime().addSecs(1800); d->age = TQDateTime::currentDateTime().addSecs(1800);
emit fileUpdate(d->wi.reportLocation); emit fileUpdate(d->wi.reportLocation);
d->updated = true; d->updated = true;
} }
@ -322,7 +322,7 @@ void WeatherLib::update(const TQString &stationID)
// Only grab new data if its more than 50 minutes old // Only grab new data if its more than 50 minutes old
Data *d = findData(stationID); Data *d = findData(stationID);
TQDateTime timeout = TQDateTime::tqcurrentDateTime(); TQDateTime timeout = TQDateTime::currentDateTime();
kdDebug (12006) << "Current Time: " << KGlobal::locale()->formatDateTime(timeout, false, false) << kdDebug (12006) << "Current Time: " << KGlobal::locale()->formatDateTime(timeout, false, false) <<
" Update at: " << KGlobal::locale()->formatDateTime(d->age, false, false) << endl; " Update at: " << KGlobal::locale()->formatDateTime(d->age, false, false) << endl;

@ -103,7 +103,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>31</height> <height>31</height>
@ -151,7 +151,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -179,7 +179,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -71,7 +71,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -88,7 +88,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -177,7 +177,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -213,7 +213,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -76,9 +76,9 @@ bool SimpleFlow::hasHeightForWidth() const
return TRUE; return TRUE;
} }
TQSize SimpleFlow::tqsizeHint() const TQSize SimpleFlow::sizeHint() const
{ {
return tqminimumSize(); return minimumSize();
} }
TQSizePolicy::ExpandData SimpleFlow::expanding() const TQSizePolicy::ExpandData SimpleFlow::expanding() const
@ -116,29 +116,29 @@ int SimpleFlow::doLayout( const TQRect &r, bool testonly )
TQLayoutItem *o; TQLayoutItem *o;
while ( (o=it.current()) != 0 ) { while ( (o=it.current()) != 0 ) {
++it; ++it;
int nextX = x + o->tqsizeHint().width() + spacing(); int nextX = x + o->sizeHint().width() + spacing();
if ( nextX - spacing() > r.right() && h > 0 ) { if ( nextX - spacing() > r.right() && h > 0 ) {
x = r.x(); x = r.x();
y = y + h + spacing(); y = y + h + spacing();
nextX = x + o->tqsizeHint().width() + spacing(); nextX = x + o->sizeHint().width() + spacing();
h = 0; h = 0;
} }
if ( !testonly ) if ( !testonly )
o->setGeometry( TQRect( TQPoint( x, y ), o->tqsizeHint() ) ); o->setGeometry( TQRect( TQPoint( x, y ), o->sizeHint() ) );
x = nextX; x = nextX;
h = TQMAX( h, o->tqsizeHint().height() ); h = TQMAX( h, o->sizeHint().height() );
} }
return y + h - r.y(); return y + h - r.y();
} }
TQSize SimpleFlow::tqminimumSize() const TQSize SimpleFlow::minimumSize() const
{ {
TQSize s(0,0); TQSize s(0,0);
TQPtrListIterator<TQLayoutItem> it(list); TQPtrListIterator<TQLayoutItem> it(list);
TQLayoutItem *o; TQLayoutItem *o;
while ( (o=it.current()) != 0 ) { while ( (o=it.current()) != 0 ) {
++it; ++it;
s = s.expandedTo( o->tqminimumSize() ); s = s.expandedTo( o->minimumSize() );
} }
return s; return s;
} }

@ -37,8 +37,8 @@ public:
void addItem( TQLayoutItem *item); void addItem( TQLayoutItem *item);
bool hasHeightForWidth() const; bool hasHeightForWidth() const;
int heightForWidth( int ) const; int heightForWidth( int ) const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSize() const; TQSize minimumSize() const;
TQLayoutIterator iterator(); TQLayoutIterator iterator();
TQSizePolicy::ExpandData expanding() const; TQSizePolicy::ExpandData expanding() const;

@ -143,7 +143,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
_cityIndicator->setIndent(0); _cityIndicator->setIndent(0);
_cityIndicator->setAutoMask(false); _cityIndicator->setAutoMask(false);
_cityIndicator->setLineWidth(1); _cityIndicator->setLineWidth(1);
_cityIndicator->tqsetAlignment(TQLabel::AlignAuto | TQLabel::AlignTop); _cityIndicator->setAlignment(TQLabel::AlignAuto | TQLabel::AlignTop);
_cityIndicator->setAutoResize(true); _cityIndicator->setAutoResize(true);
_cityIndicator->setFrameStyle(TQFrame::Box | TQFrame::Plain); _cityIndicator->setFrameStyle(TQFrame::Box | TQFrame::Plain);
_cityIndicator->setPalette(TQToolTip::palette()); _cityIndicator->setPalette(TQToolTip::palette());
@ -563,13 +563,13 @@ TQPixmap MapWidget::calculatePixmap()
if (gmt_position >= greenwich) if (gmt_position >= greenwich)
{ {
p.tqdrawPixmap(gmt_position-greenwich, 0, map, 0, 0, map.width()-gmt_position+greenwich); p.drawPixmap(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(0,0, map, map.width()-gmt_position+greenwich, 0, gmt_position-greenwich);
} }
else else
{ {
p.tqdrawPixmap(0,0, map, greenwich-gmt_position, 0, map.width()+gmt_position-greenwich); p.drawPixmap(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(map.width()+gmt_position-greenwich, 0, map, 0, 0, greenwich-gmt_position);
} }
return pm; return pm;

@ -218,8 +218,8 @@ void ZoneClockPanel::realign()
int w = 0; int w = 0;
TQPtrListIterator<ZoneClock> it(_clocks); TQPtrListIterator<ZoneClock> it(_clocks);
for ( ; it.current(); ++it) for ( ; it.current(); ++it)
if (it.current()->tqsizeHint().width() > w) if (it.current()->sizeHint().width() > w)
w = it.current()->tqsizeHint().width(); w = it.current()->sizeHint().width();
it.toFirst(); it.toFirst();
for ( ; it.current(); ++it) for ( ; it.current(); ++it)
it.current()->setFixedWidth(w); it.current()->setFixedWidth(w);

Loading…
Cancel
Save