From 3ee504ecba6caf3c2609a8648fe3659f2b541544 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:35:14 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- amor/amor.cpp | 4 ++-- amor/amoranim.cpp | 4 ++-- amor/amoranim.h | 4 ++-- amor/amorbubble.cpp | 4 ++-- fifteenapplet/fifteenapplet.cpp | 4 ++-- fifteenapplet/qttableview.cpp | 10 +++++----- kmoon/kmoonapplet.cpp | 4 ++-- kmoon/kmoondlg.cpp | 2 +- kmoon/kmoonwidget.cpp | 4 ++-- kmoon/kmoonwidget.h | 2 +- kodo/kimagenumber.cpp | 4 ++-- kodo/kimagenumber.h | 2 +- kteatime/timeedit.cpp | 8 ++++---- kteatime/toplevel.cpp | 28 ++++++++++++++-------------- ktux/sprite.cpp | 4 ++-- kweather/dockwidget.cpp | 32 ++++++++++++++++---------------- kweather/kweather.cpp | 2 +- kweather/metar_parser.cpp | 18 +++++++++--------- kweather/metar_parser.h | 2 +- kweather/prefdialogdata.ui | 12 ++++++------ kweather/serviceconfigdata.ui | 4 ++-- kweather/sidebarwidgetbase.ui | 2 +- kweather/sun.h | 2 +- kweather/weatherlib.cpp | 6 +++--- kworldwatch/about.ui | 6 +++--- kworldwatch/clock.ui | 8 ++++---- kworldwatch/flow.cpp | 16 ++++++++-------- kworldwatch/flow.h | 4 ++-- kworldwatch/mapwidget.cpp | 10 +++++----- kworldwatch/zoneclock.cpp | 4 ++-- 30 files changed, 108 insertions(+), 108 deletions(-) diff --git a/amor/amor.cpp b/amor/amor.cpp index 0a9b436..a9a73e3 100644 --- a/amor/amor.cpp +++ b/amor/amor.cpp @@ -152,7 +152,7 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject() TQT_SLOT(slotMouseClicked(const TQPoint &))); connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)), TQT_SLOT(slotWidgetDragged(const TQPoint &, bool))); - mAmor->resize(mTheme.tqmaximumSize()); + mAmor->resize(mTheme.maximumSize()); mTimer = new TQTimer(this); connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); @@ -288,7 +288,7 @@ void Amor::reset() mPosition = mCurrAnim->hotspot().x(); mState = Normal; - mAmor->resize(mTheme.tqmaximumSize()); + mAmor->resize(mTheme.maximumSize()); mCurrAnim->reset(); mTimer->start(0, true); diff --git a/amor/amoranim.cpp b/amor/amoranim.cpp index 31b4f6f..b4e595b 100644 --- a/amor/amoranim.cpp +++ b/amor/amoranim.cpp @@ -227,7 +227,7 @@ bool AmorThemeManager::readGroup(const TQString & seq) mConfig->setGroup(list.at(i)); AmorAnim *anim = new AmorAnim(*mConfig); 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 @@ -238,7 +238,7 @@ bool AmorThemeManager::readGroup(const TQString & seq) if (anim) { animList->append(anim); - mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize()); + mMaximumSize = mMaximumSize.expandedTo(anim->maximumSize()); entries++; } } diff --git a/amor/amoranim.h b/amor/amoranim.h index d315840..acc4fba 100644 --- a/amor/amoranim.h +++ b/amor/amoranim.h @@ -59,7 +59,7 @@ public: { return (mCurrent < mSequence.count()); } int totalMovement() const { return mTotalMovement; } - TQSize tqmaximumSize() const + TQSize maximumSize() const { return mMaximumSize; } int delay() const @@ -103,7 +103,7 @@ public: AmorAnim *random(const TQString & group); - TQSize tqmaximumSize() const { return mMaximumSize; } + TQSize maximumSize() const { return mMaximumSize; } protected: TQString mPath; diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp index 49e65b7..5060f97 100644 --- a/amor/amorbubble.cpp +++ b/amor/amorbubble.cpp @@ -55,7 +55,7 @@ AmorBubble::AmorBubble() 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); //Laurent TQTextBrowser didn't have this function FIX me //mBrowser->setPaperColorGroup( clgrp ); @@ -195,7 +195,7 @@ void AmorBubble::drawBubble(TQPainter &p) p.drawPolygon(pointArray); p.setPen(pen); - p.tqdrawPolyline(pointArray, 0, 3); + p.drawPolyline(pointArray, 0, 3); } //--------------------------------------------------------------------------- diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp index 498f93d..706ecb1 100644 --- a/fifteenapplet/fifteenapplet.cpp +++ b/fifteenapplet/fifteenapplet.cpp @@ -120,7 +120,7 @@ void PiecesTable::paintCell(TQPainter *p, int row, int col) // draw cell background if(number == 16) - p->setBrush(tqcolorGroup().background()); + p->setBrush(colorGroup().background()); else p->setBrush(_colors[number-1]); p->setPen(NoPen); @@ -128,7 +128,7 @@ void PiecesTable::paintCell(TQPainter *p, int row, int col) // draw borders if (height() > 40) { - p->setPen(tqcolorGroup().text()); + p->setPen(colorGroup().text()); if(col < numCols()-1) p->drawLine(x2, 0, x2, y2); // right border line diff --git a/fifteenapplet/qttableview.cpp b/fifteenapplet/qttableview.cpp index 4aded39..1d4d29c 100644 --- a/fifteenapplet/qttableview.cpp +++ b/fifteenapplet/qttableview.cpp @@ -34,8 +34,8 @@ enum ScrollBarDirtyFlags { }; -#define HSBEXT horizontalScrollBar()->tqsizeHint().height() -#define VSBEXT verticalScrollBar()->tqsizeHint().width() +#define HSBEXT horizontalScrollBar()->sizeHint().height() +#define VSBEXT verticalScrollBar()->sizeHint().width() class QCornerSquare : public TQWidget // internal class @@ -1385,7 +1385,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // outside the cells. TQRect viewR = viewRect(); - const TQColorGroup g = tqcolorGroup(); + const TQColorGroup g = colorGroup(); if ( xPos <= maxX ) { TQRect r = viewR; @@ -1443,7 +1443,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->tqsizeHint() ); // height is irrelevant + sb->resize( sb->sizeHint() ); // height is irrelevant Q_CHECK_PTR(sb); sb->setTracking( FALSE ); sb->setFocusPolicy( TQ_NoFocus ); @@ -1474,7 +1474,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->tqsizeHint() ); // width is irrelevant + sb->resize( sb->sizeHint() ); // width is irrelevant sb->setFocusPolicy( TQ_NoFocus ); Q_CHECK_PTR(sb); sb->setTracking( FALSE ); diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp index c7051a7..5a4beab 100644 --- a/kmoon/kmoonapplet.cpp +++ b/kmoon/kmoonapplet.cpp @@ -104,7 +104,7 @@ void MoonPAWidget::showAbout() KStdGuiItem::ok() ); 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 \n" "\n" "Made an applet by M G Berberich " @@ -144,7 +144,7 @@ void MoonPAWidget::timerEvent( TQTimerEvent * ) time_t clock; time(&clock); struct tm *t = localtime(&clock); - moon->calctqStatus(mktime(t)); + moon->calcStatus(mktime(t)); moon->tqrepaint(); } diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp index d4d750f..25390ac 100644 --- a/kmoon/kmoondlg.cpp +++ b/kmoon/kmoondlg.cpp @@ -94,7 +94,7 @@ void KMoonDlg::angleChanged(int value) { } void KMoonDlg::help() { - kapp->invokeHelp(TQString::tqfromLatin1("config")); + kapp->invokeHelp(TQString::fromLatin1("config")); } void KMoonDlg::toggleHemi() { diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp index 89858c8..8b769e1 100644 --- a/kmoon/kmoonwidget.cpp +++ b/kmoon/kmoonwidget.cpp @@ -70,14 +70,14 @@ MoonWidget::MoonWidget(TQWidget *parent, const char *name) time(&clock); t = gmtime(&clock); // kdDebug() << "time " << t->tm_isdst << " " << timezone << " " << daylight << endl ; - calctqStatus(mktime(t)); + calcStatus(mktime(t)); } MoonWidget::~MoonWidget() { } -void MoonWidget::calctqStatus( time_t time ) +void MoonWidget::calcStatus( time_t time ) { uint lun = 0; time_t last_new = 0; diff --git a/kmoon/kmoonwidget.h b/kmoon/kmoonwidget.h index 3b2415f..f636b60 100644 --- a/kmoon/kmoonwidget.h +++ b/kmoon/kmoonwidget.h @@ -37,7 +37,7 @@ public: MoonWidget(TQWidget *parent = 0, const char *name = 0); ~MoonWidget(); - void calctqStatus( time_t time ); + void calcStatus( time_t time ); int angle() const { return _angle; } void setAngle(int angle); diff --git a/kodo/kimagenumber.cpp b/kodo/kimagenumber.cpp index 911f718..86a44ba 100644 --- a/kodo/kimagenumber.cpp +++ b/kodo/kimagenumber.cpp @@ -30,7 +30,7 @@ KImageNumber::KImageNumber(const TQString& font, TQWidget* parent,const char* na m_value(0) { fontPix = new TQPixmap(font); - resize(tqsizeHint()); + resize(sizeHint()); } KImageNumber::~KImageNumber() @@ -65,7 +65,7 @@ double KImageNumber::value() const return m_value; } -TQSize KImageNumber::tqsizeHint() const +TQSize KImageNumber::sizeHint() const { int w = fontPix->width(); int each = w/11; diff --git a/kodo/kimagenumber.h b/kodo/kimagenumber.h index 0500d76..5719e1b 100644 --- a/kodo/kimagenumber.h +++ b/kodo/kimagenumber.h @@ -40,7 +40,7 @@ public: virtual ~KImageNumber(); void paintEvent(TQPaintEvent*); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; double value() const; public slots: diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp index 473a11b..430e1b6 100644 --- a/kteatime/timeedit.cpp +++ b/kteatime/timeedit.cpp @@ -54,16 +54,16 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) { tqlayout = new TQHBoxLayout(this); minuteBox = new TQSpinBox(0, 300, 1, this); -// minuteBox->setFixedSize(minuteBox->tqsizeHint()); +// minuteBox->setFixedSize(minuteBox->sizeHint()); TQLabel* min = new TQLabel(i18n(" min"), this); - min->setFixedSize(min->tqsizeHint()); + min->setFixedSize(min->sizeHint()); secondBox = new WrappingSpinBox(0, 59, 1, this); secondBox->setWrapping(true); -// secondBox->setFixedSize(secondBox->tqsizeHint()); +// secondBox->setFixedSize(secondBox->sizeHint()); TQLabel* sec = new TQLabel(i18n(" sec"),this); - sec->setFixedSize(sec->tqsizeHint()); + sec->setFixedSize(sec->sizeHint()); tqlayout->addWidget(minuteBox); tqlayout->addWidget(min); diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index 82539ce..4b27f30 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -487,10 +487,10 @@ void TopLevel::anonymous() prop_box->addWidget(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); TQLabel *l = new TQLabel(anon_time, i18n("Tea time:"), propleft); - l->setFixedSize(l->tqsizeHint()); + l->setFixedSize(l->sizeHint()); top_box->addStretch(); @@ -688,28 +688,28 @@ void TopLevel::config() btn_new = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_new, i18n("New")); 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())); hbox->addWidget(btn_new); btn_del = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_del, i18n("Delete")); 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())); hbox->addWidget(btn_del); btn_up = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_up, i18n("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())); hbox->addWidget(btn_up); btn_down = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_down, i18n("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())); hbox->addWidget(btn_down); @@ -726,16 +726,16 @@ void TopLevel::config() TQVBox *propleft = new TQVBox(propbox); TQVBox *propright = new TQVBox(propbox); nameEdit = new TQLineEdit(propright); - nameEdit->setFixedHeight(nameEdit->tqsizeHint().height()); - nameEdit->tqsetAlignment(TQLineEdit::AlignLeft); + nameEdit->setFixedHeight(nameEdit->sizeHint().height()); + nameEdit->setAlignment(TQLineEdit::AlignLeft); 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&)) ); timeEdit = new TimeEdit(propright); - timeEdit->setFixedHeight(timeEdit->tqsizeHint().height()); + timeEdit->setFixedHeight(timeEdit->sizeHint().height()); 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))); /* bottom - timeout actions */ @@ -751,15 +751,15 @@ void TopLevel::config() eventEnable = new TQCheckBox(i18n("Event"), actiongroup); popupEnable = new TQCheckBox(i18n("Popup"), actiongroup); - eventEnable->setFixedHeight(eventEnable->tqsizeHint().height()); - popupEnable->setFixedHeight(popupEnable->tqsizeHint().height()); + eventEnable->setFixedHeight(eventEnable->sizeHint().height()); + popupEnable->setFixedHeight(popupEnable->sizeHint().height()); TQHBox *actionbox = new TQHBox(actiongroup); actionEnable = new TQCheckBox(actionbox); // FIXME: add text to this line: // TQLabel *actionLabel = new TQLabel(i18n("Execute: "), actiongroup); 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")); connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool))); rightside->addStretch(); diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp index 5138159..a163e71 100644 --- a/ktux/sprite.cpp +++ b/ktux/sprite.cpp @@ -60,7 +60,7 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name ) tl1->addLayout(tl11); TQLabel *label = new TQLabel( i18n("Speed:"), this ); - label->setMinimumSize(label->tqsizeHint()); + label->setMinimumSize(label->sizeHint()); tl11->addStretch(1); tl11->addWidget(label); @@ -203,7 +203,7 @@ void KSpriteSaver::initialise() { mCanvas = new TQCanvas(); TQPixmap pm( locate("sprite", "bg.png") ); - mCanvas->tqsetBackgroundPixmap( pm ); + mCanvas->setBackgroundPixmap( pm ); mCanvas->resize( width(), height() ); mView = new TQCanvasView(mCanvas); mView->viewport()->setBackgroundColor( black ); diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp index 04576b1..bfcc097 100644 --- a/kweather/dockwidget.cpp +++ b/kweather/dockwidget.cpp @@ -213,18 +213,18 @@ void dockwidget::resizeView( const TQSize &size ) if ( h <= 128 ) // left to right tqlayout { static_cast(tqlayout())->setDirection(TQBoxLayout::LeftToRight); - m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); - m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); - m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); + 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(tqlayout())->setDirection(TQBoxLayout::TopToBottom); TQFontMetrics fm(m_font); h = 128 - (3 * fm.height()); // 3 lines of text below the button - m_lblTemp->tqsetAlignment(TQt::AlignCenter); - m_lblWind->tqsetAlignment(TQt::AlignCenter); - m_lblPres->tqsetAlignment(TQt::AlignCenter); + m_lblTemp->setAlignment(TQt::AlignCenter); + m_lblWind->setAlignment(TQt::AlignCenter); + m_lblPres->setAlignment(TQt::AlignCenter); } m_button->setFixedSize(h, h); } @@ -233,14 +233,14 @@ void dockwidget::resizeView( const TQSize &size ) if ( h <= 32 ) // left to right { static_cast(tqlayout())->setDirection(TQBoxLayout::LeftToRight); - m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); + m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter); } else // top to bottom { static_cast(tqlayout())->setDirection(TQBoxLayout::TopToBottom); TQFontMetrics fm(m_font); h = TQMIN(128, h) - fm.height(); - m_lblTemp->tqsetAlignment(TQt::AlignCenter); + m_lblTemp->setAlignment(TQt::AlignCenter); } m_button->setFixedSize(h, h); } @@ -260,9 +260,9 @@ void dockwidget::resizeView( const TQSize &size ) if ( w <= 128 ) // top to bottom { static_cast(tqlayout())->setDirection(TQBoxLayout::TopToBottom); - m_lblTemp->tqsetAlignment(TQt::AlignCenter); - m_lblWind->tqsetAlignment(TQt::AlignCenter); - m_lblPres->tqsetAlignment(TQt::AlignCenter); + m_lblTemp->setAlignment(TQt::AlignCenter); + m_lblWind->setAlignment(TQt::AlignCenter); + m_lblPres->setAlignment(TQt::AlignCenter); TQFontMetrics fm(m_font); 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 { static_cast(tqlayout())->setDirection(TQBoxLayout::LeftToRight); - m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); - m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); - m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); + m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter); + m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter); + m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter); } m_button->setFixedSize(h, h); } @@ -282,14 +282,14 @@ void dockwidget::resizeView( const TQSize &size ) if ( w <= 128 ) // top to bottom { static_cast(tqlayout())->setDirection(TQBoxLayout::TopToBottom); - m_lblTemp->tqsetAlignment(TQt::AlignCenter); + m_lblTemp->setAlignment(TQt::AlignCenter); h = w; } else // left to right tqlayout { static_cast(tqlayout())->setDirection(TQBoxLayout::LeftToRight); - m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter); + m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter); h = static_cast(w * 0.33); } diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp index 9b8c481..324a610 100644 --- a/kweather/kweather.cpp +++ b/kweather/kweather.cpp @@ -171,7 +171,7 @@ void kweather::preferences() /** The help handler */ void kweather::help() { - kapp->invokeHelp(TQString(), TQString::tqfromLatin1("kweather")); + kapp->invokeHelp(TQString(), TQString::fromLatin1("kweather")); } /** Display the current weather report. */ diff --git a/kweather/metar_parser.cpp b/kweather/metar_parser.cpp index 2d3eab9..d65d4da 100644 --- a/kweather/metar_parser.cpp +++ b/kweather/metar_parser.cpp @@ -147,7 +147,7 @@ bool MetarParser::parseCover(const TQString &s) { if (CoverRegExp.search(s) > -1) { - kdDebug(12006) << "Cover: " << TQString(CoverRegExp.tqcapturedTexts().join("-")) + kdDebug(12006) << "Cover: " << TQString(CoverRegExp.capturedTexts().join("-")) << endl; TQString sCode = CoverRegExp.cap(1); @@ -211,7 +211,7 @@ bool MetarParser::parseCurrent(const TQString &s) TQString sCode = CurrentRegExp.cap(2); TQString intensity, descriptor, phenomena, currentWeather; - kdDebug(12006) << "Current: " << TQString(CurrentRegExp.tqcapturedTexts().join("-")) << endl; + kdDebug(12006) << "Current: " << TQString(CurrentRegExp.capturedTexts().join("-")) << endl; // Decode the intensity if (sIntensity == "+") @@ -358,7 +358,7 @@ bool MetarParser::parseTemperature(const TQString &s) { if (TempRegExp.search(s) > -1) { - kdDebug(12006) << "Temp: " << TQString(TempRegExp.tqcapturedTexts().join("-")) + kdDebug(12006) << "Temp: " << TQString(TempRegExp.capturedTexts().join("-")) << endl; float fTemp = TempRegExp.cap(2).toFloat(); @@ -379,7 +379,7 @@ bool MetarParser::parseTemperatureTenths(const TQString &s) { if (TempTenRegExp.search(s) > -1) { - kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.tqcapturedTexts().join("-")) + kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.capturedTexts().join("-")) << endl; float temperature = TempTenRegExp.cap( 1 ).toFloat() / 10; @@ -473,7 +473,7 @@ bool MetarParser::parseDate(const TQString &s) { if (DateRegExp.search(s) > -1) { - kdDebug(12006) << "Date: " << TQString(DateRegExp.tqcapturedTexts().join("-")) + kdDebug(12006) << "Date: " << TQString(DateRegExp.capturedTexts().join("-")) << endl; TQString dateString = DateRegExp.cap(1); TQString day, month, year; @@ -496,7 +496,7 @@ bool MetarParser::parseTime(const TQString &s) { if (TimeRegExp.search(s) > -1) { - kdDebug(12006) << "Time: " << TQString(TimeRegExp.tqcapturedTexts().join("-")) + kdDebug(12006) << "Time: " << TQString(TimeRegExp.capturedTexts().join("-")) << endl; TQString hour, minute, dateString; @@ -521,7 +521,7 @@ bool MetarParser::parseVisibility(TQStringList::ConstIterator it) { fVisibility = VisRegExp.cap(1).toFloat(); - kdDebug(12006) << "Visibility: " << TQString(VisRegExp.tqcapturedTexts().join("-")) + kdDebug(12006) << "Visibility: " << TQString(VisRegExp.capturedTexts().join("-")) << endl; } @@ -564,7 +564,7 @@ bool MetarParser::parsePressure( const TQString &s) TQString type = PressRegExp.cap(1); float fPressure = PressRegExp.cap(2).toFloat(); - kdDebug(12006) << "Pressure: " << TQString(PressRegExp.tqcapturedTexts().join("-")) + kdDebug(12006) << "Pressure: " << TQString(PressRegExp.capturedTexts().join("-")) << endl; if (m_units == KLocale::Metric) @@ -643,7 +643,7 @@ bool MetarParser::parseWindSpeed(const TQString &s) float gustSpeed = WindRegExp.cap(3).toFloat(); TQString sWindUnit = WindRegExp.cap(4); - kdDebug(12006) << "Wind: " << WindRegExp.tqcapturedTexts().join("-") + kdDebug(12006) << "Wind: " << WindRegExp.capturedTexts().join("-") << endl; if (m_units == KLocale::Metric) diff --git a/kweather/metar_parser.h b/kweather/metar_parser.h index 7d94149..daeddad 100644 --- a/kweather/metar_parser.h +++ b/kweather/metar_parser.h @@ -60,7 +60,7 @@ class MetarParser public: MetarParser(StationDatabase *stationDB, KLocale::MeasureSystem units = KLocale::Imperial, - TQDate date = TQDate::tqcurrentDate(), + TQDate date = TQDate::currentDate(), TQTime time = TQTime::currentTime(), unsigned int localUTCOffset = KRFCDate::localUTCOffset()); diff --git a/kweather/prefdialogdata.ui b/kweather/prefdialogdata.ui index 590a2c2..596c54a 100644 --- a/kweather/prefdialogdata.ui +++ b/kweather/prefdialogdata.ui @@ -21,7 +21,7 @@ 0 - + 0 0 @@ -85,7 +85,7 @@ 0 - + 0 0 @@ -102,7 +102,7 @@ MinimumExpanding - + 40 20 @@ -228,7 +228,7 @@ Expanding - + 294 16 @@ -256,7 +256,7 @@ false - + 252 0 @@ -318,7 +318,7 @@ Expanding - + 170 20 diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui index befdca2..2e8e9e1 100644 --- a/kweather/serviceconfigdata.ui +++ b/kweather/serviceconfigdata.ui @@ -60,7 +60,7 @@ Expanding - + 20 86 @@ -121,7 +121,7 @@ Expanding - + 20 85 diff --git a/kweather/sidebarwidgetbase.ui b/kweather/sidebarwidgetbase.ui index 46eb042..6f1f50c 100644 --- a/kweather/sidebarwidgetbase.ui +++ b/kweather/sidebarwidgetbase.ui @@ -61,7 +61,7 @@ Expanding - + 20 20 diff --git a/kweather/sun.h b/kweather/sun.h index f56b513..fd407d7 100644 --- a/kweather/sun.h +++ b/kweather/sun.h @@ -37,7 +37,7 @@ class Sun */ Sun( const TQString &latitude, const TQString &longitude, - TQDate date = TQDate::tqcurrentDate(), + TQDate date = TQDate::currentDate(), const int localUTCOffset = KRFCDate::localUTCOffset() ); TQTime computeRiseTime(); diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp index 40eab31..ae40734 100644 --- a/kweather/weatherlib.cpp +++ b/kweather/weatherlib.cpp @@ -65,7 +65,7 @@ WeatherLib::Data::Data() void WeatherLib::Data::clear() { - age = TQDateTime::tqcurrentDateTime(); + age = TQDateTime::currentDateTime(); downloading = false; updated = false; job = 0; @@ -135,7 +135,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job) kdDebug( 12006 ) << "Parse: " << s << endl; MetarParser parser(m_StationDb, KGlobal::locale()->measureSystem()); 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); d->updated = true; } @@ -322,7 +322,7 @@ void WeatherLib::update(const TQString &stationID) // Only grab new data if its more than 50 minutes old Data *d = findData(stationID); - TQDateTime timeout = TQDateTime::tqcurrentDateTime(); + TQDateTime timeout = TQDateTime::currentDateTime(); kdDebug (12006) << "Current Time: " << KGlobal::locale()->formatDateTime(timeout, false, false) << " Update at: " << KGlobal::locale()->formatDateTime(d->age, false, false) << endl; 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 @@ Fixed - + 41 31 @@ -151,7 +151,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel Expanding - + 20 20 @@ -179,7 +179,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -88,7 +88,7 @@ Expanding - + 20 20 @@ -177,7 +177,7 @@ Expanding - + 20 20 @@ -213,7 +213,7 @@ Expanding - + 20 20 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 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 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);