diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
tree | ab537a329b9613e11dce8195761f93ffe82aed24 /kontact/interfaces | |
parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kontact/interfaces')
-rw-r--r-- | kontact/interfaces/core.cpp | 12 | ||||
-rw-r--r-- | kontact/interfaces/summary.cpp | 18 | ||||
-rw-r--r-- | kontact/interfaces/summary.h | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 92e0f624d..e4e44e704 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -42,7 +42,7 @@ Core::Core( TQWidget *parent, const char *name ) { d = new Private; TQTimer* timer = new TQTimer( this ); - mLastDate = TQDate::currentDate(); + mLastDate = TQDate::tqcurrentDate(); connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -86,10 +86,10 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) d->lastErrorMessage = KLibLoader::self()->lastErrorMessage(); break; case KParts::ComponentFactory::ErrNoFactory: - d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).arg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).tqarg( libname ); break; case KParts::ComponentFactory::ErrNoComponent: - d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).arg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).tqarg( libname ); break; } kdWarning(5601) << d->lastErrorMessage << endl; @@ -114,10 +114,10 @@ void Core::slotPartDestroyed( TQObject * obj ) void Core::checkNewDay() { - if ( mLastDate != TQDate::currentDate() ) - emit dayChanged( TQDate::currentDate() ); + if ( mLastDate != TQDate::tqcurrentDate() ) + emit dayChanged( TQDate::tqcurrentDate() ); - mLastDate = TQDate::currentDate(); + mLastDate = TQDate::tqcurrentDate(); } TQString Core::lastErrorMessage() const diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 6192dd4c4..085125222 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -55,20 +55,20 @@ TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQ TQLabel *label = new TQLabel( hbox ); label->setPixmap( icon ); - label->setFixedSize( label->sizeHint() ); - label->setPaletteBackgroundColor( colorGroup().mid() ); + label->setFixedSize( label->tqsizeHint() ); + label->setPaletteBackgroundColor( tqcolorGroup().mid() ); label->setAcceptDrops( true ); label = new TQLabel( heading, hbox ); - label->setAlignment( AlignLeft|AlignVCenter ); + label->tqsetAlignment( AlignLeft|AlignVCenter ); label->setIndent( KDialog::spacingHint() ); label->setFont( boldFont ); - label->setPaletteForegroundColor( colorGroup().light() ); - label->setPaletteBackgroundColor( colorGroup().mid() ); + label->setPaletteForegroundColor( tqcolorGroup().light() ); + label->setPaletteBackgroundColor( tqcolorGroup().mid() ); - hbox->setPaletteBackgroundColor( colorGroup().mid() ); + hbox->setPaletteBackgroundColor( tqcolorGroup().mid() ); - hbox->setMaximumHeight( hbox->minimumSizeHint().height() ); + hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() ); return hbox; } @@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event ) void Summary::dropEvent( TQDropEvent *event ) { - int alignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom); - emit summaryWidgetDropped( this, event->source(), alignment ); + int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom); + emit summaryWidgetDropped( this, event->source(), tqalignment ); } #include "summary.moc" diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h index f490f517e..f50507ce7 100644 --- a/kontact/interfaces/summary.h +++ b/kontact/interfaces/summary.h @@ -74,7 +74,7 @@ class KDE_EXPORT Summary : public TQWidget signals: void message( const TQString &message ); - void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment ); + void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment ); protected: virtual void mousePressEvent( TQMouseEvent* ); |