summaryrefslogtreecommitdiffstats
path: root/kontact
diff options
context:
space:
mode:
Diffstat (limited to 'kontact')
-rw-r--r--kontact/interfaces/core.cpp4
-rw-r--r--kontact/interfaces/summary.cpp4
-rw-r--r--kontact/interfaces/summary.h2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp4
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp4
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp10
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp10
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp10
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp2
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp4
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp2
-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
-rw-r--r--kontact/plugins/weather/summarywidget.cpp16
-rw-r--r--kontact/src/aboutdialog.cpp6
-rw-r--r--kontact/src/kcmkontact.cpp2
-rw-r--r--kontact/src/main.cpp2
-rw-r--r--kontact/src/mainwindow.cpp70
-rw-r--r--kontact/src/profiledialog.cpp8
23 files changed, 98 insertions, 98 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index ed8848c61..92e0f624d 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -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." ).tqarg( libname );
+ d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).arg( libname );
break;
case KParts::ComponentFactory::ErrNoComponent:
- d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).tqarg( libname );
+ d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).arg( libname );
break;
}
kdWarning(5601) << d->lastErrorMessage << endl;
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index ece3a5775..6192dd4c4 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event )
void Summary::dropEvent( TQDropEvent *event )
{
- int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom);
- emit summaryWidgetDropped( this, event->source(), tqalignment );
+ int alignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom);
+ emit summaryWidgetDropped( this, event->source(), alignment );
}
#include "summary.moc"
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index f50507ce7..f490f517e 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 tqalignment );
+ void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
protected:
virtual void mousePressEvent( TQMouseEvent* );
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 34bec493e..88a975b70 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -171,7 +171,7 @@ void KAddressbookPlugin::processDropEvent( TQDropEvent *event )
}
KMessageBox::sorry( core(), i18n( "Cannot handle drop events of type '%1'." )
- .tqarg( event->format() ) );
+ .arg( event->format() ) );
}
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 3a0b16591..76b2b759c 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -142,7 +142,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
TQLabel *label =
new TQLabel( TQString( i18n("%1: number of unread messages "
"%2: total number of messages", "%1 / %2") )
- .tqarg( numUnreadMsg ).tqarg( numMsg ), this );
+ .arg( numUnreadMsg ).arg( numMsg ), this );
label->setAlignment( AlignLeft );
label->show();
mLayout->addWidget( label, counter, 2 );
@@ -166,7 +166,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Open Folder: \"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 2f598990f..309904a9b 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView()
KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this );
urlLabel->installEventFilter( this );
urlLabel->setTextFormat(RichText);
- urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak );
+ urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak );
mLayout->addWidget( urlLabel, counter, 1 );
mLabels.append( urlLabel );
@@ -140,7 +140,7 @@ bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 6d39d413a..2262dcef3 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -195,7 +195,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
KCal::Incidence *i = incidences.first();
TQString summary;
if ( dynamic_cast<KCal::Journal*>( i ) )
- summary = i18n( "Note: %1" ).tqarg( i->summary() );
+ summary = i18n( "Note: %1" ).arg( i->summary() );
else
summary = i->summary();
interface()->openEventEditor( summary, i->description(), TQString() );
@@ -219,22 +219,22 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
i18n("Drops of multiple mails are not supported." ) );
} else {
KPIM::MailSummary mail = mails.first();
- TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
- .tqarg( mail.to() ).tqarg( mail.subject() );
+ TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
+ .arg( mail.to() ).arg( mail.subject() );
KTempFile tf;
tf.setAutoDelete( true );
TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() );
tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
tf.close();
- interface()->openEventEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt,
+ interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt,
uri, tf.name(), TQStringList(), "message/rfc822" );
}
return;
}
KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
- .tqarg( event->format() ) );
+ .arg( event->format() ) );
}
bool KOrganizerPlugin::queryClose() const {
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index c4c4dad9c..ee8eefdcd 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -191,14 +191,14 @@ void SummaryWidget::updateView()
// Fill Event Summary Field
TQString newtext = ev->summary();
if ( ev->isMultiDay() && !ev->doesFloat() ) {
- newtext.append( TQString(" (%1/%2)").tqarg( dayof ).tqarg( span ) );
+ newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) );
}
KURLLabel *urlLabel = new KURLLabel( this );
urlLabel->setText( newtext );
urlLabel->setURL( ev->uid() );
urlLabel->installEventFilter( this );
- urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak );
+ urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak );
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
@@ -225,8 +225,8 @@ void SummaryWidget::updateView()
}
}
datestr = i18n( "Time from - to", "%1 - %2" )
- .tqarg( KGlobal::locale()->formatTime( sST ) )
- .tqarg( KGlobal::locale()->formatTime( sET ) );
+ .arg( KGlobal::locale()->formatTime( sST ) )
+ .arg( KGlobal::locale()->formatTime( sET ) );
label = new TQLabel( datestr, this );
label->setAlignment( AlignLeft | AlignVCenter );
mLayout->addWidget( label, counter, 3 );
@@ -288,7 +288,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Edit Appointment: \"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index c17b153f5..e3ff2ba8f 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -187,7 +187,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
KCal::Incidence *i = incidences.first();
TQString summary;
if ( dynamic_cast<KCal::Journal*>( i ) )
- summary = i18n( "Note: %1" ).tqarg( i->summary() );
+ summary = i18n( "Note: %1" ).arg( i->summary() );
else
summary = i->summary();
interface()->openTodoEditor( summary, i->description(), TQString() );
@@ -210,8 +210,8 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
i18n("Drops of multiple mails are not supported." ) );
} else {
KPIM::MailSummary mail = mails.first();
- TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
- .tqarg( mail.to() ).tqarg( mail.subject() );
+ TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
+ .arg( mail.to() ).arg( mail.subject() );
KTempFile tf;
tf.setAutoDelete( true );
@@ -219,14 +219,14 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
mail.messageId();
tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
tf.close();
- interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ),
+ interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ),
txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
}
return;
}
KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
- .tqarg( event->format() ) );
+ .arg( event->format() ) );
}
#include "todoplugin.moc"
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index ed21f40bf..7171e539f 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -253,7 +253,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index ff6d41852..d2180a634 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -101,7 +101,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs );
mLayout->addWidget( mConduitsTextLabel, row, 0 );
mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
- mConduitsLabel->setAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak );
+ mConduitsLabel->setAlignment( mConduitsLabel->alignment() | TQt::WordBreak );
mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
// widgets shown if kpilotDaemon is not running
@@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename )
TQFile f(filename);
if ( !f.open( IO_ReadOnly ) ) {
- KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) );
+ KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) );
return;
}
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 9b5c27efe..1b8475080 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -595,7 +595,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
if ( e->type() == TQEvent::Enter )
- emit message( i18n( "Mail to:\"%1\"" ).tqarg( label->text() ) );
+ emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
emit message( TQString() );
}
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 );
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index a0ff4341c..bf7624e4b 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -101,7 +101,7 @@ void SummaryWidget::updateView()
for ( it = dataList.begin(); it != dataList.end(); ++it ) {
TQString cover;
for ( uint i = 0; i < (*it).cover().count(); ++i )
- cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] );
+ cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] );
TQImage img;
img = (*it).icon();
@@ -121,7 +121,7 @@ void SummaryWidget::updateView()
this, TQT_SLOT( showReport( const TQString& ) ) );
TQLabel* label = new TQLabel( this );
- label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) );
+ label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
TQFont font = label->font();
font.setBold( true );
label->setFont( font );
@@ -133,12 +133,12 @@ void SummaryWidget::updateView()
labelText = TQString( "<b>%1:</b> %2<br>"
"<b>%3:</b> %4<br>"
"<b>%5:</b> %6" )
- .tqarg( i18n( "Last updated on" ) )
- .tqarg( (*it).date() )
- .tqarg( i18n( "Wind Speed" ) )
- .tqarg( (*it).windSpeed() )
- .tqarg( i18n( "Rel. Humidity" ) )
- .tqarg( (*it).relativeHumidity() );
+ .arg( i18n( "Last updated on" ) )
+ .arg( (*it).date() )
+ .arg( i18n( "Wind Speed" ) )
+ .arg( (*it).windSpeed() )
+ .arg( i18n( "Rel. Humidity" ) )
+ .arg( (*it).relativeHumidity() );
TQToolTip::add( label, labelText.replace( " ", "&nbsp;" ) );
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 1d52da2f1..8f6be2b04 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -81,7 +81,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
text += "<p><b>" + about->programName() + "</b><br>";
- text += i18n( "Version %1</p>" ).tqarg( about->version() );
+ text += i18n( "Version %1</p>" ).arg( about->version() );
if ( !about->shortDescription().isEmpty() ) {
text += "<p>" + about->shortDescription() + "<br>" +
@@ -163,13 +163,13 @@ void AboutDialog::addLicenseText( const KAboutData *about )
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature",
KIcon::Desktop, 48 );
- TQString title = i18n( "%1 License" ).tqarg( about->programName() );
+ TQString title = i18n( "%1 License" ).arg( about->programName() );
TQFrame *topFrame = addPage( title, TQString(), pixmap );
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
KTextBrowser *textBrowser = new KTextBrowser( topFrame );
- textBrowser->setText( TQString( "<pre>%1</pre>" ).tqarg( about->license() ) );
+ textBrowser->setText( TQString( "<pre>%1</pre>" ).arg( about->license() ) );
topLayout->addWidget( textBrowser );
}
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 5de81055e..889994e9a 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -115,7 +115,7 @@ void PluginSelection::readConfig()
{
const 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 ) );
int activeComponent = 0;
mPluginCombo->clear();
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 5cf0bfd50..20c6f5456 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -77,7 +77,7 @@ static void listPlugins()
KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
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 ) );
for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
KService::Ptr service = (*it);
// skip summary only plugins
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 06664d41e..88be77c73 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -125,7 +125,7 @@ void MainWindow::initGUI()
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 ) );
mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
KPluginInfo::List::Iterator it;
@@ -136,7 +136,7 @@ void MainWindow::initGUI()
TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()),
actionCollection(), (*it)->pluginName().latin1() );
action->setName( (*it)->pluginName().latin1() );
- action->setWhatsThis( i18n( "Switch to plugin %1" ).tqarg( (*it)->name() ) );
+ action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) );
TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" );
if ( !hasPartProp.isValid() || hasPartProp.toBool() ) {
@@ -267,7 +267,7 @@ void MainWindow::initWidgets()
initAboutScreen();
TQString loading = i18n( "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>" )
- .tqarg( i18n("Loading Kontact...") );
+ .arg( i18n("Loading Kontact...") );
paintAboutScreen( loading );
@@ -290,11 +290,11 @@ void MainWindow::paintAboutScreen( const TQString& msg )
{
TQString location = locate( "data", "kontact/about/main.html" );
TQString content = KPIM::kFileToString( location );
- content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
+ content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
if ( kapp->reverseLayout() )
- content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
+ content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
else
- content = content.tqarg( "" );
+ content = content.arg( "" );
mIntroPart->begin( KURL( location ) );
@@ -302,8 +302,8 @@ void MainWindow::paintAboutScreen( const TQString& msg )
TQString catchPhrase( i18n( "Get Organized!" ) );
TQString quickDescription( i18n( "The KDE Personal Information Management Suite" ) );
- mIntroPart->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName )
- .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( msg ) );
+ mIntroPart->write( content.arg( TQFont().pointSize() + 2 ).arg( appName )
+ .arg( catchPhrase ).arg( quickDescription ).arg( msg ) );
mIntroPart->end();
}
@@ -629,7 +629,7 @@ void MainWindow::updateShortcuts()
++it;
if ( isPluginLoadedByAction( action ) ) {
loadedActions.append( action );
- TQString shortcut = TQString( "CTRL+%1" ).tqarg( i );
+ TQString shortcut = TQString( "CTRL+%1" ).arg( i );
action->setShortcut( KShortcut( shortcut ) );
i++;
} else {
@@ -794,7 +794,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
if ( !part ) {
KApplication::restoreOverrideCursor();
KMessageBox::error( this, i18n( "Cannot load part for %1." )
- .tqarg( plugin->title() )
+ .arg( plugin->title() )
+ "\n" + lastErrorMessage() );
plugin->setDisabled( true );
mSidePane->updatePlugins();
@@ -848,7 +848,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
topDock()->moveDockWindow( navigatorToolBar, -1 );
}
- setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).tqarg( plugin->title() ) );
+ setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).arg( plugin->title() ) );
if ( newAction ) {
mNewActions->setIcon( newAction->icon() );
@@ -1178,30 +1178,30 @@ TQString MainWindow::introductionString()
"<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
"</table>"
"<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" )
- .tqarg( kapp->aboutData()->version() )
- .tqarg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) )
- .tqarg( "exec:/help?kontact" )
- .tqarg( iconSize )
- .tqarg( iconSize )
- .tqarg( handbook_icon_path )
- .tqarg( "exec:/help?kontact" )
- .tqarg( i18n( "Read Manual" ) )
- .tqarg( i18n( "Learn more about Kontact and its components" ) )
- .tqarg( "http://kontact.org" )
- .tqarg( iconSize )
- .tqarg( iconSize )
- .tqarg( html_icon_path )
- .tqarg( "http://kontact.org" )
- .tqarg( i18n( "Visit Kontact Website" ) )
- .tqarg( i18n( "Access online resources and tutorials" ) )
- .tqarg( "exec:/gwwizard" )
- .tqarg( iconSize )
- .tqarg( iconSize )
- .tqarg( wizard_icon_path )
- .tqarg( "exec:/gwwizard" )
- .tqarg( i18n( "Configure Kontact as Groupware Client" ) )
- .tqarg( i18n( "Prepare Kontact for use in corporate networks" ) )
- .tqarg( "exec:/switch" );
+ .arg( kapp->aboutData()->version() )
+ .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) )
+ .arg( "exec:/help?kontact" )
+ .arg( iconSize )
+ .arg( iconSize )
+ .arg( handbook_icon_path )
+ .arg( "exec:/help?kontact" )
+ .arg( i18n( "Read Manual" ) )
+ .arg( i18n( "Learn more about Kontact and its components" ) )
+ .arg( "http://kontact.org" )
+ .arg( iconSize )
+ .arg( iconSize )
+ .arg( html_icon_path )
+ .arg( "http://kontact.org" )
+ .arg( i18n( "Visit Kontact Website" ) )
+ .arg( i18n( "Access online resources and tutorials" ) )
+ .arg( "exec:/gwwizard" )
+ .arg( iconSize )
+ .arg( iconSize )
+ .arg( wizard_icon_path )
+ .arg( "exec:/gwwizard" )
+ .arg( i18n( "Configure Kontact as Groupware Client" ) )
+ .arg( i18n( "Prepare Kontact for use in corporate networks" ) )
+ .arg( "exec:/switch" );
return info;
}
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index c58377806..89e241be9 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -140,7 +140,7 @@ void Kontact::ProfileDialog::profileLoaded( const TQString& id )
const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id );
if ( profile.isNull() )
return;
- KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").tqarg( profile.name() ), i18n("Profile Loaded") );
+ KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").arg( profile.name() ), i18n("Profile Loaded") );
}
void Kontact::ProfileDialog::saveToSelectedProfile()
@@ -148,7 +148,7 @@ void Kontact::ProfileDialog::saveToSelectedProfile()
const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() );
if ( profile.isNull() )
return;
- if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").tqarg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) )
+ if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").arg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) )
return;
Kontact::ProfileManager::self()->saveToProfile( profile.id() );
}
@@ -158,7 +158,7 @@ void Kontact::ProfileDialog::deleteSelectedProfile()
const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() );
if ( profile.isNull() )
return;
- if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").tqarg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) )
+ if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").arg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) )
return;
Kontact::ProfileManager::self()->removeProfile( profile );
}
@@ -175,7 +175,7 @@ void Kontact::ProfileDialog::exportSelectedProfile()
const Kontact::ProfileManager::ExportError error = Kontact::ProfileManager::self()->exportProfileToDirectory( id, path );
if ( error == Kontact::ProfileManager::SuccessfulExport )
{
- KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").tqarg( profile.name() ), i18n("Profile Exported") );
+ KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").arg( profile.name() ), i18n("Profile Exported") );
}
else
{