summaryrefslogtreecommitdiffstats
path: root/kopete/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:58:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:58:08 -0600
commit1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 (patch)
treee24fdc0514249de1233dd5dc07f09d07a35f4269 /kopete/plugins
parent089118c18533dfa3e6ce5065dbebdd4db94051f1 (diff)
downloadtdenetwork-1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98.tar.gz
tdenetwork-1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kopete/plugins')
-rw-r--r--kopete/plugins/alias/aliasdialog.ui2
-rw-r--r--kopete/plugins/alias/aliaspreferences.cpp14
-rw-r--r--kopete/plugins/autoreplace/autoreplaceplugin.cpp4
-rw-r--r--kopete/plugins/autoreplace/autoreplacepreferences.cpp2
-rw-r--r--kopete/plugins/contactnotes/contactnotesedit.cpp2
-rw-r--r--kopete/plugins/cryptography/cryptographyselectuserkey.cpp2
-rw-r--r--kopete/plugins/cryptography/kgpginterface.cpp4
-rw-r--r--kopete/plugins/cryptography/kgpgselkey.cpp4
-rw-r--r--kopete/plugins/cryptography/popuppublic.cpp10
-rw-r--r--kopete/plugins/history/converter.cpp4
-rw-r--r--kopete/plugins/history/historydialog.cpp4
-rw-r--r--kopete/plugins/history/historylogger.cpp6
-rw-r--r--kopete/plugins/latex/latexguiclient.cpp2
-rw-r--r--kopete/plugins/latex/latexplugin.cpp6
-rw-r--r--kopete/plugins/netmeeting/netmeetinginvitation.cpp4
-rw-r--r--kopete/plugins/netmeeting/netmeetingprefs_ui.ui4
-rw-r--r--kopete/plugins/nowlistening/nowlisteningplugin.cpp8
-rw-r--r--kopete/plugins/nowlistening/nowlisteningprefs.ui10
-rw-r--r--kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp2
-rw-r--r--kopete/plugins/smpppdcs/smpppdcspreferences.cpp2
-rw-r--r--kopete/plugins/statistics/statisticscontact.cpp34
-rw-r--r--kopete/plugins/statistics/statisticsdialog.cpp44
-rw-r--r--kopete/plugins/translator/translatorplugin.cpp2
23 files changed, 88 insertions, 88 deletions
diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui
index 61043084..5b6a832c 100644
--- a/kopete/plugins/alias/aliasdialog.ui
+++ b/kopete/plugins/alias/aliasdialog.ui
@@ -136,7 +136,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
<property name="text">
<string>For protocols:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index 694ce451..5782b95c 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -211,7 +211,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
protocol,
*it,
aliasCommand,
- TQString::fromLatin1("Custom alias for %1").tqarg(aliasCommand),
+ TQString::fromLatin1("Custom alias for %1").arg(aliasCommand),
Kopete::CommandHandler::UserAlias
);
@@ -221,7 +221,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
if( item )
{
item->protocolList.append( protocol );
- item->tqrepaint();
+ item->repaint();
}
else
{
@@ -309,7 +309,7 @@ void AliasPreferences::addAlias( TQString &alias, TQString &command, const Proto
*it,
alias,
command,
- TQString::fromLatin1("Custom alias for %1").tqarg(command),
+ TQString::fromLatin1("Custom alias for %1").arg(command),
Kopete::CommandHandler::UserAlias,
0,
argc
@@ -335,7 +335,7 @@ void AliasPreferences::slotAddAlias()
{
KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An"
" alias name cannot contain the characters \"_\" or \"=\"."
- "</qt>").tqarg(alias),i18n("Invalid Alias Name") );
+ "</qt>").arg(alias),i18n("Invalid Alias Name") );
}
else
{
@@ -353,7 +353,7 @@ void AliasPreferences::slotAddAlias()
{
KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. This "
"command is already being handled by either another alias or "
- "Kopete itself.</qt>").tqarg(alias), i18n("Could Not Add Alias") );
+ "Kopete itself.</qt>").arg(alias), i18n("Could Not Add Alias") );
return;
}
}
@@ -424,7 +424,7 @@ void AliasPreferences::slotEditAlias()
{
KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An"
" alias name cannot contain the characters \"_\" or \"=\"."
- "</qt>").tqarg(alias),i18n("Invalid Alias Name") );
+ "</qt>").arg(alias),i18n("Invalid Alias Name") );
}
else
{
@@ -449,7 +449,7 @@ void AliasPreferences::slotEditAlias()
{
KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. This "
"command is already being handled by either another alias or "
- "Kopete itself.</qt>").tqarg(alias), i18n("Could Not Add Alias") );
+ "Kopete itself.</qt>").arg(alias), i18n("Could Not Add Alias") );
return;
}
}
diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.cpp b/kopete/plugins/autoreplace/autoreplaceplugin.cpp
index 586487b8..f3610a7f 100644
--- a/kopete/plugins/autoreplace/autoreplaceplugin.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceplugin.cpp
@@ -81,7 +81,7 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg )
bool isReplaced=false;
for ( it = map.begin(); it != map.end(); ++it )
{
- TQRegExp re( match.tqarg( TQRegExp::escape( it.key() ) ) );
+ TQRegExp re( match.arg( TQRegExp::escape( it.key() ) ) );
if( re.search( replaced_message ) != -1 )
{
TQString before = re.cap(1);
@@ -113,7 +113,7 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg )
TQString replaced_message = msg.plainBody();
// eventually start each sent line with capital letter
// TODO ". " "? " "! "
- replaced_message[ 0 ] = replaced_message.tqat( 0 ).upper();
+ replaced_message[ 0 ] = replaced_message.at( 0 ).upper();
// the message is now the one with replaced words
msg.setBody( replaced_message, Kopete::Message::PlainText );
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
index 9909b5ee..7c035e24 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
@@ -126,7 +126,7 @@ void AutoReplacePreferences::slotAddCouple()
if ( ( oldLvi = preferencesDialog->m_list->findItem( k, 0 ) ) )
delete oldLvi;
lvi = new TQListViewItem( preferencesDialog->m_list, k, v );
- // Triggers a size, tqgeometry and content update
+ // Triggers a size, geometry and content update
// during the next iteration of the event loop
preferencesDialog->m_list->triggerUpdate();
// select last added
diff --git a/kopete/plugins/contactnotes/contactnotesedit.cpp b/kopete/plugins/contactnotes/contactnotesedit.cpp
index 607c0f17..782476b9 100644
--- a/kopete/plugins/contactnotes/contactnotesedit.cpp
+++ b/kopete/plugins/contactnotes/contactnotesedit.cpp
@@ -33,7 +33,7 @@ ContactNotesEdit::ContactNotesEdit(Kopete::MetaContact *m,ContactNotesPlugin *p,
TQVBox *w=new TQVBox(this);
w->setSpacing(KDialog::spacingHint());
- m_label = new TQLabel(i18n("Notes about %1:").tqarg(m->displayName()) , w , "m_label");
+ m_label = new TQLabel(i18n("Notes about %1:").arg(m->displayName()) , w , "m_label");
m_linesEdit= new TQTextEdit ( w , "m_linesEdit");
m_linesEdit->setText(p->notes(m));
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
index 9d692e08..ae92647b 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -35,7 +35,7 @@ CryptographySelectUserKey::CryptographySelectUserKey(const TQString& key ,Kopete
connect (view->m_selectKey , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotSelectPressed()));
connect (view->m_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotRemovePressed()));
- view->m_titleLabel->setText(i18n("Select public key for %1").tqarg(mc->displayName()));
+ view->m_titleLabel->setText(i18n("Select public key for %1").arg(mc->displayName()));
view->m_editKey->setText(key);
}
CryptographySelectUserKey::~CryptographySelectUserKey()
diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp
index fb407523..73858012 100644
--- a/kopete/plugins/cryptography/kgpginterface.cpp
+++ b/kopete/plugins/cryptography/kgpginterface.cpp
@@ -96,9 +96,9 @@ TQString KgpgInterface::KgpgDecryptText(TQString text,TQString userID)
/// pipe for passphrase
//userID=TQString::fromUtf8(userID);
userID.replace('<',"&lt;");
- TQString passdlg=i18n("Enter passphrase for <b>%1</b>:").tqarg(userID);
+ TQString passdlg=i18n("Enter passphrase for <b>%1</b>:").arg(userID);
if (counter>1)
- passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>").tqarg(TQString::number(4-counter)));
+ passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>").arg(TQString::number(4-counter)));
/// pipe for passphrase
int code=KPasswordDialog::getPassword(password,passdlg);
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 41bdda8f..88078ece 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -122,7 +122,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
tst=tst.section(":",9,9);
// FIXME: Same here: don't use popen! - Martijn
- fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).tqarg( KShellProcess::quote( id ) ).latin1(), "r" );
+ fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).arg( KShellProcess::quote( id ) ).latin1(), "r" );
bool dead=true;
while ( fgets( line, sizeof(line), fp2))
{
@@ -147,7 +147,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
if (!tst.isEmpty() && (!dead))
{
KListViewItem *item=new KListViewItem(keysListpr,extractKeyName(tst));
- KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").tqarg(id).tqarg(tr).tqarg(val));
+ KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val));
sub->setSelectable(false);
item->setPixmap(0,keyPair);
}
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 5e990386..116abd4a 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -73,14 +73,14 @@ def=isDefault;
}
-void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment)
+void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment)
{
if ((def) && (column<2)) {
TQFont font(p->font());
font.setBold(true);
p->setFont(font);
}
- KListViewItem::paintCell(p, cg, column, width, tqalignment);
+ KListViewItem::paintCell(p, cg, column, width, alignment);
}
TQString UpdateViewItem2 :: key(int c,bool ) const
@@ -108,7 +108,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
- if (filemode) setCaption(i18n("Select Public Key for %1").tqarg(sfile));
+ if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile));
fmode=filemode;
TQHButtonGroup *hBar=new TQHButtonGroup(page);
@@ -174,7 +174,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
(CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible"));
TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>");
- KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),parentBox );
+ KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").arg(shredWhatsThis),parentBox );
shredBox->addWidget(CBshred);
shredBox->addWidget(warn);
}
@@ -452,7 +452,7 @@ void popupPublic::slotprocread(KProcIO *p)
bool isDefaultKey=false;
if (id.right(8)==defaultKey) isDefaultKey=true;
UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey);
- //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").tqarg(id).tqarg(tr).tqarg(val));
+ //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val));
//sub->setSelectable(false);
if (seclist.find(tst,0,FALSE)!=-1)
item->setPixmap(0,keyPair);
diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp
index 64af8c81..677ed1d2 100644
--- a/kopete/plugins/history/converter.cpp
+++ b/kopete/plugins/history/converter.cpp
@@ -112,7 +112,7 @@ void HistoryPlugin::convertOldHistory()
progressDlg->progressBar()->reset();
progressDlg->progressBar()->setTotalSteps(d2.count());
- progressDlg->setLabel(i18n("Parsing old history in %1").tqarg(fi->fileName()));
+ progressDlg->setLabel(i18n("Parsing old history in %1").arg(fi->fileName()));
progressDlg->show(); //if it was not already showed...
while ( (fi2 = it2.current()) != 0 )
@@ -122,7 +122,7 @@ void HistoryPlugin::convertOldHistory()
if(!contactId.isEmpty() )
{
- progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").tqarg(fi->fileName()).tqarg(contactId));
+ progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").arg(fi->fileName()).arg(contactId));
kapp->processEvents(0); //make sure the text is updated in the progressDlg
int month=0;
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index 45c639a7..b31118ec 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -95,7 +95,7 @@ int KListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const
HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
const char* name) : KDialogBase(parent, name, false,
- i18n("History for %1").tqarg(mc->displayName()), 0), mSearching(false)
+ i18n("History for %1").arg(mc->displayName()), 0), mSearching(false)
{
TQString fontSize;
TQString htmlCode;
@@ -553,7 +553,7 @@ void HistoryDialog::slotContactChanged(int index)
else
{
mMetaContact = mMetaContactList.at(index-1);
- setCaption(i18n("History for %1").tqarg(mMetaContact->displayName()));
+ setCaption(i18n("History for %1").arg(mMetaContact->displayName()));
init();
}
}
diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp
index c79c11c0..f03d165b 100644
--- a/kopete/plugins/history/historylogger.cpp
+++ b/kopete/plugins/history/historylogger.cpp
@@ -377,7 +377,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(TQDate date)
Kopete::Message msg(dt, from, to, msgElem2.text(), dir);
msg.setBody( TQString::fromLatin1("<span title=\"%1\">%2</span>")
- .tqarg( dt.toString(Qt::LocalDate), msg.escapedBody() ),
+ .arg( dt.toString(Qt::LocalDate), msg.escapedBody() ),
Kopete::Message::RichText);
@@ -595,7 +595,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
if (colorize)
{
msg.setBody( TQString::fromLatin1("<span style=\"color:%1\" title=\"%2\">%3</span>")
- .tqarg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
+ .arg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
Kopete::Message::RichText
);
msg.setFg( fgColor );
@@ -603,7 +603,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines,
else
{
msg.setBody( TQString::fromLatin1("<span title=\"%1\">%2</span>")
- .tqarg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
+ .arg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ),
Kopete::Message::RichText
);
}
diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp
index e4062905..ea9420fb 100644
--- a/kopete/plugins/latex/latexguiclient.cpp
+++ b/kopete/plugins/latex/latexguiclient.cpp
@@ -64,7 +64,7 @@ void LatexGUIClient::slotPreview()
}
msg=Kopete::Message( msg.from() , msg.to() ,
- i18n("<b>Preview of the latex message :</b> <br />%1").tqarg(msg.plainBody()),
+ i18n("<b>Preview of the latex message :</b> <br />%1").arg(msg.plainBody()),
Kopete::Message::Internal , Kopete::Message::RichText);
m_manager->appendMessage(msg) ;
}
diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp
index 62aef452..11537aba 100644
--- a/kopete/plugins/latex/latexplugin.cpp
+++ b/kopete/plugins/latex/latexplugin.cpp
@@ -145,7 +145,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg )
TQBuffer buffer( ba );
buffer.open( IO_WriteOnly );
renderedImage.save( &buffer, "PNG" );
- TQString imageURL = TQString::fromLatin1("data:image/png;base64,%1").tqarg( KCodecs::base64Encode( ba ) );
+ TQString imageURL = TQString::fromLatin1("data:image/png;base64,%1").arg( KCodecs::base64Encode( ba ) );
replaceMap[match] = imageURL;
}
#else
@@ -230,9 +230,9 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula)
int hDPI, vDPI;
hDPI = LatexConfig::self()->horizontalDPI();
vDPI = LatexConfig::self()->verticalDPI();
- p << m_convScript << argumentRes.tqarg(TQString::number(hDPI), TQString::number(vDPI)) << argumentOut.tqarg(fileName) /*<< argumentFormat*/ << latexFormula ;
+ p << m_convScript << argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << argumentOut.arg(fileName) /*<< argumentFormat*/ << latexFormula ;
- kdDebug() << k_funcinfo << " Rendering " << m_convScript << " " << argumentRes.tqarg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.tqarg(fileName) << endl;
+ kdDebug() << k_funcinfo << " Rendering " << m_convScript << " " << argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.arg(fileName) << endl;
// FIXME our sucky sync filter API limitations :-)
p.start(KProcess::Block);
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 711dc665..5fb799c1 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -64,7 +64,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg)
MSNInvitation::parseInvitation(msg); //for the cookie
unsigned int result = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(),
- i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).tqarg(m_contact->metaContact()->displayName()),
+ i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).arg(m_contact->metaContact()->displayName()),
i18n("MSN Plugin") , i18n("Accept"),i18n("Refuse"));
MSNChatSession* manager=dynamic_cast<MSNChatSession*>(m_contact->manager());
@@ -162,7 +162,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
KConfig *config=KGlobal::config();
config->setGroup("Netmeeting Plugin");
- TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").tqarg(ip_address);
+ TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
kdDebug() << k_funcinfo << app << endl ;
diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
index ac5dc03e..57c5943b 100644
--- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
+++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
@@ -26,7 +26,7 @@
This is not the same as webcam chat you can find in the newer Windows Messenger®, but uses the older NetMeeting chat you can find in old versions.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -98,7 +98,7 @@ This is not the same as webcam chat you can find in the newer Windows MessengerÂ
<property name="text">
<string>&lt;b&gt;%1&lt;/b&gt; will be replaced by the ip to call</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index dc67a0ab..a9148187 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -298,7 +298,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
// KDE4 TODO: Use the new status message framework, and remove this "hack".
if( isPlaying )
{
- advert = TQString("[Music]%1").tqarg(mediaList);
+ advert = TQString("[Music]%1").arg(mediaList);
}
}
@@ -308,7 +308,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
{
// Check for the now listening message in parenthesis,
// include the header to not override other messages in parenthesis.
- TQRegExp statusSong( TQString(" \\(%1.*\\)$").tqarg( NowListeningConfig::header()) );
+ TQRegExp statusSong( TQString(" \\(%1.*\\)$").arg( NowListeningConfig::header()) );
// HACK: Don't keep appending the now listened song. Replace it in the status message.
advert = a->myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString();
@@ -318,11 +318,11 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
{
if(statusSong.search(advert) != -1)
{
- advert = advert.replace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) );
+ advert = advert.replace(statusSong, TQString(" (%1)").arg(mediaPlayerAdvert(false)) );
}
else
{
- advert += TQString(" (%1)").tqarg( mediaPlayerAdvert(false) );
+ advert += TQString(" (%1)").arg( mediaPlayerAdvert(false) );
}
}
else
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index dcc48d8f..474c448a 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -32,7 +32,7 @@
<property name="text">
<string>&lt;b&gt;Share Your Musical Taste&lt;/b&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
@@ -86,7 +86,7 @@
<string>%track, %artist, %album, %player will be substituted if known.
Expressions in brackets depend on a substitution being made.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -105,7 +105,7 @@ Expressions in brackets depend on a substitution being made.</string>
<property name="text">
<string>Start with:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="buddy" stdset="0">
@@ -127,7 +127,7 @@ Expressions in brackets depend on a substitution being made.</string>
<property name="text">
<string>For each track:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="buddy" stdset="0">
@@ -149,7 +149,7 @@ Expressions in brackets depend on a substitution being made.</string>
<property name="text">
<string>Conjunction (if &gt;1 track):</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
index ef29d992..1868893f 100644
--- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
+++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp
@@ -96,7 +96,7 @@ bool Unsettled::connect(Client * client, const TQString& server, uint port) {
clg.exactMatch(response)) {
if(password(client) != TQString()) {
// we are challenged, ok, respond
- write(client, TQString("response = %1\n").tqarg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1());
+ write(client, TQString("response = %1\n").arg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1());
response = read(client)[0];
if(ver.exactMatch(response)) {
setServerID(client, response);
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
index 3c486135..671008bc 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp
@@ -54,7 +54,7 @@ SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name
}
if(it.current()->inherits("Kopete::ManagedConnectionAccount")) {
- protoName += TQString(", %1").tqarg(i18n("connection status is managed by Kopete"));
+ protoName += TQString(", %1").arg(i18n("connection status is managed by Kopete"));
}
TQCheckListItem * cli = new TQCheckListItem(m_ui->accountList,
diff --git a/kopete/plugins/statistics/statisticscontact.cpp b/kopete/plugins/statistics/statisticscontact.cpp
index 3a03b7bc..d811e4d2 100644
--- a/kopete/plugins/statistics/statisticscontact.cpp
+++ b/kopete/plugins/statistics/statisticscontact.cpp
@@ -60,7 +60,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
// Generate statisticsContactId or get it from database
TQStringList buffer = m_db->query(TQString("SELECT statisticid FROM contacts "
"WHERE contactid LIKE '%1';"
- ).tqarg(c->contactId()));
+ ).arg(c->contactId()));
if (buffer.isEmpty())
{
@@ -68,7 +68,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
if ( !c->metaContact()->metaContactId().isEmpty() &&
!m_db->query(TQString("SELECT metacontactid FROM commonstats "
"WHERE metacontactid LIKE '%1';"
- ).tqarg(c->metaContact()->metaContactId())).isEmpty())
+ ).arg(c->metaContact()->metaContactId())).isEmpty())
{
// Use old style id
m_statisticsContactId = c->metaContact()->metaContactId();
@@ -81,7 +81,7 @@ void StatisticsContact::initialize(Kopete::Contact *c)
// Assign contactId to m_statisticsContactId
m_db->query(TQString("INSERT INTO contacts (statisticid, contactid) VALUES('%1', '%2');"
- ).tqarg(m_statisticsContactId).tqarg(c->contactId()));
+ ).arg(m_statisticsContactId).arg(c->contactId()));
}
else
{
@@ -129,11 +129,11 @@ void StatisticsContact::contactAdded( Kopete::Contact *c )
// Check if contact is allready in database if not add it
if (m_db->query(TQString("SELECT id FROM contacts "
"WHERE statisticid LIKE '%1' AND contactid LIKE '%2';"
- ).tqarg(m_statisticsContactId).tqarg(c->contactId())).isEmpty())
+ ).arg(m_statisticsContactId).arg(c->contactId())).isEmpty())
{
// Assign contactId to m_statisticsContactId
m_db->query(TQString("INSERT INTO contacts (statisticid, contactid) VALUES('%1', '%2');"
- ).tqarg(m_statisticsContactId).tqarg(c->contactId()));
+ ).arg(m_statisticsContactId).arg(c->contactId()));
}
kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl;
}
@@ -151,7 +151,7 @@ void StatisticsContact::contactRemoved( Kopete::Contact *c )
kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl;
m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1' AND contactid LIKE '%2';"
- ).tqarg(m_statisticsContactId).tqarg(c->contactId()));
+ ).arg(m_statisticsContactId).arg(c->contactId()));
}
void StatisticsContact::removeFromDB()
@@ -160,9 +160,9 @@ void StatisticsContact::removeFromDB()
return;
kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl;
- m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1';").tqarg(m_statisticsContactId));
- m_db->query(TQString("DELETE FROM contactstatus WHERE metacontactid LIKE '%1';").tqarg(m_statisticsContactId));
- m_db->query(TQString("DELETE FROM commonstats WHERE metacontactid LIKE '%1';").tqarg(m_statisticsContactId));
+ m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1';").arg(m_statisticsContactId));
+ m_db->query(TQString("DELETE FROM contactstatus WHERE metacontactid LIKE '%1';").arg(m_statisticsContactId));
+ m_db->query(TQString("DELETE FROM commonstats WHERE metacontactid LIKE '%1';").arg(m_statisticsContactId));
m_statisticsContactId = TQString();
}
@@ -176,7 +176,7 @@ void StatisticsContact::commonStatsSave(const TQString name, const TQString stat
return;
m_db->query(TQString("UPDATE commonstats SET statvalue1 = '%1', statvalue2='%2'"
- "WHERE statname LIKE '%3' AND metacontactid LIKE '%4';").tqarg(statVar1).tqarg(statVar2).tqarg(name).tqarg(m_statisticsContactId));
+ "WHERE statname LIKE '%3' AND metacontactid LIKE '%4';").arg(statVar1).arg(statVar2).arg(name).arg(m_statisticsContactId));
}
@@ -196,7 +196,7 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1
if (m_statisticsContactId.isEmpty())
return;
- TQStringList buffer = m_db->query(TQString("SELECT statvalue1,statvalue2 FROM commonstats WHERE statname LIKE '%1' AND metacontactid LIKE '%2';").tqarg(name, m_statisticsContactId));
+ TQStringList buffer = m_db->query(TQString("SELECT statvalue1,statvalue2 FROM commonstats WHERE statname LIKE '%1' AND metacontactid LIKE '%2';").arg(name, m_statisticsContactId));
if (!buffer.isEmpty())
{
statVar1 = buffer[0];
@@ -204,7 +204,7 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1
}
else
{
- m_db->query(TQString("INSERT INTO commonstats (metacontactid, statname, statvalue1, statvalue2) VALUES('%1', '%2', 0, 0);").tqarg(m_statisticsContactId, name));
+ m_db->query(TQString("INSERT INTO commonstats (metacontactid, statname, statvalue1, statvalue2) VALUES('%1', '%2', 0, 0);").arg(m_statisticsContactId, name));
statVar1 = defaultValue1;
statVar2 = defaultValue2;
}
@@ -279,7 +279,7 @@ void StatisticsContact::onlineStatusChanged(Kopete::OnlineStatus::StatusType sta
kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldStatus) << endl;
m_db->query(TQString("INSERT INTO contactstatus "
"(metacontactid, status, datetimebegin, datetimeend) "
- "VALUES('%1', '%2', '%3', '%4'" ");").tqarg(m_statisticsContactId).tqarg(Kopete::OnlineStatus::statusTypeToString(m_oldStatus)).tqarg(TQString::number(m_oldStatusDateTime.toTime_t())).tqarg(TQString::number(currentDateTime.toTime_t())));
+ "VALUES('%1', '%2', '%3', '%4'" ");").arg(m_statisticsContactId).arg(Kopete::OnlineStatus::statusTypeToString(m_oldStatus)).arg(TQString::number(m_oldStatusDateTime.toTime_t())).arg(TQString::number(currentDateTime.toTime_t())));
}
if (m_oldStatus == Kopete::OnlineStatus::Online || m_oldStatus == Kopete::OnlineStatus::Away)
@@ -303,7 +303,7 @@ bool StatisticsContact::wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusTyp
"FROM contactstatus WHERE metacontactid LIKE '%1' AND datetimebegin <= %2 AND datetimeend >= %3 "
"AND status LIKE '%4' "
"ORDER BY datetimebegin;"
- ).tqarg(m_statisticsContactId).tqarg(dt.toTime_t()).tqarg(dt.toTime_t()).tqarg(Kopete::OnlineStatus::statusTypeToString(status)));
+ ).arg(m_statisticsContactId).arg(dt.toTime_t()).arg(dt.toTime_t()).arg(Kopete::OnlineStatus::statusTypeToString(status)));
if (!values.isEmpty()) return true;
@@ -318,7 +318,7 @@ TQString StatisticsContact::statusAt(TQDateTime dt)
TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
"FROM contactstatus WHERE metacontactid LIKE '%1' AND datetimebegin <= %2 AND datetimeend >= %3 "
"ORDER BY datetimebegin;"
- ).tqarg(m_statisticsContactId).tqarg(dt.toTime_t()).tqarg(dt.toTime_t()));
+ ).arg(m_statisticsContactId).arg(dt.toTime_t()).arg(dt.toTime_t()));
if (!values.isEmpty()) return Kopete::OnlineStatus(Kopete::OnlineStatus::statusStringToType(values[0])).description();
else return "";
@@ -337,7 +337,7 @@ TQString StatisticsContact::mainStatusDate(const TQDate& date)
"(datetimebegin >= %2 AND datetimebegin <= %3 OR "
"datetimeend >= %4 AND datetimeend <= %5) "
"ORDER BY datetimebegin;"
- ).tqarg(m_statisticsContactId).tqarg(dt1.toTime_t()).tqarg(dt2.toTime_t()).tqarg(dt1.toTime_t()).tqarg(dt2.toTime_t());
+ ).arg(m_statisticsContactId).arg(dt1.toTime_t()).arg(dt2.toTime_t()).arg(dt1.toTime_t()).arg(dt2.toTime_t());
kdDebug() << request << endl;
TQStringList values = m_db->query(request);
@@ -390,7 +390,7 @@ TQValueList<TQTime> StatisticsContact::mainEvents(const Kopete::OnlineStatus::St
return mainEvents;
TQDateTime currentDateTime = TQDateTime::currentDateTime();
- buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").tqarg(m_statisticsContactId));
+ buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").arg(m_statisticsContactId));
// Only select the events for which the previous is not Unknown AND the status is status.
diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp
index b4ca0861..0e775405 100644
--- a/kopete/plugins/statistics/statisticsdialog.cpp
+++ b/kopete/plugins/statistics/statisticsdialog.cpp
@@ -42,7 +42,7 @@
StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, TQWidget* parent,
const char* name) : KDialogBase(parent, name, false,
- i18n("Statistics for %1").tqarg(contact->metaContact()->displayName()), Close, Close), m_db(db), m_contact(contact)
+ i18n("Statistics for %1").arg(contact->metaContact()->displayName()), Close, Close), m_db(db), m_contact(contact)
{
mainWidget = new StatisticsWidget(this);
setMainWidget(mainWidget);
@@ -107,7 +107,7 @@ void StatisticsDialog::slotOpenURLRequest(const KURL& url, const KParts::URLArgs
void StatisticsDialog::generatePageForMonth(const int monthOfYear)
{
TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
- "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").tqarg(m_contact->statisticsContactId()));
+ "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").arg(m_contact->statisticsContactId()));
TQStringList values2;
@@ -129,7 +129,7 @@ void StatisticsDialog::generatePageForMonth(const int monthOfYear)
void StatisticsDialog::generatePageForDay(const int dayOfWeek)
{
TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
- "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").tqarg(m_contact->statisticsContactId()));
+ "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").arg(m_contact->statisticsContactId()));
TQStringList values2;
@@ -190,8 +190,8 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
"margin-right: 5px;"
"padding:3px 3px 3px 10px;}"
"</style></head><body>" +
- i18n("<h1>Statistics for %1</h1>").tqarg(m_contact->metaContact()->displayName()) +
- "<h3>%1</h3><hr>").tqarg(subTitle));
+ i18n("<h1>Statistics for %1</h1>").arg(m_contact->metaContact()->displayName()) +
+ "<h3>%1</h3><hr>").arg(subTitle));
generalHTMLPart->write(i18n("<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General summary view\">General</a></b><br>"
"<span title=\"Select the a day or a month to view the stat for\"><b>Days: </b>"
@@ -351,7 +351,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
}
else color="white";
- todayString.append(TQString("<tr style=\"color:%1\"><td>%2</td><td>%3</td><td>%4</td></tr>").tqarg(color, status, dateTime1.time().toString(), dateTime2.time().toString()));
+ todayString.append(TQString("<tr style=\"color:%1\"><td>%2</td><td>%3</td><td>%4</td></tr>").arg(color, status, dateTime1.time().toString(), dateTime2.time().toString()));
}
@@ -386,11 +386,11 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
// Some "total times"
generalHTMLPart->write(i18n("<div class=\"statgroup\">"));
generalHTMLPart->write(i18n("<b title=\"The total time I have been able to see %1 status\">"
- "Total seen time :</b> %2 hour(s)<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalTime)));
+ "Total seen time :</b> %2 hour(s)<br>").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalTime)));
generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 online\">"
- "Total online time :</b> %2 hour(s)<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalOnlineTime)));
- generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 away\">Total busy time :</b> %2 hour(s)<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalAwayTime)));
- generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 offline\">Total offline time :</b> %2 hour(s)").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalOfflineTime)));
+ "Total online time :</b> %2 hour(s)<br>").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalOnlineTime)));
+ generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 away\">Total busy time :</b> %2 hour(s)<br>").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalAwayTime)));
+ generalHTMLPart->write(i18n("<b title=\"The total time I have seen %1 offline\">Total offline time :</b> %2 hour(s)").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalOfflineTime)));
generalHTMLPart->write(TQString("</div>"));
if (subTitle == i18n("General information"))
@@ -399,24 +399,24 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
*/
{
generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
- generalHTMLPart->write(i18n("<b>Average message length :</b> %1 characters<br>").tqarg(m_contact->messageLength()));
- generalHTMLPart->write(i18n("<b>Time between two messages : </b> %1 second(s)").tqarg(m_contact->timeBetweenTwoMessages()));
+ generalHTMLPart->write(i18n("<b>Average message length :</b> %1 characters<br>").arg(m_contact->messageLength()));
+ generalHTMLPart->write(i18n("<b>Time between two messages : </b> %1 second(s)").arg(m_contact->timeBetweenTwoMessages()));
generalHTMLPart->write(TQString("</div>"));
generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
- generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").tqarg(m_contact->metaContact()->displayName()).tqarg(KGlobal::locale()->formatDateTime(m_contact->lastTalk())));
- generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").tqarg(m_contact->metaContact()->displayName()).tqarg(KGlobal::locale()->formatDateTime(m_contact->lastPresent())));
+ generalHTMLPart->write(i18n("<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastTalk())));
+ generalHTMLPart->write(i18n("<b title=\"The last time I have seen %1 online or away\">Last time contact was present :</b> %2").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastPresent())));
generalHTMLPart->write(TQString("</div>"));
//generalHTMLPart->write(TQString("<div class=\"statgroup\">"));
- //generalHTMLPart->write(i18n("<b title=\"%1 uses to set his status online at these hours (EXPERIMENTAL)\">Main online events :</b><br>").tqarg(m_contact->metaContact()->displayName()));
+ //generalHTMLPart->write(i18n("<b title=\"%1 uses to set his status online at these hours (EXPERIMENTAL)\">Main online events :</b><br>").arg(m_contact->metaContact()->displayName()));
//TQValueList<TQTime> mainEvents = m_contact->mainEvents(Kopete::OnlineStatus::Online);
//for (uint i=0; i<mainEvents.count(); i++)
- //generalHTMLPart->write(TQString("%1<br>").tqarg(mainEvents[i].toString()));
+ //generalHTMLPart->write(TQString("%1<br>").arg(mainEvents[i].toString()));
//generalHTMLPart->write(TQString("</div>"));
generalHTMLPart->write("<div title=\"" +i18n("Current status") + "\" class=\"statgroup\">");
- generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").tqarg(
+ generalHTMLPart->write(i18n("Is <b>%1</b> since <b>%2</b>").arg(
Kopete::OnlineStatus(m_contact->oldStatus()).description(),
KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime())));
generalHTMLPart->write(TQString("</div>"));
@@ -440,7 +440,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
+TQString("\" src=\"file://")
+colorPath
+"\" width=\"4%\" title=\""
- +i18n("Between %1:00 and %2:00, I was able to see %3 status %4% of the hour.").tqarg(i).tqarg((i+1)%24).tqarg(m_contact->metaContact()->displayName()).tqarg(hrWidth)
+ +i18n("Between %1:00 and %2:00, I was able to see %3 status %4% of the hour.").arg(i).arg((i+1)%24).arg(m_contact->metaContact()->displayName()).arg(hrWidth)
+TQString("\">");
}
generalHTMLPart->write(chartString);
@@ -478,7 +478,7 @@ void StatisticsDialog::generatePageGeneral()
TQStringList values;
values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend "
"FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;")
- .tqarg(m_contact->statisticsContactId()));
+ .arg(m_contact->statisticsContactId()));
generatePageFromTQStringList(values, i18n("General information"));
}
@@ -524,9 +524,9 @@ void StatisticsDialog::slotAskButtonClicked()
if (mainWidget->questionComboBox->currentItem()==0)
{
TQString text = i18n("1 is date, 2 is contact name, 3 is online status", "%1, %2 was %3")
- .tqarg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())))
- .tqarg(m_contact->metaContact()->displayName())
- .tqarg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())));
+ .arg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())))
+ .arg(m_contact->metaContact()->displayName())
+ .arg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time())));
mainWidget->answerEdit->setText(text);
}
else if (mainWidget->questionComboBox->currentItem()==1)
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 61b303e1..20f3ed03 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -364,7 +364,7 @@ void TranslatorPlugin::sendTranslation( Kopete::Message &msg, const TQString &tr
msg.setBody( translated, msg.format() );
break;
case ShowOriginal:
- msg.setBody( i18n( "%2 \nAuto Translated: \n%1" ).tqarg( translated, msg.plainBody() ), msg.format() );
+ msg.setBody( i18n( "%2 \nAuto Translated: \n%1" ).arg( translated, msg.plainBody() ), msg.format() );
break;
case ShowDialog:
{