diff options
Diffstat (limited to 'kontact/interfaces')
| -rw-r--r-- | kontact/interfaces/core.cpp | 8 | ||||
| -rw-r--r-- | kontact/interfaces/summary.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index b77fabd25..d47058276 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -66,12 +66,12 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *part = KParts::ComponentFactory:: createPartInstanceFromLibrary<KParts::ReadOnlyPart> - ( libname, this, 0, this, "kontact", TQStringList(), &error ); + ( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &error ); KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part ); if ( pimPart ) { mParts.insert( libname, pimPart ); - TQObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), + QObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), TQT_SLOT( slotPartDestroyed( TQObject * ) ) ); } else { // TODO move to KParts::ComponentFactory @@ -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; diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 0f4c048cd..4fa495bf1 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -82,14 +82,14 @@ void Summary::mousePressEvent( TQMouseEvent *event ) void Summary::mouseMoveEvent( TQMouseEvent *event ) { - if ( (event->state() & LeftButton) && + if ( (event->state() & Qt::LeftButton) && (event->pos() - mDragStartPoint).manhattanLength() > 4 ) { TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" ); TQPixmap pm = TQPixmap::grabWidget( this ); if ( pm.width() > 300 ) - pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin ); + pm = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin ); TQPainter painter; painter.begin( &pm ); |