From 73c08b592db45af554b9f21029bc549d70f683ab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:46:05 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kcontrol/clock/dtime.cpp | 16 ++++++++-------- kcontrol/clock/main.cpp | 2 +- kcontrol/clock/tzone.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'kcontrol/clock') diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index ef3f73ac1..5bee23cd8 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() ); cal = new KDatePicker( dateBox ); - cal->setMinimumSize(cal->tqsizeHint()); + cal->setMinimumSize(cal->sizeHint()); l1->addWidget( cal ); TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); @@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots1 = new TQLabel(":", timeBox); dots1->setMinimumWidth( 7 ); - dots1->tqsetAlignment( TQLabel::AlignCenter ); + dots1->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots1, 0, 1, 3, 3 ); minute = new HMSTimeWidget( timeBox ); @@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots2 = new TQLabel(":", timeBox); dots2->setMinimumWidth( 7 ); - dots2->tqsetAlignment( TQLabel::AlignCenter ); + dots2->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots2, 0, 1, 5, 5 ); second = new HMSTimeWidget( timeBox ); @@ -293,7 +293,7 @@ void Dtime::save() proc << ntpUtility << timeServer; proc.start( KProcess::Block ); if( proc.exitStatus() != 0 ){ - KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").tqarg(timeServer).latin1())); + KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1())); setDateTimeAuto->setChecked( false ); } else { @@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const void Kclock::setTime(const TQTime &time) { this->time = time; - tqrepaint(); + repaint(); } void Kclock::paintEvent( TQPaintEvent * ) @@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * ) TQPointArray pts; TQPoint cp = rect().center(); int d = QMIN(width(),height()); - TQColor hands = tqcolorGroup().dark(); - TQColor shadow = tqcolorGroup().text(); + TQColor hands = colorGroup().dark(); + TQColor shadow = colorGroup().text(); paint.setPen( shadow ); paint.setBrush( shadow ); paint.setViewport(4,4,width(),height()); diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 86e47e7ad..4db1216de 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 53325c9c5..9498a062a 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -77,7 +77,7 @@ void Tzone::currentZone() time_t now = time(0); tzset(); strftime(result.data(), result.size(), "%Z", localtime(&now)); - m_local->setText(localZone.tqarg(KTimezoneWidget::displayName(m_zoneDb.local())).tqarg(static_cast(result))); + m_local->setText(localZone.arg(KTimezoneWidget::displayName(m_zoneDb.local())).arg(static_cast(result))); } // FIXME: Does the logic in this routine actually work correctly? For example, -- cgit v1.2.3