summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/summary
diff options
context:
space:
mode:
Diffstat (limited to 'kontact/plugins/summary')
-rw-r--r--kontact/plugins/summary/dropwidget.cpp6
-rw-r--r--kontact/plugins/summary/dropwidget.h2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp22
-rw-r--r--kontact/plugins/summary/summaryview_part.h2
5 files changed, 17 insertions, 17 deletions
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 63c1d3ceb..4b5373b34 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
void DropWidget::dropEvent( TQDropEvent *event )
{
- int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
- tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
- emit summaryWidgetDropped( this, event->source(), tqalignment );
+ int alignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
+ alignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
+ emit summaryWidgetDropped( this, event->source(), alignment );
}
#include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index e2d11c9ee..c4fe2c8b2 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -33,7 +33,7 @@ class DropWidget : public TQWidget
DropWidget( TQWidget *parent, const char *name = 0 );
signals:
- void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
+ void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
protected:
virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 076692948..bf0197cb9 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -120,7 +120,7 @@ void KCMKontactSummary::load()
{
KTrader::OfferList offers = KTrader::self()->query(
TQString::fromLatin1( "Kontact/Plugin" ),
- TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
+ TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
TQStringList activeSummaries;
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 9caeeb6d6..97bb4c53f 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets()
KPIM::IdentityManager idm( true, this );
const KPIM::Identity &id = idm.defaultIdentity();
- TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() );
- mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).tqarg( currentUser ) );
+ TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
+ mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) );
mSummaries.clear();
@@ -177,7 +177,7 @@ void SummaryViewPart::updateWidgets()
mSummaries.insert( plugin->identifier(), summary );
connect( summary, TQT_SIGNAL( message( const TQString& ) ),
- BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+ BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
mRightColumn->addStretch();
}
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
{
if ( target == widget )
return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
if ( target == mFrame ) {
int pos = 0;
- if ( tqalignment & TQt::AlignTop )
+ if ( alignment & TQt::AlignTop )
pos = 0;
- if ( tqalignment & TQt::AlignLeft ) {
- if ( tqalignment & TQt::AlignBottom )
+ if ( alignment & TQt::AlignLeft ) {
+ if ( alignment & TQt::AlignBottom )
pos = mLeftColumnSummaries.count();
mLeftColumn->insertWidget( pos, widget );
mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
} else {
- if ( tqalignment & TQt::AlignBottom )
+ if ( alignment & TQt::AlignBottom )
pos = mRightColumnSummaries.count();
mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
int targetPos = mLeftColumn->findWidget( target );
if ( targetPos != -1 ) {
- if ( tqalignment == TQt::AlignBottom )
+ if ( alignment == TQt::AlignBottom )
targetPos++;
mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
} else {
targetPos = mRightColumn->findWidget( target );
- if ( tqalignment == TQt::AlignBottom )
+ if ( alignment == TQt::AlignBottom )
targetPos++;
mRightColumn->insertWidget( targetPos, widget );
@@ -317,7 +317,7 @@ void SummaryViewPart::slotAdjustPalette()
void SummaryViewPart::setDate( const TQDate& newDate )
{
TQString date( "<b>%1</b>" );
- date = date.tqarg( KGlobal::locale()->formatDate( newDate ) );
+ date = date.arg( KGlobal::locale()->formatDate( newDate ) );
mDateLabel->setText( date );
}
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 5a99b947d..28a591dde 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -76,7 +76,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
protected slots:
void slotConfigure();
void updateWidgets();
- void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
+ void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment );
private:
void initGUI( Kontact::Core *core );